zhunk 1 год назад
Родитель
Сommit
c3a203f212

Разница между файлами не показана из-за своего большого размера
+ 252 - 251
Application_cbd_apm32f1/.cproject


+ 1 - 1
Application_cbd_apm32f1/.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-504266412740595079" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-472937748808239374" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

+ 100 - 16
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -23,6 +23,7 @@
 #include <ymodem.h>
 #include "beep.h"
 #include <selfcheck.h>
+#include <s2j.h>
 #define DBG_ENABLE
 #define DBG_COLOR
 #define DBG_TAG "dtu"
@@ -378,6 +379,51 @@ int dtu_data_play(void)
     return RT_EOK;
 }
 
+
+void get_iso8601_utc_time(char *buffer, size_t buffer_size,uint8_t time_h) {
+    time_t now_seconds;
+    struct tm *timeinfo;
+    // 获取当前时间(秒)
+    time(&now_seconds);
+    // 将 time_t 转换为 UTC 时间的 struct tm
+    timeinfo = gmtime(&now_seconds);
+    // 获取当前时间的毫秒部分
+    long milliseconds = rt_tick_get() % RT_TICK_PER_SECOND * (1000 / RT_TICK_PER_SECOND);
+    if(time_h<=23)
+    {
+        //工作结束在第二天
+        if(device_status.startBar>time_h)
+        {
+            // 格式化时间为 ISO 8601 标准 (UTC),在第二天日期需要+1
+            // 创建一个新的 tm 结构体并复制当前时间信息
+            struct tm next_day = *timeinfo;
+            // 增加一天
+            next_day.tm_mday += 1;
+            // 标准化时间结构体
+            mktime(&next_day);
+            // 使用标准化后的时间
+            timeinfo = &next_day;
+        }
+        // 格式化时间为 ISO 8601 标准 (UTC),并添加毫秒部分
+        snprintf(buffer, buffer_size, "%04d-%02d-%02dT%02d:00:00.000Z",
+                 timeinfo->tm_year + 1900,
+                 timeinfo->tm_mon + 1,
+                 timeinfo->tm_mday,
+                 time_h);
+    }
+    else {
+        // 格式化时间为 ISO 8601 标准 (UTC),并添加毫秒部分
+        snprintf(buffer, buffer_size, "%04d-%02d-%02dT%02d:%02d:%02d.%03ldZ",
+                 timeinfo->tm_year + 1900,
+                 timeinfo->tm_mon + 1,
+                 timeinfo->tm_mday,
+                 timeinfo->tm_hour,
+                 timeinfo->tm_min,
+                 timeinfo->tm_sec,milliseconds);
+    }
+
+}
+
 char * makeJson_ReadInfo()
 {
     cJSON * rJsonRoot = NULL;
@@ -676,6 +722,7 @@ char *makeJson_C01_Warn(uint16_t code,double process)
     cJSON_Delete(pJsonRoot);
     return w;
 }
+
 /*生成JSON数据*/
 char * makeJson()
 {
@@ -710,22 +757,6 @@ char * makeJson()
         rt_kprintf("cJSON pJsonRoot NULL!!!\n");
         return NULL;
     }
