zhunk vor 1 Monat
Ursprung
Commit
f0cbfe74e2

+ 51 - 4
Application_cbd_apm32f1/applications/control.c

@@ -886,11 +886,18 @@ void HK_TakePhoto(void)
 /*上电初始化*/
 /*上电初始化*/
 void ResetInit(void)
 void ResetInit(void)
 {
 {
+    //打开相机供电
     ctr_photo(ON);
     ctr_photo(ON);
     //开启 工控机供电
     //开启 工控机供电
+#if BZYV13_EN == 0
     ctr_router(ON);
     ctr_router(ON);
-    //关闭风机
+#endif
+    //关闭风机-2.0/2.1
+#if BZYV13_EN == 0
     ctr_Heat(OFF);
     ctr_Heat(OFF);
+#else
+    ctr_Heat(ON);   //工控机-1.3
+#endif
     //关闭制冷
     //关闭制冷
     ctr_Cold(OFF);
     ctr_Cold(OFF);
     //关闭Y轴驱动电源
     //关闭Y轴驱动电源
@@ -950,8 +957,21 @@ static void exec_work_done(void)
 {
 {
     device_status.work_done = 0;
     device_status.work_done = 0;
     LOG_I("采集段结束, 执行转带+自动对焦");
     LOG_I("采集段结束, 执行转带+自动对焦");
-    turnlimit();                           //卷带电机转一圈
-    rt_thread_delay(2000);
+#if BZYV13_EN == 1
+        turnlimit();
+        rt_thread_delay(1000);
+        turnlimit();
+        rt_thread_delay(1000);
+        turnlimit();
+        //延迟30S等胶带稳定
+        for(int i=0;i<30;i++){
+            rt_thread_delay(1000);
+            LOG_I("等待胶带稳定:%d",i);
+        }
+#else
+        turnlimit();
+        rt_thread_delay(2000);
+#endif
     uint8_t retry_send = 0;
     uint8_t retry_send = 0;
     while(1){
     while(1){
         char *take_start = makeJson_Warn("start", "autofocus");
         char *take_start = makeJson_Warn("start", "autofocus");
@@ -986,13 +1006,26 @@ void WorkTask_BZYV2(void)
         /* 处于工作窗口:按对焦状态控制路由器供电 */
         /* 处于工作窗口:按对焦状态控制路由器供电 */
         while(device_status.work_status ==1){
         while(device_status.work_status ==1){
             if(device_status.autotakepic==0){
             if(device_status.autotakepic==0){
+#if BZYV13_EN == 1
+                ctr_router(ON);
+#else
                 ctr_Heat(ON);
                 ctr_Heat(ON);
+#endif
             }else{
             }else{
+#if BZYV13_EN == 1
+                ctr_router(OFF);
+#else
                 ctr_Heat(OFF);
                 ctr_Heat(OFF);
+#endif
+
             }
             }
             if(device_status.temp_status==1){
             if(device_status.temp_status==1){
                 device_status.work_status = 0;
                 device_status.work_status = 0;
+#if BZYV13_EN == 1
+                ctr_router(OFF);
+#else
                 ctr_Heat(OFF);
                 ctr_Heat(OFF);
+#endif
                 break;
                 break;
             }
             }
             /* 任一采集段窗口结束(下降沿置位 work_done)立即执行转带+对焦 */
             /* 任一采集段窗口结束(下降沿置位 work_done)立即执行转带+对焦 */
@@ -1001,7 +1034,11 @@ void WorkTask_BZYV2(void)
             }
             }
             rt_thread_delay(1000);
             rt_thread_delay(1000);
         }
         }
-        ctr_Heat(OFF);
+#if BZYV13_EN == 1
+            ctr_router(OFF);
+#else
+            ctr_Heat(OFF);
+#endif
 
 
         /* 退出工作循环后若有未处理的结束动作(如温控异常跳出), 补做 */
         /* 退出工作循环后若有未处理的结束动作(如温控异常跳出), 补做 */
         if(device_status.work_done==1){
         if(device_status.work_done==1){
@@ -1782,7 +1819,17 @@ static void Motor_task_thread_entry(void *parameter)
     while (1)
     while (1)
     {
     {
         rt_sem_take(motor_task_sem, RT_WAITING_FOREVER);
         rt_sem_take(motor_task_sem, RT_WAITING_FOREVER);
+#if BZYV13_EN == 1
+        turnlimit();
+        rt_thread_delay(1000);
+        turnlimit();
+        rt_thread_delay(1000);
+        turnlimit();
+        rt_thread_delay(1000);
+#else
         turnlimit();
         turnlimit();
+        rt_thread_delay(1000);
+#endif
     }
     }
 }
 }
 
 

+ 3 - 2
Application_cbd_apm32f1/applications/control.h

@@ -15,7 +15,8 @@
 #include <rtdevice.h>
 #include <rtdevice.h>
 //定制相关//////////////////////////////////////////////////////
 //定制相关//////////////////////////////////////////////////////
 #define SENSOR_EN        0              //温湿度:0关闭,1打开
 #define SENSOR_EN        0              //温湿度:0关闭,1打开
-#define FOCUS_STEP_EN    0
+#define FOCUS_STEP_EN    0              //自动对焦0关闭,1打开
+#define BZYV13_EN        1              //孢子仪1.3 0关闭 1打开
 /* 录制式对焦策略: 0=旧行为(盲走到 y_init_dis 就开录, 靠长行程覆盖漂移);
 /* 录制式对焦策略: 0=旧行为(盲走到 y_init_dis 就开录, 靠长行程覆盖漂移);
  *                 1=新策略(每个点位录制前先做轻量"预对焦", 找到清晰度上升沿之前的位置
  *                 1=新策略(每个点位录制前先做轻量"预对焦", 找到清晰度上升沿之前的位置
  *                    作为录制起点, 因此只需约 3 秒行程即可覆盖整个焦区)。
  *                    作为录制起点, 因此只需约 3 秒行程即可覆盖整个焦区)。
@@ -36,7 +37,7 @@ void  slide_set_record_travel(uint8_t pf_ok);      /* 依据预对焦结果设
 ///
 ///
 ///
 ///
 ///
 ///
-#define VERSION_BZY         "3.7.36"                   //孢子仪
+#define VERSION_BZY         "3.7.38"                   //孢子仪
 
 
 /* 对焦串口通信异常标志: 串口收到合法 JSON 且含 "focus" 字段时置1(定义于dtu_uart2.c) */
 /* 对焦串口通信异常标志: 串口收到合法 JSON 且含 "focus" 字段时置1(定义于dtu_uart2.c) */
 extern volatile uint8_t focus_valid_flag;
 extern volatile uint8_t focus_valid_flag;

+ 16 - 12
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -869,7 +869,7 @@ char * makeJson()
     char utos[5];
     char utos[5];
 
 
     if(atoi(device_status.power)>5000)  //过滤异常值
     if(atoi(device_status.power)>5000)  //过滤异常值
-        rt_sprintf(device_status.power,"0.01");
+        rt_sprintf(device_status.power,"NA");
 
 
     makejson_sta = 1;
     makejson_sta = 1;
     time_t stamp=time(RT_NULL);
     time_t stamp=time(RT_NULL);
@@ -901,17 +901,7 @@ char * makeJson()
     if (device_status.version_type==7) {
     if (device_status.version_type==7) {
         rt_snprintf(device_status.driver, sizeof(device_status.driver), "%s-%s", VERSION_BZY, device_status.driver_4g);
         rt_snprintf(device_status.driver, sizeof(device_status.driver), "%s-%s", VERSION_BZY, device_status.driver_4g);
     }
     }
-    if(device_status.sensor_485_sta!=0)
-    {
-        if(strstr(device_status.driver,"485")==RT_NULL)
-        {
-            /* 2026-09-28: 原 strcat 会在版本号已拼到 60+ 字节时写穿 64 字节缓冲;
-             * 改为先拼到临时缓冲再限长写回, 避免源目的重叠与越界 */
-            char ver_tmp[sizeof(device_status.driver) + 8];
-            rt_snprintf(ver_tmp, sizeof(ver_tmp), "%s.485", device_status.driver);
-            rt_snprintf(device_status.driver, sizeof(device_status.driver), "%s", ver_tmp);
-        }
-    }
+
     cJSON_AddItemToObject(pJsonRoot, "ext", pSubJson);
     cJSON_AddItemToObject(pJsonRoot, "ext", pSubJson);
     cJSON_AddStringToObject(pSubJson, "dver", device_status.driver);        //版本号,字符型
     cJSON_AddStringToObject(pSubJson, "dver", device_status.driver);        //版本号,字符型
     cJSON_AddStringToObject(pSubJson,"proj",device_status.project);         //项目类型
     cJSON_AddStringToObject(pSubJson,"proj",device_status.project);         //项目类型
@@ -999,10 +989,12 @@ char * makeJson()
     cJSON_AddNumberToObject(pSubJson, "y_init_dis", device_status.y_init_dis);
     cJSON_AddNumberToObject(pSubJson, "y_init_dis", device_status.y_init_dis);
     cJSON_AddNumberToObject(pSubJson, "tape_used", flashdb_value.tape_used);
     cJSON_AddNumberToObject(pSubJson, "tape_used", flashdb_value.tape_used);
     cJSON_AddNumberToObject(pSubJson, "tape_max", flashdb_value.tape_max);
     cJSON_AddNumberToObject(pSubJson, "tape_max", flashdb_value.tape_max);
+#if BZYV13_EN == 0
     cJSON_AddNumberToObject(pSubJson, "filter_used", flashdb_value.filter_used);
     cJSON_AddNumberToObject(pSubJson, "filter_used", flashdb_value.filter_used);
     cJSON_AddNumberToObject(pSubJson, "filter_max", flashdb_value.filter_max);
     cJSON_AddNumberToObject(pSubJson, "filter_max", flashdb_value.filter_max);
     cJSON_AddNumberToObject(pSubJson, "worked_day", flashdb_value.worked_day);
     cJSON_AddNumberToObject(pSubJson, "worked_day", flashdb_value.worked_day);
     cJSON_AddNumberToObject(pSubJson, "freq_filter", flashdb_value.freq_filter);
     cJSON_AddNumberToObject(pSubJson, "freq_filter", flashdb_value.freq_filter);
+#endif
     char *p = cJSON_PrintUnformatted(pJsonRoot);
     char *p = cJSON_PrintUnformatted(pJsonRoot);
     if(NULL == p)
     if(NULL == p)
     {
     {
@@ -1146,7 +1138,11 @@ int parseDtu(char *json_string)
               }else{
               }else{
                   send_signal(SIGUSR2);
                   send_signal(SIGUSR2);
               }
               }
+#if BZYV13_EN == 0
               ctr_Heat(OFF);    //关闭风机
               ctr_Heat(OFF);    //关闭风机
+#else
+              ctr_router(OFF);
+#endif
               device_status.autotakepic = 2;
               device_status.autotakepic = 2;
           }
           }
 
 
@@ -1171,10 +1167,18 @@ int parseDtu(char *json_string)
               }
               }
               //采集风机开和关
               //采集风机开和关
               if(strstr(item_cmd->valuestring,"windon")!=RT_NULL){
               if(strstr(item_cmd->valuestring,"windon")!=RT_NULL){
+#if BZYV13_EN == 0
                   ctr_Heat(ON);
                   ctr_Heat(ON);
+#else
+                  ctr_router(ON);
+#endif
               }
               }
               if(strstr(item_cmd->valuestring,"windoff")!=RT_NULL){
               if(strstr(item_cmd->valuestring,"windoff")!=RT_NULL){
+#if BZYV13_EN == 0
                   ctr_Heat(OFF);
                   ctr_Heat(OFF);
+#else
+                  ctr_router(OFF);
+#endif
                }
                }
               //卷带电机执行旋转一次
               //卷带电机执行旋转一次
               if(strstr(item_cmd->valuestring,"translate")!=RT_NULL){
               if(strstr(item_cmd->valuestring,"translate")!=RT_NULL){

+ 24 - 1
Application_cbd_apm32f1/applications/hmi.c

@@ -1488,6 +1488,7 @@ static void Ctr_Mortor_entry(void* parameter)
                 LOG_I("[拍照] 开始计时");
                 LOG_I("[拍照] 开始计时");
             }
             }
             ctr_led(ON);                    //20260520,对焦拍照前开灯
             ctr_led(ON);                    //20260520,对焦拍照前开灯
