Merge branch '定位-临近' into 定位临近_工卡

zhyinch

2020-11-02 5739481744a7d26671190f6f327726e23843dd6d

 Src/application/global_param.c

@@ -42,7 +42,7 @@
      g_com_map[ALARM_DISTANCE3] = 0;   //默认报警距离50cm
      g_com_map[HEARTBEAT]=0;
      
      g_com_map[POWER]=67;
      g_com_map[POWER]=DEFAULT_RFPOWER;
      g_com_map[IMU_THRES]=2;
      g_com_map[NOMOVESLEEP_TIME]=120;
      g_com_map[MOTOR_ENABLE]=1;