zhunk 1 год назад
Родитель
Сommit
f42d119bc3

+ 1 - 5
Application_cbd_apm32f1/applications/control.c

@@ -431,9 +431,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)
 uint8_t ctr_shake(uint8_t status_shake,uint16_t shake_sec)
 {
 {
-    static rt_uint16_t shake_i = 0;
-    if(device_status.dtype==7&&shake_sec!=0)
-        DTU_Write("drop");
     rt_pin_mode(SHAKE_SW, PIN_MODE_OUTPUT);
     rt_pin_mode(SHAKE_SW, PIN_MODE_OUTPUT);
     #if 0
     #if 0
     rt_pin_write(SHAKE_SW,ON);
     rt_pin_write(SHAKE_SW,ON);
@@ -446,12 +443,11 @@ uint8_t ctr_shake(uint8_t status_shake,uint16_t shake_sec)
             for(uint8_t shake_i = 0;shake_i<shake_sec;shake_i++)
             for(uint8_t shake_i = 0;shake_i<shake_sec;shake_i++)
             {
             {
                 rt_pin_write(SHAKE_SW,ON);
                 rt_pin_write(SHAKE_SW,ON);
-                rt_thread_delay(50);
+                rt_thread_delay(100);
                 rt_pin_write(SHAKE_SW,OFF);
                 rt_pin_write(SHAKE_SW,OFF);
                 rt_thread_delay(1000);
                 rt_thread_delay(1000);
             }
             }
         }
         }
-        if(device_status.dtype==7)  rt_thread_delay(shake_sec*1000);
         rt_pin_write(SHAKE_SW,OFF);
         rt_pin_write(SHAKE_SW,OFF);
         HMI_WRITE("cangWei.switchShake.val=%d",0);
         HMI_WRITE("cangWei.switchShake.val=%d",0);
     }
     }

+ 4 - 4
Application_cbd_apm32f1/applications/control.h

@@ -17,14 +17,14 @@
 
 
 
 
 #define LAMP_EN          0             //李新3灯管:0关闭,1打开
 #define LAMP_EN          0             //李新3灯管:0关闭,1打开
-#define PCB_V1           0             //1-旧PCB,0-新PCB(模块化)
+#define PCB_V1           1             //1-旧PCB,0-新PCB(模块化)
 #define MATCH_DEVICE     0             //比赛设备
 #define MATCH_DEVICE     0             //比赛设备
 #define SENSOR_EN        0             //温湿度:0关闭,1打开
 #define SENSOR_EN        0             //温湿度:0关闭,1打开
 #define UART_TEST_EN     0             ///串口测试0-关闭,1-启用
 #define UART_TEST_EN     0             ///串口测试0-关闭,1-启用
-#define TG_MODULE        0             //推杆电机结构模块化控制
+#define TG_MODULE        1             //推杆电机结构模块化控制
 #define DINGZHI_0722     0             //控制一个电机每天12点20工作12秒
 #define DINGZHI_0722     0             //控制一个电机每天12点20工作12秒
 
 
-#define QINGSAO_IO       1             //调整清扫顺序20250801
+#define QINGSAO_IO       0             //调整清扫顺序20250801
 
 
 #if MATCH_DEVICE == 1
 #if MATCH_DEVICE == 1
 #define LAMP_CURRENT    600
 #define LAMP_CURRENT    600
@@ -37,7 +37,7 @@
     #define VERSION_HK_2000W    "1.3led.40(2000W)"       //水稻
     #define VERSION_HK_2000W    "1.3led.40(2000W)"       //水稻
 #else
 #else
     #define VERSION_HK          "2.5.41(HK)"            //4.0海康-1200W
     #define VERSION_HK          "2.5.41(HK)"            //4.0海康-1200W
-    #define VERSION_HK_2000W    "2.31.4(2000W)"         //4.0水稻
+    #define VERSION_HK_2000W    "2.31tg1.4(2000W)"         //4.0水稻
 #endif
 #endif
 
 
 #define VERSION_ZP          "2.29.1(ZP)"            //1.0转盘
 #define VERSION_ZP          "2.29.1(ZP)"            //1.0转盘