zhunk 2 месяцев назад
Родитель
Сommit
f124871143

+ 39 - 1
Application_cbd_apm32f1/applications/control.c

@@ -1123,6 +1123,7 @@ void slide_thread_entry(void *parameter)
     case 1:{
             ctr_move(X_,slide_para.xdir,slide_para.xdis,slide_para.pulse_period);
             LOG_I("The slide's x movement was done ok");
+#if FOCUS_STEP_EN == 1
             if(slide_para.xdis==55||slide_para.xdis==80)
             {
                 DTU_Write("{\"cmd\": \"takephoto\" }");
@@ -1133,6 +1134,13 @@ void slide_thread_entry(void *parameter)
                 DTU_Write("%s",photo);
                 rt_free(photo);
             }
+#else
+            if(slide_para.xdis==55||slide_para.xdis==80){
+                char *photo = makeJson_Warn("mov_init_y","takephoto_done");
+                DTU_Write("%s",photo);
+                rt_free(photo);
+            }
+#endif
             slide_para.stop_flag = 0;
             slide_para.en_slide = OFF;
             break;
@@ -1140,7 +1148,8 @@ void slide_thread_entry(void *parameter)
 
     case 2:{
             ctr_move(Z_,slide_para.zdir,slide_para.zdis,slide_para.pulse_period);
-            rt_kprintf("The slide's z movement was done ok\n");
+            LOG_I("The slide's z movement was done ok\n");
+#if FOCUS_STEP_EN == 1
             if(slide_para.zdis==55||slide_para.zdis==80)
             {
                 DTU_Write("{\"cmd\": \"takephoto\" }");
@@ -1151,6 +1160,14 @@ void slide_thread_entry(void *parameter)
                 DTU_Write("%s",photo);
                 rt_free(photo);
             }
+#else
+            if(slide_para.zdis==55||slide_para.zdis==80)
+            {
+                char *photo = makeJson_Warn("mov_init_y","takephoto_done");
+                DTU_Write("%s",photo);
+                rt_free(photo);
+            }
+#endif
             slide_para.zdir = 1;
             slide_para.zdis = 0;
             slide_para.stop_flag = 0;
@@ -1194,6 +1211,7 @@ void slide_thread_entry(void *parameter)
                           slide_para.ydis);
                     rt_thread_delay(rt_tick_from_millisecond(settle));
                 }
+#if FOCUS_STEP_EN == 1
                 if(1){
                     /* 发送movy后等待相机回传focus, 5S超时未收到则重发, 最多重传3次, 避免对焦卡死 */
                     int focus_ok = 0;
@@ -1226,6 +1244,7 @@ void slide_thread_entry(void *parameter)
                         LOG_W("movy 连续4次未收到focus回传, 放弃重传");
                     }
                 }
+#endif
                 slide_para.ydis = 0;
                 slide_para.stop_flag = 0;
                 slide_para.en_slide = OFF;
@@ -1243,6 +1262,25 @@ void slide_thread_entry(void *parameter)
                 slide_para.en_slide = OFF;
                 break;
             }
+    case 8:{    //录制:Y轴缓慢向下移动3S,完成后发送record_stop,再返回出发位置
+                LOG_W("录制:Y轴缓慢向下移动3S!");
+                uint32_t record_pulse = 5000000UL; /* 缓慢:低速PWM */
+                uint32_t record_dis   = 5000;          /* 行程约3秒 */
+                ctr_move(Y_, 1, record_dis, record_pulse);   /* 缓慢向下移动 */
+                /* 执行完成, 通知远端停止录制 */
+                char *c0 = makeJsonRpc2_0("record_stop", NULL, 0);
+                if(c0 != NULL)
+                {
+                    DTU_Write("%s", c0);
+                    rt_free(c0);
+                }
+                rt_thread_delay(200);
+                /* Y轴返回出发位置(方向0为初始/限位方向) */
+                ctr_move(Y_, 0, record_dis, record_pulse);
+                slide_para.stop_flag = 0;
+                slide_para.en_slide = OFF;
+                break;
+            }
      default:
         {
             slide_para.en_slide = OFF;

+ 2 - 1
Application_cbd_apm32f1/applications/control.h

@@ -15,11 +15,12 @@
 #include <rtdevice.h>
 //定制相关//////////////////////////////////////////////////////
 #define SENSOR_EN        0              //温湿度:0关闭,1打开
+#define FOCUS_STEP_EN    0
 ////////////////////////////////////////////////////////////////
 ///
 ///
 ///
-#define VERSION_BZY         "3.7.5"                   //孢子仪
+#define VERSION_BZY         "3.7.13"                   //孢子仪
 
 /* 对焦串口通信异常标志: 串口收到合法 JSON 且含 "focus" 字段时置1(定义于dtu_uart2.c) */
 extern volatile uint8_t focus_valid_flag;

+ 4 - 0
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -1035,6 +1035,10 @@ int parseDtu(char *json_string)
               }else if(strcmp(METHOD->valuestring,"selfclean")==0) {
                   device_status.replace_filter_sw = 1;
                   LOG_I("接收到自清洁指令!");
+              }else if(strcmp(METHOD->valuestring,"record_start")==0) {
+                  LOG_I("接收到开始录制指令!");
+                  /* 由滑台线程异步执行(Y轴缓慢向下3S->发record_stop->返回), 不阻塞串口解析线程 */
+                  slide_para.en_slide = 8;
               }
               else{
                   LOG_W("未知的命令: %s", METHOD->valuestring);

+ 6 - 1
Application_cbd_apm32f1/applications/hmi.c

@@ -1453,6 +1453,7 @@ static void Ctr_Mortor_entry(void* parameter)
                 }
             }
             if(device_status.calibrate_slide==0){
+
                 device_status.autotakepic = 3;
             }else{
                 slide_para.en_slide = 7;    //Y轴复位
@@ -1462,13 +1463,13 @@ static void Ctr_Mortor_entry(void* parameter)
                     rt_thread_delay(1000);
                 }
                 rt_thread_delay(1000);
