yf_zjb 3 лет назад
Родитель
Сommit
2147bf03a6

+ 7 - 6
Application_CBD/applications/control.c

@@ -632,8 +632,8 @@ void ctr_turn(uint8_t v,uint8_t sta)
             turn_cnt = 0;
             rt_pin_write(TURN_ZP_R, OFF);
             rt_pin_write(TURN_ZP_L, OFF);
-            char *turn_warn ="limit timeout!!!";
-            DTU_Write(makeJson_Warn(turn_warn, "ERR"));
+            char *turn_warn =makeJson_Warn("未检测到限位", "转盘");
+            DTU_Write("%s",turn_warn);
             rt_free(turn_warn);
             break;
         }
@@ -650,8 +650,8 @@ void ctr_turn(uint8_t v,uint8_t sta)
             turn_cnt = 0;
             rt_pin_write(TURN_ZP_R, OFF);
             rt_pin_write(TURN_ZP_L, OFF);
-            char *turn_warn ="turn timeout!!!";
-            DTU_Write(makeJson_Warn(turn_warn, "ERR"));
+            char *turn_warn =makeJson_Warn("超时", "转盘复位");
+            DTU_Write("%s",turn_warn);
             rt_free(turn_warn);
             break;
         }
@@ -668,8 +668,8 @@ void ctr_turn(uint8_t v,uint8_t sta)
             turn_cnt = 0;
             rt_pin_write(TURN_ZP_R, OFF);
             rt_pin_write(TURN_ZP_L, OFF);
-            char *turn_warn ="turn timrout!!!";
-            DTU_Write(makeJson_Warn(turn_warn, "ERR"));
+            char *turn_warn =makeJson_Warn("超时", "转盘");
+            DTU_Write(turn_warn);
             rt_free(turn_warn);
             break;
         }
@@ -1736,6 +1736,7 @@ void WorkTask_BZY(void)
             device_status.develop_flag = 1;
             device_status.work_status = 2;
             ctr_develop();                  //培养
+            ctr_turn(90,3);
         }
         if(device_status.run_sta==3)
         {

+ 1 - 1
Application_CBD/applications/control.h

@@ -30,7 +30,7 @@
 #define VERSION_V5          "1.2.5(HK)"             //5.0
 #define VERSION_Robot       "1.0(robot)"            //展厅机器人
 
-#define VERSION_BZY         "2.1"                   //孢子仪
+#define VERSION_BZY         "2.2"                   //孢子仪
 
 #define CompileTime         rt_sprintf(device_status.driver_compile,"%s-%s",__DATE__,__TIME__)              //编译时间,每次更新代码修改
 /*********************************************************************/

+ 31 - 1
Application_CBD/applications/dtu_uart2.c

@@ -432,6 +432,7 @@ char * makeJson()
     if(atoi(device_status.power)<400&&device_status.work_status==1&&makejson_sta!=0)
     {
         rt_kprintf("power is:%d\n",atoi(device_status.power));
+        if(atoi(device_status.power)>10)        //过滤电流检测芯片损坏导致电流直为0 的异常
         device_status.lamp_status = 1;
     }
     else {
@@ -793,7 +794,15 @@ int parseDtu(char *json_string)
                       rt_thread_delay(5000);
                       ctr_RTU_DTU(ON);
                   }
-                  if(strstr(type->valuestring,"takephoto")!=RT_NULL)
+                  //对焦拍照
+                  else if(strstr(type->valuestring,"auto_takephoto")!=RT_NULL)
+                  {
+                      char *auto_takephoto = makeJson_Warn("send cmd success:auto_takephoto","control");
+                      DTU_Write("%s",auto_takephoto);
+                      rt_free(auto_takephoto);
+                      device_status.autotakepic = 1;
+                  }
+                  else if(strstr(type->valuestring,"takephoto")!=RT_NULL)
                   {
                       HK_TakePhoto();
                       char *photo = makeJson_Warn("takephoto","control");
@@ -801,6 +810,15 @@ int parseDtu(char *json_string)
                       rt_free(photo);
                       rt_thread_delay(2000);
                   }
+                  //{"ext": {"type": "turn"}, "cmd": "ctrl"}   转仓
+                  else if(strstr(type->valuestring,"turn")!=RT_NULL)
+                  {
+                      char *turn_zp = makeJson_Warn("send cmd success:turn_zp","control");
+                      DTU_Write("%s",turn_zp);
+                      rt_free(turn_zp);
+                      ctr_turn(90, 0);
+                  }
+
               }
               //切换平台
               else if (strstr(item_cmd->valuestring,"platform")!=RT_NULL)
@@ -887,6 +905,18 @@ int parseDtu(char *json_string)
                   device_status.hmi_fresh = 2;
                   device_status.refresh_num = 15;
               }
+              else if (strstr(item_cmd->valuestring,"poweron")!=RT_NULL)
+              {
+                  device_status.ds = 1;
+                  ef_set_env_blob("ds",&device_status.ds,sizeof(device_status.ds));        //
+                  UpLoad_Data();
+              }
+              else if (strstr(item_cmd->valuestring,"poweroff")!=RT_NULL)
+              {
+                  device_status.ds = 0;
+                  ef_set_env_blob("ds",&device_status.ds,sizeof(device_status.ds));        //
+                  UpLoad_Data();
+              }
 //              else if (strstr(item_cmd->valuestring,"log")!=RT_NULL) {
 //                  rt_thread_mdelay(2000);
 //                  //read_all_flash_log();

+ 2 - 0
Application_CBD/applications/hmi.c

@@ -1125,6 +1125,8 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
             device_status.version_type = 7;
             ef_set_env_blob("dtype",&device_status.dtype,sizeof(device_status.dtype));        //设备类型
             ef_set_env_blob("version_type",&device_status.version_type,sizeof(device_status.version_type));        //版本类型
+            //给DTU发送设备类型标记(自适应)
+            DTU_Write("dtye=7");
             MA_save();
         }
     }

+ 3 - 1
Application_CBD/readme.md

@@ -1,9 +1,11 @@
+# 2023-1-07 更新说明:
+- 1.优化电流芯片损坏时 平台显示和灯管状态显示异常问题;
 # 2022-11-19 更新说明:
 ## define VERSION_BZY 			"2.0"
 - 1.适配孢子仪控制逻辑;
 	vtype = ?
 # 2022-11-18 更新说明:
-- 1.修复内存溢出问题,不能再json处理函数中退出,会导致cJSON_Delete函数未被执行,内存无法释放;
+- 1.修复内存溢出问题,不能在json处理函数中退出,会导致cJSON_Delete函数未被执行,内存无法释放;
 # 2022-11-06更新说明:
 ## define VERSION_HK          "1.47.41(HK)"        //4.0海康- 
 ## define VERSION_HK_2000W    "1.44.4(2000W)"      //4.0水稻