1.增加备注说明

2.上报mcu信息使用enable开关做判断key使用数字还是标识符

diff --git a/main/uart.h b/main/uart.h
index 2f776db..50d5b40 100644 (file)
--- a/main/uart.h
+++ b/main/uart.h
@@ -52,7 +52,7 @@ typedef enum
     // COMMON_UART_MCU_FIRMWARE_UPDATE_CMD = 0xE0,//主控固件升级
 
     //0xB2-0xB6保留
-    COMMON_UART_ESP_FIRMWARE_UPDATE_CMD = 0xB7,//模组固件升级
+    COMMON_UART_ESP_FIRMWARE_UPDATE_CMD = 0xB7,//这是usb升级 主控升级模组指令
 
 
     COMMON_UART_END_CMD = 0xFF,

diff --git a/main/user_http.c b/main/user_http.c
index 29d27ce..295faf4 100644 (file)
--- a/main/user_http.c
+++ b/main/user_http.c
@@ -518,7 +518,6 @@ static void Http_Get_Url_Task_Cb(void *pvParameters)
                                     if(serial_number_len == 0)
                                     {
                                         ESP_LOGI(HTTP_TAG, "serialNumber length is 0\n");
-                                        cJSON_Delete(root_base);
                                         result=2;
                                     }else{
 
@@ -567,7 +566,10 @@ static void Http_Get_Url_Task_Cb(void *pvParameters)
                                 ESP_LOGI(HTTP_TAG, "root_base is STORAGRE\n");
                                 result = 2;
                             }
-                            cJSON_Delete(root_base);
+                            if(root_base){
+                                cJSON_Delete(root_base);
+                                root_base = NULL;
+                            }
                         }
                         else
                         {
@@ -915,6 +917,11 @@ static void Http_Get_Url_Task_Cb(void *pvParameters)
                             {
                                 result = 3;
                             }
+                            if(root_base)
+                            {
+                                
+                                root_base =NULL;
+                            }
                             cJSON_Delete(root_base);
                         }
                         else

diff --git a/main/user_mqtt.c b/main/user_mqtt.c
index e78a13e..a93acd0 100644 (file)
--- a/main/user_mqtt.c
+++ b/main/user_mqtt.c
@@ -21,6 +21,9 @@
 #define REPLY_STATUS_FAIL 0
 
 #define REPORT_INTERVAL_CNT  2
+
+#define MCU_INFO_USER_ITEM_STRING 1 //上报mcu基础信息暂时 1 使用标识符 0使用dpid数字
+
 static const char MQTT_TAG[] = "MQTT";
 // static esp_mqtt_client_config_t mqtt_cfg = {0};
 
@@ -673,8 +676,9 @@ uint8_t Mqtt_Send_Mcu_Info(void)
     
 
     // 把设备信息加到里面
-    cJSON_AddStringToObject(root, "pid", pid_str);
+    #if MCU_INFO_USER_ITEM_STRING
     cJSON_AddStringToObject(root, "vid", vid_str);
+    cJSON_AddStringToObject(root, "pid", pid_str);
     cJSON_AddStringToObject(root, "wifi_soc", wifi_soc);
     cJSON_AddStringToObject(root, "fw_version", fw_ver);
     cJSON_AddStringToObject(root, "wifi_version", wifi_ver);
@@ -685,7 +689,20 @@ uint8_t Mqtt_Send_Mcu_Info(void)
         power_on_flag=1;
         cJSON_AddNumberToObject(root, "power_on", 1);
     }
-    
+    #else
+    cJSON_AddStringToObject(root, "1", vid_str);
+    cJSON_AddStringToObject(root, "2", pid_str);
+    cJSON_AddStringToObject(root, "3", wifi_soc);
+    cJSON_AddStringToObject(root, "4", fw_ver);
+    cJSON_AddStringToObject(root, "5", wifi_ver);
+    cJSON_AddStringToObject(root, "6", (char *)common_storage.net_info.serial_number);
+    cJSON_AddNumberToObject(root, "7", common_setting.mcu_platform_mode);
+    if(!power_on_flag)
+    {
+        power_on_flag=1;
+        cJSON_AddNumberToObject(root, "8", 1);
+    }
+    #endif
     cJSON_AddNumberToObject(root, "9", common_setting.is_connect_usb);
 
     char *post_data = cJSON_PrintUnformatted(root);
@@ -1203,7 +1220,6 @@ char *get_test_json(void)
 */
 void mqtt_ota_data_parse(const cJSON *array)
 {
-
     //array
     if(array == NULL || !cJSON_IsArray(array))
     {