zhunk пре 5 месеци
родитељ
комит
c29a33c3c3

+ 21 - 4
Application_CBD/applications/control.c

@@ -1509,6 +1509,7 @@ void ctr_RTU_DTU(uint8_t status_rtu)
         // 开机逻辑:必须满足冷却时间才能开机
         rt_uint32_t current_tick = rt_tick_get();
         rt_uint32_t cool_ticks = 30 * RT_TICK_PER_SECOND; // 30秒
+#if 1
         if (s_last_off_tick != 0)
         {
             rt_uint32_t diff_tick = current_tick - s_last_off_tick;
@@ -1522,6 +1523,7 @@ void ctr_RTU_DTU(uint8_t status_rtu)
                 rt_thread_delay(wait_ticks);
             }
         }
+#endif
         // 冷却完成,执行开机
         rt_pin_write(RTU_DTU, ON);
         s_last_off_tick = 0; // 清除关机时间
@@ -1803,7 +1805,9 @@ void ResetInit(void)
                    device_status.version_type==43||
                    device_status.version_type==12)
            {
-               device_status.clear_status=1;
+               if(device_status.photo_ws==0){       //2026-06-05  修复工作结束后最后一张照片拍到清扫电机问题;
+                   device_status.clear_status=1;
+               }
                while(device_status.clear_status==1){
                    rt_thread_delay(1000);
                }
@@ -1831,7 +1835,9 @@ void ResetInit(void)
         }
         //5.关闭加热
         //6.关闭补光灯
-        ctr_led(OFF);
+        if(device_status.photo_ws==0){
+            ctr_led(OFF);
+        }
     }
 }
 /*三色光源*/
@@ -2731,7 +2737,10 @@ static void ctr_rtu_dtu(int argc, char** argv)
 {
     if(argc != 2)
     {
-        rt_kprintf("Usage: ctr_rtu_dtu <ON|OFF>\n");
+        rt_kprintf("Usage: ctr_rtu_dtu <ON|OFF|0>\n");
+        rt_kprintf("  ON   :  RTU/DTU Power ON\n");
+        rt_kprintf("  OFF  :  RTU/DTU Power OFF\n");
+        rt_kprintf("  0    :  ON-OFF Pulse (10ms interval)\n");
         return;
     }
     
@@ -2745,10 +2754,18 @@ static void ctr_rtu_dtu(int argc, char** argv)
         ctr_RTU_DTU(OFF);
         rt_kprintf("RTU/DTU Power OFF\n");
     }
+    else if(strcmp(argv[1], "0") == 0)
+    {
+        rt_kprintf("RTU/DTU ON-OFF Pulse (10ms interval)\n");
+        ctr_RTU_DTU(OFF);
+        rt_thread_mdelay(1);
+        ctr_RTU_DTU(ON);
+        rt_kprintf("Pulse complete\n");
+    }
     else
     {
         rt_kprintf("Invalid parameter: %s\n", argv[1]);
-        rt_kprintf("Usage: ctr_rtu_dtu <ON|OFF>\n");
+        rt_kprintf("Usage: ctr_rtu_dtu <ON|OFF|0>\n");
     }
 }
 MSH_CMD_EXPORT(ctr_rtu_dtu,ctr_rtu_dtu<ON|OFF>);

+ 1 - 1
Application_CBD/applications/control.h

@@ -18,10 +18,10 @@
 #define SENSOR_EN        1              //温湿度:0关闭,1打开
 #define ROBOT_EN         0              //机器人
 #define Color_EN         0              //定制色诱
-
 #define BOOT_ERR         1              //1-新bootloader,0-旧bootloader()2023年9月份之前的设备升级需要设置为0
 #define DZ_250723        0              //触发雨控后隔天再解除
 #define DZ_260519        0              //进入工作后,每小时转一次仓
+#define TEST_REPOWER_RTU 0              //测试RTU重新上电
 ////////////////////////////////////////////////////////////////
 #if LAMP_EN == 1
     #define VERSION_HK          "1.(3ledV9).41(HK)"      //4.0海康-三色光源

+ 20 - 1
Application_CBD/applications/hmi.c

@@ -434,6 +434,9 @@ static void HMI_Decode(void)
             HMI_WRITE("uploadSet.datt.val=%d",device_status.dattim);
             //语音音量
             HMI_WRITE("sysSet.vol.val=%d",device_status.vol);
+            //震动时间
+            HMI_WRITE("cangWei.h0.val=%d",device_status.shake_sec);
+            HMI_WRITE("menu.version.txt=\"%s\"",device_status.driver);
             //更新熄屏时间
             if(device_status.thsp<60) device_status.thsp = device_status.thsp * 60;
             HMI_WRITE("thsp=%d",device_status.thsp);
@@ -1631,6 +1634,11 @@ static void Ctr_Mortor_entry(void* parameter)
    rt_uint8_t num_tg_init = 200;
    static rt_uint16_t rtu_isboot_cnt = 0;
    static rt_uint16_t mock_uart_timer2_cnt = 0;
+#if TEST_REPOWER_RTU == 1
+   device_status.rtu_isboot = 1;
+#else
+   device_status.rtu_isboot = 0;
+#endif
     while(1)
     {
         #if 1
@@ -1654,15 +1662,26 @@ static void Ctr_Mortor_entry(void* parameter)
             rtu_isboot_cnt ++;
             if(rtu_isboot_cnt>=10*20){
                 rtu_isboot_cnt = 0;
+#if TEST_REPOWER_RTU == 0
                 device_status.rtu_isboot=0;
+#endif
                 LOG_W("软重启超时,触发硬重启!");
                 ctr_RTU_DTU(OFF);
-                rt_thread_delay(1000*31);
+                rt_thread_delay(1000*30);
                 ctr_RTU_DTU(ON);
                 rt_thread_delay(1000);
             }
         }else{
             rtu_isboot_cnt = 0;
+#if TEST_REPOWER_RTU == 1
+            rtu_isboot_cnt++;
+            if(rtu_isboot_cnt>=10*60){      //开启持续60s
+                device_status.rtu_isboot=1;
+                rtu_isboot_cnt = 0;
+            }
+#else
+            rtu_isboot_cnt = 0;
+#endif
         }
         if(device_status.mock_uart2_timer_flag==1)
         {

+ 4 - 0
Application_CBD/readme.md

@@ -1,3 +1,7 @@
+# 2026-06-05 更新说明
+	1、修复工作结束后最后一张照片拍到清扫电机的问题;
+	2、增加测试RTU自动上电功能;
+	3、增加往屏幕主界面发送版本号;
 # 2026-06-01 更新说明
 	#define VERSION_HK          "1.68.41(HK)"            //4.0海康-1200W
     #define VERSION_HK_2000W    "1.68.40(2000W)"         //4.0水稻