zhunk 6 months ago
parent
commit
f0f6d8771b

+ 7 - 0
Application_CBD/applications/control.c

@@ -2594,6 +2594,13 @@ void WorkTask(void)
             //6.打开下仓门
             //6.打开下仓门
             if(device_status.rain_status==0)
             if(device_status.rain_status==0)
             {
             {
+                uint16_t cnt_photo = 0;
+                while(device_status.photo_ws==1)    //如果正在拍照,要等拍照结束
+                {
+                    rt_thread_delay(1000);
+                    cnt_photo++;
+                    if(cnt_photo>=60) break;
+                }
                 device_status.ctr_down_motor =1;
                 device_status.ctr_down_motor =1;
             }
             }
             else {
             else {

+ 4 - 4
Application_CBD/applications/control.h

@@ -27,16 +27,16 @@
     #define VERSION_HK          "1.(3ledV9).41(HK)"      //4.0海康-三色光源
     #define VERSION_HK          "1.(3ledV9).41(HK)"      //4.0海康-三色光源
     #define VERSION_HK_2000W    "1.3led0.40(2000W)"       //水稻
     #define VERSION_HK_2000W    "1.3led0.40(2000W)"       //水稻
 #else
 #else
-    #define VERSION_HK          "1.66.41(HK)"            //4.0海康-1200W
-    #define VERSION_HK_2000W    "1.66.40(2000W)"         //4.0水稻
+    #define VERSION_HK          "1.67.41(HK)"            //4.0海康-1200W
+    #define VERSION_HK_2000W    "1.67.40(2000W)"         //4.0水稻
 #endif
 #endif
 #if DZ_260519 == 0
 #if DZ_260519 == 0
-#define VERSION_ZP          "1.66.1(ZP)"            //1.0转盘
+#define VERSION_ZP          "1.67.1(ZP)"            //1.0转盘
 #else
 #else
 #define VERSION_ZP          "DZ_260519"            //1.0转盘
 #define VERSION_ZP          "DZ_260519"            //1.0转盘
 #endif
 #endif
 
 
-#define VERSION_GK          "1.66.1(GK)"            //1.0高空
+#define VERSION_GK          "1.67.1(GK)"            //1.0高空
 
 
 #define VERSION_XCT         "1.13.6(HK)"            //吸虫塔-海康
 #define VERSION_XCT         "1.13.6(HK)"            //吸虫塔-海康
 #define VERSION_Robot       "1.0(robot)"            //展厅机器人
 #define VERSION_Robot       "1.0(robot)"            //展厅机器人

+ 3 - 0
Application_CBD/applications/dtu_uart2.c

@@ -1600,6 +1600,7 @@ int parseDtu(char *json_string)
           if(item_checkself!=NULL){//自检签名
           if(item_checkself!=NULL){//自检签名
               memset(device_status.qianming,0,sizeof(device_status.qianming));
               memset(device_status.qianming,0,sizeof(device_status.qianming));
               device_status.photo_ws = 1;
               device_status.photo_ws = 1;
+              device_status.clear_status = 1; //20260522
               LOG_I("自检签名:%s",item_checkself->valuestring);
               LOG_I("自检签名:%s",item_checkself->valuestring);
               sprintf(device_status.qianming,"%s",item_checkself->valuestring);
               sprintf(device_status.qianming,"%s",item_checkself->valuestring);
               //生成自检应答json
               //生成自检应答json
@@ -1618,6 +1619,7 @@ int parseDtu(char *json_string)
               {
               {
                   //HK_TakePhoto();
                   //HK_TakePhoto();
                   device_status.photo_ws=1;
                   device_status.photo_ws=1;
+                  device_status.test_flag = 1;
                   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);
@@ -1676,6 +1678,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
                       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);

+ 6 - 2
Application_CBD/applications/hmi.c

@@ -605,6 +605,7 @@ static void HMI_Decode(void)
     //拍照
     //拍照
     else if(strstr(rx_buffer,"putTest.switchPhoto=1")!=NULL) {
     else if(strstr(rx_buffer,"putTest.switchPhoto=1")!=NULL) {
 #if 1
 #if 1
+        device_status.test_flag = 1;
         device_status.photo_ws = 0;
         device_status.photo_ws = 0;
         rt_thread_delay(500);
         rt_thread_delay(500);
         device_status.photo_ws = 1;
         device_status.photo_ws = 1;
@@ -1779,9 +1780,12 @@ static void Ctr_Mortor_entry(void* parameter)
                 ctr_led(OFF);
                 ctr_led(OFF);
                 photo_led_sec = 900;
                 photo_led_sec = 900;
                 device_status.photo_ws = 0;
                 device_status.photo_ws = 0;
-                if(device_status.work_status == 1){
-                    device_status.clear_status = 1;
+                if(device_status.test_flag==0){
+                    device_status.clear_status = 1; //20260522
+                }else{
+                    device_status.test_flag = 0;
                 }
                 }
+
                 HMI_WRITE("sysTest.switchPhoto.val=0");
                 HMI_WRITE("sysTest.switchPhoto.val=0");
                 HMI_WRITE("sysTest.switchFill.val=0");
                 HMI_WRITE("sysTest.switchFill.val=0");
             }
             }

+ 9 - 1
Application_CBD/readme.md

@@ -1,5 +1,13 @@
+# 2026-05-22 更新说明
+	#define VERSION_HK          "1.67.41(HK)"            //4.0海康-1200W
+    #define VERSION_HK_2000W    "1.67.40(2000W)"         //4.0水稻
+	#define VERSION_ZP          "1.67.1(ZP)"            //1.0转盘
+	#define VERSION_GK          "1.67.1(GK)"            //1.0高空
+	1、取消拍照后立即执行清扫的工作状态判断,如果是屏幕测试或者平台下发,不执行清扫;
+	2、工作流程打开下仓门前等待拍照结束
+
 # 2026-04-14 更新说明
 # 2026-04-14 更新说明
-	1、1.0转仓取消PWM;
+	1、1.0转仓PWM占空比调整为3/4;
 # 2026-04-09 更新说明
 # 2026-04-09 更新说明
 	#define VERSION_HK          "1.66.41(HK)"            //4.0海康-1200W
 	#define VERSION_HK          "1.66.41(HK)"            //4.0海康-1200W
     #define VERSION_HK_2000W    "1.66.40(2000W)"         //4.0水稻
     #define VERSION_HK_2000W    "1.66.40(2000W)"         //4.0水稻