V1.11 修复读取参数回复BUG

zhyinch

2020-04-16 a26a36940097da7c033be9199219374801d9b32c

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

@@ -55,27 +55,25 @@
   //deca_sleep(1000);
   HeartBeatInit();
#ifdef DEBUG_MODE
   g_com_map[DEV_ROLE]=1;
      g_com_map[DEV_ID]=4;
   g_com_map[COM_INTERVAL]=100;
   g_com_map[MAX_REPORT_ANC_NUM]=3;
//   g_com_map[DEV_ROLE]=1;
//      g_com_map[DEV_ID]=1;
//   g_com_map[COM_INTERVAL]=100;
//   g_com_map[MAX_REPORT_ANC_NUM]=3;
//      g_com_map[NEARBASE_NUM]=1;  
//      g_com_map[NEARBASE_ID1]=2;
   g_com_map[ANC_FLAG]=1;
      save_com_map_to_flash();
#endif
   OUT485_ENABLE;
   g_com_map[VERSION] = 0x0106;	
   g_com_map[VERSION] = 0x010b;	
   dev_id = g_com_map[DEV_ID];
   temp=(float)g_com_map[MAX_REPORT_ANC_NUM]*4/3;	
   temp2=g_com_map[MAX_REPORT_ANC_NUM]*4/3;
   if(temp2<temp)
   {
      temp2++;
   }
   slottime=temp2;
   slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]/3)+1;
   max_slotpos=g_com_map[COM_INTERVAL]/slottime;
   tyncpoll_time=(g_com_map[DEV_ID]%max_slotpos)*slottime;   
   
	
   if(g_com_map[DEV_ROLE])
   {
      tyncpoll_time=g_com_map[DEV_ID]*g_com_map[MAX_REPORT_ANC_NUM]*4/3;
   printf("标签ID: %d .\r\n",dev_id);
   printf("通讯间隔: %d ms.\r\n",g_com_map[COM_INTERVAL]);
   printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
@@ -110,7 +108,7 @@
{ 
UART_PushFrame(hbsend,16);
}
extern u8 g_start_sync_flag;
extern u8 g_start_sync_flag,usart_send_flag,anc_report_num;
u16 heartbeat_timer,poll_timer,sync_timer;
void IdleTask(void)
{
@@ -124,6 +122,16 @@
      HeatBeat();
   }

   if(g_com_map[DEV_ROLE]==0&&usart_send_flag)
   {u16 checksum;
            usart_send_flag=0;
            usart_send[2] = 4;//正常模式
            usart_send[3] = anc_report_num*6+2;//正常模式
            checksum = Checksum_u16(&usart_send[2],anc_report_num*6+2);
            memcpy(&usart_send[4+anc_report_num*6],&checksum,2);
            UART_PushFrame(usart_send,6+anc_report_num*6);
            anc_report_num=0;		
   }
   if(g_com_map[CNT_UPDATE]==1)
   {
   uint32_t result = 0;