-    if(strstr(device_status.project,"A7_DTU_V3")!=RT_NULL)
-    {
-        cJSON_AddStringToObject(pJsonRoot, "cmd", "read_data");
-    }
-    else
-    {
-        cJSON_AddStringToObject(pJsonRoot, "cmd", "data");
-    }
-
-    cJSON * pSubJson = NULL;
-    pSubJson = cJSON_CreateObject();
-    if(NULL==pSubJson)
-    {
-        rt_kprintf("cJSON pSubJson NULL!!!\n");
-        return NULL;
-    }
     memset(device_status.driver,0,sizeof(device_status.driver));
     if(device_status.version_type==1)
     {
@@ -742,7 +773,60 @@ char * makeJson()
     }
     else if (device_status.version_type==5) {
         rt_sprintf(device_status.driver,"%s-%s",VERSION_V5,device_status.driver_4g);
+        cJSON_AddStringToObject(pJsonRoot, "DEVICE_SERIAL_NUMBER", device_status.imei);
+        cJSON_AddStringToObject(pJsonRoot, "VERSION", device_status.driver);
+        cJSON_AddStringToObject(pJsonRoot, "SIGNAL", device_status.csq);
+        cJSON_AddStringToObject(pJsonRoot, "SIM", device_status.iccid);
+        static char iso8601_time[32];  // 确保缓冲区足够大以容纳时间字符串
+        get_iso8601_utc_time(iso8601_time, sizeof(iso8601_time),24);
+        cJSON_AddStringToObject(pJsonRoot, "UPDATE_DATE", iso8601_time);
+        cJSON_AddStringToObject(pJsonRoot, "STATUS", "STATUS_ONLINE");
+        cJSON_AddStringToObject(pJsonRoot, "STATUS_DESCRIPTION","设备运行正常");
+        cJSON_AddStringToObject(pJsonRoot, "LOCATION","113.0,34.0");
+        static char iso8601_time_s[32];  // 确保缓冲区足够大以容纳时间字符串
+        get_iso8601_utc_time(iso8601_time_s, sizeof(iso8601_time_s),device_status.startBar);
+        cJSON_AddStringToObject(pJsonRoot, "START_TIME",iso8601_time_s);
+        get_iso8601_utc_time(iso8601_time_s, sizeof(iso8601_time_s),device_status.stopBar);
+        cJSON_AddStringToObject(pJsonRoot, "END_TIME",iso8601_time_s);
+
+        cJSON_AddNumberToObject(pJsonRoot, "CONTRIL", !device_status.timeSwitch);
+        cJSON_AddNumberToObject(pJsonRoot, "TT", device_status.sunBar);
+        cJSON_AddNumberToObject(pJsonRoot, "WS", device_status.work_status);
+        cJSON_AddNumberToObject(pJsonRoot, "TPS", device_status.tpl);
+        cJSON_AddNumberToObject(pJsonRoot, "RPS", device_status.rain_status);
+        cJSON_AddNumberToObject(pJsonRoot, "LPS", device_status.sun_status);
+        cJSON_AddNumberToObject(pJsonRoot, "TEMPERATURE", 20.2);
+        cJSON_AddNumberToObject(pJsonRoot, "HUMIDITY", 60.2);
+        char *p = cJSON_PrintUnformatted(pJsonRoot);
+        if(NULL == p)
+        {
+            cJSON_Delete(pJsonRoot);
+            rt_kprintf("cJSON_Delete NULL!!!\n");
+            return NULL;
+        }
+        cJSON_Delete(pJsonRoot);
+        return p;
+    }
+
+
+    cJSON * pSubJson = NULL;
+    pSubJson = cJSON_CreateObject();
+    if(NULL==pSubJson)
+    {
+        rt_kprintf("cJSON pSubJson NULL!!!\n");
+        return NULL;
+    }
+
+    if(strstr(device_status.project,"A7_DTU_V3")!=RT_NULL)
+    {
+        cJSON_AddStringToObject(pJsonRoot, "cmd", "read_data");
     }
