zhunk 5 ماه پیش
والد
کامیت
fe3bcd36cf

+ 6 - 2
Application_cbd_apm32f1/applications/control.h

@@ -18,7 +18,7 @@
 
 #define LAMP_EN          0             //李新3灯管:0关闭,1打开
 #define PCB_V1           0             //1-旧PCB,0-新PCB(模块化)
-#define MATCH_DEVICE     0             //比赛设备
+#define MATCH_DEVICE     0             //比赛设备1-开启 0-关闭
 #define SENSOR_EN        0             //温湿度:0关闭,1打开
 #define UART_TEST_EN     0             ///串口测试0-关闭,1-启用
 #define TG_MODULE        1             //推杆电机结构模块化控制
@@ -43,7 +43,11 @@
     #if TG_MODULE == 0
     #define VERSION_HK_2000W    "2.36.4(2000W)"         //4.0水稻
     #else
-    #define VERSION_HK_2000W    "2.9.4(TG)"             //推杆结构
+    #if MATCH_DEVICE == 1
+    #define VERSION_HK_2000W    "3.0.4(TG)"             //推杆结构比赛设备
+    #else
+    #define VERSION_HK_2000W    "2.9.4(TG110)"             //推杆结构
+    #endif
     #endif
 #endif
 

+ 13 - 1
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -150,7 +150,7 @@ static int DTU_uart5_init(void)
         dtuconfig.rx_bufsz = 1024;
         dtuconfig.tx_bufsz = 1024;
         #else
-        dtuconfig.bufsz = 1024;                 //缓冲区1k
+        dtuconfig.bufsz = 1024;                 //缓冲区1kJSON
         #endif
 
         dtuconfig.parity = PARITY_NONE;        //奇校验
@@ -1853,6 +1853,18 @@ int parseDtu(char *json_string)
                               DTU_Write("%s",makeJson_Warn(temp, "switch mode"));
                           }
                       }
+                  }else if(strcmp(METHOD->valuestring,"alarm")==0) {
+                      if(PARAMS !=NULL&&PARAMS->type==cJSON_Object){
+                          cJSON* s_time = cJSON_GetObjectItem(PARAMS, "time");
+                          if(s_time!=NULL&&s_time->type==cJSON_String){
+                              LOG_I("设置闹钟时间:%s",s_time->valuestring);
+                              rt_sprintf(device_status.alarm_tg, "%s", s_time->valuestring);
+                              ef_set_env_blob("alarm_tg", &device_status.alarm_tg, sizeof(device_status.alarm_tg));
+                              static char temp[10];
+                              rt_sprintf(temp, "time:%s",device_status.alarm_tg);
+                              DTU_Write("%s",makeJson_Warn(temp, "set alarmtime"));
+                          }
+                      }
                   }
                   else{
                       LOG_W("未知的命令: %s", METHOD->valuestring);

+ 1 - 2
Application_cbd_apm32f1/applications/hmi.c

@@ -447,8 +447,7 @@ static void refresh_hmi_Component(struct tm tm)
         //更新密码
         HMI_WRITE("inputPasswd.pwdData.txt=\"8888\"");
         //更新工作进度
-        //
-        HMI_WRITE("menu.workProgress.val=%d",);
+        //HMI_WRITE("menu.workProgress.val=%d",);
         //更新定时模式
         HMI_WRITE("clockSet.timeSwitch.val=%d",device_status.timeSwitch);
         //更新光控定时时长

+ 5 - 2
Application_cbd_apm32f1/packages/syswatch-latest/src/syswatch.c

@@ -408,7 +408,10 @@ static void syswatch_thread_entry(void *parameter)
         if((alarm_new.tm_hour)==8&&(alarm_new.tm_min==00)&&(alarm_new.tm_sec==0))
         {
             LOG_W("定制8:00执行转仓!");
-            device_status.clear_status = 2;
+            if(device_status.version_type==1){
+                device_status.clear_status = 2;
+            }
+
         }
 
 
@@ -418,7 +421,7 @@ static void syswatch_thread_entry(void *parameter)
             ctr_cangmen_up(OFF);
         }
 #endif
-        #if MATCH_DEVICE == 1
+        #if 0
         if(((alarm_new.tm_hour)==22 ||
                 (alarm_new.tm_hour)==0 ||
                 (alarm_new.tm_hour)==1 ||

+ 5 - 0
Application_cbd_apm32f1/readme.md

@@ -1,3 +1,8 @@
+# 2026-05-29 更新说明
+	"2.9.4(TG110)"
+	1. 增加远程设置触发时间;
+	{"jsonrpc":"2.0","method":"alarm","params":{"time":"230120"},"id":1}
+	2. 关闭欠压保护;
 # 2026-05-14 更新说明
 	"2.8.4(TG)"
 	1. B模式下,根据工作状态字段开关灯管