v1.30，把gcom表1搬到表2的时候往后挪，防止保存出错一直重启。

WXK

2024-09-18 ee0d5aab5ecbbd265660cba45c8a1946005b8f8c

 Src/radio/Lora.c

@@ -170,6 +170,7 @@
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) //配置写入完成设备需要重启
@@ -185,7 +186,16 @@
    }
    else
    {
    Radio.Rx( 50 ); 
        if(uwb_rxflag)
        {
        uwb_rxflag=0;
        UWB_RXOFF();   
        Radio.Rx( 50 ); 
        }
        else
        {
        Radio.Rx( 50 ); 
        }
    } 
}
extern LPTIM_HandleTypeDef hlptim1;
@@ -261,7 +271,6 @@
    {
        UWB_RXStart(10);
        delay_ms(time);
        HAL_GPIO_WritePin(RADIO_NSS_GPIO_Port, RADIO_NSS_Pin, GPIO_PIN_RESET); //片选lora有效
    }
    if(RX_Buffer[MSG_TYPE_IDX]==LORA_MSGTYPE_WGRESPTAG)
    {
@@ -322,7 +331,7 @@
                             }
                            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[PWTAG_WRITE_VALUE_IDX],BufferSize-PWTAG_WRITE_VALUE_IDX);
                            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;  
@@ -484,10 +493,11 @@
    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);   
    delay_ms(200);    
    __disable_irq();
//    FLASH_Read(APP_1OR2_ADRESS,(uint8_t*)&app1_or_app2,2);        
    final_bag_num=(rec_wenjian_daxiao/220)+1;//计算一共要请求多少包   
@@ -502,6 +512,7 @@
    __enable_irq();             
    while(1)
    {
//        huifushengjibao_flag=1;
        if(huifushengjibao_flag==1)
        {lora_up_rec_flag=1;
            while(1)