+#if BZYV13_EN == 0
             ctr_lamp(ON,1);                 //X轴开关:开[预启动[]
             ctr_lamp(ON,1);                 //X轴开关:开[预启动[]
             device_status.step_focus = 1;
             device_status.step_focus = 1;
             slide_para.en_slide =3;     //X轴复位
             slide_para.en_slide =3;     //X轴复位
@@ -1497,6 +1498,7 @@ static void Ctr_Mortor_entry(void* parameter)
             slide_para.en_slide = 4;     //Z轴复位
             slide_para.en_slide = 4;     //Z轴复位
             slide_para.pulse_period = mapSpeed(50);
             slide_para.pulse_period = mapSpeed(50);
             slide_wait_done(SLIDE_WAIT_TIMEOUT_MS);   /* 2026-09-28: 带超时, 替代死等(等待Z轴电机完成复位) */
             slide_wait_done(SLIDE_WAIT_TIMEOUT_MS);   /* 2026-09-28: 带超时, 替代死等(等待Z轴电机完成复位) */
+
             ctr_swz(OFF);             //Z轴开关:关
             ctr_swz(OFF);             //Z轴开关:关
             ctr_lamp(OFF,1);          //X轴开关:关
             ctr_lamp(OFF,1);          //X轴开关:关
             ctr_Collect_Fan(ON);           //Y轴电源开关:开
             ctr_Collect_Fan(ON);           //Y轴电源开关:开
