zhunk 5 месяцев назад
Родитель
Сommit
c06308eeae

+ 0 - 3
Application_cbd_apm32f1/applications/control.c

@@ -1398,9 +1398,6 @@ void ResetInit(void)
 #endif
             ctr_RTU_DTU(ON);
         }
-        //5.关闭加热
-        //6.关闭补光灯
-        ctr_led(OFF);
     }
 }
 /*三色光源*/

+ 5 - 5
Application_cbd_apm32f1/applications/control.h

@@ -18,10 +18,10 @@
 
 #define LAMP_EN          0             //李新3灯管:0关闭,1打开
 #define PCB_V1           0             //1-旧PCB,0-新PCB(模块化)
-#define MATCH_DEVICE     0             //比赛设备1-开启 0-关闭
+#define MATCH_DEVICE     1             //比赛设备1-开启 0-关闭
 #define SENSOR_EN        0             //温湿度:0关闭,1打开
 #define UART_TEST_EN     0             ///串口测试0-关闭,1-启用
-#define TG_MODULE        1             //推杆电机结构模块化控制
+#define TG_MODULE        0             //推杆电机结构模块化控制
 #define DINGZHI_0722     0             //控制一个电机每天12点20工作12秒
 #define QINGSAO_IO       1             //调整清扫顺序20250801
 #define WENKONG          0             //温控功能1-开启 0-关闭
@@ -41,12 +41,12 @@
 #else
     #define VERSION_HK          "2.35.41(HK)"            //4.0海康-1200W
     #if TG_MODULE == 0
-    #define VERSION_HK_2000W    "2.36.4(2000W)"         //4.0水稻
+    #define VERSION_HK_2000W    "2.37.4(2000W-000)"         //4.0水稻
     #else
     #if MATCH_DEVICE == 1
-    #define VERSION_HK_2000W    "3.2.4(TG)"             //推杆结构比赛设备
+    #define VERSION_HK_2000W    "3.3.4(TG)"             //推杆结构比赛设备
     #else
-    #define VERSION_HK_2000W    "2.11.4(TG111)"             //推杆结构
+    #define VERSION_HK_2000W    "2.11.4(TG111)"         //推杆结构
     #endif
     #endif
 #endif

+ 1 - 1
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -1877,7 +1877,7 @@ int parseDtu(char *json_string)
                       cJSON* message = cJSON_GetObjectItem(RESULT, "message");
                       if(message!=NULL && message->type==cJSON_String){
                           if(strcmp(message->valuestring,"success")==0){
-                              device_status.rtu_isboot = 0;
+                              LOG_W("重启RTU指令响应成功!");
                           }
                       }else{
                           HMI_WRITE("menu.result.txt=\"%s\"",RESULT->valuestring);

+ 1 - 17
Application_cbd_apm32f1/applications/hmi.c

@@ -1541,7 +1541,6 @@ static void Ctr_Mortor_entry(void* parameter)
    rt_uint16_t num_down_open = 200;  //     下仓门打开时间
    rt_uint16_t num_down_close = 200;  //    下仓门关闭时间
    rt_int16_t photo_led_sec = 900;  //55S
-   static rt_uint16_t rtu_isboot_cnt = 0;
    static rt_uint16_t mock_uart2_timer_cnt = 0;
    static rt_uint16_t route_off_t = 0;
    device_status.route_off_t = 0;
@@ -1558,27 +1557,12 @@ static void Ctr_Mortor_entry(void* parameter)
         {
             char *rep = makeJsonRpc2_0("reboot",NULL, 1);
             if(rep){
-                device_status.rtu_isboot = 1;
                 DTU_Write(rep);
-                //启动超时定时器
-                Start_timer_Uart2();
                 free(rep);
             }
             rt_thread_delay(1000);
         }
-        if(device_status.rtu_isboot == 1){
-            rtu_isboot_cnt++;
-            if(rtu_isboot_cnt>=200)
-            {
-                device_status.rtu_isboot = 0;
-                rtu_isboot_cnt = 0;
-                ctr_RTU_DTU(OFF);
-                rt_thread_delay(1000*31);
-                ctr_RTU_DTU(ON);
-            }
-        }else{
-            rtu_isboot_cnt = 0;
-        }
+
         if(device_status.mock_uart2_timer_flag==1){
             mock_uart2_timer_cnt++;
             if(mock_uart2_timer_cnt>=200){

+ 4 - 0
Application_cbd_apm32f1/readme.md

@@ -1,3 +1,7 @@
+# 2026-06-05 更新说明
+	#define VERSION_HK_2000W    "2.37.4(2000W-111)"         //4.0水稻
+	1、比赛设备取消推杆结构;
+	2、取消定时重启RTU的硬件12V断电;
 # 2026-06-03 更新说明
     #if MATCH_DEVICE == 1
     #define VERSION_HK_2000W    "3.2.4(TG)"             //推杆结构比赛设备