1.12 修复大于25个的添加标签的bug

yincheng.zhong

2024-03-24 f7107e325fbd42ed9875b7b28c340e1cda8627cc

 Src/radio/Lora.c

@@ -10,6 +10,8 @@
#include "stdio.h"
#include "delay.h"
#include "dw_mbx_anc.h"
#include "Flash.h"
#include "dw_mbx_anc.h"
#define USE_MODEM_LORA
//#define USE_MODEM_FSK
#define REGION_CN779
@@ -193,16 +195,20 @@
{
//   HAL_GPIO_TogglePin(GPIOB, LED1_Pin);
}
uint8_t tttt;

uint8_t huifushengjibao_flag;
uint8_t LoraUp_flag;
extern uint8_t flag_writepara_needreset;
void OnTxDone( void )
{   
//   T_R_Init(0);   
//    Radio.Standby();
    Radio.Standby();
//    Radio.Rx( RX_TIMEOUT_VALUE ); //进入接收
  tttt++;
    if(flag_writepara_needreset) //配置写入完成设备需要重启
    {
        printf("网关下发配置写入完成，重启");
        SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader   
    }
    if(LoraUp_flag)
    {
    huifushengjibao_flag=1;
@@ -220,13 +226,18 @@
    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 )
{
    rec_lp_count = HAL_LPTIM_ReadCounter(&hlptim1);
    rxbuff_len = size;
    memcpy( rxbuffer, payload, BufferSize );

    memcpy( rxbuffer, payload, size );
    RssiValue = rssi;
    SnrValue = snr;
    
@@ -267,22 +278,15 @@
    RadioEvents.RxTimeout = OnRxTimeout;
    RadioEvents.RxError = OnRxError;
    
        Radio.Init( &RadioEvents );
       Radio.SetChannel( RF_FREQUENCY );														 
      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, 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;

    Radio.Init( &RadioEvents );
    Radio.Standby();
    Radio.Sleep();
    
//       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, 3000 );
}


@@ -319,17 +323,21 @@
{
    return flag_lora_wait_sync;
}
void SwitchLoraSettings(uint32_t freq,uint8_t sf)
void SwitchLoraSettings(uint32_t freq,uint8_t sf,uint8_t power)
{
    RadioEvents.TxDone = OnTxDone;
    RadioEvents.RxDone = OnRxDone;
    RadioEvents.TxTimeout = OnTxTimeout;
    RadioEvents.RxTimeout = OnRxTimeout;
    RadioEvents.RxError = OnRxError;
    Radio.Init( &RadioEvents );
    Radio.SetChannel( freq );	
    
    Radio.SetTxConfig( MODEM_LORA, TX_OUTPUT_POWER, 0, 2,
//    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 );

@@ -337,29 +345,10 @@
    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 );
    
}
void SwitchLoraSettingstest(uint32_t freq,uint8_t sf)
{
    RadioEvents.TxDone = OnTxDone;
    RadioEvents.RxDone = OnRxDone;
    RadioEvents.TxTimeout = OnTxTimeout;
    RadioEvents.RxTimeout = OnRxTimeout;
    RadioEvents.RxError = OnRxError;
    Radio.Init( &RadioEvents );
    Radio.SetChannel( freq );	
    
    Radio.SetTxConfig( MODEM_LORA, TX_OUTPUT_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, 1 );
    
    Radio.Rx( RX_TIMEOUT_VALUE ); 
}

uint16_t rec_wenjian_daxiao;
uint16_t wangguan_up_id;
uint8_t send_lora_data[250];
@@ -368,26 +357,44 @@
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;
    memcpy(&rec_wenjian_daxiao,&rxbuffer[WRITEPATE_VALUE_IDX],2);//网关ID 占用2个字节
    memcpy(&rec_wenjian_daxiao,&rxbuffer[WRITEPARA_VALUE_IDX],2);//文件大小
//    rec_wenjian_daxiao=rxbuffer[WRITEPATE_VALUE_IDX];
    if(rec_wenjian_daxiao>0XAC00)
    {}//文件过大，超出范围
    else
    {
    final_bag_num=(rec_wenjian_daxiao/220)+1;//计算一共要请求多少包    
    wangguan_up_id=rxbuffer[WG_ID_IDX];
    { 
    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[WANGGUAN_ID],&wangguan_up_id,2);//网关ID 占用2个字节
    memcpy(&send_lora_data[JIZHAN_ID],&dev_id,2);//标签或者基站的设备ID 2个字节
    send_lora_data[MUQIAN_BAG]=0xFF;
    crc16=Cal_CRC16(send_lora_data,6);
    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,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)
    {
        if(huifushengjibao_flag==1)
@@ -395,13 +402,13 @@
            while(1)
            {
                send_lora_data[MSG_TYPE_IDX]=LORA_MSGTYPE_UPDATEFILE_REQUEST;
                memcpy(&send_lora_data[WANGGUAN_ID],&wangguan_up_id,2);//网关ID 占用2个字节
                memcpy(&send_lora_data[JIZHAN_ID],&dev_id,2);//标签或者基站的设备ID 2个字节
                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=Cal_CRC16(send_lora_data,6);
                memcpy(&send_lora_data[6],&crc16,2);
                crc16=Checksum_u16(send_lora_data,7);
                memcpy(&send_lora_data[7],&crc16,2);
                lora_up_rec_flag=0;    
                Radio.Send(send_lora_data,8);//基站发送升级确认回复
                Radio.Send(send_lora_data,9);//基站发送请求第x包
                
                start_count1=HAL_LPTIM_ReadCounter(&hlptim1);     //等待接收完成直到超时
                end_count1=start_count1+32768/2;//500ms等待
@@ -415,30 +422,48 @@
                    {
                    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,6+ONE_BAG_DAXIAO);
                     if(!memcmp(&crc16,&rxbuffer[6+ONE_BAG_DAXIAO],2)&&!memcmp(&dev_id,&RX_Buffer[JIZHAN_ID],2)&& !memcmp(&wangguan_up_id,&RX_Buffer[WANGGUAN_ID],2))
                    HAL_IWDG_Refresh(&hiwdg);
                     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))
                     {
                    result = FLASH_Prepare(APP2_ADRESS+ONE_BAG_DAXIAO*rxbuffer[MUQIAN_BAG], ONE_BAG_DAXIAO);
                    if(result)
                    result = FLASH_Write(APP2_ADRESS+ONE_BAG_DAXIAO*rxbuffer[MUQIAN_BAG],rxbuffer[DATA_IDX],ONE_BAG_DAXIAO);     
                     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
                {
                    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)
                {
                Delay_Ms(500);
                uint16_t tmp11 ,result11;
                    tmp11=0XBB;
                result11 = FLASH_Prepare(APP_1OR2_ADRESS, PAGE_SIZE);
                if(result11)
                result11 = FLASH_Write(APP_1OR2_ADRESS, (const uint8_t*)&tmp11, 2); 
                Delay_Ms(1500);
                HAL_NVIC_SystemReset();
                }
            }
@@ -446,7 +471,7 @@
        else
        {
        Delay_Ms(500);
        huifushengjibao_flag=0;
//        huifushengjibao_flag=0;
        Radio.Send(send_lora_data,8);//基站发送升级确认回复
        huifushengjibaoerror_num++;
            if(huifushengjibaoerror_num>=5)
@@ -456,40 +481,6 @@
            }                
        }
    }
