zhunk 2 년 전
부모
커밋
583729dc10

+ 1 - 1
Application_BZY/.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="1296825131319521479" 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="1297872936118873969" 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>

+ 1 - 1
Application_BZYV2-NHT/.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="1279170959373326186" 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="1280218764172678676" 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>

+ 1 - 1
Application_BZYV2/.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="1336815596739157319" 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="1337863401538509809" 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>

BIN
Application_CBD/.settings/.rtmenus


BIN
Application_CBD/Debug/Application_CBD.bin


BIN
Application_CBD/Debug/Application_CBD.elf


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1112 - 1109
Application_CBD/Debug/Application_CBD.map


BIN
Application_CBD/Debug/applications/control.o


BIN
Application_CBD/Debug/applications/dtu_uart2.o


BIN
Application_CBD/Debug/applications/hmi.o


BIN
Application_CBD/Debug/applications/main.o


BIN
Application_CBD/Debug/applications/sht30_collect.o


+ 0 - 58
Application_CBD/Debug/rt-thread/src/kservice.d

@@ -1,58 +0,0 @@
-rt-thread/src/kservice.o: ../rt-thread/src/kservice.c \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rtconfig_preinc.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/rtthread.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD/rtconfig.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/rtdebug.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/rtdef.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/libc/libc_signal.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD/cconfig.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/rtlibc.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/libc/libc_stat.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/libc/libc_errno.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/libc/libc_fcntl.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/libc/libc_ioctl.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/libc/libc_dirent.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/libc/libc_signal.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/libc/libc_fdset.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/rtservice.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/rtm.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\components\finsh/finsh_api.h \
- D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/rthw.h
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rtconfig_preinc.h:
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/rtthread.h:
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD/rtconfig.h:
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/rtdebug.h:
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/rtdef.h:
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/libc/libc_signal.h:
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD/cconfig.h:
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/rtlibc.h:
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/libc/libc_stat.h:
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/libc/libc_errno.h:
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/libc/libc_fcntl.h:
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/libc/libc_ioctl.h:
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/libc/libc_dirent.h:
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/libc/libc_signal.h:
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/libc/libc_fdset.h:
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/rtservice.h:
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/rtm.h:
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\components\finsh/finsh_api.h:
-
-D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\rt-thread\include/rthw.h:

+ 1 - 1
Application_CBD/applications/control.h

@@ -24,7 +24,7 @@
 #if LAMP_EN == 1
     #define VERSION_HK          "1.(3ledV9).41(HK)" //4.0海康-三色光源
 #else
-    #define VERSION_HK          "1.51.41(HK)"       //4.0海康-1200W
+    #define VERSION_HK          "1.52.41(HK)"       //4.0海康-1200W
 #endif
 #define VERSION_HK_2000W    "1.51.40(2000W)"         //4.0水稻
 #define VERSION_ZP          "1.44.1(ZP)"            //1.0转盘

+ 6 - 0
Application_CBD/applications/dtu_uart2.c

@@ -873,6 +873,7 @@ int parseDtu(char *json_string)
     cJSON* item_ext = NULL;    //嵌套ext
     cJSON* item_checkself = NULL;
     cJSON* photolink = NULL;
+    cJSON* photo_sta = NULL;
     cJSON* hst  = NULL; //加热温度
     cJSON* collt  = NULL; //收集时间
     cJSON* et  = NULL; //结束时间
@@ -1229,10 +1230,15 @@ int parseDtu(char *json_string)
                   mqttcfg1 = cJSON_GetObjectItem(item_ext,"mqttcfg1");
                   mqttcfg2 = cJSON_GetObjectItem(item_ext,"mqttcfg2");
                   link_sta = cJSON_GetObjectItem(item_ext,"link_sta");
+                  photo_sta = cJSON_GetObjectItem(item_ext,"photo_sta");
                   cJSON *gps_inuse = cJSON_GetObjectItem(item_ext,"gps_inuse");
                   cJSON *gps_view = cJSON_GetObjectItem(item_ext,"gps_view");
                   //如果DTU的IMEI和FLash中的不一样,保存到FLASH
                   value_commn = cJSON_GetObjectItem(item_ext,"photo_sta");