-
                 //生成JSON指令
                 char *photo = makeJson_Warn("mov_init_y","takephoto_done");
                 DTU_Write("%s",photo);
                 rt_free(photo);
                 device_status.autotakepic = 4;
             }
+
         }
         if(device_status.autotakepic==3)
         {
@@ -1493,7 +1494,11 @@ static void Ctr_Mortor_entry(void* parameter)
             char *photo = makeJson_Warn("mov_init_y","takephoto_done");
             DTU_Write("%s",photo);
             rt_free(photo);
+#if FOCUS_STEP_EN == 1
             device_status.autotakepic = 4;
+#else
+            device_status.autotakepic = 0;
+#endif
         }
         if(device_status.autotakepic == 4)
         {

+ 1 - 1
Application_cbd_apm32f1/packages/ota_downloader-v1.0.0/tools/ota_packager/rt_ota_packaging_tool.exe.config

@@ -6,5 +6,5 @@
   <runtime>
     <enforceFIPSPolicy enabled="false" />
   </runtime>
-  <configs SELEFILE="D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_cbd_apm32f1\Debug\rtthread.bin" SAVEFILE="D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_cbd_apm32f1\Debug\BZYV2_1.rbl" COMPRESS="0" CRYPT="0" KEY="" IV="" NAME="app" VERSION="3.7.4" />
+  <configs SELEFILE="D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_cbd_apm32f1\Debug\rtthread.bin" SAVEFILE="D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_cbd_apm32f1\Debug\BZYV2_1.rbl" COMPRESS="0" CRYPT="0" KEY="" IV="" NAME="app" VERSION="3.7.12" />
 </configuration>

+ 14 - 0
Application_cbd_apm32f1/readme.md

@@ -1,3 +1,17 @@
+# 2026-09-120 更新说明
+	#define VERSION_BZY         "3.7.13"                   //孢子仪	
+	1、hmi.c 1497 对焦初始化完成之后重置标志位状态;
+# 2026-09-18 更新说明
+	#define VERSION_BZY         "3.7.12"                   //孢子仪	
+	1、Y轴扫描事件修改为5S,5000000UL;
+	2、条件编译Y轴移动后的movy
+	#define VERSION_BZY         "3.7.11"                   //孢子仪	
+	1、Y轴扫描事件修改为3S,5000000UL;
+	#define VERSION_BZY         "3.7.10"                   //孢子仪	
+	1、修复X轴到位后发送指令导致录制;
+	#define VERSION_BZY         "3.7.9"                   //孢子仪	
+	1、增加条件编译FOCUS_STEP_EN,关闭自动对焦驱动;
+	2、Y轴扫描事件修改为3S,4000000UL;
 # 2026-09-16 更新说明
 	#define VERSION_BZY         "3.7.5"                   //孢子仪	
 	1、修复工作任务把屏幕电源关闭的问题;

+ 9 - 1
README.md

@@ -8,10 +8,18 @@
 
 | 版本 | 日期 |
 | --- | --- |
-| 3.7.2 | 2026-09-07 |
+| 3.7.6 | 2026-09-07 |
 
 ## 变更记录
 
+## 3.7.6 - 2026-09-07
+
+- 【修改】`record_start` 指令改为异步执行:电机移动放入滑台线程(`en_slide=8`),不再阻塞串口解析线程;滑台线程完成"Y 轴缓慢向下 3S → 发送 record_stop → 返回出发位置"全流程;版本号同步 3.7.3 → 3.7.6(作者:Administrator)
+
+## 3.7.3 - 2026-09-07
+
+- 【新增】`dtu_uart2.c` 处理 `record_start` 指令:Y 轴低速 PWM 缓慢向下移动约 3 秒后发送 jsonrpc `record_stop`,再返回出发位置;并修复命令匹配笔误 `valurecord_estring`→`valuestring`;版本号同步 3.7.2 → 3.7.3(作者:Administrator)
+
 ## 3.7.2 - 2026-09-07
 
 - 【修复】`Work_status_thread_entry` 23 点整点检查仅执行一次:新增 `work_day_checked` 标志,进入 23 点置位、离开 23 点复位,避免 23:00-23:59 内循环每秒重复执行判断;版本号同步 3.7.1 → 3.7.2(作者:Administrator)