WXK
2024-03-24 5b8bde9ae08b29e4ce6d04149fe0cb78e0c5d68c
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;
@@ -245,6 +246,7 @@
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;
@@ -304,9 +306,6 @@
                        rec_index = RX_Buffer[PWTAG_WRITE_IDX_IDX];
                    switch(rec_index)
                    {
                        case 0xaa:  //升级下发
                            LoraUp_Poll();
                            break;
                        case 0xdd:  //语音下发
                            break;
                        case 0x20:  //蜂鸣
@@ -322,6 +321,24 @@
                            no_rx_flag = 1;                           
                    }
                        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;
                        }
//                      LoraUp_Poll();
                            break;
                    }
                        break;                                 
                }
            }
@@ -415,8 +432,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 +445,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
    if(shengji_flag)
    { 
    memcpy(&wangguan_up_id,&RX_Buffer[SOURCE_ID_IDX],2);//网关ID 占用2个字节
//    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个字节
@@ -543,6 +554,8 @@
            if(huifushengjibaoerror_num>=5)
            {
            huifushengjibaoerror_num=0;    
                    Delay_Ms(500);
                    HAL_NVIC_SystemReset();
            break;
            }                
        }