+                  if(photo_sta!=NULL){
+                      device_status.camsta = photo_sta->valueint;
+                      LOG_I("相机状态:%d",device_status.camsta);
+                  }
                   if(value_commn!=RT_NULL)
                   {
                       HMI_WRITE("menu.eth1_sta.val=%d",atoi(value_commn->valuestring));

+ 96 - 93
Application_CBD/applications/hmi.c

@@ -188,97 +188,98 @@ static void HMI_Decode(void)
         device_status.refresh_timeout++;
         if(device_status.version_type!=6)
         {
-        HMI_WRITE("uploadSet.iccid.txt=\"%s\"",device_status.iccid);
-        if(strstr(device_status.mqttcfg1,"8.136.98.49")!=NULL)
-        {
-            HMI_WRITE("uploadSet.plt.val=%d",RESET);
-        }
-        else if (strstr(device_status.mqttcfg1,"120.27.222.26")!=NULL) {
-            HMI_WRITE("uploadSet.plt.val=%d",SET);
-        }
-        //HMI_WRITE("mqttcfg.mqtt1Message.txt=\"%s\"",device_status.mqttcfg1);
-        HMI_WRITE("uploadSet.t0.txt=\"%s\"",device_status.mqttcfg1);
+            HMI_WRITE("uploadSet.iccid.txt=\"%s\"",device_status.iccid);
+            if(strstr(device_status.mqttcfg1,"8.136.98.49")!=NULL)
+            {
+                HMI_WRITE("uploadSet.plt.val=%d",RESET);
+            }
+            else if (strstr(device_status.mqttcfg1,"120.27.222.26")!=NULL) {
+                HMI_WRITE("uploadSet.plt.val=%d",SET);
+            }
+            //HMI_WRITE("mqttcfg.mqtt1Message.txt=\"%s\"",device_status.mqttcfg1);
+            HMI_WRITE("uploadSet.t0.txt=\"%s\"",device_status.mqttcfg1);
 
-        //更新固件版本号
-        HMI_WRITE("debug.t3.txt=\"%s\"",device_status.driver);
-        //更新固件编译日期
-        HMI_WRITE("debug.t4.txt=\"%s\"",device_status.driver_compile);
-        //
-        HMI_WRITE("debug.t5.txt=\"%s\"",device_status.driver_bl);
-        HMI_WRITE("debug.t7.txt=\"%s\"",device_status.driver_compile);
-        //更新dtu/rtu版本
-        HMI_WRITE("debug.t9.txt=\"%s\"",device_status.driver_4g);
-        //更新时间
-        HMI_WRITE("menu.rtc.txt=\"%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);
-        HMI_WRITE("workSta.rtc.txt=\"%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);
-        HMI_WRITE("set.t0.txt=\"%d\"",tm.tm_hour);
-        HMI_WRITE("set.t1.txt=\"%d\"",tm.tm_min);
-        HMI_WRITE("set.t2.txt=\"%d\"",tm.tm_sec);
-        //更新电压
-        HMI_WRITE("workSta.vbat.txt=\"%s\"",device_status.voltage);
-        //更新电流
-         HMI_WRITE("workSta.power.txt=\"%s\"",device_status.power);
-        //更新温湿度数据
-        HMI_WRITE("workSta.envHum.val=%d",atoi(device_status.humidity));
-        HMI_WRITE("workSta.envTem.val=%d",atoi(device_status.tempture));
-        //更新电池状态
-        HMI_WRITE("workSta.batStatus.val=%d",device_status.bat_status);
-        //更新上仓门状态
-        HMI_WRITE("workSta.upStatus.val=%d",device_status.up_status);
-        //更新下仓门状态
-        HMI_WRITE("workSta.downStatus.val=%d",device_status.down_status);
-        //更新工作状态
-        HMI_WRITE("workSta.workStatus.val=%d",device_status.work_status);
-        //更新温控状态
-        HMI_WRITE("workSta.tempStatus.val=%d",device_status.temp_status);
-        //更新雨控状态
-        HMI_WRITE("workSta.rainStatus.val=%d",device_status.rain_status);
-        //更新光控状态
-        HMI_WRITE("workSta.sunStatus.val=%d",device_status.sun_status);
-        //更新有线连接状态
-        HMI_WRITE("menu.va_net.val=%d",device_status.link_sta);
-        //更新CSQ
-        HMI_WRITE("menu.csq_value.txt=\"%s\"",device_status.csq);
-        HMI_WRITE("menu.va_csq.val=%d",atoi(device_status.csq));
-        HMI_WRITE("workSta.csq_value.txt=\"%s\"",device_status.csq);
-        //更新收集时间
-        HMI_WRITE("sysSet.stime.val=%d",device_status.clt_time);
-        //更新加热时间
-        HMI_WRITE("workSta.heatTime.val=%d",device_status.heattime);
-        HMI_WRITE("sysSet.jtime.val=%d",device_status.heattime);
-        //
-        HMI_WRITE("sysSet.vol.val=%d",device_status.vol);
-        //更新加热时间和温度
-        HMI_WRITE("workSta.heatTem.val=%d",device_status.heattem);
-        HMI_WRITE("sysSet.jheat.val=%d",device_status.heatvalue);
-        //更新加热状态
-        HMI_WRITE("workSta.heatStatus.val=%d",device_status.heat_status);
+            //更新固件版本号
+            HMI_WRITE("debug.t3.txt=\"%s\"",device_status.driver);
+            //更新固件编译日期
+            HMI_WRITE("debug.t4.txt=\"%s\"",device_status.driver_compile);
+            //
+            HMI_WRITE("debug.t5.txt=\"%s\"",device_status.driver_bl);
+            HMI_WRITE("debug.t7.txt=\"%s\"",device_status.driver_compile);
+            //更新dtu/rtu版本
+            HMI_WRITE("debug.t9.txt=\"%s\"",device_status.driver_4g);
+            //更新时间
+            HMI_WRITE("menu.rtc.txt=\"%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);
+            HMI_WRITE("workSta.rtc.txt=\"%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);
+            HMI_WRITE("set.t0.txt=\"%d\"",tm.tm_hour);
+            HMI_WRITE("set.t1.txt=\"%d\"",tm.tm_min);
+            HMI_WRITE("set.t2.txt=\"%d\"",tm.tm_sec);
+            //更新电压
+            HMI_WRITE("workSta.vbat.txt=\"%s\"",device_status.voltage);
+            //更新电流
+             HMI_WRITE("workSta.power.txt=\"%s\"",device_status.power);
+            //更新温湿度数据
+            HMI_WRITE("workSta.envHum.val=%d",atoi(device_status.humidity));
+            HMI_WRITE("workSta.envTem.val=%d",atoi(device_status.tempture));
+            //更新电池状态
+            HMI_WRITE("workSta.batStatus.val=%d",device_status.bat_status);
+            //更新上仓门状态
+            HMI_WRITE("workSta.upStatus.val=%d",device_status.up_status);
+            //更新下仓门状态
+            HMI_WRITE("workSta.downStatus.val=%d",device_status.down_status);
+            //更新工作状态
+            HMI_WRITE("workSta.workStatus.val=%d",device_status.work_status);
+            //更新温控状态
+            HMI_WRITE("workSta.tempStatus.val=%d",device_status.temp_status);
+            //更新雨控状态
+            HMI_WRITE("workSta.rainStatus.val=%d",device_status.rain_status);
+            //更新光控状态
+            HMI_WRITE("workSta.sunStatus.val=%d",device_status.sun_status);
+            //更新有线连接状态
+            HMI_WRITE("menu.va_net.val=%d",device_status.link_sta);
+            //更新CSQ
+            HMI_WRITE("menu.csq_value.txt=\"%s\"",device_status.csq);
+            HMI_WRITE("menu.va_csq.val=%d",atoi(device_status.csq));
+            HMI_WRITE("workSta.csq_value.txt=\"%s\"",device_status.csq);
+            //更新收集时间
+            HMI_WRITE("sysSet.stime.val=%d",device_status.clt_time);
+            //更新加热时间
+            HMI_WRITE("workSta.heatTime.val=%d",device_status.heattime);
+            HMI_WRITE("sysSet.jtime.val=%d",device_status.heattime);
+            //
+            HMI_WRITE("sysSet.vol.val=%d",device_status.vol);
+            //更新加热时间和温度
+            HMI_WRITE("workSta.heatTem.val=%d",device_status.heattem);
+            HMI_WRITE("sysSet.jheat.val=%d",device_status.heatvalue);
+            //更新加热状态
+            HMI_WRITE("workSta.heatStatus.val=%d",device_status.heat_status);
 
-        //更新密码
-        HMI_WRITE("inputPasswd.pwdData.txt=\"8888\"");
-        //更新时间设置中的参数
-        //更新定时模式
-        HMI_WRITE("clockSet.timeSwitch.val=%d",device_status.timeSwitch);
-        //更新光控定时时长
-        HMI_WRITE("clockSet.sunBar.val=%d",device_status.sunBar);
-        //更新时控开始
-        HMI_WRITE("clockSet.startBar.val=%d",device_status.startBar);
-        //更新时控结束
-        HMI_WRITE("clockSet.stopBar.val=%d",device_status.stopBar);
-        //SIM卡状态
-        HMI_WRITE("workSta.bt0.val=%d",atoi(device_status.sim));
-        //ID
-        HMI_WRITE("menu.equipid.txt=\"%s\"",device_status.imei);
-        HMI_WRITE("menu.deviceId.txt=\"%s\"",device_status.deviceId);
-        //HMI_WRITE("workSta.equipid.txt=\"%s\"",device_status.imei);
-        //数据上传间隔
-        HMI_WRITE("uploadSet.datt.val=%d",device_status.dattim);
-        //语音音量
-        HMI_WRITE("sysSet.vol.val=%d",device_status.vol);
-        //更新熄屏时间
-        if(device_status.thsp<60) device_status.thsp = device_status.thsp * 60;
-        HMI_WRITE("thsp=%d",device_status.thsp);
+            //更新密码
+            HMI_WRITE("inputPasswd.pwdData.txt=\"8888\"");
+            //更新时间设置中的参数
+            //更新定时模式
+            HMI_WRITE("clockSet.timeSwitch.val=%d",device_status.timeSwitch);
+            //更新光控定时时长
+            HMI_WRITE("clockSet.sunBar.val=%d",device_status.sunBar);
+            //更新时控开始
+            HMI_WRITE("clockSet.startBar.val=%d",device_status.startBar);
+            //更新时控结束
+            HMI_WRITE("clockSet.stopBar.val=%d",device_status.stopBar);
+            //SIM卡状态
+            HMI_WRITE("workSta.bt0.val=%d",atoi(device_status.sim));
+            //ID
+            HMI_WRITE("menu.equipid.txt=\"%s\"",device_status.imei);
+            HMI_WRITE("menu.deviceId.txt=\"%s\"",device_status.deviceId);
+            //HMI_WRITE("workSta.equipid.txt=\"%s\"",device_status.imei);
+            //数据上传间隔
+            HMI_WRITE("uploadSet.datt.val=%d",device_status.dattim);
+            //语音音量
+            HMI_WRITE("sysSet.vol.val=%d",device_status.vol);
+            //更新熄屏时间
+            if(device_status.thsp<60) device_status.thsp = device_status.thsp * 60;
+            HMI_WRITE("thsp=%d",device_status.thsp);
         }
+        HMI_WRITE("menu.cam_sta.val=%d",device_status.camsta);
         #if BOOT_ERR == 1
         if(atoi(device_status.gps)==1){
             HMI_WRITE("menu.gps_state.txt=\"定位成功:(%s)%d/%d\"",device_status.gps_state,device_status.gps_inuse,device_status.gps_view);
@@ -1838,7 +1839,7 @@ void Check_ParamConfig(void)
         device_status.vol = 7;          //音量
         device_status.timeSwitch = 0;   //工作模式:光控
         device_status.passWord = 8888;    //屏幕密码
-        device_status.dattim = 20;      //数据上传间隔
+        device_status.dattim = 10;      //数据上传间隔
         device_status.ds = 1;           //设备状态
         device_status.update_flag = 0;
         /*孢子仪*/
@@ -1949,7 +1950,7 @@ void Check_ParamConfig(void)
         //工作完成标志位
         if(device_status.dattim==0)
         {
-            device_status.dattim = 20;
+            device_status.dattim = 10;
         }
         /*设备类型,7孢子仪,3测报灯,默认设置测报灯*/
         if(device_status.dtype!=7)
@@ -2118,17 +2119,18 @@ void ResetParamDefault(void)
     device_status.ds = 1;           //设备状态开机
     device_status.thsp = 300;
     device_status.passWord = 8888;
-    device_status.dattim = 30;
+    device_status.dattim = 10;
     device_status.collecting_sh1 = 9;
     device_status.collecting_eh1 = 10;
     device_status.collecting_sh2 = 14;
     device_status.collecting_eh2 = 16;
     device_status.Power_Type = 0;
     ef_set_env_blob("Power_Type", &device_status.Power_Type, sizeof(device_status.Power_Type));
+
+    ef_set_env_blob("dattim",&device_status.dattim,sizeof(device_status.dattim));        //上传时间
     if(device_status.dtype==3)
     {
         device_status.clt_time = 10;    //收集时间
-        device_status.dattim = 20;      //数据上传间隔
         #if LAMP_EN == 0
         device_status.startBar = 20;    //定时开始时间
         device_status.stopBar = 5;      //定时结束时间
@@ -2182,7 +2184,7 @@ void ResetParamDefault_DC(void)
     //将温度数据设置为-15摄氏度,以便上传的数据中包含温控数据
     rt_sprintf(device_status.tempture,"%d",-15);
     device_status.clt_time = 10;    //收集时间
-    device_status.dattim = 20;      //数据上传间隔
+    device_status.dattim = 10;      //数据上传间隔
     #if LAMP_EN == 0
     device_status.startBar = 20;    //定时开始时间
     device_status.stopBar = 0;      //定时结束时间
@@ -2205,6 +2207,7 @@ void ResetParamDefault_DC(void)
     device_status.timeSwitch = 0;
     device_status.Power_Type = 1;
     device_status.handle_bugger = 0;
+    ef_set_env_blob("dattim",&device_status.dattim,sizeof(device_status.dattim));        //上传时间
     ef_set_env_blob("handle_bugger", &device_status.handle_bugger, sizeof(device_status.handle_bugger));
     ef_set_env_blob("Power_Type", &device_status.Power_Type, sizeof(device_status.Power_Type));
     ef_set_env_blob("ds", &device_status.ds, sizeof(device_status.ds));

+ 2 - 2
Application_CBD/applications/sht30_collect.c

@@ -165,14 +165,14 @@ static void Power_ReadCheck(void *parameter)
                     ctr_cangmen_up(OFF);    //关闭上仓门输出(散热)
                     #endif
                 }
-        if(Read_Real_Voltage()/100<22)
+        if(atof(device_status.voltage)<22.0)    //小于22.0V,并且持续10S,欠压
         {
             #if ROBOT_EN == 1
             ctr_led(OFF);
             HMI_WRITE("sleep=%d",1);
             #endif
             bat_cnt++;
-        }else if(Read_Real_Voltage()/100>23)
+        }else if(atof(device_status.voltage)>24.0)    //大于24.0V,解除欠压
         {
             bat_cnt = 0;
             device_status.bat_status = 0; //解除欠压

+ 1 - 1
Application_CBD/packages/EasyFlash-latest/inc/ef_cfg.h

@@ -92,7 +92,7 @@
 #define EF_START_ADDR             PKG_EASYFLASH_START_ADDR
 
 /* ENV area size. It's at least one empty sector for GC. So it's definition must more then or equal 2 flash sector size. */
-#define ENV_AREA_SIZE             (EF_ERASE_MIN_SIZE * 16) /* default is the double erase min size */
+#define ENV_AREA_SIZE             (EF_ERASE_MIN_SIZE * 16) /* default is the double erase min size 2024-07-10 2 to 16*/
 
 /* print debug information of flash */
 #ifdef PKG_EASYFLASH_DEBUG

+ 4 - 0
Application_CBD/readme.md

@@ -1,3 +1,7 @@
+# 2024-07-10 更新说明
+1. 取消模拟RTC
+2. 增加相机状态发送到显示屏
+3. 欠压值22.0V,消抖10S,解除大于24.0V
 # 2024-06-19 更新说明	版本变更为:1.50.40(2000W)
 1. 增加485采集太阳能板电压;
 2. 增加重置RTU参数;

+ 1 - 1
Application_GK_CBD/.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="1263327003201175488" 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="1264374808000527978" 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>

+ 1 - 1
CBD_FOTA_BootLoader/.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="1369183061114295484" 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="1370230865913647974" 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>