Browse Source

1.0增加转仓电压到18V

zhunk 7 months ago
parent
commit
b1cfa83603

+ 1 - 1
Application_CBD/applications/beep.c

@@ -96,7 +96,7 @@ void Motor_Juandai(uint8_t on_off)
 {
     pwm8_init();
 
-    rt_pwm_set(pwm_tim8, PC7_TIM3_CH, 200000, 100000);//channel,period,pulse
+    rt_pwm_set(pwm_tim8, PC7_TIM3_CH, 200000, 150000);//channel,period,pulse
 
     //
     if(on_off==ON){

+ 2 - 2
Application_CBD/applications/control.c

@@ -1117,8 +1117,8 @@ void ctr_Petroleum_jelly(rt_uint32_t delay)
 void turnzp(void)
 {
     static uint16_t turn_timeout = 0;
-//    rt_pin_mode(CLEAR_R, PIN_MODE_OUTPUT);
-//    rt_pin_mode(CLEAR_L, PIN_MODE_OUTPUT);
+    //rt_pin_mode(CLEAR_R, PIN_MODE_OUTPUT);
+    //rt_pin_mode(CLEAR_L, PIN_MODE_OUTPUT);
     rt_pin_mode(CLEAR_R_LIMIT,PIN_MODE_INPUT);
 //    rt_pin_write(CLEAR_R,OFF);
 //    rt_pin_write(CLEAR_L,OFF);

+ 10 - 2
Application_CBD/applications/dtu_uart2.c

@@ -1681,7 +1681,16 @@ int parseDtu(char *json_string)
                       rt_free(photo);
                       rt_thread_delay(2000);
                   }
-                  //{"ext": {"type": "turn"}, "cmd": "ctrl"}   转仓
+                  else if (strstr(type->valuestring,"turnzp")!=RT_NULL) //1.0测报灯转仓
+                  {
+                      LOG_I("远程打开转仓!");
+                      device_status.clear_status = 2;
+                      char *ctr_c = makeJson_Warn("执行转仓","control");
+                      DTU_Write("%s",ctr_c);
+                      rt_free(ctr_c);
+                      rt_thread_delay(2000);
+                  }
+                  //{"ext": {"type": "turn"}, "cmd": "ctrl"}   孢子仪转仓
                   else if(strstr(type->valuestring,"turn")!=RT_NULL)
                   {
                       #if Color_EN == 0
@@ -1797,7 +1806,6 @@ int parseDtu(char *json_string)
                       rt_free(ctr_c);
                       rt_thread_delay(2000);
                   }
-
                   else if(strstr(type->valuestring,"selfcheck")!=RT_NULL)
                   {
                       if(device_status.selfcheck_ws == 2)

+ 2 - 0
Application_CBD/readme.md

@@ -1,3 +1,5 @@
+# 2026-04-14 更新说明
+	1、1.0转仓取消PWM;
 # 2026-04-09 更新说明
 	#define VERSION_HK          "1.66.41(HK)"            //4.0海康-1200W
     #define VERSION_HK_2000W    "1.66.40(2000W)"         //4.0水稻