zhunk 3 недель назад
Родитель
Сommit
d7f4abbe34

+ 1 - 1
Application_CBD/applications/control.h

@@ -15,7 +15,7 @@
 #include <rtdevice.h>
 #include <rtdevice.h>
 //定制相关//////////////////////////////////////////////////////
 //定制相关//////////////////////////////////////////////////////
 /* 清扫/卷带电机驱动方式:0-普通IO(H桥双高刹车),1-PWM(pwm8) */
 /* 清扫/卷带电机驱动方式:0-普通IO(H桥双高刹车),1-PWM(pwm8) */
-#define PWM_EN           1
+#define PWM_EN           0             //20261026 1>0
 #define LAMP_EN          0             //李新3灯管:0关闭,1打开
 #define LAMP_EN          0             //李新3灯管:0关闭,1打开
 /* 三灯管轮换:工作开始后,3只灯管依次循环点亮,每只连续工作时间(s)。
 /* 三灯管轮换:工作开始后,3只灯管依次循环点亮,每只连续工作时间(s)。
  * 该周期与屏幕/串口2下发的"工作时间"(sunBar/时控时段)无关,仅本宏决定。 */
  * 该周期与屏幕/串口2下发的"工作时间"(sunBar/时控时段)无关,仅本宏决定。 */

+ 4 - 1
Application_CBD/applications/dtu_uart2.c

@@ -1888,6 +1888,9 @@ char * makeJson()
 #if DZ_260917_1 == 1
 #if DZ_260917_1 == 1
     cJSON_AddStringToObject(pSubJson,"dz_v","DZ_260917_1");
     cJSON_AddStringToObject(pSubJson,"dz_v","DZ_260917_1");
 #endif
 #endif
+#if PWM_EN == 0
+    cJSON_AddStringToObject(pSubJson,"pwn_en","0");
+#endif
     #if 0
     #if 0
     //太阳能板电压
     //太阳能板电压
     cJSON_AddStringToObject(pSubJson,"cv",device_status.voltage_sun);
     cJSON_AddStringToObject(pSubJson,"cv",device_status.voltage_sun);
@@ -2332,7 +2335,7 @@ int parseDtu(char *json_string)
                   {
                   {
                       //HK_TakePhoto();
                       //HK_TakePhoto();
                       device_status.photo_ws = 1;
                       device_status.photo_ws = 1;
-                      device_status.clear_status = 1; //20260522
+                      device_status.test_flag = 1; //20261027
                       char *photo = makeJson_Warn("takephoto","control");
                       char *photo = makeJson_Warn("takephoto","control");
                       DTU_Write("%s",photo);
                       DTU_Write("%s",photo);
                       rt_free(photo);
                       rt_free(photo);

+ 3 - 1
Application_CBD/doc/readme.md

@@ -1,5 +1,7 @@
+# 2026-10-27 更新说明
+1. 修复四情平台下发拍照指令立即执行清扫导致拍到推杆电机;
 # 2026-10-24 更新说明
 # 2026-10-24 更新说明
-1.修复下面bug:
+1. 修复下面bug:
 HMI_WRITE("menu.gps_state.txt=\"定位成功:(GPS+BD)%d/%d\"",device_status.gps_state,device_status.gps_inuse,device_status.gps_view);
 HMI_WRITE("menu.gps_state.txt=\"定位成功:(GPS+BD)%d/%d\"",device_status.gps_state,device_status.gps_inuse,device_status.gps_view);
  多发送了device_status.gps_state导致显示异常;
  多发送了device_status.gps_state导致显示异常;
 # 2026-10-22 更新说明
 # 2026-10-22 更新说明