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

+ 36 - 3
Application_cbd_apm32f1/applications/control.c

@@ -906,9 +906,6 @@ u_int8_t alarmCheck(u_int8_t starthour,u_int8_t endhour,u_int8_t startmin,u_int8
 void WorkTask_BZYV2(void)
 {
     if(device_status.ds==1&&device_status.temp_status==0){
-        ctr_lamp(OFF,1);    //镇流器关=X轴开关:开
-        ctr_swz(OFF);
-        ctr_Collect_Fan(OFF);
 
         while(device_status.work_status ==0){
             rt_thread_delay(10000);
@@ -1199,6 +1196,42 @@ void reboot(void)
     LOG_W("手动触发重启!");
     rt_hw_cpu_reset();
 }
+
+// ------------------------------
+// RT-Thread 控制台命令实现
+// ------------------------------
+void fan_cmd(int argc, char *argv[])
+{
+    if (argc == 1)
+    {
+        // 只输入 fan → 打印当前状态
+        rt_kprintf("Collect Fan status: %s\n",
+                   device_status.collect_fan_status ? "ON" : "OFF");
+        return;
+    }
+
+    if (argc == 2)
+    {
+        if (!rt_strcmp(argv[1], "on"))
+        {
+            ctr_Collect_Fan(ON);
+            rt_kprintf("[FAN] Turn ON\n");
+        }
+        else if (!rt_strcmp(argv[1], "off"))
+        {
+            ctr_Collect_Fan(OFF);
+            rt_kprintf("[FAN] Turn OFF\n");
+        }
+        else
+        {
+            rt_kprintf("Usage: fan [on|off]\n");
+        }
+    }
+}
+
+// 导出到控制台命令
+MSH_CMD_EXPORT(fan_cmd, fan control: fan on | fan off | fan);
+
 MSH_CMD_EXPORT(ctr_lamp,ctr_lamp<ON|OFF>);
 MSH_CMD_EXPORT(ctr_led,sample:ctr_led <ON|OFF>);
 MSH_CMD_EXPORT(reboot,reboot);

+ 1 - 1
Application_cbd_apm32f1/applications/control.h

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

+ 2 - 0
Application_cbd_apm32f1/applications/hmi.c

@@ -1442,6 +1442,8 @@ static void Ctr_Mortor_entry(void* parameter)
         /*对焦拍照,滑台初始化*/
         if(device_status.autotakepic==1)
         {
+            ctr_led(ON);                    //20260520,对焦拍照前开灯
+            ctr_lamp(ON,1);                 //X轴开关:开[预启动[]
             device_status.step_focus = 1;
             slide_para.en_slide =3;     //X轴复位
             slide_para.pulse_period = mapSpeed(50);

+ 3 - 0
Application_cbd_apm32f1/readme.md

@@ -1,3 +1,6 @@
+# 2026-05-20 更新说明
+	#define VERSION_BZY         "2.7.20"                   //孢子仪
+	修复工作循环线程持续关闭驱动器电源导致自动运行结束后的对焦拍照不能完全归位;
 # 2026-04-27 更新说明
 	#define VERSION_BZY         "2.7.19"                   //孢子仪
 	修复因拍照指令丢失/乱码导致的不拍照问题,增加重试:30次