+    else
+    {
+        cJSON_AddStringToObject(pJsonRoot, "cmd", "data");
+    }
+
+
     if(device_status.sensor_485_sta!=0)
     {
         if(strstr(device_status.driver,"485")==RT_NULL)

+ 36 - 0
Application_cbd_apm32f1/applications/dtu_uart2.h

@@ -16,6 +16,42 @@ typedef struct{
     char msg_pool[MAX_DTU_SIZE];
 }DataTemp;
 
+//enum B_2
+//{
+//    "STATUS_UNACTIVE",
+//    "STATUS_OFFLINE",
+//    "STATUS_UNUSUAL",
+//    |STATUS_ONLINE""
+//};
+
+//5.0测报灯数据上报结构体
+typedef struct {
+    char DEVICE_SERIAL_NUMBER[32];
+    char SIM[32];
+    char SIGNAL[16];
+    char LOCATION[32];
+    double VOLTAGE;
+    double CURRENT;
+    double TEMPERATURE;
+    double HUMIDITY;
+    char UPDATE_DATE[64];
+    char STATUS[32];
+    char STATUS_DESCRIPTION[64];
+    char START_TIME[64];
+    char END_TIME[64];
+    char VERSION[16];
+    uint8_t DATT;
+    uint8_t TPS;
+    uint8_t LPS;
+    uint8_t RPS;
+    uint8_t WS;
+    uint8_t TT;
+
+}WS_CBDV5;
+
+
+
+
 //查询数据---{"cmd": "read"}
 //重启-------{"cmd": "reboot"}
 //升级-------{"cmd": "update"}

+ 2 - 48
Application_cbd_apm32f1/applications/hmi.c

@@ -532,6 +532,7 @@ static void HMI_Decode(void)
         ctr_lamp(OFF,2);
         ctr_lamp(OFF,3);
         #endif
+        DTU_Write("{\"cmd\":\"workdone\"}");
     }
     //关闭加热
     else if(strstr(rx_buffer,"putTest.switchHeat=0")!=NULL) {
@@ -780,9 +781,6 @@ static void HMI_Decode(void)
         {
             if(device_status.version_type!=6)
             {
-                #if LAMP_EN == 1
-                if(device_status.sunBar%3==0)
-                #endif
                 device_status.sunBar=atoi(value_str);
                 ef_set_env_blob("sunBar", &device_status.sunBar, sizeof(device_status.sunBar));
             }
@@ -1037,51 +1035,7 @@ static void HMI_Decode(void)
 
         LOG_D("震动时间设置:%d",device_status.shake_sec);
     }
-    //切换大数据平台
-    else if (strstr(rx_buffer,"8.136.98.49")!=NULL)
-    {
-        memset(device_status.json_w_platform,0,sizeof(device_status.json_w_platform));
-        rt_sprintf(device_status.mqttcfg1, "8.136.98.49");
-        ef_set_env_blob("platform", &device_status.mqttcfg1, sizeof(device_status.mqttcfg1));
-        //给RTU发送切换指令
-        if(strstr(device_status.project,"DTU_CBD")!=NULL)
-        {
-            DTU_Write("%s",makeJson_platform("8.136.98.49"));
-            rt_free(makeJson_platform("8.136.98.49"));
-            rt_thread_delay(1000);
-        }
-        //2022/06/23,add:
-        rt_sprintf(device_status.json_w_platform,"屏幕操作:切换平台:8.136.98.49,操作时间:%s",device_status.stamp);
-        json_temp = makeJson_Warn(device_status.json_w_platform, "切换平台");
-        ef_set_env_blob("json_w_platform", &device_status.json_w_platform, sizeof(device_status.json_w_platform));   //将修改屏幕参数操作记录保存到Flash中
-        if(atoi(device_status.net)==0)
-            DTU_Write("%s",json_temp);
-        rt_free(json_temp);
-        rt_thread_delay(1000);
-        MA_save();
-    }
-    else if (strstr(rx_buffer,"120.27.222.26")!=NULL)
-    {
-        memset(device_status.json_w_platform,0,sizeof(device_status.json_w_platform));
-        rt_sprintf(device_status.mqttcfg1, "120.27.222.26");
-        ef_set_env_blob("platform", &device_status.mqttcfg1, sizeof(device_status.mqttcfg1));
-        //给RTU发送切换指令
-        if(strstr(device_status.project,"DTU_CBD")!=NULL)
-        {
-            DTU_Write("%s",makeJson_platform("120.27.222.26"));
-            rt_free(makeJson_platform("120.27.222.26"));
-            rt_thread_delay(1000);
-        }
-        //2022/06/23,add:
-        rt_sprintf(device_status.json_w_platform,"屏幕操作:切换平台:120.27.222.26,操作时间:%04d-%02d-%02d %02d:%02d:%02d",tm.tm_year+1900,tm.tm_mon+1,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec);
-        json_temp = makeJson_Warn(device_status.json_w_platform, "切换平台");
-        ef_set_env_blob("json_w_platform", &device_status.json_w_platform, sizeof(device_status.json_w_platform));   //将修改屏幕参数操作记录保存到Flash中
-        if(atoi(device_status.net)==0)
-            DTU_Write("%s",json_temp);
-        rt_free(json_temp);
-        rt_thread_delay(1000);
-        MA_save();
-    }
+
     //恢复出厂设置电池
     else if (strstr(rx_buffer,"resetdcDefault")!=NULL)
     {

+ 2 - 0
Application_cbd_apm32f1/applications/sht30_collect.c

@@ -142,6 +142,8 @@ int UART_485_INIT(void)
     return 0;
 }
 
+
+
 /* 入口函数 */
 static void sht30_collect_thread_entry(void *parameter)
 {