zhunk hai 2 meses
pai
achega
b09ca1f09e

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
Application_cbd_apm32f1/.cproject


+ 13 - 5
Application_cbd_apm32f1/applications/control.c

@@ -322,7 +322,7 @@ uint32_t ctr_move(uint8_t DIR_,uint8_t dir_,uint32_t dis_,uint32_t pulse)
             break;
         case Y_:
             ctr_Collect_Fan(ON);           //Y轴电源开关:开
-            rt_thread_delay(100);
+            //rt_thread_delay(100);
             //判断限位
             if(dir_== 0 && rt_pin_read(Limit_Motor_Y)==1){
                 for(int z =0;z < 3; z++){
@@ -1135,7 +1135,12 @@ void slide_thread_entry(void *parameter)
                 rt_free(photo);
             }
 #else
-            if(slide_para.xdis==55||slide_para.xdis==80){
+            if(slide_para.xdis==55||slide_para.xdis==80)
+            {
+                ctr_swz(OFF);             //Z轴开关:关
+                ctr_lamp(OFF,1);          //X轴开关:关
+                ctr_Collect_Fan(ON);           //Y轴电源开关:开
+                rt_thread_delay(200);
                 char *photo = makeJson_Warn("mov_init_y","takephoto_done");
                 DTU_Write("%s",photo);
                 rt_free(photo);
@@ -1163,6 +1168,10 @@ void slide_thread_entry(void *parameter)
 #else
             if(slide_para.zdis==55||slide_para.zdis==80)
             {
+                ctr_swz(OFF);             //Z轴开关:关
+                ctr_lamp(OFF,1);          //X轴开关:关
+                ctr_Collect_Fan(ON);           //Y轴电源开关:开
+                rt_thread_delay(200);
                 char *photo = makeJson_Warn("mov_init_y","takephoto_done");
                 DTU_Write("%s",photo);
                 rt_free(photo);
@@ -1195,7 +1204,6 @@ void slide_thread_entry(void *parameter)
                slide_para.zdis = 5000;
                ctr_move(Z_,slide_para.zdir,slide_para.zdis,slide_para.pulse_period);
                LOG_I("The slide's Z movement was done ok");
-
                slide_para.zdis = 0;
                slide_para.stop_flag = 0;
                slide_para.en_slide = OFF;
@@ -1265,7 +1273,7 @@ void slide_thread_entry(void *parameter)
     case 8:{    //录制:Y轴缓慢向下移动3S,完成后发送record_stop,再返回出发位置
                 LOG_W("录制:Y轴缓慢向下移动3S!");
                 uint32_t record_pulse = 5000000UL; /* 缓慢:低速PWM */
-                uint32_t record_dis   = 5000;          /* 行程约3秒 */
+                uint32_t record_dis   = 8000;          /* 行程约8秒 */
                 ctr_move(Y_, 1, record_dis, record_pulse);   /* 缓慢向下移动 */
                 /* 执行完成, 通知远端停止录制 */
                 char *c0 = makeJsonRpc2_0("record_stop", NULL, 0);
@@ -1274,7 +1282,7 @@ void slide_thread_entry(void *parameter)
                     DTU_Write("%s", c0);
                     rt_free(c0);
                 }
-                rt_thread_delay(200);
+                rt_thread_delay(1000);
                 /* Y轴返回出发位置(方向0为初始/限位方向) */
                 ctr_move(Y_, 0, record_dis, record_pulse);
                 slide_para.stop_flag = 0;

+ 1 - 1
Application_cbd_apm32f1/applications/control.h

@@ -20,7 +20,7 @@
 ///
 ///
 ///
-#define VERSION_BZY         "3.7.13"                   //孢子仪
+#define VERSION_BZY         "3.7.18"                   //孢子仪
 
 /* 对焦串口通信异常标志: 串口收到合法 JSON 且含 "focus" 字段时置1(定义于dtu_uart2.c) */
 extern volatile uint8_t focus_valid_flag;

+ 1 - 0
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -1037,6 +1037,7 @@ int parseDtu(char *json_string)
                   LOG_I("接收到自清洁指令!");
               }else if(strcmp(METHOD->valuestring,"record_start")==0) {
                   LOG_I("接收到开始录制指令!");
+                  ctr_Collect_Fan(ON);           //Y轴电源开关:开
                   /* 由滑台线程异步执行(Y轴缓慢向下3S->发record_stop->返回), 不阻塞串口解析线程 */
                   slide_para.en_slide = 8;
               }

+ 8 - 2
Application_cbd_apm32f1/applications/hmi.c

@@ -1432,7 +1432,10 @@ static void Ctr_Mortor_entry(void* parameter)
                 LOG_D("等待Z轴电机完成复位!");
                 rt_thread_delay(1000);
             }
-
+            ctr_swz(OFF);             //Z轴开关:关
+            ctr_lamp(OFF,1);          //X轴开关:关
+            ctr_Collect_Fan(ON);           //Y轴电源开关:开
+            rt_thread_delay(200);
             slide_para.en_slide = 7;    //Y轴复位
             slide_para.pulse_period = mapSpeed(50);
             while(slide_para.en_slide!=0){
@@ -1443,7 +1446,6 @@ static void Ctr_Mortor_entry(void* parameter)
             //X轴电机运行到胶带位置
             if(rt_pin_read(Limit_Motor_X)==1){
                 slide_para.xdir = 1;        //1位反向,0位正向;
-
                 slide_para.xdis = device_status.x_init_dis;  //1200
                 slide_para.pulse_period = mapSpeed(50);
                 slide_para.en_slide = 1;
@@ -1473,6 +1475,10 @@ static void Ctr_Mortor_entry(void* parameter)
         }
         if(device_status.autotakepic==3)
         {
+            ctr_swz(OFF);             //Z轴开关:关
+            ctr_lamp(OFF,1);          //X轴开关:关
+            ctr_Collect_Fan(ON);           //Y轴电源开关:开
+            rt_thread_delay(200);
             slide_para.en_slide = 7;    //Y轴复位
             slide_para.pulse_period = mapSpeed(50);
             while(slide_para.en_slide!=0){

+ 11 - 1
Application_cbd_apm32f1/readme.md

@@ -1,4 +1,14 @@
-# 2026-09-120 更新说明
+# 2026-09-21 更新说明
+	#define VERSION_BZY         "3.7.18"                   //孢子仪
+	1、取消PWM计数,录制时间修改为8S;
+	#define VERSION_BZY         "3.7.17"                   //孢子仪	
+	1、修改参数为2000对应10S
+	#define VERSION_BZY         "3.7.16"                   //孢子仪	
+	1、TIM3 更新中断计数)+ 范围只改录制与对焦
+# 2026-09-20 更新说明
+	#define VERSION_BZY         "3.7.14"                   //孢子仪	
+	1、修复使用视频流对焦时Y轴启动增加了延时导致累计误差;
+	2、包括自动对焦的初始化,Y轴移动之前先打开电源并延迟
 	#define VERSION_BZY         "3.7.13"                   //孢子仪	
 	1、hmi.c 1497 对焦初始化完成之后重置标志位状态;
 # 2026-09-18 更新说明