V1.15 修改同步逻辑，罗姆验证没问题

yincheng.zhong

2024-06-25 d00fd80d6dfbc216136632765a8883827219cecd

 Src/radio/Lora.c

@@ -39,7 +39,8 @@
#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;
@@ -206,19 +207,19 @@
extern uint8_t lora_sendbuffer[200];
void LoraSendComMap(uint8_t cmd)
{
   uint8_t data_length = 0x28;
   uint16_t checksum = 0;
   lora_sendbuffer[MSG_TYPE_IDX] = LORA_MSGTYPE_READPARARESP;
   lora_sendbuffer[MSG_LENGTH] = data_length+9;
        uint8_t data_length = 0x50;
        uint16_t checksum = 0;
        lora_sendbuffer[MSG_TYPE_IDX] = LORA_MSGTYPE_READPARARESP;
        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);
        lora_sendbuffer[RP_CMD_IDX] = cmd;
        lora_sendbuffer[RP_INDEX_IDX] = 2;
        lora_sendbuffer[RP_LEN_IDX] = data_length;
        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)
@@ -238,13 +239,15 @@
    Radio.Send(lora_sendbuffer,data_length+11);
  //  Delay_Ms(100);
}
extern uint8_t imu_enable,motor_enable;
extern u8 lora_jianting_flag,report_ancnum;
static uint16_t delaytime = 771;
static uint16_t source_id;
uint8_t rec_index;
uint8_t rec_index,rec_secdelay;
uint16_t rec_value,rec_delaytime,rx_count,datalen_offset;
int32_t target_count;
extern uint16_t motor_keeptime;
uint8_t shengji_flag;
void OnRxDone( uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr )
{   uint16_t checksum1;
        BufferSize = size;
@@ -282,13 +285,18 @@
                        current_count = HAL_LPTIM_ReadCounter(&hlptim1);
                        wg_report_freq = RX_Buffer[POLL_FREQ_IDX]+400;
                        memcpy(&rec_delaytime,&RX_Buffer[NEXTPOLL_TIME_IDX],2);
                    if(report_ancnum<2)
                    {
                        datalen_offset = report_ancnum*85;
                    }else{
                        datalen_offset = (report_ancnum-1)*46+85;
                    }
                        
                        if(report_ancnum<2)
                        {
                            datalen_offset = report_ancnum*85;
                        }else{
                            datalen_offset = (report_ancnum-1)*46+85;
                        }
                        rec_secdelay = RX_Buffer[PWTAG_SECDELAY_IDX];
                        if(BufferSize!=13||rec_secdelay>20)
                        {
                            rec_secdelay = 0;
                        }
                    
                        target_count = current_count + rec_delaytime*3.2768 - delaytime-datalen_offset;
                        while(target_count>=32768)
                            target_count-=32768;
@@ -304,9 +312,6 @@
                        rec_index = RX_Buffer[PWTAG_WRITE_IDX_IDX];
                    switch(rec_index)
                    {
                        case 0xaa:  //升级下发
                            LoraUp_Poll();
                            break;
                        case 0xdd:  //语音下发
                            break;
                        case 0x20:  //蜂鸣
@@ -322,7 +327,26 @@
                            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>0XAC00||rec_wenjian_daxiao==0)
                        {}//文件过大，超出范围
                        else
                        {
                        memcpy(&wangguan_up_id,&RX_Buffer[SOURCE_ID_IDX],2);//网关ID 占用2个字节
                        shengji_flag=1;
                        LoraUp_flag=1;   
                        imu_enable=0;                            
                        }
//                      LoraUp_Poll();
                            break;                        
                    }
                        break; 
                }
            }
        }
@@ -348,11 +372,14 @@
void OnRxTimeout( void )
{
    Radio.Standby();
    current_count = HAL_LPTIM_ReadCounter(&hlptim1);
    target_count-=current_count%3276;
    while(target_count<0)
        target_count+=32768;
    __HAL_LPTIM_COMPARE_SET(&hlptim1, target_count);
    if(wg_state==WG_Lost)
    {
        current_count = HAL_LPTIM_ReadCounter(&hlptim1);
        target_count-=current_count%3276;
        while(target_count<0)
            target_count+=32768;
        __HAL_LPTIM_COMPARE_SET(&hlptim1, target_count);
    }
    if(lora_jianting_flag)
    {
        SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],UWB_CHANNEL_SF,0);
@@ -415,8 +442,6 @@
                                   
}

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;
@@ -430,13 +455,9 @@
void LoraUp_Poll()
{    uint16_t  result ;
    uint16_t crc16;
    memcpy(&rec_wenjian_daxiao,&RX_Buffer[WRITEPARA_VALUE_IDX],2);//文件大小
//    rec_wenjian_daxiao=rxbuffer[WRITEPATE_VALUE_IDX];
    if(rec_wenjian_daxiao>0XAC00)
    {}//文件过大，超出范围
    else
    { 
    memcpy(&wangguan_up_id,&RX_Buffer[SOURCE_ID_IDX],2);//网关ID 占用2个字节
    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个字节
@@ -446,7 +467,7 @@
    huifushengjibao_flag=0;
    LoraUp_flag=1;
    Radio.Send(send_lora_data,8);//基站发送升级确认回复
    Delay_Ms(1000);    
    Delay_Ms(1000); 
    SwitchLoraSettings(LORA_UPCHANNEL_FRQ,LORA_UPCHANNEL_SF,22); //切换lora升级频点  
    delay_ms(200);   
    __disable_irq();
@@ -542,10 +563,12 @@
        huifushengjibaoerror_num++;
            if(huifushengjibaoerror_num>=5)
            {
            huifushengjibaoerror_num=0;    
            huifushengjibaoerror_num=0;  
                    Delay_Ms(500);
                    HAL_NVIC_SystemReset();                  
            break;
            }                
        }
    }
   }
  }
}