V2.46 修改丢包问题

zhyinch

2022-02-10 a89755d21f5c57d4f5b96fee03eab246995df341

 Ô´Âë/ºËÐÄ°å/Src/application/serial_at_cmd_app.c

@@ -9,6 +9,7 @@
#define MSG_WTAG  6
#define MSG_PWTAG 8
#define MSG_REGTAGRESPONSE 0x0b
#define MSG_TAGPOS 0x0D

#define CMD_READ   1
#define CMD_WRITE   2
@@ -77,8 +78,10 @@
}
u8 remotetag_para[30],remotetag_paralen;
u8 remotesend_state=0;
uint16_t configremotetagID;
uint16_t configremotetagID,rec_times1,rec_times2;
struct regtag_structure regtag_map;
extern u16 taglist_pos;
struct tagpos_structure tagpos[50];
void UsartParseDataHandler(uint8_t data)
{
   static UsartRecvPackState usart_receive_state = UsartReceiveWaitHead0;
@@ -95,11 +98,12 @@
      }
      checksum += pack_msgtype;
      checksum += pack_length;

rec_times1++;
      if(((data + checksum)&0xff) == 0xFF)            //校验通过
      {
         switch(pack_msgtype)
         {
            uint16_t serial_tag_id_recv;
            case MSG_RW:
                   pack_cmd = mUsartReceivePack[0];
                   pack_index = mUsartReceivePack[1];
@@ -109,9 +113,28 @@
                  case CMD_WRITE:
                     //从mUsartReceivePack中读取pack_length长度的字节，放到全局变量中
                     memcpy((uint8_t*)&g_com_map + pack_index, &mUsartReceivePack[3], pack_datalen);
                            memcpy((uint8_t*)&g_com_map2 + pack_index, &mUsartReceivePack[3], pack_datalen);
                         //   memcpy((uint8_t*)&g_com_map2 + pack_index, &mUsartReceivePack[3], pack_datalen);
                     //返回一个error状态
                     //SendComMap(pack_datalen,pack_index);
                            if(pack_index==CNT_RESTART*2)
                            {
                                SendAnchorState(SM_RESTART);
                                SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader  
                            }
                            if(pack_index==CNT_UPDATE*2)
                            {
                                uint32_t result = 0;
                                u16 tmp = 0xAAAA;
                                SendAnchorState(SM_UPDATE);
                                __disable_irq();
                                result = FLASH_Prepare(0x8004A38, 2);
                                if(result)
                                    result = FLASH_Write(0x8004A38, (const uint8_t*)&tmp, 2); 
                                __enable_irq();
                                printf("进入升级模式\r\n");
                               //delay_ms(100);
                                SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader   
                            }
                     save_com_map_to_flash();
                     delay_ms(100);
                     NVIC_SystemReset();
@@ -119,6 +142,7 @@
                  case CMD_READ:
                     //read包中data字节，即mUsartReceivePack[0]表示数据长度；
                  //从g_com_data结构体中的第index位置读取长度为mUsartReceivePack[0]的字节，发送出来
                        rec_times2++;
                     SendComMap(pack_datalen,pack_index);      
                     break;
                  default:
@@ -152,6 +176,13 @@
               memcpy(&regtag_map.tag_frequency[regtag_map.index],&mUsartReceivePack[2],2);
               memcpy(&regtag_map.tag_slotpos[regtag_map.index],&mUsartReceivePack[4],2);
               break;
             case MSG_TAGPOS:             
                    memcpy(&serial_tag_id_recv,&mUsartReceivePack[0],2);
                    taglist_pos=CmpTagInList(serial_tag_id_recv);
                    tagpos[taglist_pos].tagid = serial_tag_id_recv;
                    memcpy(&tagpos[taglist_pos].baoxu,&mUsartReceivePack[2],2);
                    memcpy(&tagpos[taglist_pos].pos,&mUsartReceivePack[4],12);
                    break;
      }
         SendConfigConfirm(pack_msgtype,pack_length);
      }