V1.28 三一

zhyinch

2020-09-12 7fb3818d7bdae672c6df22c94698ce9c7c629e56

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

@@ -67,9 +67,13 @@
      save_com_map_to_flash();
#endif
   OUT485_ENABLE;
   g_com_map[VERSION] = 0x0116;	
   if(g_com_map[COM_INTERVAL]==0)
   {
     g_com_map[COM_INTERVAL]=100;
   }
   g_com_map[VERSION] = 0x011c;	
   dev_id = g_com_map[DEV_ID];
   slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*0.4)+3;
   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];
@@ -152,7 +156,7 @@
   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);
@@ -192,7 +196,7 @@
         delay_ms(100);
            SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //杞浣嶅洖鍒癰ootloader   
      }
            if(g_com_map[MAP_SIGN_INDEX]!=0x55AA)
            if(g_com_map[MAP_SIGN_INDEX]!=0x55AA||g_com_map[COM_INTERVAL]==0)
      {
            SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //杞浣嶅洖鍒癰ootloader   
      }