@@ -1513,6 +1515,7 @@ static void Ctr_Mortor_entry(void* parameter)
                 slide_para.en_slide = 1;
                 slide_para.en_slide = 1;
                 slide_wait_done(SLIDE_WAIT_TIMEOUT_MS);   /* 2026-09-28: 带超时, 替代死等(X轴运行到胶带位置) */
                 slide_wait_done(SLIDE_WAIT_TIMEOUT_MS);   /* 2026-09-28: 带超时, 替代死等(X轴运行到胶带位置) */
             }
             }
+#endif
             if(device_status.calibrate_slide==0){
             if(device_status.calibrate_slide==0){
                 device_status.autotakepic = 3;
                 device_status.autotakepic = 3;
             }else{
             }else{
@@ -1614,13 +1617,34 @@ static void Ctr_Mortor_entry(void* parameter)
         if(device_status.auto_test_sw==1)
         if(device_status.auto_test_sw==1)
         {
         {
             //开始采集风机持续5S
             //开始采集风机持续5S
+#if BZYV13_EN == 0
             ctr_Heat(ON);
             ctr_Heat(ON);
+#else
+            ctr_router(ON);
+#endif
             rt_thread_delay(1000*60);
             rt_thread_delay(1000*60);
             //关闭采集风机
             //关闭采集风机
+#if BZYV13_EN == 0
             ctr_Heat(OFF);
             ctr_Heat(OFF);
+#else
+            ctr_router(OFF);
+#endif
             //胶带传送
             //胶带传送
+#if BZYV13_EN == 0
             turnlimit();
             turnlimit();
             rt_thread_delay(1000);
             rt_thread_delay(1000);
+#else
+            turnlimit();
+            rt_thread_delay(1000);
+            turnlimit();
+            rt_thread_delay(1000);
+            turnlimit();
+            //延迟30S等胶带稳定
+            for(int i=0;i<30;i++){
+                rt_thread_delay(1000);
+                LOG_I("等待胶带稳定:%d",i);
+            }
+#endif
             //滑台归位,自动对焦
             //滑台归位,自动对焦
             //拍一张照片上传到平台
             //拍一张照片上传到平台
             device_status.autotakepic=1;
             device_status.autotakepic=1;
@@ -1939,7 +1963,6 @@ void ResetParamDefault_DC(void)
     ef_set_env_blob("tph", &device_status.tph, sizeof(device_status.tph));
     ef_set_env_blob("tph", &device_status.tph, sizeof(device_status.tph));
     ef_set_env_blob("tpl", &device_status.tpl, sizeof(device_status.tpl));
     ef_set_env_blob("tpl", &device_status.tpl, sizeof(device_status.tpl));
     ef_set_env_blob("thsp", &device_status.thsp, sizeof(device_status.thsp));
     ef_set_env_blob("thsp", &device_status.thsp, sizeof(device_status.thsp));
-    ef_set_env_blob("passWord", &device_status.passWord,sizeof(device_status.passWord));
     rt_thread_delay(1000);
     rt_thread_delay(1000);
 }
 }
 //固件备份
 //固件备份

+ 5 - 1
Application_cbd_apm32f1/applications/main.c

@@ -40,7 +40,11 @@ int main(void)
     led_set_level(1,0);
     led_set_level(1,0);
     clock_information();
     clock_information();
     Beep_Tip(100);
     Beep_Tip(100);
-    ctr_router(ON);
+#if BZYV13_EN == 0
+    ctr_router(ON); //2.0-屏幕
+#else
+    ctr_Heat(ON);   //1.3-屏幕
+#endif
     Check_ParamConfig();
     Check_ParamConfig();
     //打印内存占用
     //打印内存占用
     memtrace(0, NULL);
     memtrace(0, NULL);

+ 4 - 4
Application_cbd_apm32f1/applications/sht30_collect.c

@@ -158,20 +158,20 @@ static void Power_ReadCheck(void *parameter)
          * (原 heat_power[8] 写入 "24850.00" 需 9 字节, 溢出的 '\0' 踩坏 voltage[0] -> 欠压误判) */
          * (原 heat_power[8] 写入 "24850.00" 需 9 字节, 溢出的 '\0' 踩坏 voltage[0] -> 欠压误判) */
         if(_24v_current_int-2430>0)
         if(_24v_current_int-2430>0)
         {
         {
-            rt_snprintf(device_status.power,sizeof(device_status.power),"%.2f",(float)(_24v_current_int-2400)/0.4);
+            snprintf(device_status.power,sizeof(device_status.power),"%.2f",(float)(_24v_current_int-2400)/0.4);
         }else {
         }else {
-            rt_snprintf(device_status.power,sizeof(device_status.power),"0.0");
+            snprintf(device_status.power,sizeof(device_status.power),"0.0");
         }
         }
 
 
         //消除误差
         //消除误差
         if(Read_Heat_Current()-2450<10)
         if(Read_Heat_Current()-2450<10)
         {
         {
-            rt_snprintf(device_status.heat_power,sizeof(device_status.heat_power),"%.f",0.0);
+            snprintf(device_status.heat_power,sizeof(device_status.heat_power),"%.f",0.0);
         }
         }
         else
         else
         {
         {
             //rt_uint16_t _heat_current_int = moving_average_filter_update(filter_hi,Read_Heat_Current());
             //rt_uint16_t _heat_current_int = moving_average_filter_update(filter_hi,Read_Heat_Current());
-            rt_snprintf(device_status.heat_power,sizeof(device_status.heat_power),"%.2f",(float)(Read_Heat_Current()-2450)/0.1);     //2481-2465
+            snprintf(device_status.heat_power,sizeof(device_status.heat_power),"%.2f",(float)(Read_Heat_Current()-2450)/0.1);     //2481-2465
         }
         }
         #else
         #else
         rt_snprintf(device_status.power,sizeof(device_status.power),"%.2f",(float)(moving_average_filter_update(filter, (float)Read_Real_Current()))/100.0*2.5);
         rt_snprintf(device_status.power,sizeof(device_status.power),"%.2f",(float)(moving_average_filter_update(filter, (float)Read_Real_Current()))/100.0*2.5);

+ 5 - 0
Application_cbd_apm32f1/readme.md

@@ -1,3 +1,8 @@
+# 2026-09-30 更新说明
+	#define VERSION_BZY         "3.7.38"                   //孢子仪
+	1. rt_snprintf不支持浮点数导致电压电流异常,取消rt_
+	#define VERSION_BZY         "3.7.37"                   //孢子仪
+	1、适配孢子仪V1.3
 # 2026-09-28 更新说明
 # 2026-09-28 更新说明
 	#define VERSION_BZY         "3.7.36"                   //孢子仪
 	#define VERSION_BZY         "3.7.36"                   //孢子仪
 	1、/* 回退到"上升沿之前 0"作为录制起点(dir=0 为上行/限位方向) */
 	1、/* 回退到"上升沿之前 0"作为录制起点(dir=0 为上行/限位方向) */