zhyinch
2021-03-26 f953d3bbc23a978d6bd0683371582c16eadc9daf
Ô´Âë/ºËÐİå/Src/main.c
@@ -45,7 +45,7 @@
   memcpy(&hbsend[14],&checksum,2);
}
uint16_t vel_factor,pos_factor;
u16 tyncpoll_time;
u16 tyncpoll_time,dist_threshold;
u16 slottime,max_slotpos;
extern u8 module_power;
extern u16 total_slotnum;
@@ -72,11 +72,13 @@
   {
     g_com_map[COM_INTERVAL]=100;
   }
<<<<<<< HEAD
   g_com_map[VERSION] = 0x012a;
=======
   g_com_map[VERSION] = 0x0127;
>>>>>>> parent of 47d2701 (V1.41  è´Ÿæ•°ä¸è¾“出 ä¿®æ”¹å›žå¤485无显示BUG)
dist_threshold = (g_com_map[SPEEDFILTER_THRES]*10)/(1000/g_com_map[COM_INTERVAL]);
      if(dist_threshold<300)
      {dist_threshold = 300;}
      if(dist_threshold>15000)
      {dist_threshold = 15000;}
   g_com_map[SW_TYPE] =    SW_FANGZHUANG;
   dev_id = g_com_map[DEV_ID];
   slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*SLOT_SCALE)+3;