zhunk 2 роки тому
батько
коміт
7085343782

BIN
Application_CBD/Debug/Application_CBD.bin


BIN
Application_CBD/Debug/Application_CBD.elf


Різницю між файлами не показано, бо вона завелика
+ 926 - 924
Application_CBD/Debug/Application_CBD.map


BIN
Application_CBD/Debug/applications/dtu_uart2.o


BIN
Application_CBD/Debug/applications/main.o


+ 9 - 3
Application_CBD/applications/dtu_uart2.c

@@ -460,7 +460,7 @@ char *makeJson_selfCheck_(uint8_t sta)  //sta==0 应答,sta==1结果
         cJSON_AddItemToObject(pRoot, "msgType", cJSON_CreateString("X7"));
         cJSON_AddItemToObject(pRoot2, "X701", cJSON_CreateString(device_status.qianming));
         cJSON_AddItemToObject(pRoot2, "X702", cJSON_CreateNumber(device_status.work_status));       //工作状态
-        cJSON_AddItemToObject(pRoot2, "X703", cJSON_CreateNumber(device_status.Power_Type));       //供电类型
+        cJSON_AddItemToObject(pRoot2, "X703", cJSON_CreateNumber(1));       //供电类型
 
         cJSON_AddItemToObject(pRoot2, "X704", cJSON_CreateNumber(atof(device_status.voltage)));       //电池电压
         cJSON_AddItemToObject(pRoot2, "X705", cJSON_CreateNumber(0.0));       //太阳能板电压
@@ -1169,14 +1169,20 @@ int parseDtu(char *json_string)
                   DTU_Write("%s",restart);
                   rt_hw_cpu_reset();
               }
+              else if (strstr(item_cmd->valuestring,"reset_dc")!=RT_NULL) {
+                  ResetParamDefault_DC();
+                  char *restart = makeJson_Warn("sysrem will reset_dc","control");
+                  DTU_Write("%s",restart);
+                  rt_free(restart);
+                  rt_thread_delay(2000);
+              }
               else if (strstr(item_cmd->valuestring,"reset")!=RT_NULL) {
                   ResetParamDefault();
                   char *restart = makeJson_Warn("sysrem will reset","control");
                   DTU_Write("%s",restart);
                   rt_free(restart);
                   rt_thread_delay(2000);
-
-            }
+              }
               else if (strstr(item_cmd->valuestring,"update")!=RT_NULL)
               {
                   rt_kprintf("准备升级!!!");