zhunk 6 miesięcy temu
rodzic
commit
fe523ad20b

+ 12 - 8
Application_cbd_apm32f1/applications/control.c

@@ -932,15 +932,19 @@ void WorkTask_BZYV2(void)
             turnlimit();                           //卷带电机转一圈
             rt_thread_delay(1000);
             turnlimit();
-            slide_para.en_slide = 5;               //滑台复位
-            while(slide_para.en_slide!=0){
-                LOG_D("等待电机完成复位!");
-                rt_thread_delay(100);
+            rt_thread_delay(1000);
+            uint8_t retry_send = 0;
+            while(1){
+                char *take_start = makeJson_Warn("start", "autofocus");
+                DTU_Write(take_start);
+                rt_free(take_start);
+                rt_thread_delay(2000);
+                if(device_status.autotakepic==1 || retry_send==5)
+                {
+                    break;
+                }
+                retry_send ++;
             }
-
-            char *take_start = makeJson_Warn("start", "autofocus");
-            DTU_Write(take_start);
-            rt_free(take_start);
             device_status.work_done = 0;
         }
     }else{

+ 1 - 1
Application_cbd_apm32f1/applications/control.h

@@ -16,7 +16,7 @@
 //定制相关//////////////////////////////////////////////////////
 #define SENSOR_EN        1              //温湿度:0关闭,1打开
 ////////////////////////////////////////////////////////////////
-#define VERSION_BZY         "3.1.1"                   //孢子仪
+#define VERSION_BZY         "3.2.2"                   //孢子仪
 
 /*********************************************************************/
 typedef struct  _packed

+ 1 - 18
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -1094,24 +1094,7 @@ int parseDtu(char *json_string)
                       sprintf(device_status.mqttcfg2,"%s",mqttcfg2->valuestring);
                       LOG_I("当前平台2:%s",mqttcfg2->valuestring);
                   }
