From ee0d5aab5ecbbd265660cba45c8a1946005b8f8c Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期三, 18 九月 2024 13:49:17 +0800
Subject: [PATCH] v1.30，把gcom表1搬到表2的时候往后挪，防止保存出错一直重启。
---
Src/radio/Lora.c | 339 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 305 insertions(+), 34 deletions(-)
diff --git a/Src/radio/Lora.c b/Src/radio/Lora.c
index 7a9751c..da6839b 100644
--- a/Src/radio/Lora.c
+++ b/Src/radio/Lora.c
@@ -12,6 +12,9 @@
#include "main.h"
#include <stdlib.h>
#include "dw_mbx_tag.h"
+#include "Flash.h"
+#include "dw_driver.h"
+#include "WS2812.h"
static RadioEvents_t RadioEvents;
#define USE_MODEM_LORA
//#define USE_MODEM_FSK
@@ -37,15 +40,62 @@
#define RF_FREQUENCY_R 500000000 // Hz
#define RF_FREQUENCY_T 470200000 // Hz
#define TX_OUTPUT_POWER 22 // 22 dBm
-
+uint16_t rec_wenjian_daxiao;
+uint16_t wangguan_up_id;
extern bool IrqFired;
extern uint8_t lora_yingda_flag;
uint16_t lora_yingda_num;
uint16_t crc_value;
-/*!
- * Radio events function pointer
- */
+/**
+ * @brief Update CRC16 for input byte
+ * @param CRC input value
+ * @param input byte
+ * @retval Updated CRC value
+ */
+uint16_t UpdateCRC16(uint16_t crcIn, uint8_t byte)
+{
+ uint32_t crc = crcIn;
+ uint32_t in = byte|0x100;
+ do
+ {
+ crc <<= 1;
+ in <<= 1;
+
+ if(in&0x100)
+ {
+ ++crc;
+ }
+
+ if(crc&0x10000)
+ {
+ crc ^= 0x1021;
+ }
+ } while(!(in&0x10000));
+
+ return (crc&0xffffu);
+}
+
+/**
+ * @brief Cal CRC16 for YModem Packet
+ * @param data
+ * @param length
+ * @retval CRC value
+ */
+uint16_t Cal_CRC16(const uint8_t* data, uint32_t size)
+{
+ uint32_t crc = 0;
+ const uint8_t* dataEnd = data+size;
+
+ while(data<dataEnd)
+ {
+ crc = UpdateCRC16(crc,*data++);
+ }
+ crc = UpdateCRC16(crc,0);
+ crc = UpdateCRC16(crc,0);
+
+ return (crc&0xffffu);
+}
static RadioEvents_t RadioEvents;
#if defined( USE_MODEM_LORA )
@@ -112,12 +162,15 @@
uint8_t lora_chongfuyingda_flag;
uint8_t Lora_rx_open_flag;
extern u32 Loratx_frequency;
-
+uint8_t huifushengjibao_flag;
+uint8_t LoraUp_flag;
+uint8_t lora_up_rec_flag;
uint8_t flag_writepara_needreset = 0;
uint32_t wg_lost_count = 10;
uint32_t lora_zhuangtai;
uint16_t current_count;
extern wg_state_enum wg_state;
+extern u8 uwb_rxflag;
void OnTxDone( void )
{
if(flag_writepara_needreset) //配置写入完成设备需要重启
@@ -126,8 +179,24 @@
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
}
Radio.Standby();
- Radio.Rx( 50 );
-// LED_TB_OFF;
+ if(LoraUp_flag)
+ {
+ huifushengjibao_flag=1;
+ Radio.Rx( 500 );
+ }
+ else
+ {
+ if(uwb_rxflag)
+ {
+ uwb_rxflag=0;
+ UWB_RXOFF();
+ Radio.Rx( 50 );
+ }
+ else
+ {
+ Radio.Rx( 50 );
+ }
+ }
}
extern LPTIM_HandleTypeDef hlptim1;
uint16_t current_time,start_time,end_time;
@@ -148,19 +217,19 @@
extern uint8_t lora_sendbuffer[200];
void LoraSendComMap(uint8_t cmd)
{
- uint8_t data_length = 0x28;
+ uint8_t data_length = 0x50;
uint16_t checksum = 0;
lora_sendbuffer[MSG_TYPE_IDX] = LORA_MSGTYPE_READPARARESP;
- lora_sendbuffer[MSG_LENGTH] = data_length+9;
+ lora_sendbuffer[MSG_LENGTH] = data_length+11;
memcpy(&lora_sendbuffer[SOURCE_ID_IDX],&g_com_map[DEV_ID],2);
memcpy(&lora_sendbuffer[DEST_ID_IDX],&wg_report_id,2);
lora_sendbuffer[RP_CMD_IDX] = cmd;
lora_sendbuffer[RP_INDEX_IDX] = 2;
lora_sendbuffer[RP_LEN_IDX] = data_length;
- memcpy(&lora_sendbuffer[7], &g_com_map[1], data_length);
- checksum = Checksum_u16(lora_sendbuffer,9+data_length);
- memcpy(&lora_sendbuffer[9+data_length],&checksum,2);
- Radio.Send(lora_sendbuffer,data_length+11);
+ memcpy(&lora_sendbuffer[9], &g_com_map[1], data_length);
+ checksum = Checksum_u16(lora_sendbuffer,11+data_length);
+ memcpy(&lora_sendbuffer[11+data_length],&checksum,2);
+ Radio.Send(lora_sendbuffer,data_length+13);
// Delay_Ms(100);
}
void LoraRspWriteCommap(uint8_t index)
@@ -180,27 +249,33 @@
Radio.Send(lora_sendbuffer,data_length+11);
// Delay_Ms(100);
}
-static uint16_t delaytime = 1050;
+extern uint8_t report_ancnum;
+static uint16_t delaytime = 1200;
static uint16_t source_id;
-uint8_t rec_index;
+uint8_t rec_index,rec_secdelay;
uint16_t rec_value,rec_delaytime,rx_count;
-int16_t target_count;
+uint16_t rec_value,rec_delaytime,rx_count,datalen_offset;
+int32_t target_count;
+uint8_t shengji_flag,time=5;
+extern uint32_t uwbled,gpsled,loraled,powerled;
void OnRxDone( uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr )
-{
+{ uint16_t checksum1;
BufferSize = size;
memcpy( RX_Buffer, payload, BufferSize );
RssiValue = rssi;
SnrValue = snr;
Radio.Standby();
no_rx_flag = 0;
+ lora_up_rec_flag=1;
if(RX_Buffer[MSG_TYPE_IDX]==LORA_MSGTYPE_RANGEPOLL)
{
- UWB_Wkup();
- MbxTagUwbRec();
- HAL_GPIO_WritePin(RADIO_NSS_GPIO_Port, RADIO_NSS_Pin, GPIO_PIN_RESET); //片选lora有效
+ UWB_RXStart(10);
+ delay_ms(time);
}
if(RX_Buffer[MSG_TYPE_IDX]==LORA_MSGTYPE_WGRESPTAG)
{
+ checksum1=Checksum_u16(RX_Buffer,BufferSize-2);
+ if(!memcmp(&checksum1,&RX_Buffer[BufferSize-2],2))
if(!memcmp(&dev_id,&RX_Buffer[DEST_ID_IDX],2))
{
memcpy(&source_id,&RX_Buffer[SOURCE_ID_IDX],2);
@@ -212,14 +287,28 @@
if(!memcmp(&wg_report_id,&RX_Buffer[SOURCE_ID_IDX],2))
{
wg_lost_count = 0;
+ loraled=GREEN;
switch(RX_Buffer[PWTAG_RW_FLAG_IDX])
{
case WGRSP_RWTAG_NONE:
current_count = HAL_LPTIM_ReadCounter(&hlptim1);
wg_report_freq = RX_Buffer[POLL_FREQ_IDX]+400;
- memcpy(&rec_delaytime,&RX_Buffer[NEXTPOLL_TIME_IDX],2);
- target_count = current_count + rec_delaytime*3.2768 - delaytime;
- if(target_count>=32768)
+ memcpy(&rec_delaytime,&RX_Buffer[NEXTPOLL_TIME_IDX],2);
+ rec_secdelay = RX_Buffer[PWTAG_SECDELAY_IDX];
+ if(BufferSize!=13||rec_secdelay>20)
+ {
+ rec_secdelay = 0;
+ }
+
+ if(report_ancnum<2)
+ {
+ datalen_offset = report_ancnum*85;
+ }else{
+ datalen_offset = (report_ancnum-1)*46+85;
+ }
+
+ target_count = current_count + rec_delaytime*3.2768 - delaytime-datalen_offset;
+ while(target_count>=32768)
target_count-=32768;
__HAL_LPTIM_COMPARE_SET(&hlptim1, target_count);
rx_count = HAL_LPTIM_ReadCounter(&hlptim1);
@@ -231,6 +320,8 @@
break;
case WGRSP_RWTAG_WRITE:
rec_index = RX_Buffer[PWTAG_WRITE_IDX_IDX];
+ if(rec_index<=DEV_ID)
+ return;
if(rec_index==0xDD)
{
if(usart5_state==1)
@@ -240,10 +331,14 @@
}
HAL_GPIO_WritePin(GPIOC, GPIO_PIN_7, GPIO_PIN_SET);
HAL_GPIO_WritePin(GPIOC, GPIO_PIN_13, GPIO_PIN_SET);
- memcpy(&xiafayuyin_data,&RX_Buffer[9],RX_Buffer[8]);
+ memcpy(&xiafayuyin_data,&RX_Buffer[PWTAG_WRITE_VALUE_IDX],BufferSize-PWTAG_WRITE_VALUE_IDX-2);
yuyin_sendflag=1;
yuyinzidongguan_time=0;
- yuyin_no_sleep_flag=1;
+ yuyin_no_sleep_flag=1;
+// SYN_FrameInfo(0,xiafayuyin_data); //播放内容
+// memset(xiafayuyin_data,0,sizeof(xiafayuyin_data));
+ LoraRspWriteCommap(SUBMSG_WRITE_ANCPARA);
+ no_rx_flag = 1;
}else{
memcpy(&rec_value,&RX_Buffer[PWTAG_WRITE_VALUE_IDX],2);
g_com_map[rec_index/2] = rec_value;
@@ -252,13 +347,31 @@
flag_writepara_needreset = 1;
no_rx_flag = 1;
}
- break;
+ break;
+ case WGRSP_RWTAG_UPDATE:
+ rec_index = RX_Buffer[PWTAG_WRITE_IDX_IDX];
+ switch(rec_index)
+ {
+ case 0xaa: //升级下发
+ memcpy(&rec_wenjian_daxiao,&RX_Buffer[WRITEPARA_VALUE_IDX],2);//文件大小
+ if(rec_wenjian_daxiao>APP_SIZE||rec_wenjian_daxiao==0)
+ {}//文件过大，超出范围
+ else
+ {
+ memcpy(&wangguan_up_id,&RX_Buffer[SOURCE_ID_IDX],2);//网关ID 占用2个字节
+ shengji_flag=1;
+ LoraUp_flag=1;
+ }
+ break;
+ }
+ break;
}
}
}
- }
- if(!no_rx_flag)
+ }
+ if(!no_rx_flag&&LoraUp_flag==0)
{
+ if(RX_Buffer[MSG_TYPE_IDX]!=LORA_MSGTYPE_RANGEPOLL)
SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],UWB_CHANNEL_SF,0);
Radio.Rx(0);
}
@@ -276,7 +389,7 @@
Radio.Standby();
current_count = HAL_LPTIM_ReadCounter(&hlptim1);
target_count-=current_count%3276;
- if(target_count<0)
+ while(target_count<0)
target_count+=32768;
__HAL_LPTIM_COMPARE_SET(&hlptim1, target_count);
SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],UWB_CHANNEL_SF,0);
@@ -327,12 +440,170 @@
Radio.Init( &RadioEvents );
SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],5,0); //切换lora接收频点
- if(active_flag)
- {
+// if(active_flag)
+// {
Radio.Rx( 0 );
- }else{
- Radio.Sleep();
- }
+// }else{
+// Radio.Sleep();
+// }
// Radio.SetRxDutyCycle(RxDutyCycle_RX_time,RxDutyCycle_SLEEP_time);
+ RadioGetStatus();
}
+uint32_t IAP_JumpTo(uint32_t ApplicationAddress)
+{
+ uint32_t JumpAddress;
+
+ if (((*(uint32_t*)ApplicationAddress) & 0x2FFE0000 ) == 0x20000000)
+ {
+//HAL_NVIC_DisableIRQ(EXTI0_1_IRQn);
+// __disable_irq();
+ JumpAddress = *(uint32_t*) (ApplicationAddress + 4);
+
+ __set_MSP(*(uint32_t*) ApplicationAddress); //Set MSP
+
+ (*((void(*)(void))JumpAddress))();
+
+ return 1;
+ }
+
+ return 0;
+}
+uint8_t send_lora_data[250];
+//extern uint8_t lora_recbuffer[255];
+uint8_t muqiandeshengjibao;
+static uint16_t current_count1,target_count1,end_count1,start_count1;
+uint8_t huifushengjibaoerror_num;
+uint8_t final_bag_num;
+uint16_t testflag;
+uint32_t Zhongjian_data[60];
+uint16_t app1_or_app2;
+extern IWDG_HandleTypeDef hiwdg;
+void LoraUp_Poll()
+{ uint16_t result ;
+ uint16_t crc16;
+ if(shengji_flag)
+ {
+// memcpy(&wangguan_up_id,&RX_Buffer[SOURCE_ID_IDX],2);//网关ID 占用2个字节
+ send_lora_data[MSG_TYPE_IDX]=LORA_MSGTYPE_UPDATE_CONFIRM;
+ memcpy(&send_lora_data[SOURCE_ID_IDX],&dev_id,2);//网关ID 占用2个字节
+ memcpy(&send_lora_data[DEST_ID_IDX],&wangguan_up_id,2);//标签或者基站的设备ID 2个字节
+// send_lora_data[MUQIAN_BAG]=0xFF;
+ crc16=Checksum_u16(send_lora_data,6);
+ memcpy(&send_lora_data[6],&crc16,2);
+ huifushengjibao_flag=0;
+ LoraUp_flag=1;
+// SwitchLoraSettings(LORA_UPCHANNEL_FRQ,LORA_UPCHANNEL_SF,22); //切换lora升级频点
+ Radio.Send(send_lora_data,8);//基站发送升级确认回复
+ Delay_Ms(1000);
+ SwitchLoraSettings(LORA_UPCHANNEL_FRQ,LORA_UPCHANNEL_SF,22); //切换lora升级频点
+ delay_ms(200);
+ __disable_irq();
+// FLASH_Read(APP_1OR2_ADRESS,(uint8_t*)&app1_or_app2,2);
+ final_bag_num=(rec_wenjian_daxiao/220)+1;//计算一共要请求多少包
+ while(1)
+ {
+ FLASH_Prepare(APP2_ADRESS, APP_SIZE);
+ delay_ms(500);
+ if(testflag==0)
+ {break;}
+ }
+// FLASH_Write(APP2_ADRESS, (const uint8_t*)&tmp111, 2);
+ __enable_irq();
+ while(1)
+ {
+// huifushengjibao_flag=1;
+ if(huifushengjibao_flag==1)
+ {lora_up_rec_flag=1;
+ while(1)
+ {
+ send_lora_data[MSG_TYPE_IDX]=LORA_MSGTYPE_UPDATEFILE_REQUEST;
+ memcpy(&send_lora_data[SOURCE_ID_IDX],&dev_id,2);//网关ID 占用2个字节
+ memcpy(&send_lora_data[DEST_ID_IDX],&wangguan_up_id,2);//标签或者基站的设备ID 2个字节
+ send_lora_data[MUQIAN_BAG]=muqiandeshengjibao;
+ crc16=Checksum_u16(send_lora_data,7);
+ memcpy(&send_lora_data[7],&crc16,2);
+ lora_up_rec_flag=0;
+ Radio.Send(send_lora_data,9);//基站发送请求第x包
+
+ start_count1=HAL_LPTIM_ReadCounter(&hlptim1); //等待接收完成直到超时
+ end_count1=start_count1+32768/2;//500ms等待
+ if(end_count1>=32768)
+ {end_count1-=32768;}
+ current_count1=HAL_LPTIM_ReadCounter(&hlptim1);
+ while(!lora_up_rec_flag)
+ {
+ current_count1=HAL_LPTIM_ReadCounter(&hlptim1);
+ if(current_count1>=end_count1&¤t_count1<end_count1+15000)
+ {
+ break;
+ }
+ delay_ms(100);
+ if(lora_up_rec_flag)
+ {break;}
+ Radio.Send(send_lora_data,9);
+ }
+// while(1);
+ if(lora_up_rec_flag)
+ { uint16_t result12;
+ HAL_IWDG_Refresh(&hiwdg);
+ crc16=Cal_CRC16(RX_Buffer,DATA_IDX+ONE_BAG_DAXIAO);
+ __disable_irq();
+ if(muqiandeshengjibao==RX_Buffer[MUQIAN_BAG]&&!memcmp(&crc16,&RX_Buffer[DATA_IDX+ONE_BAG_DAXIAO],2)&&!memcmp(&dev_id,&RX_Buffer[DEST_ID_IDX],2)&& !memcmp(&wangguan_up_id,&RX_Buffer[SOURCE_ID_IDX],2))
+ {
+ memcpy(Zhongjian_data,&RX_Buffer[DATA_IDX],ONE_BAG_DAXIAO);
+ result12=FLASH_Write(APP2_ADRESS+ONE_BAG_DAXIAO*RX_Buffer[MUQIAN_BAG],(uint8_t*)Zhongjian_data,ONE_BAG_DAXIAO);
+ while(result12==0)
+ {
+ result12=FLASH_Write(APP2_ADRESS+ONE_BAG_DAXIAO*RX_Buffer[MUQIAN_BAG],(uint8_t*)Zhongjian_data,ONE_BAG_DAXIAO);
+ delay_ms(10);
+ }
+ if(result12)
+ muqiandeshengjibao++;
+ }
+ __enable_irq();
+ }
+ else
+ {
+ HAL_IWDG_Refresh(&hiwdg);
+ huifushengjibaoerror_num++;
+ if(huifushengjibaoerror_num>=20)
+ {
+ huifushengjibaoerror_num=0;
+ muqiandeshengjibao=0;
+ Delay_Ms(500);
+ HAL_NVIC_SystemReset();
+ break;
+ }
+ }
+ if(muqiandeshengjibao==final_bag_num)
+ {
+ uint16_t tmp11 ,result11;
+ tmp11=0XCC;
+ result11 = FLASH_Prepare(APP_1OR2_ADRESS, PAGE_SIZE);
+ if(result11)
+ result11 = FLASH_Write(APP_1OR2_ADRESS, (const uint8_t*)&tmp11, 2);
+ __disable_irq();
+ Delay_Ms(1500);
+ HAL_NVIC_SystemReset();
+ }
+ }
+ }
+ else
+ {
+ Delay_Ms(500);
+// huifushengjibao_flag=0;
+ Radio.Send(send_lora_data,8);//基站发送升级确认回复
+ huifushengjibaoerror_num++;
+ if(huifushengjibaoerror_num>=5)
+ {
+ huifushengjibaoerror_num=0;
+ Delay_Ms(500);
+ HAL_NVIC_SystemReset();
+ break;
+ }
+ }
+ }
+ }
+}
+
--
Gitblit v1.9.3