//    LoraUp_flag=1;
//    SetFlagLoraWaitSync(1);
//   while(1)
//   {
//        start_count1=HAL_LPTIM_ReadCounter(&hlptim1);     //等待接收完成直到超时
////        poll_timeout=500*10; //单位0.1ms
//        end_count1=start_count1+(5000<<2);
//        if(end_count1>=32768)
//        {end_count1-=32768;}
//        current_count1=HAL_LPTIM_ReadCounter(&hlptim1);
//       while(GetFlagLoraWaitSync())
//       {
//         current_count1=HAL_LPTIM_ReadCounter(&hlptim1);
//         if(current_count1>=end_count1&&current_count1<end_count1+15000)
//         {
//                break;
//         }
//       }
//       if(!GetFlagLoraWaitSync())
//       {
//        send_lora_data[MSG_TYPE_IDX]=LORA_MSGTYPE_UPDATEFILE_REQUEST;
//        memcpy(&send_lora_data[WANGGUAN_ID],&wangguan_up_id,2);//网关ID 占用2个字节
//        memcpy(&send_lora_data[JIZHAN_ID],&dev_id,2);//标签或者基站的设备ID 2个字节
//        send_lora_data[MUQIAN_BAG]=mudeshengjibao;
//        crc16=Cal_CRC16(send_lora_data,6);
//        memcpy(&send_lora_data[6],&crc16,2);
//           
//       }
//   }
   }
}

void test1()
{
    if(!memcmp(&dev_id,&rxbuffer[ANCTAG_DEVICEID_IDX],2))
    {LoraUp_Poll();}
}