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

+ 119 - 1
Application_cbd_apm32f1/.config

@@ -80,7 +80,7 @@ CONFIG_RT_USING_DEVICE=y
 # CONFIG_RT_USING_DEVICE_OPS is not set
 # CONFIG_RT_USING_INTERRUPT_INFO is not set
 CONFIG_RT_USING_CONSOLE=y
-CONFIG_RT_CONSOLEBUF_SIZE=256
+CONFIG_RT_CONSOLEBUF_SIZE=1024
 CONFIG_RT_CONSOLE_DEVICE_NAME="uart1"
 # end of Kernel Device Object
 
@@ -281,6 +281,7 @@ CONFIG_PKG_USING_FREEMODBUS_LATEST_VERSION=y
 CONFIG_PKG_FREEMODBUS_VER="latest"
 # CONFIG_PKG_USING_NANOPB is not set
 # CONFIG_PKG_USING_WIFI_HOST_DRIVER is not set
+# CONFIG_PKG_USING_ESP_HOSTED is not set
 
 #
 # Wi-Fi
@@ -396,6 +397,7 @@ CONFIG_PKG_OTA_DOWNLOADER_VER="v1.0.0"
 # CONFIG_PKG_USING_QMODBUS is not set
 # CONFIG_PKG_USING_PNET is not set
 # CONFIG_PKG_USING_OPENER is not set
+# CONFIG_PKG_USING_FREEMQTT is not set
 # end of IoT - internet of things
 
 #
@@ -561,6 +563,7 @@ CONFIG_PKG_EASYFLASH_VER_NUM=0x40100
 # CONFIG_PKG_USING_ZDEBUG is not set
 # CONFIG_PKG_USING_RVBACKTRACE is not set
 # CONFIG_PKG_USING_HPATCHLITE is not set
+# CONFIG_PKG_USING_THREAD_METRIC is not set
 # end of tools packages
 
 #
@@ -674,6 +677,7 @@ CONFIG_PKG_SYSWATCH_VER="latest"
 # CONFIG_PKG_USING_RMP is not set
 # CONFIG_PKG_USING_R_RHEALSTONE is not set
 # CONFIG_PKG_USING_HEARTBEAT is not set
+# CONFIG_PKG_USING_MICRO_ROS_RTTHREAD_PACKAGE is not set
 # end of system packages
 
 #
@@ -687,12 +691,44 @@ CONFIG_PKG_SYSWATCH_VER="latest"
 #
 # STM32 HAL & SDK Drivers
 #
+# CONFIG_PKG_USING_STM32F0_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32F0_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32F1_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32F1_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32F2_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32F2_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32F3_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32F3_CMSIS_DRIVER is not set
 # CONFIG_PKG_USING_STM32F4_HAL_DRIVER is not set
 # CONFIG_PKG_USING_STM32F4_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32F7_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32F7_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32G0_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32G0_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32G4_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32G4_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32H5_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32H5_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32H7_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32H7_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32H7RS_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32H7RS_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32L0_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32L0_CMSIS_DRIVER is not set
 # CONFIG_PKG_USING_STM32L4_HAL_DRIVER is not set
 # CONFIG_PKG_USING_STM32L4_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32L5_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32L5_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32U5_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32U5_CMSIS_DRIVER is not set
 # CONFIG_PKG_USING_STM32WB55_SDK is not set
 # CONFIG_PKG_USING_STM32_SDIO is not set
+# CONFIG_PKG_USING_STM32WL_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32WL_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32WB_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32WB_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32MP1_M4_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32MP1_M4_CMSIS_DRIVER is not set
 # end of STM32 HAL & SDK Drivers
 
 #
@@ -725,6 +761,78 @@ CONFIG_PKG_SYSWATCH_VER="latest"
 # CONFIG_PKG_USING_NRFX is not set
 # CONFIG_PKG_USING_RASPBERRYPI_PICO_SDK is not set
 # CONFIG_PKG_USING_MM32 is not set
+
+#
+# WCH HAL & SDK Drivers
+#
+# CONFIG_PKG_USING_CH32V20x_SDK is not set
+# CONFIG_PKG_USING_CH32V307_SDK is not set
+# end of WCH HAL & SDK Drivers
+
+#
+# AT32 HAL & SDK Drivers
+#
+# CONFIG_PKG_USING_AT32A403A_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32A403A_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32A423_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32A423_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F45x_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F45x_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F402_405_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F402_405_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F403A_407_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F403A_407_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F413_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F413_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F415_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F415_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F421_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F421_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F423_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F423_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F425_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F425_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F435_437_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F435_437_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32M412_416_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32M412_416_CMSIS_DRIVER is not set
+# end of AT32 HAL & SDK Drivers
+
+#
+# HC32 DDL Drivers
+#
+# CONFIG_PKG_USING_HC32F3_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_HC32F3_SERIES_DRIVER is not set
+# CONFIG_PKG_USING_HC32F4_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_HC32F4_SERIES_DRIVER is not set
+# end of HC32 DDL Drivers
+
+#
+# NXP HAL & SDK Drivers
+#
+# CONFIG_PKG_USING_NXP_MCX_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_NXP_MCX_SERIES_DRIVER is not set
+# CONFIG_PKG_USING_NXP_LPC_DRIVER is not set
+# CONFIG_PKG_USING_NXP_LPC55S_DRIVER is not set
+# CONFIG_PKG_USING_NXP_IMX6SX_DRIVER is not set
+# CONFIG_PKG_USING_NXP_IMX6UL_DRIVER is not set
+# CONFIG_PKG_USING_NXP_IMXRT_DRIVER is not set
+# end of NXP HAL & SDK Drivers
+
+#
+# NUVOTON Drivers
+#
+# CONFIG_PKG_USING_NUVOTON_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_NUVOTON_SERIES_DRIVER is not set
+# CONFIG_PKG_USING_NUVOTON_ARM926_LIB is not set
+# end of NUVOTON Drivers
+
+#
+# GD32 Drivers
+#
+# CONFIG_PKG_USING_GD32_ARM_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_GD32_ARM_SERIES_DRIVER is not set
+# end of GD32 Drivers
 # end of HAL & SDK Drivers
 
 #
@@ -762,6 +870,7 @@ CONFIG_PKG_SYSWATCH_VER="latest"
 # CONFIG_PKG_USING_BMI088 is not set
 # CONFIG_PKG_USING_HMC5883 is not set
 # CONFIG_PKG_USING_MAX6675 is not set
+# CONFIG_PKG_USING_MAX31855 is not set
 # CONFIG_PKG_USING_TMP1075 is not set
 # CONFIG_PKG_USING_SR04 is not set
 # CONFIG_PKG_USING_CCS811 is not set
@@ -797,6 +906,9 @@ CONFIG_PKG_SYSWATCH_VER="latest"
 # CONFIG_PKG_USING_ICM20608 is not set
 # CONFIG_PKG_USING_PAJ7620 is not set
 # CONFIG_PKG_USING_STHS34PF80 is not set
+# CONFIG_PKG_USING_P3T1755 is not set
+# CONFIG_PKG_USING_QMI8658 is not set
+# CONFIG_PKG_USING_ICM20948 is not set
 # end of sensors drivers
 
 #
@@ -891,6 +1003,11 @@ CONFIG_PKG_LEDBLINK_VER="latest"
 # CONFIG_PKG_USING_BT_MX02 is not set
 # CONFIG_PKG_USING_GC9A01 is not set
 # CONFIG_PKG_USING_IK485 is not set
+# CONFIG_PKG_USING_SERVO is not set
+# CONFIG_PKG_USING_SEAN_WS2812B is not set
+# CONFIG_PKG_USING_IC74HC165 is not set
+# CONFIG_PKG_USING_IST8310 is not set
+# CONFIG_PKG_USING_ST7789_SPI is not set
 # end of peripheral libraries and drivers
 
 #
@@ -990,6 +1107,7 @@ CONFIG_PKG_LEDBLINK_VER="latest"
 # CONFIG_PKG_USING_SOEM is not set
 # CONFIG_PKG_USING_QPARAM is not set
 # CONFIG_PKG_USING_CorevMCU_CLI is not set
+# CONFIG_PKG_USING_DRMP is not set
 # end of miscellaneous packages
 
 #

+ 1 - 1
Application_cbd_apm32f1/.config.old

@@ -133,7 +133,7 @@ CONFIG_RT_USING_SERIAL=y
 CONFIG_RT_USING_SERIAL_V2=y
 CONFIG_RT_SERIAL_USING_DMA=y
 # CONFIG_RT_USING_CAN is not set
-# CONFIG_RT_USING_HWTIMER is not set
+CONFIG_RT_USING_HWTIMER=y
 # CONFIG_RT_USING_CPUTIME is not set
 # CONFIG_RT_USING_I2C is not set
 # CONFIG_RT_USING_PHY is not set

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


+ 22 - 21
Application_cbd_apm32f1/.project

@@ -1,27 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>Application_cbd_apm32f1</name>
-	<comment></comment>
-	<projects>
+  <name>Application_cbd_apm32f1</name>
+  <comment />
+  <projects>
 	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers>clean,full,incremental,</triggers>
-			<arguments>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+      <triggers>clean,full,incremental,</triggers>
+      <arguments>
 			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
+    </buildCommand>
+    <buildCommand>
+      <name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+      <triggers>full,incremental,</triggers>
+      <arguments>
 			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.rt-thread.studio.rttnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-	</natures>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.cdt.core.cnature</nature>
+    <nature>org.rt-thread.studio.rttnature</nature>
+    <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+    <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+  </natures>
+  <linkedResources />
 </projectDescription>

BIN
Application_cbd_apm32f1/.settings/.rtmenus


+ 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="-434655907455513827" 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="-483663910935864681" 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>

+ 13 - 444
Application_cbd_apm32f1/applications/control.c

@@ -277,45 +277,7 @@ void ctr_JD_Clear(uint8_t shake_sw)
     ctr_cangmen_up(OFF);    //关闭清扫
     ctr_Heat(OFF);
 }
