zhunk 5 miesięcy temu
rodzic
commit
cfa3d5dfff

+ 6 - 27
Application_CBD/applications/control.c

@@ -793,11 +793,6 @@ uint8_t ctr_lamp(uint8_t status_lamp,uint8_t lamp_num)
 //震动电机
 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);
@@ -805,44 +800,28 @@ uint8_t ctr_shake(uint8_t status_shake,uint16_t shake_sec)
     #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--)
+            for(uint8_t shake_i = 0;shake_i<shake_sec;shake_i++)
             {
+                rt_pin_write(SHAKE_SW,ON);
                 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));
+                rt_pin_write(SHAKE_SW,OFF);
+                rt_thread_delay(1000);
             }
         }
-        if(device_status.dtype==7)  rt_thread_delay(shake_sec*1000);
         rt_pin_write(SHAKE_SW,OFF);
         HMI_WRITE("cangWei.switchShake.val=%d",0);
+        system_status.vibration_count += 1;
     }
     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)
 {

+ 1 - 1
Application_CBD/applications/hmi.c

@@ -1125,7 +1125,7 @@ static void HMI_Decode(void)
         strncpy(shakesec_str,var,2);
         if(atoi(shakesec_str)>=0&&atoi(shakesec_str)<=10)
         {
-            device_status.shake_sec =atoi(shakesec_str)*10; //
+            device_status.shake_sec =atoi(shakesec_str); // 2026-0608:取消*10
         }
         else {
             LOG_E("设置失败!!!");

+ 8 - 8
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             //比赛设备1-开启 0-关闭
+#define MATCH_DEVICE     0             //比赛设备1-开启 0-关闭
 #define SENSOR_EN        0             //温湿度:0关闭,1打开
 #define UART_TEST_EN     0             ///串口测试0-关闭,1-启用
 #define TG_MODULE        0             //推杆电机结构模块化控制
 #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
@@ -39,9 +39,9 @@
     #define VERSION_HK          "1.(3ledV9).41(HK)"      //4.0海康-三色光源
     #define VERSION_HK_2000W    "1.3led.40(2000W)"       //水稻
 #else
-    #define VERSION_HK          "2.35.41(HK)"            //4.0海康-1200W
+    #define VERSION_HK          "2.39.41(HK)"            //4.0海康-1200W
     #if TG_MODULE == 0
-    #define VERSION_HK_2000W    "2.38.4(2000W-000)"         //4.0水稻
+    #define VERSION_HK_2000W    "2.39.4(2000W)"         //4.0水稻
     #else
     #if MATCH_DEVICE == 1
     #define VERSION_HK_2000W    "3.3.4(TG)"             //推杆结构比赛设备
@@ -51,8 +51,8 @@
     #endif
 #endif
 
-#define VERSION_ZP          "2.35.1(ZP)"            //1.0转盘
-#define VERSION_GK          "2.35.1(GK)"            //1.0高空
+#define VERSION_ZP          "2.39.1(ZP)"            //1.0转盘
+#define VERSION_GK          "2.39.1(GK)"            //1.0高空
 
 extern rt_event_t event_485_play;
 

+ 1 - 1
Application_cbd_apm32f1/applications/hmi.c

@@ -1219,7 +1219,7 @@ static void HMI_Decode(void)
         strncpy(shakesec_str,var,2);
         if(atoi(shakesec_str)>=0&&atoi(shakesec_str)<=10)
         {
-            device_status.shake_sec =atoi(shakesec_str); //
+            device_status.shake_sec =atoi(shakesec_str); //2026-0608:取消*10
         }
         else {
             LOG_E("设置失败!!!");

+ 3 - 0
Application_cbd_apm32f1/readme.md

@@ -1,3 +1,6 @@
+# 2026-06-08 更新说明
+	#define VERSION_HK_2000W    "2.39.4(2000W-111)"         //4.0水稻
+	1、震动功能优化,100ms间隔停顿1000ms;
 # 2026-06-05 更新说明
 	#define VERSION_HK_2000W    "2.38.4(2000W-111)"         //4.0水稻
 	1、uart2串口通信连续2个小时没有收到json数据,安全重启RTU电源;