Merge branch '基站测距' into ALPHAV1

zhyinch

2019-11-04 aaf7e4ef5c1aa0535940531f20e4846cbcd39b69

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

@@ -55,7 +55,7 @@
//      g_com_map[DEV_ID]=1;
//   g_com_map[COM_INTERVAL]=10;
   OUT485_ENABLE;
   g_com_map[VERSION] = 0x0103;		
   g_com_map[VERSION] = 0x0104;		
   if(g_com_map[DEV_ROLE])
   {
      tyncpoll_time=g_com_map[DEV_ID]*g_com_map[MAX_REPORT_ANC_NUM]*4/3;