zhunk 5 ay önce
ebeveyn
işleme
1a3f60a27d

+ 2 - 1
Application_cbd_apm32f1/applications/control.c

@@ -1326,7 +1326,8 @@ void ResetInit(void)
            //5.关闭加热
            ctr_Heat(OFF);
            //6.关闭补光灯
-           ctr_led(OFF);
+           if(device_status.photo_ws==0)
+               ctr_led(OFF);
            if(device_status.bat_status==1||atoi(device_status.fuse_voltage)<1)
            {
                LOG_W("欠压!");

+ 5 - 5
Application_cbd_apm32f1/applications/control.h

@@ -18,15 +18,15 @@
 
 #define LAMP_EN          0             //李新3灯管:0关闭,1打开
 #define PCB_V1           0             //1-旧PCB,0-新PCB(模块化)
-#define MATCH_DEVICE     1             //比赛设备
+#define MATCH_DEVICE     0             //比赛设备
 #define SENSOR_EN        0             //温湿度:0关闭,1打开
 #define UART_TEST_EN     0             ///串口测试0-关闭,1-启用
 #define TG_MODULE        1             //推杆电机结构模块化控制
 #define DINGZHI_0722     0             //控制一个电机每天12点20工作12秒
 #define QINGSAO_IO       1             //调整清扫顺序20250801
-#define WENKONG          0             //温控功能1-开启 0-关闭
-#define YUKONG           0             //雨控功能1-开启 0-关闭
-#define QIANYA           0             //欠压功能1-开启 0-关闭
+#define WENKONG          1             //温控功能1-开启 0-关闭
+#define YUKONG           1             //雨控功能1-开启 0-关闭
+#define QIANYA           1             //欠压功能1-开启 0-关闭
 
 
 #if MATCH_DEVICE == 1
@@ -43,7 +43,7 @@
     #if TG_MODULE == 0
     #define VERSION_HK_2000W    "2.36.4(2000W)"         //4.0水稻
     #else
-    #define VERSION_HK_2000W    "2.8.4(TG)"             //推杆结构
+    #define VERSION_HK_2000W    "2.9.4(TG)"             //推杆结构
     #endif
 #endif
 

+ 3 - 1
Application_cbd_apm32f1/applications/hmi.c

@@ -446,7 +446,9 @@ static void refresh_hmi_Component(struct tm tm)
         HMI_WRITE("workSta.heatStatus.val=%d",device_status.heat_status);
         //更新密码
         HMI_WRITE("inputPasswd.pwdData.txt=\"8888\"");
-        //更新时间设置中的参数
+        //更新工作进度
+        //
+        HMI_WRITE("menu.workProgress.val=%d",);
         //更新定时模式
         HMI_WRITE("clockSet.timeSwitch.val=%d",device_status.timeSwitch);
         //更新光控定时时长