-                  if( device_status.num_updata==0)
-                  {
-                      Beep_Tip(100);
-                      UpLoad_Data();
-                  }
-                  else if(device_status.num_updata!=0&&device_status.hmi_fresh==2)
-                  {
-                      if(strstr(device_status.project,"cgo")!=RT_NULL||strstr(device_status.project,"Android11")!=RT_NULL)
-                      {
-                          UpLoad_Data();
-                      }
-                      else
-                      {
-                          rt_thread_delay(2000);
-                          UpLoad_Data();
-                      }
-                  }
-                  device_status.hmi_fresh = 0;
+                  UpLoad_Data();
               }
               if(item_ext!=RT_NULL&&strstr(item_cmd->valuestring,"paramconf")!=RT_NULL)
               {

+ 1 - 1
Application_cbd_apm32f1/applications/dtu_uart2.h

@@ -9,7 +9,7 @@
  */
 #ifndef APPLICATIONS_INC_DTU_UART2_H_
 #define APPLICATIONS_INC_DTU_UART2_H_
-
+#include "cJSON.h"
 #define DTU_UART_NAME "uart2"  /*串口设备名称*/
 #define MAX_DTU_SIZE 1024
 typedef struct{

+ 21 - 71
Application_cbd_apm32f1/applications/hmi.c

@@ -1131,50 +1131,6 @@ static void HMI_Decode(void)
     else if (strstr(rx_buffer,"reboot")!=NULL) {
         rt_hw_cpu_reset();
     }
-    //屏幕上触发远程升级
-    else if (strstr(rx_buffer,"hmi_update")!=NULL) {
-        DTU_Write("hmi_update");
-        device_status.update_flag = 1;
-        ef_set_env_blob("update_flag", &device_status.update_flag, sizeof(device_status.update_flag));
-        rt_thread_delay(2000);
-        rt_hw_cpu_reset();
-    }else if (strstr(rx_buffer,"checkcamera")!=NULL){
-        DTU_Write("{\"ctr_cam\":\"checkcamera\"}");
-        //校准屏幕的RTC
-        HMI_WRITE("rtc0=%d",tm.tm_year+1900);
-        HMI_WRITE("rtc1=%d",tm.tm_mon+1);
-        HMI_WRITE("rtc2=%d",tm.tm_mday);
-        HMI_WRITE("rtc3=%d",tm.tm_hour);
-        HMI_WRITE("rtc4=%d",tm.tm_min);
-        HMI_WRITE("rtc5=%d",tm.tm_sec);
-        //开启超时定时器
-        Start_timer_Uart2();
-    }else if (strstr(rx_buffer,"ReadCamParam")!=NULL){
-        DTU_Write("{\"ctr_cam\":\"ReadParam\"}");
-        //开启超时定时器
-        Start_timer_Uart2();
-    }//SaveCamParam:2070.00000-0.7-144-30-0-0-5472*5472
-    else if (strstr(rx_buffer,"SaveCamParam")!=NULL){
-        const char *prefix ="SaveCamParam:";
-        size_t prefix_len = strlen(prefix);
-        const char *start_pos = strstr(rx_buffer, prefix);
-        if(start_pos!=NULL)
-        {
-            // 移动到前缀之后的位置
-            start_pos += prefix_len;
-            DTU_Write("%s",makeJson_Cam("SaveParam",start_pos));
-        }
-        //开启超时定时器
-        Start_timer_Uart2();
-    }else if (strstr(rx_buffer,"GrabOn")!=NULL){
-        DTU_Write("{\"ctr_cam\":\"GrabOn\"}");
-        //开启超时定时器
-        Start_timer_Uart2();
-    }else if (strstr(rx_buffer,"GrabOff")!=NULL){
-        DTU_Write("{\"ctr_cam\":\"GrabOff\"}");
-        //开启超时定时器
-        Start_timer_Uart2();
-    }
     else if(strstr(rx_buffer,"SelfCheck")!=NULL)
     {
         //校准屏幕的RTC
@@ -1834,25 +1790,20 @@ void Check_ParamConfig(void)
         //等待联网,
         while(atoi(device_status.net)==1)
         {
-            char *readinfo =  makeJson_ReadInfo();
-            DTU_Write("%s",readinfo);
-            rt_free(readinfo);
-            rt_thread_delay(10000);
             connect_num++;
             LOG_I("联网中......%d",connect_num);
             //超时时间为100S
-            if(connect_num==10)
+            if(connect_num==60)
             {
-                device_status.timeSwitch = 0;
                 LOG_W("Time not set:%04d-%02d-%02d %02d:%02d:%02d",tm.tm_year+1900,tm.tm_mon+1,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec);
                 break;
             }
+            Beep_Tip(1000);
         }
         connect_num = 0;
         rt_thread_delay(2000);
         DTU_Write("%s",makeJson_Warn("turnon", "device_stm32"));
         rt_thread_delay(1000);
-        device_status.num_updata = 1;
         UpLoad_Data();
         Workstatus_check();
         Work_Loop_Task();
@@ -1861,6 +1812,7 @@ void Check_ParamConfig(void)
 }
 void ResetParamDefault(void)
 {
+    device_status.dtype = 7;
     device_status.ds = 1;           //设备状态开机
     device_status.thsp = 300;
     device_status.passWord = 8888;
@@ -1885,29 +1837,27 @@ void ResetParamDefault(void)
     ef_set_env_blob("Power_Type", &device_status.Power_Type, sizeof(device_status.Power_Type));
 
     ef_set_env_blob("dattim",&device_status.dattim,sizeof(device_status.dattim));        //上传时间
-    if(device_status.dtype==7)
-    {
-        device_status.run_sta = 0;
-        device_status.heatvalue = 25;    //培养温度
-        ef_set_env_blob("run_sta", &device_status.run_sta, sizeof(device_status.run_sta));
-        ef_set_env_blob("collecting_sh1", &device_status.collecting_sh1, sizeof(device_status.collecting_sh1));    //采集时间
-        ef_set_env_blob("collecting_eh1", &device_status.collecting_eh1, sizeof(device_status.collecting_eh1));    //采集时间
-        ef_set_env_blob("collecting_sh2", &device_status.collecting_sh2, sizeof(device_status.collecting_sh2));    //采集时间
-        ef_set_env_blob("collecting_eh2", &device_status.collecting_eh2, sizeof(device_status.collecting_eh2));    //采集时间
-        ef_set_env_blob("collecting_sh3", &device_status.collecting_sh3, sizeof(device_status.collecting_sh3));    //采集时间
-        ef_set_env_blob("collecting_eh3", &device_status.collecting_eh3, sizeof(device_status.collecting_eh3));    //采集时间
-        ef_set_and_save_env("collt_min_sh1", "0");
-        ef_set_and_save_env("collt_min_eh1", "0");
-        ef_set_and_save_env("collt_min_sh2", "0");
-        ef_set_and_save_env("collt_min_eh2", "0");
-        ef_set_and_save_env("collt_min_sh3", "0");
-        ef_set_and_save_env("collt_min_eh3", "0");
-        ef_set_env_blob("jheat", &device_status.heatvalue, sizeof(device_status.heatvalue));
-    }
+
+    device_status.run_sta = 0;
+    device_status.heatvalue = 25;    //培养温度
+    ef_set_env_blob("run_sta", &device_status.run_sta, sizeof(device_status.run_sta));
+    ef_set_env_blob("collecting_sh1", &device_status.collecting_sh1, sizeof(device_status.collecting_sh1));    //采集时间
+    ef_set_env_blob("collecting_eh1", &device_status.collecting_eh1, sizeof(device_status.collecting_eh1));    //采集时间
+    ef_set_env_blob("collecting_sh2", &device_status.collecting_sh2, sizeof(device_status.collecting_sh2));    //采集时间
+    ef_set_env_blob("collecting_eh2", &device_status.collecting_eh2, sizeof(device_status.collecting_eh2));    //采集时间
+    ef_set_env_blob("collecting_sh3", &device_status.collecting_sh3, sizeof(device_status.collecting_sh3));    //采集时间
+    ef_set_env_blob("collecting_eh3", &device_status.collecting_eh3, sizeof(device_status.collecting_eh3));    //采集时间
+    ef_set_and_save_env("collt_min_sh1", "0");
+    ef_set_and_save_env("collt_min_eh1", "0");
+    ef_set_and_save_env("collt_min_sh2", "0");
+    ef_set_and_save_env("collt_min_eh2", "0");
+    ef_set_and_save_env("collt_min_sh3", "0");
+    ef_set_and_save_env("collt_min_eh3", "0");
+    ef_set_env_blob("jheat", &device_status.heatvalue, sizeof(device_status.heatvalue));
+
     ef_set_env_blob("ds", &device_status.ds, sizeof(device_status.ds));
     ef_set_env_blob("thsp", &device_status.thsp, sizeof(device_status.thsp));
     ef_set_env_blob("passWord", &device_status.passWord,sizeof(device_status.passWord));
-    DTU_Write("reset.mp3");
     rt_thread_delay(1000);
 }
 void ResetParamDefault_DC(void)

+ 4 - 0
Application_cbd_apm32f1/readme.md

@@ -1,3 +1,7 @@
+# 2026-04-27 更新说明
+	#define VERSION_BZY         "3.2.2"                //孢子仪V1.3
+	1、工作结束发送对焦拍照指令增加校验;
+		解决:此指令发送失败/乱码导致的不拍照;
 # 2026-04-21 更新说明
 	#define VERSION_BZY         "3.1.1"                //孢子仪V1.3
 	1、串口2写数据增加互斥锁