测试用成熟版本1.2.3

custom/GPS/src/gps_config.c

@@ -186,7 +186,7 @@ void gps_config_init(void){
         CM_UART_STOP_BIT_ONE, 
         CM_UART_FLOW_CTRL_NONE, 
         CM_UART_BAUDRATE_115200,
-        0   //配置为普通串口模式，若要配置为低功耗模式可改为1
+        0   //配置为普通串口模式，若要配置为低功耗模式可改为1     确誉达默认为115200   百年星38400  大夏龙雀 9600
     };
     // 开启串口
     ret = cm_uart_open(GPS_URAT, &uart_cfg);

custom/jt808/inc/jt808_config.h

@@ -6,7 +6,7 @@
 #include <stdlib.h>
 #include "jt808_util.h"
 
-#define JT808_DEBUG_ENABLE 1
+#define JT808_DEBUG_ENABLE 0
 
 #if JT808_DEBUG_ENABLE
 #include "app_uart.h"

custom/jt808/inc/jt808_protocol.h

@@ -252,7 +252,7 @@ typedef union{
         uint32_t A_brake     :1; // 1:自动刹车,0:手动刹车
         uint32_t A_Speed_Cut :1; // 1:自动减速,0:手动减速
         uint32_t P_Radar_EN  :2; // 1:雷达使能,0:雷达禁止
-        uint32_t retain2 : 3;// 保留10位
+        uint32_t retain2 : 2;// 保留10位
   };
   uint32_t val32;
 }LocStatus_t;

custom/jt808/src/jt808_set_TermParam.c

@@ -157,7 +157,7 @@ void update_manager_start(UpdateType_t type) {
     update_status.start_time = osKernelGetTickCount();
     update_status.retry_count = 0;
     osMutexRelease(update_mutex);
-    
+    local_tts_text_play("更新流程开始",0,0);
     JT808_DEBUG("Update started: type=%d\n", type);
 }
 
@@ -168,7 +168,7 @@ void update_manager_begin_receiving(uint16_t packet_count) {
     update_status.expected_packets = packet_count;
     update_status.received_packets = 0;
     osMutexRelease(update_mutex);
-    
+    local_tts_text_play("开始接收数据",0,0);
     JT808_DEBUG("Receiving %d data packets\n", packet_count);
 }
 
@@ -191,7 +191,7 @@ void update_manager_complete(void) {
     osMutexAcquire(update_mutex, osWaitForever);
     update_status.state = UPDATE_COMPLETED;
     osMutexRelease(update_mutex);
-    
+    local_tts_text_play("接收数据完成",0,0);
     JT808_DEBUG("Update completed: type=%d\n", update_status.type);
 }
 
@@ -1038,7 +1038,7 @@ void jt808_set_term_param_init(void){
 				if((operator_val ==0)||(operator_val ==2)||(operator_val ==4)||(operator_val ==7)){ // 中国移动
 					start_val -= 12;
 				}else if((operator_val ==1)||(operator_val ==6)||(operator_val ==9)){ // 中国联通
-					start_val -= 12;
+					start_val -= 13;
 				}else if((operator_val ==3)||(operator_val ==11)){ // 电信
 					start_val -= 13;
 				}

custom/radar/src/radar.c

@@ -15,7 +15,7 @@
 #include "local_tts.h"
 
 
-#define RADAR_DEBUG_ENABLE 1
+#define RADAR_DEBUG_ENABLE 0
 
 #if RADAR_DEBUG_ENABLE
 #include "app_uart.h"
@@ -135,6 +135,22 @@ static void RADAR_TaskHandle(void *param){
        if(old_state != jt808_term_param_item.set_term_param.RadarEN)
         {
           sys_sta.P_Radar_EN = jt808_term_param_item.set_term_param.RadarEN;
+          old_state = jt808_term_param_item.set_term_param.RadarEN;
+
+          if (0==sys_sta.P_Radar_EN)
+          {
+            local_tts_text_play("雷达关闭",0,0);
+          }
+          
+          if (1==sys_sta.P_Radar_EN)
+          {
+            local_tts_text_play("雷达开启",0,0);
+          }
+
+          if (2==sys_sta.P_Radar_EN)
+          {
+            local_tts_text_play("雷达临时关闭",0,0);
+          }
 
         }
         DEBUG("radar task init\r\n");    
@@ -201,7 +217,6 @@ static void RADAR_TaskHandle(void *param){
 
     }
 
-    old_state = jt808_term_param_item.set_term_param.RadarEN;
         osMutexRelease(radar_mutex);  
         osDelay(140/5); // 140ms
    }
@@ -215,7 +230,7 @@ void radar_init(void){
     osThreadAttr_t radar_task_attr = {
         .name = "uart_tx_task",
        .stack_size = 4096*4,
-       .priority= osPriorityNormal
+       .priority= osPriorityBelowNormal
     };
     os_RADAR_ThreadId= osThreadNew(RADAR_TaskHandle, 0, &radar_task_attr);
 }