From 15c798731ba5658fc0ecd9e3f47f662861c56b9c Mon Sep 17 00:00:00 2001 From: WXK <287788329@qq.com> Date: 星期五, 23 二月 2024 14:40:37 +0800 Subject: [PATCH] 加入lora升级。 --- Src/radio/Lora.c | 516 +++++++++++++++++++++++++++++++++----------------------- 1 files changed, 301 insertions(+), 215 deletions(-) diff --git a/Src/radio/Lora.c b/Src/radio/Lora.c index 79319fc..ffea0f3 100644 --- a/Src/radio/Lora.c +++ b/Src/radio/Lora.c @@ -9,13 +9,12 @@ #include "string.h" #include "stdio.h" #include "delay.h" -#include "main.h" -static RadioEvents_t RadioEvents; +#include "dw_mbx_anc.h" +#include "Flash.h" +#include "dw_mbx_anc.h" #define USE_MODEM_LORA //#define USE_MODEM_FSK #define REGION_CN779 -uint32_t RxDutyCycle_RX_time =128; -uint32_t RxDutyCycle_SLEEP_time=256; #if defined( REGION_AS923 ) #define RF_FREQUENCY 923000000 // Hz @@ -64,8 +63,8 @@ -//bool EnableMaster=true;//主选择 -bool EnableMaster=false;//从选择 +bool EnableMaster=true;//主选择 +//bool EnableMaster=false;//从选择 uint16_t crc_value; /*! @@ -73,6 +72,56 @@ */ static RadioEvents_t RadioEvents; +/** + * @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); +} #if defined( USE_MODEM_LORA ) @@ -85,8 +134,8 @@ // 2: 4/6, // 3: 4/7, // 4: 4/8] -#define LORA_PREAMBLE_LENGTH_T 10 // Same for Tx -#define LORA_PREAMBLE_LENGTH_R 64 // Same for Rx +#define LORA_PREAMBLE_LENGTH_T 8 // 96 // Same for Tx +#define LORA_PREAMBLE_LENGTH_R 8 // Same for Rx //#define LORA_PREAMBLE_LENGTH 990 // Same for Tx and Rx #define LORA_SYMBOL_TIMEOUT 0 // Symbols #define LORA_FIX_LENGTH_PAYLOAD_ON false @@ -117,8 +166,9 @@ TX_TIMEOUT, }States_t; -//#define RX_TIMEOUT_VALUE 1000 -#define RX_TIMEOUT_VALUE 64000 +static uint8_t flag_lora_wait_sync = 0; + +#define RX_TIMEOUT_VALUE 9999 #define BUFFER_SIZE 64 // Define the payload size here const uint8_t PingMsg[] = "PING"; @@ -139,74 +189,68 @@ void OnRxTimeout( void ); void OnRxError( void ); -uint8_t Lora_rx_open_flag; + void LedToggle(void) { // HAL_GPIO_TogglePin(GPIOB, LED1_Pin); } -void Lora_rx_open( void ) -{ - if(Lora_rx_open_flag==1) - { - Lora_Init(); - Lora_rx_open_flag=0; - } -} +uint8_t huifushengjibao_flag; +uint8_t LoraUp_flag; +extern uint8_t flag_writepara_needreset; void OnTxDone( void ) { -Lora_rx_open_flag=1; +// T_R_Init(0); + Radio.Standby(); +// Radio.Rx( RX_TIMEOUT_VALUE ); //进入接收 + if(flag_writepara_needreset) //配置写入完成设备需要重启 + { + printf("网关下发配置写入完成,重启"); + SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader + } + if(LoraUp_flag) + { + huifushengjibao_flag=1; + Radio.Rx( 500 ); + } + else + { Radio.Sleep( );} +//printf("TX SUCCESS2\r\n"); } -extern uint8_t frame_seq_nb2,rec_nearbase_num,ancidlist_num; -uint16_t RX_TIMEOUTs; -extern LPTIM_HandleTypeDef hlptim1; -uint16_t current_time,start_time,end_time; +static uint8_t rxbuffer[255],rxbuff_len; +static uint16_t rec_lp_count; +uint8_t GetLoraBufferAndLen(uint8_t* buffer,uint16_t* lp_count) +{ + memcpy(buffer,rxbuffer,rxbuff_len); + memcpy(lp_count,&rec_lp_count,2); + return rxbuff_len; +} +uint16_t GetLoraSyncCount(void) +{ + return rec_lp_count; +} +uint8_t lora_up_rec_flag; +extern uint16_t tx_num; void OnRxDone( uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr ) { - BufferSize = size; - memcpy( RX_Buffer, payload, BufferSize ); + rec_lp_count = HAL_LPTIM_ReadCounter(&hlptim1); + rxbuff_len = size; + + memcpy( rxbuffer, payload, size ); RssiValue = rssi; SnrValue = snr; Radio.Standby(); - { -// HAL_GPIO_WritePin(GPIOB, GPIO_PIN_2, GPIO_PIN_SET); -// Delay_Ms(10); -// HAL_GPIO_WritePin(GPIOB, GPIO_PIN_2, GPIO_PIN_RESET); - uint16_t i=0; - for(i=0;i<BufferSize;i++) - {printf("RXD %d:\r\n",RX_Buffer[i]);} - RX_TIMEOUTs++; - printf("RX_num :%d\r\n",RX_TIMEOUTs); -// start_time=HAL_LPTIM_ReadCounter(&hlptim1); -// end_time=start_time+((32768/1000)*20); -// if(end_time>=32768) -// {end_time-=32768;} -// current_time=HAL_LPTIM_ReadCounter(&hlptim1); - HAL_GPIO_WritePin(RADIO_NSS_GPIO_Port, RADIO_NSS_Pin, GPIO_PIN_SET); -// while(current_time<end_time||current_time>end_time+15000) -// { -// current_time=HAL_LPTIM_ReadCounter(&hlptim1); - Anchor_App(); -// } + lora_up_rec_flag=1; + flag_lora_wait_sync = 0; + SetFlagSyncSuccess(1); + Radio.Rx( RX_TIMEOUT_VALUE ); - HAL_GPIO_WritePin(RADIO_NSS_GPIO_Port, RADIO_NSS_Pin, GPIO_PIN_RESET); - delay_ms(10); - - Radio.SetChannel( 470200000 ); - Radio.SetTxConfig( MODEM_LORA, TX_OUTPUT_POWER, 0, 0, - 7, LORA_CODINGRATE,LORA_PREAMBLE_LENGTH_T, LORA_FIX_LENGTH_PAYLOAD_ON, - false, 0, 0, LORA_IQ_INVERSION_ON_T, 3000 ); - - Radio.Send( usart_send, 12+rec_nearbase_num*4); -// printf("RX_TIMEOUTs :%d\r\n",RX_TIMEOUTs); -// Radio.SetRxDutyCycle(RxDutyCycle_RX_time,RxDutyCycle_SLEEP_time); -// printf("RX_TIMEOUTs :XXXX\r\n"); -// Radio.Rx( RX_TIMEOUT_VALUE ); -// printf("Slave TXD XXXX\r\n"); - - } +// if(LoraUp_flag) +// { +// +// } } void OnTxTimeout( void ) @@ -217,98 +261,14 @@ void OnRxTimeout( void ) { Radio.Standby(); - if(EnableMaster) - { -// TX_Buffer[0] = 'P'; -// TX_Buffer[1] = 'I'; -// TX_Buffer[2] = 'N'; -// TX_Buffer[3] = 'G'; -// -//// crc_value=RadioComputeCRC(TX_Buffer,4,CRC_TYPE_IBM);//计算得出要发送数据包CRC值 -//// TX_Buffer[4]=crc_value>>8; -//// TX_Buffer[5]=crc_value; -// //Radio.Send( TX_Buffer, 6); -// Radio.Send( TX_Buffer, 4); - -// HAL_GPIO_WritePin( OUT1_GPIO_Port, OUT1_Pin,GPIO_PIN_SET); -// HAL_Delay_nMS( 1 ); -// HAL_GPIO_WritePin( OUT1_GPIO_Port, OUT1_Pin,GPIO_PIN_RESET); - printf("Master TXD PING!\r\n"); - } - else - { - Radio.SetRxDutyCycle(RxDutyCycle_RX_time,RxDutyCycle_SLEEP_time); -// printf("slave OnRxTimeout\r\n"); - -// Radio.Rx( RX_TIMEOUT_VALUE ); - printf("slave OnRxTimeout\r\n"); - } + flag_lora_wait_sync = 0; } void OnRxError( void ) { - + flag_lora_wait_sync = 0; Radio.Standby(); - if(EnableMaster) - { - TX_Buffer[0] = 'P'; - TX_Buffer[1] = 'I'; - TX_Buffer[2] = 'N'; - TX_Buffer[3] = 'G'; - -// crc_value=RadioComputeCRC(TX_Buffer,4,CRC_TYPE_IBM);//计算得出要发送数据包CRC值 -// TX_Buffer[4]=crc_value>>8; -// TX_Buffer[5]=crc_value; - //Radio.Send( TX_Buffer, 6); - Radio.Send( TX_Buffer, 4); -// HAL_GPIO_WritePin( OUT1_GPIO_Port, OUT1_Pin,GPIO_PIN_SET); -// HAL_Delay_nMS( 1 ); -// HAL_GPIO_WritePin( OUT1_GPIO_Port, OUT1_Pin,GPIO_PIN_RESET); - printf("Master TXD PING!\r\n"); - } - else - { - Radio.SetRxDutyCycle(RxDutyCycle_RX_time,RxDutyCycle_SLEEP_time); - printf("slave OnRxError\r\n"); -// Radio.Rx( RX_TIMEOUT_VALUE ); - - } - } - - - -//void T_R_Init(uint8_t kind) -//{ -// Radio.Init( &RadioEvents ); -// if(kind==1) //1:Txd config -// { -// Radio.SetChannel( RF_FREQUENCY ); -// Radio.SetTxConfig( MODEM_LORA, TX_OUTPUT_POWER, 0, LORA_BANDWIDTH, -// LORA_SPREADING_FACTOR, LORA_CODINGRATE, -// LORA_PREAMBLE_LENGTH_T, LORA_FIX_LENGTH_PAYLOAD_ON, -// false, 0, 0, LORA_IQ_INVERSION_ON_T, 1000 ); - -// } -// else //0:Rxd config -// { -// Radio.SetChannel( RF_FREQUENCY ); -// Radio.SetRxConfig( MODEM_LORA, LORA_BANDWIDTH, LORA_SPREADING_FACTOR, -// LORA_CODINGRATE, 0, LORA_PREAMBLE_LENGTH_R, -// LORA_SYMBOL_TIMEOUT, LORA_FIX_LENGTH_PAYLOAD_ON, -// 0, false, 0, 0, LORA_IQ_INVERSION_ON_R, false ); -// } -// -//// Radio.SetTxConfig( MODEM_LORA, TX_OUTPUT_POWER, 0, LORA_BANDWIDTH, -//// LORA_SPREADING_FACTOR, LORA_CODINGRATE, -//// LORA_PREAMBLE_LENGTH_T, LORA_FIX_LENGTH_PAYLOAD_ON, -//// false, 0, 0, LORA_IQ_INVERSION_ON_T, 1000 ); - -//// Radio.SetRxConfig( MODEM_LORA, LORA_BANDWIDTH, LORA_SPREADING_FACTOR, -//// LORA_CODINGRATE, 0, LORA_PREAMBLE_LENGTH_R, -//// LORA_SYMBOL_TIMEOUT, LORA_FIX_LENGTH_PAYLOAD_ON, -//// 0, false, 0, 0, LORA_IQ_INVERSION_ON_R, false ); -//} void Lora_Init(void) { @@ -318,77 +278,203 @@ RadioEvents.RxTimeout = OnRxTimeout; RadioEvents.RxError = OnRxError; - Radio.Init( &RadioEvents ); - if(EnableMaster) - { - Radio.SetChannel( RF_FREQUENCY ); - } - else - { - Radio.SetChannel( RF_FREQUENCY ); - } -// Radio.SetStandby( STDBY_RC ); + Radio.Init( &RadioEvents ); + Radio.Standby(); + Radio.Sleep(); -// Radio.SetTxConfig( MODEM_LORA, TX_OUTPUT_POWER, 0, LORA_BANDWIDTH, -// LORA_SPREADING_FACTOR, LORA_CODINGRATE, -// LORA_PREAMBLE_LENGTH, LORA_FIX_LENGTH_PAYLOAD_ON, -// true, 0, 0, LORA_IQ_INVERSION_ON, 3000 ); - -// Radio.SetTxConfig( MODEM_LORA, TX_OUTPUT_POWER, 0, LORA_BANDWIDTH, +// Radio.SetChannel( UWB_CHANNEL_FRQ ); +// Radio.SetTxConfig( MODEM_LORA, 22, 0, LORA_BANDWIDTH, // LORA_SPREADING_FACTOR, LORA_CODINGRATE, // LORA_PREAMBLE_LENGTH_T, LORA_FIX_LENGTH_PAYLOAD_ON, -// false, 0, 0, LORA_IQ_INVERSION_ON_T, 1000 ); +// false, 0, 0, LORA_IQ_INVERSION_ON_T, 3000 ); +} + + +void Lora470_Init(void) +{ + RadioEvents.TxDone = OnTxDone; + RadioEvents.RxDone = OnRxDone; + RadioEvents.TxTimeout = OnTxTimeout; + RadioEvents.RxTimeout = OnRxTimeout; + RadioEvents.RxError = OnRxError; -// Radio.SetRxConfig( MODEM_LORA, LORA_BANDWIDTH, LORA_SPREADING_FACTOR, -// LORA_CODINGRATE, 0, LORA_PREAMBLE_LENGTH, -// LORA_SYMBOL_TIMEOUT, LORA_FIX_LENGTH_PAYLOAD_ON, -// 0, true, 0, 0, LORA_IQ_INVERSION_ON, false ); - - Radio.SetRxConfig( MODEM_LORA, LORA_BANDWIDTH, LORA_SPREADING_FACTOR, - LORA_CODINGRATE, 0, LORA_PREAMBLE_LENGTH_R, - LORA_SYMBOL_TIMEOUT, LORA_FIX_LENGTH_PAYLOAD_ON, - 0, false, 0, 0, LORA_IQ_INVERSION_ON_R, 1 ); -// Radio.SetRxConfig( MODEM_LORA, LORA_BANDWIDTH, LORA_SPREADING_FACTOR, -// LORA_CODINGRATE, 0, LORA_PREAMBLE_LENGTH, -// LORA_SYMBOL_TIMEOUT, LORA_FIX_LENGTH_PAYLOAD_ON, -// 0, false, 0, 0, LORA_IQ_INVERSION_ON, true ); + Radio.Init( &RadioEvents ); + Radio.SetChannel( 470000000 ); + Radio.SetTxConfig( MODEM_LORA, 22, 0, LORA_BANDWIDTH, + 7, LORA_CODINGRATE, + 10, LORA_FIX_LENGTH_PAYLOAD_ON, + false, 0, 0, LORA_IQ_INVERSION_ON_T, 3000 ); + +// TX_Buffer[0] = 'P'; +// TX_Buffer[1] = 'I'; +// TX_Buffer[2] = 'N'; +// TX_Buffer[3] = tx_num; +// +// crc_value=RadioComputeCRC(TX_Buffer,4,CRC_TYPE_IBM);//计算得出要发送数据包CRC值 +// TX_Buffer[4]=crc_value>>8; +// TX_Buffer[5]=crc_value; + +} +void SetFlagLoraWaitSync(uint8_t value) +{ + flag_lora_wait_sync = value; +} +uint8_t GetFlagLoraWaitSync(void) +{ + return flag_lora_wait_sync; +} +void SwitchLoraSettings(uint32_t freq,uint8_t sf,uint8_t power) +{ - if(EnableMaster) - { - - printf("I am Master!\r\n"); - - TX_Buffer[0] = 'P'; - TX_Buffer[1] = 'I'; - TX_Buffer[2] = 'N'; - TX_Buffer[3] = 'G'; - - crc_value=RadioComputeCRC(TX_Buffer,4,CRC_TYPE_IBM);//计算得出要发送数据包CRC值 - TX_Buffer[4]=crc_value>>8; - TX_Buffer[5]=crc_value; - //Radio.Send( TX_Buffer, 6); - Radio.Send( TX_Buffer, 4); - -// HAL_GPIO_WritePin( OUT1_GPIO_Port, OUT1_Pin,GPIO_PIN_SET); -// HAL_Delay_nMS( 1 ); -// HAL_GPIO_WritePin( OUT1_GPIO_Port, OUT1_Pin,GPIO_PIN_RESET); - - printf("Master TXD PING!\r\n"); - } - else - { - SX126xClearIrqStatus( IRQ_RADIO_ALL ); -// SX126xSetDioIrqParams( IRQ_RX_DONE | IRQ_CRC_ERROR, -// IRQ_RX_DONE | IRQ_CRC_ERROR, -// IRQ_RADIO_NONE, IRQ_RADIO_NONE -// ); -// SX126xSetDioIrqParams( IRQ_RADIO_ALL, //IRQ_RX_DONE | IRQ_RX_TX_TIMEOUT, -// IRQ_RADIO_ALL, //IRQ_RX_DONE | IRQ_RX_TX_TIMEOUT, -// IRQ_RADIO_NONE, -// IRQ_RADIO_NONE ); - Radio.SetRxDutyCycle(RxDutyCycle_RX_time,RxDutyCycle_SLEEP_time); -// Radio.Rx( RX_TIMEOUT_VALUE ); -// printf("I am Slave!\r\n"); - } +// RadioEvents.TxDone = OnTxDone; +// RadioEvents.RxDone = OnRxDone; +// RadioEvents.TxTimeout = OnTxTimeout; +// RadioEvents.RxTimeout = OnRxTimeout; +// RadioEvents.RxError = OnRxError; + //HAL_GPIO_WritePin(GPIOB, GPIO_PIN_12, GPIO_PIN_SET); +// Radio.Init( &RadioEvents ); + Radio.Standby(); + // HAL_GPIO_WritePin(GPIOB, GPIO_PIN_12, GPIO_PIN_RESET); + Radio.SetChannel( freq*1000000 ); + + Radio.SetTxConfig( MODEM_LORA, power, 0, 2, + sf, LORA_CODINGRATE,LORA_PREAMBLE_LENGTH_T, LORA_FIX_LENGTH_PAYLOAD_ON, + false, 0, 0, LORA_IQ_INVERSION_ON_T, 3000 ); + + Radio.SetRxConfig( MODEM_LORA, LORA_BANDWIDTH, + sf,LORA_CODINGRATE, 0, LORA_PREAMBLE_LENGTH_R, + LORA_SYMBOL_TIMEOUT, LORA_FIX_LENGTH_PAYLOAD_ON, + 0, false, 0, 0, LORA_IQ_INVERSION_ON_R, 0 ); + } + +uint16_t rec_wenjian_daxiao; +uint16_t wangguan_up_id; +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; +void LoraUp_Poll() +{ uint16_t result ; + uint16_t crc16; + memcpy(&rec_wenjian_daxiao,&rxbuffer[WRITEPARA_VALUE_IDX],2);//文件大小 +// rec_wenjian_daxiao=rxbuffer[WRITEPATE_VALUE_IDX]; + if(rec_wenjian_daxiao>0XAC00) + {}//文件过大,超出范围 + else + { + __disable_irq(); + 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(); + FLASH_Read(APP_1OR2_ADRESS,(uint8_t*)&app1_or_app2,2); + final_bag_num=(rec_wenjian_daxiao/220)+1;//计算一共要请求多少包 + memcpy(&wangguan_up_id,&rxbuffer[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; + Radio.Send(send_lora_data,8);//基站发送升级确认回复 + Delay_Ms(1000); + SwitchLoraSettings(LORA_UPCHANNEL_FRQ,7,22); + while(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) + { + crc16=Cal_CRC16(rxbuffer,DATA_IDX+ONE_BAG_DAXIAO); + if(muqiandeshengjibao==rxbuffer[MUQIAN_BAG]&&!memcmp(&crc16,&rxbuffer[DATA_IDX+ONE_BAG_DAXIAO],2)&&!memcmp(&dev_id,&rxbuffer[DEST_ID_IDX],2)&& !memcmp(&wangguan_up_id,&rxbuffer[SOURCE_ID_IDX],2)) + { + memcpy(Zhongjian_data,&rxbuffer[DATA_IDX],ONE_BAG_DAXIAO); + if(app1_or_app2==1) + FLASH_Write(APP1_ADRESS+ONE_BAG_DAXIAO*rxbuffer[MUQIAN_BAG],(uint8_t*)Zhongjian_data,ONE_BAG_DAXIAO); + else + FLASH_Write(APP2_ADRESS+ONE_BAG_DAXIAO*rxbuffer[MUQIAN_BAG],(uint8_t*)Zhongjian_data,ONE_BAG_DAXIAO); + + muqiandeshengjibao++; + } + } + else + { + huifushengjibaoerror_num++; + if(huifushengjibaoerror_num>=20) + { + huifushengjibaoerror_num=0; + muqiandeshengjibao=0; + break; + } + } + if(muqiandeshengjibao==final_bag_num) + { + uint16_t tmp11 ,result11; + tmp11=!app1_or_app2; + result11 = FLASH_Prepare(APP_1OR2_ADRESS, 2); + if(result11) + result11 = FLASH_Write(APP_1OR2_ADRESS, (const uint8_t*)&tmp11, 2); + Delay_Ms(500); + 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; + break; + } + } + } + } +} + -- Gitblit v1.9.3