-//工作任务流程
-void WorkTask_XCT(void)
-{
-    while(device_status.work_status==1&&device_status.ds==1)
-    {
 
-        ctr_Motor_xifu(ON);
-        //打开相机供电
-        ctr_Camera_Power(ON);
-        //ctr_Heat(ON);   //清洁风机
-        uint32_t photo_fre = 0;
-        photo_fre = device_status.dattim * 60;
-        while(photo_fre!=0)
-        {
-            photo_fre --;
-            rt_thread_delay(1000);
-            LOG_I("收集中,等待开始拍照:%d",photo_fre);
-        }
-        //卷带
-        ctr_JD_Clear(OFF);
-        //拍照
-        HK_TakePhoto();
-        //关闭吸附风机
-        ctr_Motor_xifu(OFF);
-        //关闭相机供电
-        //ctr_Heat(OFF);
-        ctr_Camera_Power(OFF);
-        //卷带
-        ctr_JD_Clear(ON);
-//        rt_thread_delay(1000);
-//        ctr_JD_Clear(ON);
-        //震动
-        Motor_shake(ON, device_status.shake_sec);
-    }
-    //关闭风机
-    ctr_Motor_xichong(OFF);
-    ctr_Motor_xifu(OFF);
-    LOG_I("不在工作时间,未工作!!!");
-}
 /**********************************************************************/
 /*光控*/
 uint8_t In_Light_status(void)
@@ -527,59 +489,6 @@ uint8_t ctr_lamp(uint8_t status_lamp,uint8_t lamp_num)
     return device_status.lamp_status;
 }
 
-//震动电机
-uint8_t ctr_shake(uint8_t status_shake,uint16_t shake_sec)
-{
-    static rt_uint16_t shake_i = 0;
-    shake_i = atoi(device_status.power);
-    LOG_I("震动电机待机电流:%d",shake_i);
-    if(device_status.dtype==7&&shake_sec!=0)
-        DTU_Write("drop");
-    rt_pin_mode(SHAKE_SW, PIN_MODE_OUTPUT);
-    #if 0
-    rt_pin_write(SHAKE_SW,ON);
-    return 0;
-    #endif
-    if(status_shake==ON&&device_status.shake_ws==1)
-    {
-        #if 0
-        for(int8_t s = 0;s++;s<2)
-        {
-            rt_pin_write(SHAKE_SW,ON);
-            rt_thread_delay(100);
-            rt_pin_write(SHAKE_SW,OFF);
-            rt_thread_delay(1000);
-        }
-        #endif
-
-        rt_pin_write(SHAKE_SW,ON);
-        if(device_status.dtype==3)
-        {
-            while(shake_sec--)
-            {
-                rt_thread_delay(100);
-                if(shake_sec==20&&device_status.clear_status==0&&device_status.work_status==1&&atoi(device_status.power)-shake_i<100&&shake_i!=0&&shake_i<5000)
-                {
-                    char * shake_warn = makeJson_Warn("电流不足", "震动电机");
-                    DTU_Write("%s",shake_warn);
-                    rt_free(shake_warn);
-                }
-                LOG_D("震动电机:%d",atoi(device_status.power));
-            }
-        }
-        if(device_status.dtype==7)  rt_thread_delay(shake_sec*1000);
-        rt_pin_write(SHAKE_SW,OFF);
-        HMI_WRITE("cangWei.switchShake.val=%d",0);
-    }
-    else
-    {
-        rt_pin_write(SHAKE_SW,OFF);
-        HMI_WRITE("cangWei.switchShake.val=%d",0);
-    }
-    if(device_status.dtype==7)
-    HMI_WRITE("sysTest.switchDrop.val=%d",OFF);
-    return status_shake;
-}
 //补光
 uint8_t ctr_led(uint8_t status_led)
 {
@@ -982,19 +891,11 @@ void ctr_router(uint8_t status_router)
     if(status_router==ON)
     {
         rt_pin_write(ROUTER,ON);
-        //
-        #if LAMP_EN == 0
-        if(device_status.version_type==6)
-            rt_pin_write(ROUTER_P,ON);
-        #endif
+        LOG_W("打开路由器电源!");
     }
     else {
         rt_pin_write(ROUTER,OFF);
-        //
-        #if LAMP_EN == 0
-        if(device_status.version_type==6)
-            rt_pin_write(ROUTER_P,OFF);
-        #endif
+        LOG_W("关闭路由器电源!");
     }
 }
 //清扫-推杆电机
@@ -1196,9 +1097,6 @@ void HardWare_Init(uint8_t boot)
     if(device_status.autotakepic==0)
     ctr_lamp(OFF,1);
 
-    //关闭震动电机
-    ctr_shake(OFF,0);
-
     //关闭加热
     ctr_Heat(OFF);
 
@@ -1210,8 +1108,6 @@ void HardWare_Init(uint8_t boot)
 
     //关闭清扫电机驱动
     ctr_clear(OFF);
-
-
 }
 //拍照
 void HK_TakePhoto(void)
@@ -1281,13 +1177,10 @@ void SunTest(void)
 void ResetInit(void)
 {
     LOG_I("ResetInit...");
-    if(device_status.sleep_mode==0)
-    {
-        //1.打开路由器供电
-        ctr_router(ON);
-        //2. 打开RTU供电
-        ctr_RTU_DTU(ON);
-    }
+    //1.打开路由器供电
+    ctr_router(ON);
+    //2. 打开RTU供电
+    ctr_RTU_DTU(ON);
     //3.打开光栅供电
     ctr_photo(ON);
     //5.关闭加热
@@ -1411,359 +1304,35 @@ void WorkCheck(void)
     rt_thread_delay(1000);
 }
 
