V1.31 标签有点bug

zhyinch

2020-10-29 613cb918c5d9d0c7bef84514c21dcca216d7b334

 源码/核心板/Src/main.c

@@ -67,9 +67,13 @@
      save_com_map_to_flash();
#endif
   OUT485_ENABLE;
   g_com_map[VERSION] = 0x0113;	
   if(g_com_map[COM_INTERVAL]==0)
   {
     g_com_map[COM_INTERVAL]=100;
   }
   g_com_map[VERSION] = 0x011f;	
   dev_id = g_com_map[DEV_ID];
   slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*0.4)+2;
   slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*SLOT_SCALE)+3;
   max_slotpos=g_com_map[COM_INTERVAL]/slottime;
   tyncpoll_time=(g_com_map[DEV_ID]%max_slotpos)*slottime;   
   module_power = g_com_map[POWER];
@@ -115,17 +119,30 @@
{ 
UART_PushFrame(hbsend,16);
}
uint16_t temp;
float dw_vbat;
void StartUpTest(void)
{
   temp=dwt_readtempvbat(1);
   dw_vbat=(float)((temp&0xff)-173)/173+3.3;	
   if(dw_vbat<2.8)
   {
      SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //杞浣嶅洖鍒癰ootloader   
   }	
}
extern u8 g_start_sync_flag,usart_send_flag,anc_report_num;
u16 heartbeat_timer,poll_timer;
int16_t sync_timer;
extern u8 flag_newsecond, tagpos_rec[50], tagpos_send[50],ancidlist_num;
uint32_t tagpos_binary;
extern u16 ancidlist_rec[20],ancidlist_send[20];
extern u16 target_time;
void IdleTask(void)
{
      
         UART_CheckReceive();
      UART_CheckSend();
	
   if(heartbeat_timer>1000)
   {
      heartbeat_timer=0;
@@ -134,6 +151,16 @@
   }
   if(flag_newsecond)
   {
      uint32_t temp23;
         temp23 =  dwt_read32bitreg(CHAN_CTRL_ID) ;
         if(temp23!=0x4A480022)
         {
            temp23 =  dwt_read32bitreg(CHAN_CTRL_ID) ;
               if(temp23!=0x4A480022)
               {
                  NVIC_SystemReset();
               }
            }
     flag_newsecond=0;
      tagpos_binary=0;
      memcpy(ancidlist_send,ancidlist_rec,ancidlist_num*2);
@@ -145,17 +172,20 @@
         tagpos_rec[i] = 0;
      }
   }

   if(target_time>1000)
   {target_time-=1000;}
   #ifdef USART_INTEGRATE_OUTPUT
   if(g_com_map[DEV_ROLE]==0&&usart_send_flag)
   {u16 checksum;
            usart_send_flag=0;
            usart_send_anc[2] = 4;//姝ｅ父妯″紡
            usart_send_anc[2] = 5;//姝ｅ父妯″紡
            usart_send_anc[3] = anc_report_num*6+2;//姝ｅ父妯″紡
            checksum = Checksum_u16(&usart_send_anc[2],anc_report_num*6+2);
            memcpy(&usart_send_anc[4+anc_report_num*6],&checksum,2);
            UART_PushFrame(usart_send_anc,6+anc_report_num*6);
            anc_report_num=0;      
   }
   #endif
   if(g_com_map[CNT_UPDATE]==1)
   {
   uint32_t result = 0;
@@ -188,12 +218,17 @@
         delay_ms(100);
            SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //杞浣嶅洖鍒癰ootloader   
      }
            if(g_com_map[MAP_SIGN_INDEX]!=0x55AA||g_com_map[COM_INTERVAL]==0)
      {
            SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //杞浣嶅洖鍒癰ootloader   
      }

   }
int main(void)
{
 
   Device_Init();
   //StartUpTest();
   Program_Init();
   Dw1000_Init();
  delay_ms(10);