-#if 0
-void WorkCheck(void)
-{
-    static rt_uint32_t light_timeout = 3600;
-    while(device_status.ds == 1 &&
-          device_status.rain_status == 0 &&
-          device_status.temp_status == 0 &&
-          device_status.bat_status == 0)
-    {
-        if(device_status.timeSwitch == 1) // 时控模式
-        {
-            LOG_I("***********时控*****************");
-            if(device_status.startBar == device_status.stopBar &&
-               device_status.startBar == 0)
-            {
-                // 24小时模式处理
-                device_status.work_status = 1;
-                rt_thread_delay(10000);
-                continue;
-            }
-
-            time_t now;
-            time(&now);
-            struct tm now_tm = *localtime(&now);
-            struct tm start_tm = *localtime(&now);
-            struct tm end_tm = *localtime(&now);
-
-            // 设置开始时间
-            now_tm.tm_hour = now_tm.tm_hour-8;
-            time_t now_time = mktime(&now_tm);
-
-            // 设置开始时间
-            start_tm.tm_hour = device_status.startBar-8;
-            start_tm.tm_min = 0;
-            start_tm.tm_sec = 0;
-            time_t start_time = mktime(&start_tm);
-
-            // 设置结束时间(自动处理跨天)
-            end_tm.tm_hour = device_status.stopBar-8;
-            end_tm.tm_min = 0;
-            end_tm.tm_sec = 0;
-            if(device_status.startBar >= device_status.stopBar) {
-                end_tm.tm_mday += 1; // 结束时间+1天
-            }
-            time_t end_time = mktime(&end_tm);
 
-            // 工作时间判断
-            if(now_time >= start_time && now_time < end_time)
-            {
-                device_status.work_status = 1;
-                LOG_I("时控工作模式:现在:%d- 开始:%d-结束:%d",now_time,start_time,end_time);
-                rt_thread_delay(10000);
-            }
-            else
-            {
-                device_status.work_status = 0;
-                LOG_I("时控待机模式:现在:%d- 开始:%d-结束:%d",now_time,start_time,end_time);
-                rt_thread_delay(10000);
-            }
-        }
-        else // 光控模式
-        {
-            LOG_I("光控定时模式!");
-            if(device_status.sun_status == 0 && device_status.light_over_tim != 0)
-            {
-                device_status.light_over_tim--;
-                light_timeout = 3600;  // 重置超时计数器
-                device_status.work_status = 1;
-                LOG_I("光控定时,计时中>>>>>>>>>:%d",device_status.light_over_tim);
-            }
-            else
-            {
-                // 仅在白天递减超时计数器
-                if(device_status.sun_status == 1 && light_timeout > 0) {
-                    light_timeout--;
-                }
-
-                device_status.work_status = 0;
-
-                //没有在测试并且没有在自检
-                if(device_status.test_flag==0&&device_status.selfcheck_ws==0)
-                {
-                    ctr_lamp(OFF,1);
-                }
-
-                // 连续1小时白天后重置
-                if(light_timeout == 0) {
-                    device_status.light_over_tim = 0;
-                    light_timeout = 3600;  // 重置防止负数
-                }
-
-                // 白天且倒计时结束:重置夜晚时长
-                if(device_status.light_over_tim == 0 &&
-                   device_status.sun_status == 1)
-                {
-                    device_status.light_over_tim = device_status.sunBar * 3600;
-                }
-            }
-        }
-        rt_thread_delay(1000);
-    }
-
-    // 异常状态处理
-    device_status.work_status = 0;
-    rt_thread_delay(1000);
-}
-#endif
-#if 0
-//工作状态检测
-void WorkCheck(void)
-{
-    static rt_uint32_t light_timeout = 3600;
-    //雨控检测,温控检测,电池电压检测
-    while(device_status.ds==1&&device_status.rain_status==0&&device_status.temp_status==0&&device_status.bat_status==0)
-    {
-        //工作模式检测(RTC时间正常,1-时控/0-光控)(RTC时间异常强行使用光控)
-        if(device_status.timeSwitch==1)
-        {
-            LOG_I("***********时控*****************");
-            if(device_status.startBar==device_status.stopBar&&device_status.startBar==0){
-                device_status.work_status = 1;
-                LOG_I("24 hours work...");
-                #if LAMP_EN == 1
-                device_status.lamp_status = 1;
-                device_status.lamp1_status = 0;
-                device_status.lamp2_status = 0;
-                if(device_status.sun_status==1){
-                    ctr_lamp(OFF, 1);
-                    ctr_lamp(OFF, 2);
-                    ctr_lamp(OFF, 3);
-                }
-                #endif
-            }
-
-            //如果开始和结束是同一天
-            if(device_status.startBar<device_status.stopBar)
-            {
-                LOG_I("开始和结束是同一天");
-                time_t now;
-                time(&now);
-                static struct tm nowtime;   //现在
-                static struct tm starttime; //开始
-                static struct tm endtime;   //结束
-                //获取当前时间戳
-                nowtime =*localtime(&now);
-                nowtime.tm_hour = nowtime.tm_hour-8;
-                //获取定时开始的时间戳
-                starttime = *localtime(&now);
-                starttime.tm_hour = device_status.startBar-8;
-                starttime.tm_min = 0;
-                starttime.tm_sec = 0;
-                //获取定时结束的时间戳
-                endtime = *localtime(&now);
-                endtime.tm_hour = device_status.stopBar-8;
-                endtime.tm_min = 0;
-                endtime.tm_sec = 0;
-                LOG_I("***工作结束在当天:现在时间:%d-开始时间:%d-结束时间:%d***",mktime(&nowtime),mktime(&starttime),mktime(&endtime));
-                //如果当前时间大于开始时间且小于结束时间,且没有开始工作
-                if((difftime(mktime(&nowtime), mktime(&starttime)) >=0) && (difftime(mktime(&nowtime),mktime(&endtime))<0))
-                {
-                    LOG_I("当前时间大于开始时间,小于结束时间,工作中!!!");
-                    device_status.work_status = 1;
-                }
-                //如果当前时间小于开始时间
-                else if(difftime(mktime(&nowtime),mktime(&starttime))<0)
-                {
-                    LOG_I("当前时间小于开始时间,不工作!!!-%d-%d",mktime(&nowtime),mktime(&starttime));
-                    device_status.work_status = 0;
-                }
-                //当前时间大于结束时间
-                else {
-                    LOG_I("当前时间大于结束时间,不工作!!!-%d-%d",mktime(&nowtime),mktime(&starttime));
-                    device_status.work_status = 0;
-                }
-                #if LAMP_EN == 1
-                //如果当前时间超过20点,未到21点
-                if((difftime(mktime(&nowtime), mktime(&starttime)) >=0) && (difftime(mktime(&nowtime),mktime(&starttime)+3600)<0))
-                {
-                    LOG_I("3led:20~21");
-                    device_status.lamp_status = 1;
-                    device_status.lamp1_status = 0;
-                    device_status.lamp2_status = 0;
-                }
-                else if ((difftime(mktime(&nowtime), mktime(&starttime)+3600) >=0) && (difftime(mktime(&nowtime),mktime(&starttime)+7200)<0)) {
-                    LOG_I("3led:21~22");
-                    device_status.lamp1_status = 1;
-                    device_status.lamp_status = 0;
-                    device_status.lamp2_status = 0;
-                }
-                else if ((difftime(mktime(&nowtime), mktime(&starttime)+7200) >=0) && (difftime(mktime(&nowtime),mktime(&starttime)+10800)<0)) {
-                    LOG_I("3led:22~23");
-                    device_status.lamp2_status = 1;
-                    device_status.lamp_status = 0;
-                    device_status.lamp1_status =0;
-                }
-                #endif
-            }
-            //如果结束时间是第二天
-            else if (device_status.startBar>device_status.stopBar) {
-                time_t now;
-                time(&now);
-                static struct tm nowtime;   //现在
-                static struct tm starttime; //开始
-                static struct tm endtime;   //结束
-                //获取当前时间戳
-                nowtime =*localtime(&now);
-                nowtime.tm_hour = nowtime.tm_hour-8;
-                //获取定时开始的时间戳
-                starttime = *localtime(&now);
-                starttime.tm_hour = device_status.startBar-8;
-                starttime.tm_min = 0;
-                starttime.tm_sec = 0;
-                //获取定时结束的时间戳
-                endtime = *localtime(&now);
-                endtime.tm_hour = device_status.stopBar-8;
-                endtime.tm_min = 0;
-                endtime.tm_sec = 0;
-                LOG_I("工作结束在第二天:现在时间:%d-开始时间:%d-结束时间:%d!!!",mktime(&nowtime),mktime(&starttime),mktime(&endtime));
-                //如果当前时间大于开始时间,且没有开始工作 ,注意时间戳日期加1
-                if((difftime(mktime(&nowtime), mktime(&starttime)) > 0 ))
-                {
-                    //获取定时结束的时间戳
-                    endtime = *localtime(&now);  //将获取到的时间转换为时间戳
-                    endtime.tm_hour = device_status.stopBar-8;  //这里需减8用于时区转换
-                    endtime.tm_min = 0;
-                    endtime.tm_sec = 0;
-                    device_status.work_status = 1;
-                    LOG_I("当前前时间大于开始时间,且没有开始工作");
-                }
-                //当前时间小于开始时间
-                else if ((difftime(mktime(&nowtime), mktime(&starttime)) < 0))
-                {
-                    //获取定时结束的时间戳
-                    endtime = *localtime(&now);  //将获取到的时间转换为时间戳
-                    endtime.tm_hour = device_status.stopBar-8;  //这里需减8用于时区转换
-                    endtime.tm_min = 0;
-                    endtime.tm_sec = 0;
-                    //如果当前时间戳小于结束时间戳
-                    if(difftime(mktime(&nowtime),mktime(&endtime)) < 0)
-                    {
-                        LOG_I("当前时间大于开始时间,且没有开始工作,当前时间小于结束时间的情况:计算工作时间:从当前时间工作第二天的结束时间");
-                        device_status.work_status = 1;
-                    }
-                    else
-                    {
-                        LOG_I("当前时间小于开始时间,且没有开始工作,不是重启引起的,即还没到开始时间");
-                        device_status.work_status = 0; //不在工作时间,待机
-                    }
-                }
-            }
-        }
-        else {
-                LOG_I("光控定时模式!");
-                /*
-                time_t now;
-                time(&now);
-                static struct tm nowstamp;
-                nowstamp =*localtime(&now);
-                nowstamp.tm_hour = nowstamp.tm_hour - 8;
-                static rt_uint32_t nowstamp_num = 0;
-                nowstamp_num = mktime(&nowstamp);
-                rt_kprintf("now stamp:%d\n",nowstamp_num);
-                */
-                if(device_status.sun_status==0&&device_status.light_over_tim!=0)
-                {
-
-                    device_status.light_over_tim--;
-                    light_timeout = 3600;
-                    #if LAMP_EN == 1
-                    Led_Check(device_status.sunBar);
-                    #else
-                    device_status.work_status = 1;;
-                    LOG_I("光控定时,计时中>>>>>>>>>:%d",device_status.light_over_tim);
-                    #endif
-                }
-                else
-                {
-                    light_timeout --;
-                    //没有在测试并且没有在自检
-                    if(device_status.test_flag==0&&device_status.selfcheck_ws==0)
-                    {
-                        ctr_lamp(OFF,1);
-                        #if LAMP_EN == 1
-                        ctr_lamp(OFF,2);
-                        ctr_lamp(OFF,3);
-                        #endif
-                    }
-                    device_status.work_status = 0;
-                    if(light_timeout==0) device_status.light_over_tim = 0;  //持续1小时白天,清除光控计时,20250519
-                    if(device_status.light_over_tim==0&&device_status.sun_status==1) device_status.light_over_tim = device_status.sunBar * 3600;
-                    LOG_I("光控中,白天:%d!!!",device_status.sun_status);
-                }
-        }
-        rt_thread_delay(1000);
-    }
-    LOG_I("雨控状态,温控状态,电压状态:%d-%d-%d",device_status.rain_status,device_status.temp_status,device_status.bat_status);
-    device_status.work_status = 0;
-    rt_thread_delay(1000);
-}
-#endif
-
-
-static uint8_t sleep_cnt = 0;
 //拍照性诱工作任务流程
 void WorkTask_XYV3(void)
 {
     int cal_n = device_status.cul_time * 60;
     LOG_I("工作状态:%d",device_status.work_status);
     LOG_I("开关机状态:%d",device_status.ds);
-    while(device_status.work_status==1&&device_status.bat_status==0&&device_status.ds==1&&device_status.temp_status==0)
+    while(device_status.work_status==1&&
+            device_status.bat_status==0&&
+            device_status.ds==1&&
+            device_status.temp_status==0)
     {
         //高压板通电
         ctr_lamp(ON, 1);     //清扫-DC12v电机正反转
         //光栅传感器通电
         ctr_photo(ON);
         //拍照(?触发条件)计数?没有虫呢?定时
-        while(1){
+        while(device_status.sleep_mode==0){
             cal_n--;
             LOG_I("诱虫检测计数剩余时间:%d S",cal_n);
             if(cal_n==0){
-                //自动进入省电模式
-                device_status.sleep_mode = 1;
                 //发送拍照计数指令
                 device_status.photo_ws = 2;
                 cal_n = device_status.cul_time * 60;
             }
-            if(device_status.sleep_mode>0){
-                device_status.cul_time = 120;
-                if(cal_n==60){
-                    ctr_router(ON);
-                    ctr_RTU_DTU(ON);
-                }
-                if(cal_n==7000){
-                    ctr_router(OFF);
-                    ctr_RTU_DTU(OFF);
-                }
-            }
-            if(device_status.sleep_mode==10)
-            {
-                LOG_I("倒计时关闭联网模块电源:%d",sleep_cnt);
-                sleep_cnt++;
-                if(sleep_cnt>=60)
-                {
-                    sleep_cnt = 0;
-                    ctr_router(OFF);
-                    ctr_RTU_DTU(OFF);
-                    device_status.sleep_mode = 1;
-                }
-            }
-
             if(device_status.temp_status==1 || device_status.bat_status==1 ||device_status.work_status==0) break;
             rt_thread_delay(1000);
         }
+        rt_thread_delay(10000);
     }
     ctr_lamp(OFF, 1);
     ctr_photo(OFF);
@@ -1929,7 +1498,7 @@ static void Control_Heat_thread_entry(void *parameter) {
                 // 执行关闭高压操作(示例函数)
                 ctr_lamp(OFF, 1);
                 // 可选:自动复位保护
-                rt_thread_mdelay(10000);    // 等待2秒
+                rt_thread_mdelay(10000);    // 等待10秒
                 ctr_lamp(ON, 1);
                 highPressureDuration = 0;
             }

+ 1 - 1
Application_cbd_apm32f1/applications/control.h

@@ -29,7 +29,7 @@
 #endif
 ////////////////////////////////////////////////////////////////
 
-#define VERSION  "2.1.0"
+#define VERSION  "2.2.3"
 
 
 extern rt_event_t event_485_play;

+ 207 - 504
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -62,33 +62,33 @@ extern eMBMasterReqErrCode _485_play(USHORT *Buffer,USHORT NREGS);
 
 static int DTU_uart2_init(void)
 {
-        dtuserial  = rt_device_find(DTU_UART_NAME);
-        /*修改串口配置参数*/
-        dtuconfig.baud_rate = BAUD_RATE_115200;  //修改波特率9600
-        dtuconfig.data_bits = DATA_BITS_8;     //数据位8c
-        dtuconfig.stop_bits = STOP_BITS_1;     //停止位1
-        #ifdef RT_USING_SERIAL_V2
-        dtuconfig.rx_bufsz = 1024;
-        dtuconfig.tx_bufsz = 1024;
-        #else
-        dtuconfig.bufsz = 1024;                 //缓冲区1k
-        #endif
-        dtuconfig.parity = PARITY_NONE;        //奇校验
-        /* step3:控制串口设备。通过控制接口传入命令控制字,与控制参数 */
-        rt_device_control(dtuserial, RT_DEVICE_CTRL_CONFIG, &dtuconfig);
-        /* step4:打开串口设备。以DMA接收及轮询发送模式打开串口设备 */
-        #ifdef RT_USING_SERIAL_V2
-        rt_err_t uart_res = rt_device_open(dtuserial, RT_DEVICE_FLAG_RX_NON_BLOCKING | RT_DEVICE_FLAG_TX_BLOCKING); // 串口设备使用模式为 (发送阻塞 接收非阻塞) 模式
-        #else
-        rt_err_t uart_res = rt_device_open(dtuserial, RT_DEVICE_FLAG_DMA_RX);  //RT_DEVICE_FLAG_DMA_RX
-        #endif
-        if(uart_res!=RT_EOK)
-        {
-            LOG_E("%s打开失败!",DTU_UART_NAME);
-        }else{
-            LOG_I("%s Open Success!",DTU_UART_NAME);
-        }
-        return RT_EOK;
+    dtuserial  = rt_device_find(DTU_UART_NAME);
+    /*修改串口配置参数*/
+    dtuconfig.baud_rate = BAUD_RATE_115200;  //修改波特率9600
+    dtuconfig.data_bits = DATA_BITS_8;     //数据位8c
+    dtuconfig.stop_bits = STOP_BITS_1;     //停止位1
+    #ifdef RT_USING_SERIAL_V2
+    dtuconfig.rx_bufsz = 1024;
+    dtuconfig.tx_bufsz = 1024;
+    #else
+    dtuconfig.bufsz = 1024;                 //缓冲区1k
+    #endif
+    dtuconfig.parity = PARITY_NONE;        //奇校验
+    /* step3:控制串口设备。通过控制接口传入命令控制字,与控制参数 */
+    rt_device_control(dtuserial, RT_DEVICE_CTRL_CONFIG, &dtuconfig);
+    /* step4:打开串口设备。以DMA接收及轮询发送模式打开串口设备 */
+    #ifdef RT_USING_SERIAL_V2
+    rt_err_t uart_res = rt_device_open(dtuserial, RT_DEVICE_FLAG_RX_NON_BLOCKING | RT_DEVICE_FLAG_TX_NON_BLOCKING); // 串口设备使用模式为 (发送阻塞 接收非阻塞) 模式
+    #else
+    rt_err_t uart_res = rt_device_open(dtuserial, RT_DEVICE_FLAG_DMA_RX);  //RT_DEVICE_FLAG_DMA_RX
+    #endif
+    if(uart_res!=RT_EOK)
+    {
+        LOG_E("%s打开失败!",DTU_UART_NAME);
+    }else{
+        LOG_I("%s Open Success!",DTU_UART_NAME);
+    }
+    return RT_EOK;
 }
 
 
@@ -107,7 +107,7 @@ void DTU_Write(char *fmt, ...)
     if (str_length > 1024 - 1)
         str_length = 1024 - 1;
     rt_device_write(dtuserial, 0, dtu_str, str_length);
-    rt_thread_mdelay(20);
+    LOG_I("DTU_Write:%s",dtu_str);
 //    if(strstr(dtu_str,"volume")!=RT_NULL)
 //    {
 //        rt_device_write(dtuserial,0,dtu_conf,4);
@@ -120,149 +120,21 @@ void DTU_Write(char *fmt, ...)
 /* 接收数据回调函数 */
 static rt_err_t dtu_input(rt_device_t dev, rt_size_t size)
 {
-        struct rx_msg msg;
-        rt_err_t result;
-        msg.dev = dev;
-        msg.size = size;
-        result = rt_mq_send(&rx_mq_dtu,&msg, sizeof(struct rx_msg));
-        if ( result == -RT_EFULL)
-        {
-            /* 消息队列满 */
-            rt_kprintf("message queue full!\n");
-            rt_mq_control(&rx_mq_dtu, RT_IPC_CMD_RESET, RT_NULL); // 清空队列
-        }
-        return result;
-}
-
-// 最大JSON缓冲区长度(建议根据设备内存调整)
-#define MAX_JSON_BUFFER 1024
-// 最大超时时间(单位:RT_TICK_PER_SECOND)
-#define JSON_PARSE_TIMEOUT 2
-
-// 全局缓冲区结构体
-static struct {
-    char buffer[MAX_JSON_BUFFER]; // 数据存储区
-    int index;                   // 当前写入位置
-    rt_tick_t last_received;     // 最后接收时间戳
-    int nested_level;            // 当前嵌套层数
-} json_ctx = {.index = 0, .last_received = 0, .nested_level = 0};
-
-
-// 自定义异常类型
-typedef enum {
-    JSON_OK,
-    JSON_INCOMPLETE,
-    JSON_INVALID_CHAR,
-    JSON_TOO_DEEP,
-    JSON_TOO_LONG
-} json_status_t;
-
-// 查找完整JSON边界(支持嵌套)
-static json_status_t find_json_boundary(int *start, int *end)
-{
-    *start = -1;
-    *end = -1;
-    int level = 0;
-
-    for (int i = 0; i < json_ctx.index; i++) {
-        if (json_ctx.buffer[i] == '{') {
-            if (level == 0) *start = i;
-            level++;
-            if (level > 32) return JSON_TOO_DEEP;
-        } else if (json_ctx.buffer[i] == '}') {
-            level--;
-            if (level < 0) return JSON_INVALID_CHAR;
-            if (level == 0 && *start != -1) {
-                *end = i;
-                return JSON_OK;
-            }
-        }
-    }
-
-    if (*start != -1) return JSON_INCOMPLETE;
-    return JSON_OK;
-}
-// 处理缓冲区超时
-static void check_timeout_reset(void)
-{
-    if (rt_tick_get() - json_ctx.last_received > JSON_PARSE_TIMEOUT * RT_TICK_PER_SECOND) {
-        rt_memset(json_ctx.buffer, 0, MAX_JSON_BUFFER);
-        json_ctx.index = 0;
-        json_ctx.nested_level = 0;
-        rt_kprintf("[JSON] Timeout reset\n");
-    }
-}
-#define RT_MIN(a, b) ((a) < (b) ? (a) : (b))
-// 核心处理函数
-void process_uart_data(const char *data, int length)
-{
-    // 有效性检查
-    if (data == NULL || length <= 0) return;
-    json_ctx.last_received = rt_tick_get();
-
-    // 缓冲区溢出保护
-    int remain_space = MAX_JSON_BUFFER - json_ctx.index - 1;
-    if (remain_space < length) {
-        rt_kprintf("[JSON] Buffer overflow (%d/%d)\n",
-                  json_ctx.index + length, MAX_JSON_BUFFER);
-        json_ctx.index = 0; // 清空缓冲区重新开始
-        return;
-    }
-
-    // 追加新数据
-    rt_memcpy(json_ctx.buffer + json_ctx.index, data, length);
-    json_ctx.index += length;
-    json_ctx.buffer[json_ctx.index] = '\0';
-
-    // 循环处理所有完整报文
-    while (1) {
-        int start_pos, end_pos;
-        json_status_t status = find_json_boundary(&start_pos, &end_pos);
-
-        switch (status) {
-        case JSON_OK:
-            if (start_pos != -1 && end_pos != -1) {
-                // 提取有效JSON内容
-                char json_str[512] = {0};
-                int json_len = end_pos - start_pos + 1;
-                rt_strncpy(json_str, json_ctx.buffer + start_pos,
-                          RT_MIN(sizeof(json_str)-1, json_len));
-
-                // 调用解析函数
-                if (parseDtu(json_str) == RT_EOK) {
-                    rt_kprintf("[JSON] Parsed: %.*s\n", json_len, json_str);
-                }
-
-                // 移动缓冲区剩余内容
-                int remain_data = json_ctx.index - (end_pos + 1);
-                if (remain_data > 0) {
-                    rt_memmove(json_ctx.buffer,
-                              json_ctx.buffer + end_pos + 1,
-                              remain_data);
-                }
-                json_ctx.index = remain_data;
-                json_ctx.buffer[json_ctx.index] = '\0';
-            } else {
-                return; // 无更多完整报文
-            }
-            break;
-
-        case JSON_INCOMPLETE:
-            return; // 等待更多数据
-
-        default:
-            LOG_E("[JSON] Error %d at pos %d", status, start_pos);
-            // 错误恢复:跳过错误数据
-            json_ctx.index = 0;
-            rt_memset(json_ctx.buffer, 0, sizeof(json_ctx.buffer));
-            return;
-        }
+    struct rx_msg msg;
+    rt_err_t result;
+    msg.dev = dev;
+    msg.size = size;
+    result = rt_mq_send(&rx_mq_dtu,&msg, sizeof(struct rx_msg));
+    if ( result == -RT_EFULL)
+    {
+        /* 消息队列满 */
+        LOG_E("rx_mq_dtu message queue full!\n");
+        rt_mq_control(&rx_mq_dtu, RT_IPC_CMD_RESET, RT_NULL); // 清空队列
     }
+    return result;
 }
 
 
-
-
 /* 入口函数-指令接收*/
 static void dtu_thread_entry_recv(void *parameter)
 {
@@ -436,7 +308,6 @@ static void dtu_thread_entry_send(void *parameter)
 {
 
     device_status.power_status = 1;
-    device_status.num_updata = 200;
     rt_thread_delay(10000);
     static rt_uint16_t wait_i = 0;
     static rt_uint8_t check_i = 0;
@@ -481,7 +352,6 @@ static void dtu_thread_entry_send(void *parameter)
             }
             else {
                 char *readinfo =  makeJson_ReadInfo();
-                rt_kprintf("upload data:%s\n",readinfo);
                 DTU_Write("%s",readinfo);
                 rt_free(readinfo);
                 rt_thread_delay(1000);
@@ -543,57 +413,15 @@ int dtu_data_play(void)
             DTU_THREAD_PRIORITY,
             DTU_THREAD_TIMESLICE);
     /* 如果获得线程控制块,启动这个线程 */
-    if(dtu_send_data!=RT_NULL)
-        rt_thread_startup(dtu_send_data);
-    /* 如果获得线程控制块,启动这个线程 */
     if (dtu_recv_data != RT_NULL)
         rt_thread_startup(dtu_recv_data);
     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);
-    }
-
+void dtu_send_data_start(void)
+{
+    if(dtu_send_data!=RT_NULL)
+        rt_thread_startup(dtu_send_data);
 }
 
 char * makeJson_ReadInfo()
@@ -838,7 +666,7 @@ char *makeJson_Warn(char * s,char *t)
     pubstring = cJSON_CreateObject();
     if(NULL==pubstring)
     {
-        rt_kprintf("cJSON pubstring NULL!!!\n");
+        LOG_E("cJSON pubstring NULL!!!");
         return NULL;
     }
     cJSON_AddItemToObject(wJsonRoot, "ext", pubstring);
@@ -1021,8 +849,11 @@ char * makeJson()
     cJSON_AddStringToObject(pSubJson,"wind_sped","0");
     //cpu_temp
     cJSON_AddStringToObject(pSubJson,"cpu_tmp",device_status.cpu_temp);
-    //camera_sta
-    cJSON_AddStringToObject(pSubJson,"cam_sta",device_status.camera_sta);
+    //温控
+    rt_sprintf(utos, "%d",device_status.tpl);
+    cJSON_AddStringToObject(pSubJson,"tpl",utos);
+    rt_sprintf(utos, "%d",device_status.tph);
+    cJSON_AddStringToObject(pSubJson,"tph",utos);
     //InsectSpecies,昆虫种类
     cJSON_AddNumberToObject(pSubJson,"InsectSpecies",device_status.InsectSpecies);
     cJSON_AddNumberToObject(pSubJson,"Power_Type",device_status.Power_Type);
@@ -1117,7 +948,6 @@ int Parse_Cam_Param(cJSON *param_msg)
 int parseDtu(char *json_string)
 {
     extern int rt_hw_rtc_init(void);
-    char* json_s = NULL;
     cJSON* item_cmd = NULL;    //嵌套ext
     cJSON* item_ext = NULL;    //嵌套ext
     cJSON* item_checkself = NULL;
@@ -1157,6 +987,7 @@ int parseDtu(char *json_string)
     cJSON* link_sta = NULL;
     cJSON* link_ip = NULL;
     cJSON* value_commn= NULL;
+    static struct tm tm_now;
     rt_kprintf("%s\n",json_string);
     cJSON *root = cJSON_Parse(json_string);
     if(!root)
@@ -1169,98 +1000,14 @@ int parseDtu(char *json_string)
     {
 
           item_cmd = cJSON_GetObjectItem(root,"cmd");
-          cJSON* item_aplay = cJSON_GetObjectItem(root,"aplay");
           item_checkself = cJSON_GetObjectItem(root,"selfcheck");
           photolink = cJSON_GetObjectItem(root,"photolink");
           cJSON* ledsta = cJSON_GetObjectItem(root,"ledsta");
           cJSON* cam_cmd= cJSON_GetObjectItem(root,"cam_code");
-          cJSON* yolo_start = cJSON_GetObjectItem(root,"yolo");
+
           item_ext=cJSON_GetObjectItem(root,"ext");
-          if(yolo_start!=NULL)
-          {
-            if(strcmp(yolo_start->valuestring,"start")==0)  //”识别进程已启动“
-            {
-                //CAB6 B1F0 BDF8 B3CC D2D1 C6F4 B6AF
-                static USHORT sound_7[] = {0xCAB6,0xB1F0,0xBDF8,0xB3CC,0xD2D1,0xC6F4,0xB6AF};
-                _485_play(sound_7,7);
-            }
-          }
-          if(item_aplay!=NULL)
-          {
-              if(strcmp(item_aplay->valuestring,"data_upload")==0)  //数据上传中
-              {
-                  //CAFD BEDD C9CF B4AB D6D0
-                  static USHORT sound_0[] = {0xcafd,0xbedd,0xc9cf,0xb4ab,0xd6d0};
-                  _485_play(sound_0,5);
-              }else if(strcmp(item_aplay->valuestring,"kuaimen")==0)  //数据上传中
-              {
-                  //736F 756E 6431 3031
-                  static USHORT sound_1[] = {0x736f,0x756e,0x6431,0x3031};
-                  _485_play(sound_1,4);
-              }else if(strcmp(item_aplay->valuestring,"photouploadsuccess")==0)  //图片上传成功
-              {
-                  //C9CF B4AB B3C9 B9A6
-                  static USHORT sound_2[] = {0xc9cf,0xb4ab,0xb3c9,0xb9a6};
-                  _485_play(sound_2,4);
-              }else if(strcmp(item_aplay->valuestring,"photouploadfailed")==0)  //图片上传失败
-              {
-                  //C9CF B4AB CAA7 B0DC
-                  static USHORT sound_3[] = {0xc9cf,0xb4ab,0xcaa7,0xb0dc};
-                  _485_play(sound_3,4);
-              }else if(strcmp(item_aplay->valuestring,"welcom")==0)  //JETSON启动
-              {
-                  //4A45 5453 4F4E C6F4 B6AF
-                  static USHORT sound_4[] = {0x4A45,0x5453,0x4F4E,0xC6F4,0xB6AF};
-                  _485_play(sound_4,5);
-              }else if(strcmp(item_aplay->valuestring,"fdsucess")==0)  //升级文件下载成功
-              {
-                  //C9FD BCB6 CEC4 BCFE CFC2 D4D8 B3C9 B9A6
-                  static USHORT sound_5[] = {0xC9FD,0xBCB6,0xCEC4,0xBCFE,0xCFC2,0xD4D8,0xB3C9,0xB9A6};
-                  _485_play(sound_5,8);
-              }else if(strcmp(item_aplay->valuestring,"fdfailed")==0)  //”升级文件下载失败“
-              {
-                  //C9FD BCB6 CEC4 BCFE CFC2 D4D8 CAA7 B0DC
-                  static USHORT sound_6[] = {0xC9FD,0xBCB6,0xCEC4,0xBCFE,0xCFC2,0xD4D8,0xCAA7,0xB0DC};
-                  _485_play(sound_6,8);
-              }else if(strcmp(item_aplay->valuestring,"yolodone")==0)  //”识别进程已结束“
-              {
-                  //CAB6 B1F0 BDF8 B3CC D2D1 BDE1 CAF8
-                  static USHORT sound_8[] = {0xCAB6,0xB1F0,0xBDF8,0xB3CC,0xD2D1,0xBDE1,0xCAF8};
-                  _485_play(sound_8,8);
-              }else if(strcmp(item_aplay->valuestring,"onmessage")==0)  //”提示音“
-              {
-                  //sound10?
-                  static USHORT sound_9[] = {0xCAB6,0xB1F0,0xBDF8,0xB3CC,0xD2D1,0xBDE1,0xCAF8};
-                  _485_play(sound_9,8);
-              }else if(strcmp(item_aplay->valuestring,"startupdate")==0)  //”开始升级“
-              {
-                  //BFAA CABC C9FD BCB6
-                  static USHORT sound_10[] = {0xBFAA,0xCABC,0xC9FD,0xBCB6};
-                  _485_play(sound_10,4);
-              }else if(strcmp(item_aplay->valuestring,"updatesuccess")==0)  //”升级成功“
-              {
-                  //C9FD BCB6 B3C9 B9A6
-                  static USHORT sound_11[] = {0xC9FD,0xBCB6,0xB3C9,0xB9A6};
-                  _485_play(sound_11,4);
-              }else if(strcmp(item_aplay->valuestring,"updatefailed")==0)  //”升级失败“
-              {
-                  //C9FD BCB6 CAA7 B0DC
-                  static USHORT sound_12[] = {0xC9FD,0xBCB6,0xCAA7,0xB0DC};
-                  _485_play(sound_12,4);
-              }else if(strcmp(item_aplay->valuestring,"sound113")==0)  //”mqtt消息提示音“
-              {
-                  //736F 756E 6431 3133
-                  static USHORT sound_13[] = {0x736F,0x756E,0x6431,0x3133};
-                  _485_play(sound_13,4);
-              }else if(strcmp(item_aplay->valuestring,"net_connect")==0)  //"网络连接成功“
-              {
-                  //CDF8 C2E7 C1AC BDD3 B3C9 B9A6
-                  static USHORT sound_14[] = {0xCDF8,0xC2E7,0xC1AC,0xBDD3,0xB3C9,0xB9A6};
-                  _485_play(sound_14,6);
-              }
 
 
-          }
           if(cam_cmd!=NULL){
               //先检查定时器状态,否则会崩溃
               rt_timer_stop(timer_uart2);
@@ -1292,7 +1039,8 @@ int parseDtu(char *json_string)
                   free(json_temp);
               }
               if(device_status.work_status==0) ctr_lamp(OFF, 1);  //关闭高压
-              device_status.sleep_mode = 10;
+              //收到拍照结果,
+
           }
           if(item_checkself!=NULL){//自检签名
               memset(device_status.qianming,0,sizeof(device_status.qianming));
@@ -1327,40 +1075,15 @@ int parseDtu(char *json_string)
                 rt_thread_delay(2000);
                 #endif
               }
-              else if (strstr(item_cmd->valuestring,"json_w_clock")!=RT_NULL) {
-                  rt_kprintf("查询时间配置!\n");
-                  json_s = makeJson_Warn(device_status.json_w_clock, "主动查询");
-                  DTU_Write("%s",json_s);
-                  rt_free(json_s);
-                  rt_thread_delay(1000);
-              }
-              else if (strstr(item_cmd->valuestring,"json_w_reset")!=RT_NULL) {
-                  rt_kprintf("查询重置配置!\n");
-                  json_s = makeJson_Warn(device_status.json_w_reset, "主动查询");
-                  DTU_Write("%s",json_s);
-                  rt_free(json_s);
-                  rt_thread_delay(1000);
-              }
-              else if (strstr(item_cmd->valuestring,"json_w_platform")!=RT_NULL) {
-                  rt_kprintf("查询平台配置!\n");
-                  json_s = makeJson_Warn(device_status.json_w_platform, "主动查询");
-                  DTU_Write("%s",json_s);
-                  rt_free(json_s);
-                  rt_thread_delay(1000);
-              }
-              else if (strstr(item_cmd->valuestring,"shake")!=RT_NULL)
-              {
-                  ctr_shake(ON, 30);
-                  char *shake = makeJson_Warn("shake","control");
-                  DTU_Write("%s",shake);
-                  rt_free(shake);
-                  rt_thread_delay(2000);
+              else if (strstr(item_cmd->valuestring,"takeDone")!=RT_NULL){
+                 //device_status.clear_status=10;
+                 LOG_I("拍照成功,执行清扫!");
               }
               //{"cmd":"photoinfo","ext":{"photo_ct":2}}
               else if (strstr(item_cmd->valuestring,"photoinfo")!=RT_NULL)
               {
-                  device_status.sleep_mode = 10;
-                  LOG_I("拍照成功,准备关闭联网模块电源!");
+                  //device_status.sleep_mode = 10;
+                  LOG_I("拍照成功,准备关闭联网模块电源?%d",device_status.sleep_mode);
               }
               //远程给rtu重新上电
               else if (strstr(item_cmd->valuestring,"ctrl")!=RT_NULL)
@@ -1373,33 +1096,16 @@ int parseDtu(char *json_string)
                       rt_thread_delay(5000);
                       ctr_RTU_DTU(ON);
                   }
-                  //对焦拍照
-                  else if(strstr(type->valuestring,"auto_takephoto")!=RT_NULL)
-                  {
-                      device_status.autotakepic = 1;
-                      rt_thread_delay(2000);
-                      char *auto_takephoto = makeJson_Warn("send cmd success:auto_takephoto","control");
-                      DTU_Write("%s",auto_takephoto);
-                      rt_free(auto_takephoto);
-                  }
                   else if(strstr(type->valuestring,"takephoto")!=RT_NULL)
                   {
                       //HK_TakePhoto();
-                      device_status.photo_ws = 1;
+                      device_status.photo_ws = 2;
                       char *photo = makeJson_Warn("takephoto","control");
                       DTU_Write("%s",photo);
                       rt_free(photo);
                       rt_thread_delay(2000);
                   }
 
-                  //{"ext": {"type": "paichong"}, "cmd": "ctrl"}   排虫
-                  else if (strstr(type->valuestring,"paichong")!=RT_NULL) {
-                      char *turn_zp = makeJson_Warn("send cmd success:paichong","control");
-                      DTU_Write("%s",turn_zp);
-                      rt_free(turn_zp);
-                      if(device_status.vol==0)
-                          device_status.vol = 111;
-                  }
                   else if (strstr(type->valuestring,"led_on")!=RT_NULL)
                   {
                       ctr_led(ON);
@@ -1413,20 +1119,23 @@ int parseDtu(char *json_string)
                   else if(strstr(type->valuestring,"sleep_mode")!=RT_NULL)
                   {
                       device_status.sleep_mode = 1;
-                      ef_set_env_blob("sleep_mode", &device_status.sleep_mode, sizeof(device_status.sleep_mode));           //设备编码
+                      ef_set_env_blob("sleep_mode", &device_status.sleep_mode, sizeof(device_status.sleep_mode));      //
                       LOG_I("收到设置休眠指令:%d",device_status.sleep_mode);
+                      char *sleep = makeJson_Warn("set sleep mode enable","control");
+                      DTU_Write("%s",sleep);
+                      rt_free(sleep);
+                  }
+                  else if(strstr(type->valuestring,"sleep_off")!=RT_NULL)
+                  {
+                      device_status.sleep_mode = 0;
+                      ef_set_env_blob("sleep_mode", &device_status.sleep_mode, sizeof(device_status.sleep_mode));      //
+                      LOG_I("收到设置休眠指令:%d",device_status.sleep_mode);
+                      char *sleep = makeJson_Warn("set sleep mode disable","control");
+                      DTU_Write("%s",sleep);
+                      rt_free(sleep);
                   }
               }
 
-              //水稻2000万像素的串口拍照指令
-              else if (strstr(item_cmd->valuestring,"mvs_photo")!=RT_NULL)
-              {
-                  HK_TakePhoto();
-                  char *photo = makeJson_Warn("mvs_takephoto","control");
-                  DTU_Write("%s",photo);
-                  rt_free(photo);
-                  rt_thread_delay(2000);
-              }
               else if (strstr(item_cmd->valuestring,"reboot")!=RT_NULL)
               {
                   char *restart = makeJson_Warn("sysrem will restart","control");
@@ -1557,16 +1266,6 @@ int parseDtu(char *json_string)
               }
               else if (strstr(item_cmd->valuestring,"synchronization")!=RT_NULL)
               {
-//                  #if Color_EN == 0
-//                  if(device_status.dtype==7)
-//                  {
-//                      DTU_Write("%s","SwversionV7");
-//                  }
-//                  else if (device_status.dtype==3)
-//                  {
-//                      DTU_Write("%s","SwversionV4");
-//                  }
-//                  #endif
                   device_status.refresh_timeout=0;
                   //driver_4g =  cJSON_GetObjectItem(item_ext,"version");
                   driver_4g = cJSON_GetObjectItem(item_ext,"dver");
@@ -1632,42 +1331,43 @@ int parseDtu(char *json_string)
 
                   if(datetime!=RT_NULL){
                       LOG_I("DTU时间:%s",datetime->valuestring);
-                      int year, month, day, hour, minute, second;
-                      sscanf(datetime->valuestring, "%4d%2d%2d%2d%2d%2d", &year, &month, &day, &hour, &minute, &second);
-                      if(set_date(year,month,day)==RT_EOK)
-                      {
-                            LOG_I("设置日期:%d年%d月%d日",year,month,day);
-                            if(hour<24&&minute>=0&&minute<60&&second>=0&&second<60)
-                            {
-                                LOG_I("设置时间:%d时%d分%d秒",hour,minute,second);
-                                set_time(hour,minute,second);
-                            }else{
-                                LOG_E("set_date failed!");
-                            }
+                      struct tm *tm_time = parseTimestamp(datetime->valuestring);
+                      time_t timestamp;
+                      if(tm_time!=NULL){
+
+                          time_t now;
+                          time(&now);
+                          tm_now =*localtime(&now);
+
+                          timestamp = mktime(tm_time);
+                          LOG_I("RTU时间戳:%d",timestamp);
+                          //获取当前系统时间戳
+                          struct timeval tv;
+                          gettimeofday(&tv,NULL);
+                          LOG_I("系统当前时间戳:%d",tv.tv_sec);
+                          time_t timestamp_diff;
+                          if(timestamp>tv.tv_sec)
+                          {
+                             timestamp_diff = timestamp - tv.tv_sec;
+                          }else
+                          {
+                             timestamp_diff = tv.tv_sec - timestamp;
+                             if(timestamp_diff>1000)   //
+                             {
+                                 setSystemTime(tm_time);
+                             }
+                          }
+                          if (timestamp_diff<300&&tm_now.tm_year+1900>=2025) {
+                             setSystemTime(tm_time);
+                          }else {
+                              if(tm_now.tm_year+1900<=2025)
+                              {
+                                  setSystemTime(tm_time);
+                              }
+                          }
+
                       }
-//                      static char year_s[5],month_s[3],day_s[3],hour_s[3],min_s[3],sec_s[3];
-//                      strncpy(year_s, datetime->valuestring, 4);
-//                      strncpy(month_s,datetime->valuestring+4,2);
-//                      strncpy(day_s,datetime->valuestring+6,2);
-//                      strncpy(hour_s,datetime->valuestring+8,2);
-//                      strncpy(min_s,datetime->valuestring+10,2);
-//                      strncpy(sec_s,datetime->valuestring+12,2);
-//                      if(atoi(year_s)>=2024&&atoi(year_s)<3000&&atoi(month_s)>0&&atoi(month_s)<13&&atoi(day_s)>0&&atoi(day_s)<32)
-//                      {
-//                          if(set_date(atoi(year_s),atoi(month_s),atoi(day_s))==RT_EOK)
-//                          {
-//                              LOG_I("设置日期:%d年%d月%d日",atoi(year_s),atoi(month_s),atoi(day_s));
-//                              if(atoi(hour_s)>0&&atoi(hour_s)<=24&&atoi(min_s)>=0&&atoi(min_s)<=60&&atoi(sec_s)>=0&&atoi(sec_s)<=60)
-//                              {
-//                                  LOG_I("设置时间:%d时%d分%d秒",atoi(hour_s),atoi(min_s),atoi(sec_s));
-//                                  set_time(atoi(hour_s),atoi(min_s),atoi(sec_s));
-//                              }
-//                          }
-//                          else {
-//                              LOG_E("set_date failed!");
-//                              rt_hw_rtc_init();
-//                          }
-//                      }
+                      free(tm_time); // Free the allocated memory
                   }
 
                   LOG_I("参数同步:lat:%s lng:%s",lat->valuestring,lng->valuestring);
@@ -1797,82 +1497,105 @@ int parseDtu(char *json_string)
               }
               if(item_ext!=RT_NULL&&strstr(item_cmd->valuestring,"paramconf")!=RT_NULL)
               {
-                          if(device_status.dtype==3)
-                          hst = cJSON_GetObjectItem(item_ext,"hst");
-                          if(device_status.dtype==7)
-                          hst = cJSON_GetObjectItem(item_ext,"set_temp");
-
-                          et  = cJSON_GetObjectItem(item_ext,"et");
-                          datt = cJSON_GetObjectItem(item_ext,"datt");
-
-                          shake_sec = cJSON_GetObjectItem(item_ext,"shake_sec");
-                          tpl = cJSON_GetObjectItem(item_ext,"tpl");
-                          shake = cJSON_GetObjectItem(item_ext,"shake");
-                          tph = cJSON_GetObjectItem(item_ext,"tph");
-                          ts = cJSON_GetObjectItem(item_ext,"ts");
-                          st = cJSON_GetObjectItem(item_ext,"st");
-                          tt = cJSON_GetObjectItem(item_ext,"tt");
-                          htim = cJSON_GetObjectItem(item_ext,"htim");
-                          if(device_status.dtype==3)
-                          ds = cJSON_GetObjectItem(item_ext,"ds");
-                          vt = cJSON_GetObjectItem(item_ext,"vt");
-
-                          if(device_status.dtype==3)
-                          collt = cJSON_GetObjectItem(item_ext,"collt");
-
-                          if(device_status.dtype==7)
-                          ds = cJSON_GetObjectItem(item_ext,"on_off");
-                          if(device_status.dtype==7)
-                          collt = cJSON_GetObjectItem(item_ext,"coll_time");    //收集(数组格式)
-
-                          cJSON* cul_time = cJSON_GetObjectItem(item_ext,"cul_time");   //培养时间1~24
-                          cJSON* drop_sec = cJSON_GetObjectItem(item_ext,"drop_time");
-                          if(drop_sec!=NULL)
+                  cJSON *work_tim = cJSON_GetObjectItem(item_ext,"work_tim");
+                  cJSON *data_tim = cJSON_GetObjectItem(item_ext,"data_tim");
+                  cJSON *power = cJSON_GetObjectItem(item_ext,"power");
+                  cJSON *clt_tim = cJSON_GetObjectItem(item_ext,"clt_tim");
+
+                  if(device_status.dtype==3)
+                  hst = cJSON_GetObjectItem(item_ext,"hst");
+                  if(device_status.dtype==7)
+                  hst = cJSON_GetObjectItem(item_ext,"set_temp");
+
+                  et  = cJSON_GetObjectItem(item_ext,"et");
+                  datt = cJSON_GetObjectItem(item_ext,"datt");
+
+                  shake_sec = cJSON_GetObjectItem(item_ext,"shake_sec");
+                  tpl = cJSON_GetObjectItem(item_ext,"tpl");
+                  shake = cJSON_GetObjectItem(item_ext,"shake");
+                  tph = cJSON_GetObjectItem(item_ext,"tph");
+                  ts = cJSON_GetObjectItem(item_ext,"ts");
+                  st = cJSON_GetObjectItem(item_ext,"st");
+                  tt = cJSON_GetObjectItem(item_ext,"tt");
+                  htim = cJSON_GetObjectItem(item_ext,"htim");
+                  if(device_status.dtype==3)
+                  ds = cJSON_GetObjectItem(item_ext,"ds");
+                  vt = cJSON_GetObjectItem(item_ext,"vt");
+
+                  if(device_status.dtype==3)
+                  collt = cJSON_GetObjectItem(item_ext,"collt");
+
+                  if(device_status.dtype==7)
+                  ds = cJSON_GetObjectItem(item_ext,"on_off");
+                  if(device_status.dtype==7)
+                  collt = cJSON_GetObjectItem(item_ext,"coll_time");    //收集(数组格式)
+
+                  cJSON* cul_time = cJSON_GetObjectItem(item_ext,"cul_time");   //培养时间1~24
+                  cJSON* drop_sec = cJSON_GetObjectItem(item_ext,"drop_time");
+                  if(work_tim!=RT_NULL){
+                      device_status.timeSwitch = 1;
+                      st = cJSON_GetObjectItem(work_tim,"st");
+                      et = cJSON_GetObjectItem(work_tim,"et");
+                  }
+
+                  if(data_tim!=RT_NULL){
+                      datt = cJSON_GetObjectItem(data_tim,"dat_f");
+                  }
+
+                  if(power!=RT_NULL){
+                      ds = cJSON_GetObjectItem(power,"ds");
+                  }
+
+                  if(clt_tim!=RT_NULL){
+                      cul_time = cJSON_GetObjectItem(clt_tim,"clt_t");
+                  }
+
+                  if(drop_sec!=NULL)
+                  {
+                      if(drop_sec->valueint>=1&&drop_sec->valueint<=300)
+                      {
+                          device_status.shake_sec = drop_sec->valueint;
+                          ef_set_env_blob("shake_sec", &device_status.shake_sec, sizeof(device_status.shake_sec)); //培养时间
+                          LOG_I("下发设置滴液时间:%d",drop_sec->valueint);
+                      }
+                  }
+                  if(cul_time!=NULL)
+                  {
+                      if(cul_time->valueint>=1&&cul_time->valueint<=240)
+                      {
+                          device_status.cul_time = cul_time->valueint;
+                          ef_set_env_blob("cul_time", &device_status.cul_time, sizeof(device_status.cul_time)); //培养时间
+                          LOG_I("下发设置收集时间:%d",cul_time->valueint);
+                      }
+                  }
+                          /*加热温度*/
+                  if(hst!=NULL)
+                  {
+                      if(hst->type==cJSON_Number)
+                      {
+                          if(hst->valueint>=10&&hst->valueint<=150)
                           {
-                              if(drop_sec->valueint>=1&&drop_sec->valueint<=300)
-                              {
-                                  device_status.shake_sec = drop_sec->valueint;
-                                  ef_set_env_blob("shake_sec", &device_status.shake_sec, sizeof(device_status.shake_sec)); //培养时间
-                                  LOG_I("下发设置滴液时间:%d",drop_sec->valueint);
-                              }
+                              device_status.heatvalue = hst->valueint;
+                              ef_set_env_blob("jheat", &device_status.heatvalue, sizeof(device_status.heatvalue));   //开始时间
+                              LOG_I("加热温度hst:%d",hst->valueint);
                           }
-                          if(cul_time!=NULL)
+                          else {
+                              LOG_E("加热温度hst设置失败参数错误!!!");
+                        }
+                      }
+                      else {
+                          if(atoi(hst->valuestring)>10&&atoi(hst->valuestring)<150)
                           {
-                              if(cul_time->valueint>=1&&cul_time->valueint<=24)
-                              {
-                                  device_status.cul_time = cul_time->valueint;
-                                  ef_set_env_blob("cul_time", &device_status.cul_time, sizeof(device_status.cul_time)); //培养时间
-                                  LOG_I("下发设置培养时间:%d",cul_time->valueint);
-                              }
+                              device_status.heatvalue=atoi(hst->valuestring);
+                              ef_set_env_blob("jheat", &device_status.heatvalue, sizeof(device_status.heatvalue));      //加热温度
+                              LOG_I("加热温度hst:%d",atoi(hst->valuestring));
                           }
-                          /*加热温度*/
-                          if(hst!=NULL)
-                          {
-                              if(hst->type==cJSON_Number)
-                              {
-                                  if(hst->valueint>=10&&hst->valueint<=150)
-                                  {
-                                      device_status.heatvalue = hst->valueint;
-                                      ef_set_env_blob("jheat", &device_status.heatvalue, sizeof(device_status.heatvalue));   //开始时间
-                                      LOG_I("加热温度hst:%d",hst->valueint);
-                                  }
-                                  else {
-                                      LOG_E("加热温度hst设置失败参数错误!!!");
-                                }
-                              }
-                              else {
-                                  if(atoi(hst->valuestring)>10&&atoi(hst->valuestring)<150)
-                                  {
-                                      device_status.heatvalue=atoi(hst->valuestring);
-                                      ef_set_env_blob("jheat", &device_status.heatvalue, sizeof(device_status.heatvalue));      //加热温度
-                                      LOG_I("加热温度hst:%d",atoi(hst->valuestring));
-                                  }
-                                  else {
-                                      LOG_E("加热温度hst设置失败参数错误!!!");
-                                }
-                            }
+                          else {
+                              LOG_E("加热温度hst设置失败参数错误!!!");
+                        }
+                    }
 
-                          }
+                  }
 #if 1  //三色光源无法修改开始和结束时间
                           if (st!=NULL)
                           {
@@ -2301,27 +2024,10 @@ int parseDtu(char *json_string)
                               }
 
                           }
-                          if(vt!=NULL)
-                          {
-                              if(atoi(vt->valuestring)>=0&&atoi(vt->valuestring)<=100)
-                              {
-                                  device_status.version_type = atoi(vt->valuestring);
-                                  ef_set_env_blob("version_type", &device_status.version_type, sizeof(device_status.version_type));
-                                  if(device_status.version_type==7)
-                                  {
-                                      device_status.dtype = 7;
-                                      ef_set_env_blob("dtype", &device_status.dtype, sizeof(device_status.dtype));
-                                  }
-                                  rt_kprintf("版本类型vt:%d\n",atoi(vt->valuestring));
-                              }
-                              else {
-                                  rt_kprintf("版本类型设置失败参数错误!!!\n");
-                            }
-                          }
+
                           UpLoad_Data();
                           rt_thread_delay(2000);
                           //2022/06/23,add:
-                          rt_thread_delay(1000);
                           MA_save();
                           rt_thread_delay(1000);
                }
@@ -2334,15 +2040,12 @@ int parseDtu(char *json_string)
 void UpLoad_Data(void)
 {
     char *updata = makeJson();
-    LOG_I("upload data:%d %s",rt_strlen(updata),updata);
-    rt_free(updata);
-    #if Color_EN ==0
     DTU_Write("%s",updata);
-    #endif
+    rt_free(updata);
     if(device_status.sleep_mode == 1&&device_status.work_status==0&&atoi(device_status.net)==0) {
-        rt_thread_delay(5000);
-        ctr_router(OFF);
-        ctr_RTU_DTU(OFF);
+        //60S后关闭RTU、路由器电源
+        device_status.C01 = 10;
+        LOG_W("60S后关闭RTU、路由器电源");
     }
     //list_mem();
     //播放数据上传中语音

+ 1 - 1
Application_cbd_apm32f1/applications/dtu_uart2.h

@@ -28,7 +28,7 @@ typedef struct{
 
 
 
-
+void dtu_send_data_start(void);
 //查询数据---{"cmd": "read"}
 //重启-------{"cmd": "reboot"}
 //升级-------{"cmd": "update"}

+ 27 - 22
Application_cbd_apm32f1/applications/hmi.c

@@ -46,8 +46,6 @@ static char msg_pool[512];
 
 static char rx_buffer[HMI_UART_RXBUFFER_SIZE + 1];
 
-static USHORT sound122[] = {0x736f,0x756e,0x6431,0x3232};
-
 void list_mem(void);
 int mb_master_samlpe();
 /**/
@@ -625,7 +623,6 @@ static void HMI_Decode(void)
     }
     else if (strstr(rx_buffer,"saveSystemSet")!=NULL) {
         static char clt_time_str[3],heattime_str[3],heatvale_str[4],vol_str[4],thsp_str[5];
-        static char value_temp[5];
         LOG_I("系统设置!");
         var = strstr(rx_buffer,"=");
         var ++;
@@ -871,10 +868,11 @@ static void Ctr_Mortor_entry(void* parameter)
 {
 
    rt_int16_t photo_led_sec = 900;  //55S
+   rt_int16_t off_router_sec = 600; //60S
    struct timeval tv;
     while(1)
     {
-        #if 1
+        #if 0
         time_t time_reset12V;
         time(&time_reset12V);
         static struct tm alarm_reset12V;
@@ -929,9 +927,20 @@ static void Ctr_Mortor_entry(void* parameter)
                 photo_led_sec = 900;
                 ctr_led(OFF);
                 device_status.photo_ws = 0;
+                device_status.clear_status = 10;    //翻板
+            }
+        }
+        if(device_status.C01==10)
+        {
+            off_router_sec--;
+            if(off_router_sec==0)
+            {
+                off_router_sec = 600;
+                device_status.C01=0;
+                ctr_router(OFF);
+                ctr_RTU_DTU(OFF);
             }
         }
-
         rt_thread_delay(100);
     }
 }
@@ -1202,10 +1211,9 @@ void Check_ParamConfig(void)
         //等待联网,
         while(atoi(device_status.net)==1)
         {
+            device_status.num_updata = 0;
             if(Read_Real_Voltage()/100>5&&device_status.power_status==0)
             ctr_RTU_DTU(ON);
-            if(device_status.dtype==7)
-            HMI_WRITE("sysTest.auto_flag.txt=\"0\"");
             char *readinfo =  makeJson_ReadInfo();
             DTU_Write("%s",readinfo);
             rt_free(readinfo);
@@ -1217,10 +1225,6 @@ void Check_ParamConfig(void)
             {
                 device_status.timeSwitch = 1;
                 LOG_W("Time not set:%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);
-                #if 0
-                set_date(2020, 1, 1);
-                set_time(0, 0, 0);
-                #endif
                 break;
             }
             if(tm.tm_year>=2021)
@@ -1240,14 +1244,17 @@ void Check_ParamConfig(void)
         device_status.timeSwitch = 1;
         DTU_Write("%s",makeJson_Warn("turnon", "device_stm32"));
         rt_thread_delay(1000);
+        dtu_send_data_start();
         Workstatus_check();
         Work_Loop_Task();
-        device_status.num_updata = 2;
+
     }
 }
 
 void ResetParamDefault(void)
 {
+    ctr_router(ON);
+    ctr_RTU_DTU(ON);
     device_status.dtype = 8;
     device_status.version_type = 8;
     ef_set_env_blob("dtype", &device_status.dtype, sizeof(device_status.dtype));
@@ -1270,22 +1277,20 @@ void ResetParamDefault(void)
         ef_set_env_blob("cul_time", &device_status.cul_time, sizeof(device_status.cul_time));
         device_status.dattim = 30;      //数据上传间隔
         ef_set_env_blob("dattim", &device_status.dattim, sizeof(device_status.dattim)); //数据上传间隔
-        #if LAMP_EN == 0
-        device_status.startBar = 0;    //定时开始时间
-        device_status.stopBar = 0;      //定时结束时间
-        #endif
+
+        device_status.startBar = 9;    //定时开始时间
+        device_status.stopBar = 18;      //定时结束时间
+
         device_status.heattime = 10;    //加热时间
         device_status.shake_ws = 1;     //针对开关
         device_status.shake_sec = 1;    //震动时间1-100ms
-        #if LAMP_EN == 1
-        device_status.sunBar = 3;       //光控定时时长
-        #else
         device_status.sunBar = 8;
-        #endif
         device_status.tph = 70;         //高温保护阈值
         device_status.tpl = -5;          //低温保护阈值
         device_status.timeSwitch = 1;   //定时模式:时控
         device_status.heatvalue=100;    //加热温度
+        device_status.sleep_mode = 0;
+        ef_set_env_blob("sleep_mode", &device_status.sleep_mode, sizeof(device_status.sleep_mode));
         ef_set_env_blob("cul_time", &device_status.cul_time, sizeof(device_status.cul_time));
         ef_set_env_blob("startBar", &device_status.startBar, sizeof(device_status.startBar));
         ef_set_env_blob("stopBar", &device_status.stopBar, sizeof(device_status.stopBar));
@@ -1324,7 +1329,7 @@ void ResetParamDefault_DC(void)
     ef_set_env_blob("dattim", &device_status.dattim, sizeof(device_status.dattim)); //数据上传间隔
 
     device_status.startBar = 9;    //定时开始时间
-    device_status.stopBar = 17;      //定时结束时间
+    device_status.stopBar = 18;      //定时结束时间
 
     device_status.heattime = 10;    //加热时间
     device_status.shake_ws = 1;     //针对开关
@@ -1344,7 +1349,7 @@ void ResetParamDefault_DC(void)
     device_status.passWord = 8888;
     device_status.Power_Type = 0;
     device_status.sleep_mode = 0;
-    ef_set_env_blob("sleep_mode", &device_status.sleep_mode, sizeof(device_status.sleep_mode));           //设备编码
+    ef_set_env_blob("sleep_mode", &device_status.sleep_mode, sizeof(device_status.sleep_mode));
     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));
     ef_set_env_blob("stime", &device_status.clt_time, sizeof(device_status.clt_time));

+ 1 - 1
Application_cbd_apm32f1/drivers/board.h

@@ -88,7 +88,7 @@ extern "C"
 
 #define BSP_USING_UART5         //485
 #define BSP_UART5_TX_PIN       "PC12"
-#define BSP_UART5_RX_PIN       "PC2"
+#define BSP_UART5_RX_PIN       "PD2"
 #define BSP_UART5_RX_BUFSIZE   128
 #define BSP_UART5_TX_BUFSIZE   128
 

+ 46 - 1
Application_cbd_apm32f1/packages/syswatch-latest/src/syswatch.c

@@ -11,7 +11,7 @@
 #include <rtdevice.h>
 #include <rthw.h>
 #include <syswatch.h>
-
+#include <control.h>
 #ifdef SYSWATCH_USING
 
 //#define SYSWATCH_DEBUG
@@ -23,6 +23,7 @@
 #define DBG_LVL                         DBG_INFO
 #endif
 #include <rtdbg.h>
+Device_Status_typedef device_status;
 
 typedef struct{
     rt_bool_t init_ok;
@@ -374,6 +375,7 @@ static void syswatch_fsm(void)
 
 static void syswatch_thread_entry(void *parameter)
 {
+    static struct tm alarm_new;
     if (syswatch_wdt_startup() != RT_EOK)
     {
         LOG_E("watch dog startup fail");
@@ -387,6 +389,49 @@ static void syswatch_thread_entry(void *parameter)
     
     while(1)
     {
+
+        #if 1
+        time_t now;
+        time(&now);
+        alarm_new =*localtime(&now);
+        if((alarm_new.tm_hour)==9&&(alarm_new.tm_min==00)&&(alarm_new.tm_sec==0))
+        {
+            #if ROBOT_EN == 0
+            rt_hw_cpu_reset();
+            #endif
+        }
+
+
+        if(((alarm_new.tm_hour)==11 ||
+                (alarm_new.tm_hour)==13 ||
+                (alarm_new.tm_hour)==15 ||
+                (alarm_new.tm_hour)==17)&&(alarm_new.tm_min==00)&&(alarm_new.tm_sec==0))
+        {
+            ctr_router(ON);
+            ctr_RTU_DTU(ON);
+        }
+
+        if(((alarm_new.tm_hour)==11 ||
+                (alarm_new.tm_hour)==13 ||
+                (alarm_new.tm_hour)==15 ||
+                (alarm_new.tm_hour)==17)&&(alarm_new.tm_min==04)&&(alarm_new.tm_sec==0))
+        {
+            if(device_status.sleep_mode==1){
+                device_status.photo_ws = 2;
+            }
+        }
+
+        if(((alarm_new.tm_hour)==11 ||
+                (alarm_new.tm_hour)==13 ||
+                (alarm_new.tm_hour)==15 ||
+                (alarm_new.tm_hour)==17)&&(alarm_new.tm_min==10)&&(alarm_new.tm_sec==0))
+        {
+            if(device_status.sleep_mode==1){
+                ctr_router(OFF);
+                ctr_RTU_DTU(OFF);
+            }
+        }
+        #endif
         rt_thread_delay(RT_TICK_PER_SECOND);
         syswatch_wdt_feed();
         syswatch_fsm();

BIN
Application_cbd_apm32f1/rt-thread/tools/building.pyc


BIN
Application_cbd_apm32f1/rt-thread/tools/eclipse.pyc


BIN
Application_cbd_apm32f1/rt-thread/tools/gcc.pyc


BIN
Application_cbd_apm32f1/rt-thread/tools/menuconfig.pyc


BIN
Application_cbd_apm32f1/rt-thread/tools/mkdist.pyc


BIN
Application_cbd_apm32f1/rt-thread/tools/options.pyc


BIN
Application_cbd_apm32f1/rt-thread/tools/rt_studio.pyc


BIN
Application_cbd_apm32f1/rt-thread/tools/utils.pyc


+ 25 - 1
Application_cbd_apm32f1/rtconfig.h

@@ -52,7 +52,7 @@
 
 #define RT_USING_DEVICE
 #define RT_USING_CONSOLE
-#define RT_CONSOLEBUF_SIZE 256
+#define RT_CONSOLEBUF_SIZE 1024
 #define RT_CONSOLE_DEVICE_NAME "uart1"
 /* end of Kernel Device Object */
 #define RT_VER_NUM 0x40101
@@ -286,6 +286,30 @@
 /* Kendryte SDK */
 
 /* end of Kendryte SDK */
+
+/* WCH HAL & SDK Drivers */
+
+/* end of WCH HAL & SDK Drivers */
+
+/* AT32 HAL & SDK Drivers */
+
+/* end of AT32 HAL & SDK Drivers */
+
+/* HC32 DDL Drivers */
+
+/* end of HC32 DDL Drivers */
+
+/* NXP HAL & SDK Drivers */
+
+/* end of NXP HAL & SDK Drivers */
+
+/* NUVOTON Drivers */
+
+/* end of NUVOTON Drivers */
+
+/* GD32 Drivers */
+
+/* end of GD32 Drivers */
 /* end of HAL & SDK Drivers */
 
 /* sensors drivers */

BIN
Application_cbd_apm32f1/rtconfig.pyc