yf_zjb 2 年之前
父節點
當前提交
0d3bf4144a
共有 38 個文件被更改,包括 2076 次插入 和 2198 次删除
  1. 二進制
      Application_BZYV2-NHT/Debug/Application_BZYV2-NHT.bin
  2. 二進制
      Application_BZYV2-NHT/Debug/Application_BZYV2-NHT.elf
  3. 823 824
      Application_BZYV2-NHT/Debug/Application_BZYV2-NHT.map
  4. 二進制
      Application_BZYV2-NHT/Debug/applications/control.o
  5. 二進制
      Application_BZYV2-NHT/Debug/applications/dtu_uart2.o
  6. 二進制
      Application_BZYV2-NHT/Debug/applications/hmi.o
  7. 二進制
      Application_BZYV2-NHT/Debug/applications/main.o
  8. 二進制
      Application_BZYV2-NHT/Debug/applications/sht30_collect.o
  9. 二進制
      Application_BZYV2-NHT/Debug/rt-thread/src/kservice.o
  10. 52 39
      Application_BZYV2-NHT/applications/control.c
  11. 10 27
      Application_BZYV2-NHT/applications/dtu_uart2.c
  12. 84 101
      Application_BZYV2-NHT/applications/hmi.c
  13. 1 0
      Application_BZYV2-NHT/applications/sht30_collect.c
  14. 二進制
      Application_BZYV2/Debug/Application_BZYV2.bin
  15. 二進制
      Application_BZYV2/Debug/Application_BZYV2.elf
  16. 1092 1094
      Application_BZYV2/Debug/Application_BZYV2.map
  17. 二進制
      Application_BZYV2/Debug/Application_BZYV2.rbl
  18. 二進制
      Application_BZYV2/Debug/applications/control.o
  19. 二進制
      Application_BZYV2/Debug/applications/dtu_uart2.o
  20. 二進制
      Application_BZYV2/Debug/applications/hmi.o
  21. 二進制
      Application_BZYV2/Debug/applications/main.o
  22. 二進制
      Application_BZYV2/Debug/drivers/board.o
  23. 二進制
      Application_BZYV2/Debug/rt-thread/src/kservice.o
  24. 4 3
      Application_BZYV2/applications/control.c
  25. 1 1
      Application_BZYV2/applications/control.h
  26. 0 2
      Application_BZYV2/applications/dtu_uart2.c
  27. 3 102
      Application_BZYV2/applications/hmi.c
  28. 1 1
      Application_BZYV2/drivers/board.c
  29. 二進制
      Application_CBD/Debug/Application_CBD.bin
  30. 二進制
      Application_CBD/Debug/Application_CBD.elf
  31. 3 2
      Application_CBD/Debug/Application_CBD.map
  32. 二進制
      Application_CBD/Debug/applications/control.o
  33. 二進制
      Application_CBD/Debug/applications/hmi.o
  34. 二進制
      Application_CBD/Debug/applications/main.o
  35. 二進制
      Application_CBD/Debug/rt-thread/src/kservice.o
  36. 二進制
      Application_CBD/Debug/rtthread.rbl
  37. 1 1
      Application_CBD/applications/control.h
  38. 1 1
      Application_CBD/applications/hmi.c

二進制
Application_BZYV2-NHT/Debug/Application_BZYV2-NHT.bin


二進制
Application_BZYV2-NHT/Debug/Application_BZYV2-NHT.elf


文件差異過大導致無法顯示
+ 823 - 824
Application_BZYV2-NHT/Debug/Application_BZYV2-NHT.map


二進制
Application_BZYV2-NHT/Debug/applications/control.o


二進制
Application_BZYV2-NHT/Debug/applications/dtu_uart2.o


二進制
Application_BZYV2-NHT/Debug/applications/hmi.o


二進制
Application_BZYV2-NHT/Debug/applications/main.o


二進制
Application_BZYV2-NHT/Debug/applications/sht30_collect.o


二進制
Application_BZYV2-NHT/Debug/rt-thread/src/kservice.o


+ 52 - 39
Application_BZYV2-NHT/applications/control.c

@@ -1313,24 +1313,13 @@ void HK_TakePhoto(void)
     if(device_status.version_type!=6)
     if(device_status.version_type!=6)
     {
     {
         ctr_led(ON);
         ctr_led(ON);
-        if(device_status.version_type==48)
-        {
-            rt_thread_delay(1000*60);
-        }
-        else {
-            rt_thread_delay(1000*15);
-        }
+
+        rt_thread_delay(1000*10);
+
     }
     }
     //触发海康相机拍照
     //触发海康相机拍照
     Hk_Take_io();
     Hk_Take_io();
-    if(device_status.version_type!=6)
-    {
-        rt_thread_delay(1000*45);
-    }
-    else {
-        ctr_led(ON);
-        rt_thread_delay(1000*19);
-    }
+    rt_thread_delay(1000*1);
     ctr_led(OFF);
     ctr_led(OFF);
 }
 }
 //光控测试任务
 //光控测试任务
@@ -1874,6 +1863,7 @@ void WorkTask_BZ(void)
 
 
 void WorkTask_BZYV2(void)
 void WorkTask_BZYV2(void)
 {
 {
+
     //打开胶带步进电机
     //打开胶带步进电机
     //等待采集结束
     //等待采集结束
     //拍照
     //拍照
@@ -1888,7 +1878,6 @@ void WorkTask_BZYV2(void)
         while(device_status.work_status ==0){
         while(device_status.work_status ==0){
             rt_thread_delay(1000);
             rt_thread_delay(1000);
             LOG_W("等待设备进入工作");
             LOG_W("等待设备进入工作");
-            ctr_router(OFF);
         }
         }
         while(device_status.work_status ==1){
         while(device_status.work_status ==1){
             if(device_status.autotakepic==0){
             if(device_status.autotakepic==0){
@@ -1907,7 +1896,7 @@ void WorkTask_BZYV2(void)
                 LOG_D("等待电机完成复位!");
                 LOG_D("等待电机完成复位!");
                 rt_thread_delay(100);
                 rt_thread_delay(100);
             }
             }
-            device_status.autotakepic = 1;          //相机自动对焦
+
             char *take_start = makeJson_Warn("start", "autofocus");
             char *take_start = makeJson_Warn("start", "autofocus");
             DTU_Write(take_start);
             DTU_Write(take_start);
             rt_free(take_start);
             rt_free(take_start);
@@ -2398,7 +2387,7 @@ uint8_t ctr_swz(uint8_t status_swz)
 uint32_t ctr_move(uint8_t DIR_,uint8_t dir_,uint32_t dis_,uint8_t pulse)
 uint32_t ctr_move(uint8_t DIR_,uint8_t dir_,uint32_t dis_,uint8_t pulse)
 {
 {
     uint32_t j;
     uint32_t j;
-
+    slidelock();
     //限位检测初始化
     //限位检测初始化
     rt_pin_mode(Limit_Motor_X, PIN_MODE_INPUT);
     rt_pin_mode(Limit_Motor_X, PIN_MODE_INPUT);
     rt_pin_mode(Limit_Motor_Y, PIN_MODE_INPUT);
     rt_pin_mode(Limit_Motor_Y, PIN_MODE_INPUT);
@@ -2420,7 +2409,12 @@ uint32_t ctr_move(uint8_t DIR_,uint8_t dir_,uint32_t dis_,uint8_t pulse)
         rt_pin_write(CTR_RO_LIMIT, OFF);
         rt_pin_write(CTR_RO_LIMIT, OFF);
     }
     }
 
 
-    beep_set(1000000, 500000); //PWM使能
+    if(dis_ >=1000){
+        beep_set(500000, 250000); //PWM使能
+    }else{
+        beep_set(2000000, 1000000); //PWM使能
+    }
+
 
 
     switch(DIR_){
     switch(DIR_){
         case X_:
         case X_:
@@ -2440,7 +2434,9 @@ uint32_t ctr_move(uint8_t DIR_,uint8_t dir_,uint32_t dis_,uint8_t pulse)
                     rt_thread_delay(pulse);   //10ms
                     rt_thread_delay(pulse);   //10ms
                    if(dir_==0&&rt_pin_read(Limit_Motor_X)==0){
                    if(dir_==0&&rt_pin_read(Limit_Motor_X)==0){
                        rt_thread_delay(10);   //10ms
                        rt_thread_delay(10);   //10ms
-                       if(rt_pin_read(Limit_Motor_X)==0) break;
+                       if(rt_pin_read(Limit_Motor_X)==0){
+                           j = dis_;
+                       }
                    }
                    }
                 }else{  //急停
                 }else{  //急停
                     for(int z =0;z < 3; z++){
                     for(int z =0;z < 3; z++){
@@ -2461,7 +2457,7 @@ uint32_t ctr_move(uint8_t DIR_,uint8_t dir_,uint32_t dis_,uint8_t pulse)
                 }
                 }
                 return 0;
                 return 0;
             }
             }
-            ctr_Collect_Fan(ON);           //Z轴电源开关:开
+            ctr_Collect_Fan(ON);           //Y轴电源开关:开
             rt_thread_delay(100);
             rt_thread_delay(100);
 
 
             for(j=0;j<dis_;j++){
             for(j=0;j<dis_;j++){
@@ -2469,7 +2465,9 @@ uint32_t ctr_move(uint8_t DIR_,uint8_t dir_,uint32_t dis_,uint8_t pulse)
                     rt_thread_delay(pulse);
                     rt_thread_delay(pulse);
                    if(dir_==0&&rt_pin_read(Limit_Motor_Y)==0){
                    if(dir_==0&&rt_pin_read(Limit_Motor_Y)==0){
                        rt_thread_delay(10);
                        rt_thread_delay(10);
-                       if(rt_pin_read(Limit_Motor_Y)==0) break;
+                       if(rt_pin_read(Limit_Motor_Y)==0){
+                           j = dis_;
+                       }
                    }
                    }
                 }else{  //急停
                 }else{  //急停
                     for(int z =0;z < 3; z++){
                     for(int z =0;z < 3; z++){
@@ -2498,7 +2496,9 @@ uint32_t ctr_move(uint8_t DIR_,uint8_t dir_,uint32_t dis_,uint8_t pulse)
                     rt_thread_delay(pulse);
                     rt_thread_delay(pulse);
                    if(dir_==1&&rt_pin_read(Limit_Motor_Z)==0){
                    if(dir_==1&&rt_pin_read(Limit_Motor_Z)==0){
                        rt_thread_delay(10);
                        rt_thread_delay(10);
-                       if(rt_pin_read(Limit_Motor_Z)==0) break;
+                       if(rt_pin_read(Limit_Motor_Z)==0){
+                           j = dis_;
+                       }
                    }
                    }
                 }else{  //急停
                 }else{  //急停
                     for(int z =0;z < 3; z++){
                     for(int z =0;z < 3; z++){
@@ -2511,8 +2511,26 @@ uint32_t ctr_move(uint8_t DIR_,uint8_t dir_,uint32_t dis_,uint8_t pulse)
             break;
             break;
     }
     }
     pwm_stop();
     pwm_stop();
-    rt_pin_write(HK_IO, OFF);
-    slidelock();
+    rt_pin_write(HK_IO, ON);
+
+    switch(DIR_){
+        case X_:
+            ctr_lamp(ON,1);          //X轴开关:关
+            ctr_swz(OFF);             //Z轴开关:关
+            ctr_Collect_Fan(OFF);     //Y轴开关:关
+            break;
+        case Y_:
+            ctr_swz(OFF);             //Z轴开关:关
+            ctr_lamp(OFF,1);          //X轴开关:关
+            ctr_Collect_Fan(ON);      //Y轴开关:开
+            break;
+        case Z_:
+            ctr_swz(ON);     //Y轴开关:关
+            ctr_lamp(OFF,1);          //X轴开关:关
+            ctr_Collect_Fan(OFF);     //Y轴开关:关
+            break;
+    }
+
     return dis_;
     return dis_;
 }
 }
 
 
@@ -2616,12 +2634,6 @@ void slide_thread_entry(void *parameter)
             LOG_I("%s",photo);
             LOG_I("%s",photo);
             DTU_Write("%s",photo);
             DTU_Write("%s",photo);
             rt_free(photo);
             rt_free(photo);
-            //释放电机,解决发热问题
-            {
-                ctr_lamp(OFF,1);    //镇流器关=X轴开关:开
-                ctr_swz(OFF);
-                ctr_Collect_Fan(OFF);
-            }
             break;
             break;
     }
     }
 
 
@@ -2638,18 +2650,13 @@ void slide_thread_entry(void *parameter)
             LOG_I("%s",photo);
             LOG_I("%s",photo);
             DTU_Write("%s",photo);
             DTU_Write("%s",photo);
             rt_free(photo);
             rt_free(photo);
-            //释放电机,解决发热问题
-            {
-                ctr_lamp(OFF,1);    //镇流器关=X轴开关:开
-                ctr_swz(OFF);
-                ctr_Collect_Fan(OFF);
-            }
+
             break;
             break;
     }
     }
 
 
     case 3:{  //复位X
     case 3:{  //复位X
                slide_para.xdir = 0;
                slide_para.xdir = 0;
-               slide_para.xdis = 1000000;
+               slide_para.xdis = 100000;
                ctr_move(X_,slide_para.xdir,slide_para.xdis,slide_para.pulse_period);
                ctr_move(X_,slide_para.xdir,slide_para.xdis,slide_para.pulse_period);
                rt_kprintf("The slide's photo movement was done ok\n");
                rt_kprintf("The slide's photo movement was done ok\n");
 
 
@@ -2674,7 +2681,13 @@ void slide_thread_entry(void *parameter)
     case 6:{    //Y轴
     case 6:{    //Y轴
                 ctr_move(Y_,slide_para.ydir,slide_para.ydis,slide_para.pulse_period);
                 ctr_move(Y_,slide_para.ydir,slide_para.ydis,slide_para.pulse_period);
                 rt_kprintf("The slide's y movement was done ok\n");
                 rt_kprintf("The slide's y movement was done ok\n");
-
+                rt_thread_delay(1000);
+                if(slide_para.ydis==2||slide_para.ydis==50){
+                    char *photo = makeJson_Warn("movy","done");
+                    LOG_I("%s",photo);
+                    DTU_Write("%s",photo);
+                    rt_free(photo);
+                }
                 slide_para.ydis = 0;
                 slide_para.ydis = 0;
                 slide_para.stop_flag = 0;
                 slide_para.stop_flag = 0;
                 slide_para.en_slide = OFF;
                 slide_para.en_slide = OFF;

+ 10 - 27
Application_BZYV2-NHT/applications/dtu_uart2.c

@@ -665,42 +665,21 @@ char * makeJson()
         //工作状态
         //工作状态
         rt_sprintf(utos, "%d",device_status.work_status);
         rt_sprintf(utos, "%d",device_status.work_status);
         cJSON_AddStringToObject(pSubJson,"work_sta",utos);
         cJSON_AddStringToObject(pSubJson,"work_sta",utos);
-        //运行状态
-        rt_sprintf(utos, "%d",device_status.run_sta);
-        cJSON_AddStringToObject(pSubJson,"run_sta",utos);
-        //箱体温度-box_tem
-        rt_sprintf(utos, "%d",device_status.box_temp);
-        cJSON_AddStringToObject(pSubJson,"box_tem",utos);
-        //培养时间-cul_time
-        rt_sprintf(utos, "%d",device_status.cul_time);
-        cJSON_AddStringToObject(pSubJson,"cul_time",utos);
-        //制冷状态
-        rt_sprintf(utos, "%d",device_status.cold_sw);
-        cJSON_AddStringToObject(pSubJson,"cold_sw",utos);
+
         //电压状态-batStatus
         //电压状态-batStatus
         rt_sprintf(utos, "%d",device_status.bat_status);
         rt_sprintf(utos, "%d",device_status.bat_status);
         cJSON_AddStringToObject(pSubJson,"batStatus",utos);
         cJSON_AddStringToObject(pSubJson,"batStatus",utos);
-        //已培养时间-staytime
-        rt_sprintf(utos, "%d",device_status.stay_time);
-        cJSON_AddStringToObject(pSubJson,"stay_time",utos);
+
         //风机开关
         //风机开关
         rt_sprintf(utos, "%d",device_status.wind_sw);
         rt_sprintf(utos, "%d",device_status.wind_sw);
         cJSON_AddStringToObject(pSubJson,"wind_sw",utos);
         cJSON_AddStringToObject(pSubJson,"wind_sw",utos);
-        //培养仓温度
-        rt_sprintf(utos, "%d",device_status.pre_temp);
-        cJSON_AddStringToObject(pSubJson,"pre_temp",utos);
         //分辨率
         //分辨率
         cJSON_AddStringToObject(pSubJson,"imgres","0");
         cJSON_AddStringToObject(pSubJson,"imgres","0");
         //usb
         //usb
         cJSON_AddStringToObject(pSubJson,"usb_sta","0");
         cJSON_AddStringToObject(pSubJson,"usb_sta","0");
-        //雨控状态-rps
-        rt_sprintf(utos, "%d",device_status.rain_status);
-        cJSON_AddStringToObject(pSubJson,"rps",utos);
+
         //收集时间
         //收集时间
         cJSON_AddItemToObject(pSubJson,"coll_time",data_clt);
         cJSON_AddItemToObject(pSubJson,"coll_time",data_clt);
-        //设定温度
-        rt_sprintf(utos, "%d",device_status.heatvalue);
-        cJSON_AddStringToObject(pSubJson,"set_temp",utos);
     }
     }
     if(device_status.dtype!=7)
     if(device_status.dtype!=7)
     {
     {
@@ -708,9 +687,7 @@ char * makeJson()
         rt_sprintf(utos, "%d",device_status.shake_ws);
         rt_sprintf(utos, "%d",device_status.shake_ws);
         cJSON_AddStringToObject(pSubJson,"shake",utos);
         cJSON_AddStringToObject(pSubJson,"shake",utos);
     }
     }
-    //震动时间
-    rt_sprintf(utos, "%d",device_status.shake_sec);
-    cJSON_AddStringToObject(pSubJson,"shake_sec",utos);
+
     cJSON_AddStringToObject(pSubJson,"gps",device_status.gps);              //定位状态
     cJSON_AddStringToObject(pSubJson,"gps",device_status.gps);              //定位状态
     //开关状态
     //开关状态
     rt_sprintf(utos, "%d",device_status.ds);
     rt_sprintf(utos, "%d",device_status.ds);
@@ -818,6 +795,8 @@ int parseDtu(char *json_string)
           {
           {
               if(strstr(item_cmd->valuestring,"autotest")!=RT_NULL){
               if(strstr(item_cmd->valuestring,"autotest")!=RT_NULL){
                   device_status.auto_test_sw=1;
                   device_status.auto_test_sw=1;
+              }else if (strstr(item_cmd->valuestring,"auto_focus")!=RT_NULL) {
+                  device_status.autotakepic = 2;
               }
               }
               //补光灯开灯和关灯
               //补光灯开灯和关灯
               if(strstr(item_cmd->valuestring,"ledon")!=RT_NULL){
               if(strstr(item_cmd->valuestring,"ledon")!=RT_NULL){
@@ -832,6 +811,7 @@ int parseDtu(char *json_string)
 //                    rt_pin_mode(ROUTER,PIN_MODE_OUTPUT);
 //                    rt_pin_mode(ROUTER,PIN_MODE_OUTPUT);
 //                    rt_pin_write(ROUTER,OFF);
 //                    rt_pin_write(ROUTER,OFF);
                   ctr_Cold(OFF);
                   ctr_Cold(OFF);
+                  slidelock();
               }
               }
               //采集风机开和关
               //采集风机开和关
               if(strstr(item_cmd->valuestring,"windon")!=RT_NULL){
               if(strstr(item_cmd->valuestring,"windon")!=RT_NULL){
@@ -978,6 +958,9 @@ int parseDtu(char *json_string)
                       DTU_Write("%s",auto_takephoto);
                       DTU_Write("%s",auto_takephoto);
                       rt_free(auto_takephoto);
                       rt_free(auto_takephoto);
                   }
                   }
+                  else if (strstr(type->valuestring,"auto_focus")!=RT_NULL) {
+                      device_status.autotakepic = 2;
+                  }
                   else if(strstr(type->valuestring,"takephoto")!=RT_NULL)
                   else if(strstr(type->valuestring,"takephoto")!=RT_NULL)
                   {
                   {
                       HK_TakePhoto();
                       HK_TakePhoto();

+ 84 - 101
Application_BZYV2-NHT/applications/hmi.c

@@ -36,7 +36,7 @@
 #define HMI_THREAD_STACK_SIZE       2048        //线程栈空间大小
 #define HMI_THREAD_STACK_SIZE       2048        //线程栈空间大小
 #define HMI_THREAD_TIMESLICE        10           //时间片
 #define HMI_THREAD_TIMESLICE        10           //时间片
 
 
-#define CONTROL_MOTOR_PRIORITY      18
+#define CONTROL_MOTOR_PRIORITY      7
 #define CONTROL_MOTOR_STACK_SIZE    2048
 #define CONTROL_MOTOR_STACK_SIZE    2048
 #define CONTROL_MOTOR_TIMESLICE     10
 #define CONTROL_MOTOR_TIMESLICE     10
 
 
@@ -1194,18 +1194,59 @@ static void Ctr_Mortor_entry(void* parameter)
    rt_uint8_t maxIndex = 0;
    rt_uint8_t maxIndex = 0;
 
 
    /*孢子仪2.0*/
    /*孢子仪2.0*/
-   const int maxIterations = 30; // 最大迭代次数,可根据实际情况调整
-   const int stepS = 1;    // 对焦步长
+   const int maxIterations = 20; // 最大迭代次数,可根据实际情况调整
+   const int stepS = 2;    // 对焦步长
    double allSharpness[maxIterations];    // 当前图像清晰度评价值
    double allSharpness[maxIterations];    // 当前图像清晰度评价值
    char tmp_s[10];
    char tmp_s[10];
    char tmp[10];
    char tmp[10];
     while(1)
     while(1)
     {
     {
+        if(device_status.autotakepic==2){
+            memset(allSharpness,0,sizeof(allSharpness));
+            for(int i = 0; i < 3; i++){
+                slide_para.ydir = 1;        //1位反向,0位正向;
+                slide_para.ydis = stepS;
+                slide_para.en_slide = 6;
+                while(slide_para.en_slide!=0)
+                {
+                    rt_thread_delay(3000);
+                }
+                allSharpness[i] =  device_status.focus_value;
+            }
+            //归位
+            for(int i = 3; i < 9; i++){
+                slide_para.ydir = 0;        //1位反向,0位正向;
+                slide_para.ydis = stepS;
+                slide_para.en_slide = 6;
+                while(slide_para.en_slide!=0)
+                {
+                    rt_thread_delay(3000);
+                }
+                if(i>=6)    //过了初始位置再进行记录
+                    allSharpness[i-3] =  device_status.focus_value;
+            }
+            //检索最大清晰度位置
+            int max_i = findMaxIndex(allSharpness,6);
+
+            for(int i = 0; i < 6-max_i; i++){
+                slide_para.ydir = 1;        //1位反向,0位正向;
+                slide_para.ydis = stepS;
+                slide_para.en_slide = 6;
+                while(slide_para.en_slide!=0)
+                {
+                    rt_thread_delay(3000);
+                }
+            }
+            char *photo_f = makeJson_Warn("auto_focus","focus_done");
+            DTU_Write("%s",photo_f);
+            rt_free(photo_f);
+            device_status.autotakepic = 0;
+        }
         /*对焦拍照*/
         /*对焦拍照*/
         if(device_status.autotakepic==1)
         if(device_status.autotakepic==1)
         {
         {
+            memset(allSharpness,0,sizeof(allSharpness));
             device_status.step_focus = 1;
             device_status.step_focus = 1;
-
             slide_para.en_slide =3;     //X轴复位
             slide_para.en_slide =3;     //X轴复位
             while(slide_para.en_slide!=0){
             while(slide_para.en_slide!=0){
                 LOG_D("等待X轴电机完成复位!");
                 LOG_D("等待X轴电机完成复位!");
@@ -1235,16 +1276,17 @@ static void Ctr_Mortor_entry(void* parameter)
 
 
             if(rt_pin_read(Limit_Motor_Y)==0){
             if(rt_pin_read(Limit_Motor_Y)==0){
                 slide_para.ydir = 1;        //1位反向,0位正向;
                 slide_para.ydir = 1;        //1位反向,0位正向;
-                slide_para.ydis = 18000;     //
+                slide_para.ydis = 8600;     //
                 slide_para.en_slide = 6;
                 slide_para.en_slide = 6;
                 ctr_Cold(ON);                         //ctr_router(ON);  打开补光灯
                 ctr_Cold(ON);                         //ctr_router(ON);  打开补光灯
                 while(slide_para.en_slide!=0){
                 while(slide_para.en_slide!=0){
                     LOG_D("等待Y轴电机完成移位:%d",slide_para.ydis);
                     LOG_D("等待Y轴电机完成移位:%d",slide_para.ydis);
-                    rt_thread_delay(1000);
+                    rt_thread_delay(2000);
                 }
                 }
             }
             }
-
-            //遍历所有位置
+#if 0
+            slide_para.pulse_period = 20;  //修改滑台的脉宽为20ms
+            //遍历所有位置,粗对焦
             for(int i = 0; i < maxIterations; i++){
             for(int i = 0; i < maxIterations; i++){
                 slide_para.ydir = 0;        //1位反向,0位正向;
                 slide_para.ydir = 0;        //1位反向,0位正向;
                 slide_para.ydis = stepS;
                 slide_para.ydis = stepS;
@@ -1254,6 +1296,7 @@ static void Ctr_Mortor_entry(void* parameter)
                     rt_thread_delay(2500);
                     rt_thread_delay(2500);
                 }
                 }
                 allSharpness[i] =  device_status.focus_value;
                 allSharpness[i] =  device_status.focus_value;
+                if(device_status.focus_value > 10.0) break;
             }
             }
             for(int i = 0; i < maxIterations; i++){
             for(int i = 0; i < maxIterations; i++){
                 sprintf(tmp_s, "%f",allSharpness[i]);
                 sprintf(tmp_s, "%f",allSharpness[i]);
@@ -1261,6 +1304,7 @@ static void Ctr_Mortor_entry(void* parameter)
             }
             }
             maxIndex = findMaxIndex(allSharpness,maxIterations);    //最大清晰度的位置
             maxIndex = findMaxIndex(allSharpness,maxIterations);    //最大清晰度的位置
 
 
+
             for(int i = 0; i < (maxIterations-maxIndex); i++){      //运动到该位置
             for(int i = 0; i < (maxIterations-maxIndex); i++){      //运动到该位置
                 slide_para.ydir = 1;        //1位反向,0位正向;
                 slide_para.ydir = 1;        //1位反向,0位正向;
                 slide_para.ydis = stepS;
                 slide_para.ydis = stepS;
@@ -1270,110 +1314,49 @@ static void Ctr_Mortor_entry(void* parameter)
                     rt_thread_delay(2500);
                     rt_thread_delay(2500);
                 }
                 }
             }
             }
-
-#if 0
-            for(int i = 0; i < maxIterations; ++i){
-                slide_para.ydir = 1;        //1位反向,0位正向;
-                slide_para.ydis = stepI;
-                slide_para.en_slide = 6;
-                while(slide_para.en_slide!=0)
-                {
-                    rt_thread_delay(2500);
-                }
-                if(device_status.focus_value > allSharpness[maxIndex]){ //如果清晰度增大,继续前进
-                    allSharpness[maxIndex] = device_status.focus_value;
-                }else{
-                    slide_para.ydir = 0;        //1位反向,0位正向;
-                    slide_para.ydis = stepI;
-                    slide_para.en_slide = 6;
-                    while(slide_para.en_slide!=0)
-                    {
-                        rt_thread_delay(2500);
-                    }
-                    break;
-                }
-            }
-            for(int i = 0; i < maxIterations; ++i){
-                slide_para.ydir = 0;        //1位反向,0位正向;
-                slide_para.ydis = stepI;
-                slide_para.en_slide = 6;
-                while(slide_para.en_slide!=0)
-                {
-                    rt_thread_delay(2500);
-                }
-                if(device_status.focus_value > allSharpness[maxIndex]){ //如果清晰度增大,继续前进
-                    allSharpness[maxIndex] = device_status.focus_value;
-                }else{
-                    slide_para.ydir = 1;        //1位反向,0位正向;
-                    slide_para.ydis = stepI;
-                    slide_para.en_slide = 6;
-                    while(slide_para.en_slide!=0)
-                    {
-                        rt_thread_delay(2500);
-                    }
-                    break;
-                }
-            }
-
+            slide_para.pulse_period = 1;  //修改滑台的脉宽为20ms
 #endif
 #endif
-            // 在清晰度最佳的位置停止后,可以根据需要进行后续处理
-
-            // 在清晰度最佳的位置停止后,可以根据需要进行后续处理
-//            if(device_status.step_focus<5){
-//                //粗对焦
 
 
-//            }else{
-//                maxIndex = device_status.step_focus;
-//            }
-//
-//            LOG_D("对焦最佳索引是:%d",maxIndex);
-//            //粗对焦,滑台移动到清晰度最大的位置
-//            for(int i = 0; i < maxIterations; i++){
-//            //for(int i = 0; i < (maxIterations-maxIndex); i++){
-//                //currentSharpness = device_status.focus_value;
+//            //细对焦
+//            memset(allSharpness,0,sizeof(allSharpness));
+//            for(int i = 0; i < 3; i++){
 //                slide_para.ydir = 1;        //1位反向,0位正向;
 //                slide_para.ydir = 1;        //1位反向,0位正向;
 //                slide_para.ydis = stepS;
 //                slide_para.ydis = stepS;
 //                slide_para.en_slide = 6;
 //                slide_para.en_slide = 6;
 //                while(slide_para.en_slide!=0)
 //                while(slide_para.en_slide!=0)
 //                {
 //                {
-//                    rt_thread_delay(2500);
+//                    rt_thread_delay(3000);
 //                }
 //                }
-//                //if ((arr[i] - arr[maxIndex])>EPS)
-//                if((device_status.focus_value-allSharpness[maxIndex]) > EPS) break; //当前清晰度大于之前计算的清晰度位置
+//                allSharpness[i] =  device_status.focus_value;
 //            }
 //            }
-//            Sharpness_stepS = allSharpness[maxIndex];
-//            memset(allSharpness,0,sizeof(allSharpness));
-
-
-
-            //细对焦
-
-
-//            #if 1
-//            if(allSharpness[0]!=allSharpness[10])
-//            {
-//
-
-//            {//如果当前位置相比前一个位置清晰度减少,则返回到前一个位置,{之后再往前前位置运行,再对比清晰度}
-//                //如果当前位置比前一个位置清晰度增大,继续前进,直到减少再返回前一个位置
-//                if(device_status.focus_value-allSharpness[maxIndex] > EPS){     //清晰度增大
-//
-//                    slide_para.ydir = 0;        //1位反向,0位正向;
-//                    slide_para.ydis = stepI;
-//                    slide_para.en_slide = 6;
-//                    while(slide_para.en_slide!=0)
-//                    {
-//                        rt_thread_delay(2000);
-//                    }
-//                }else{
+//            //归位
+//            for(int i = 3; i < 9; i++){
+//                slide_para.ydir = 0;        //1位反向,0位正向;
+//                slide_para.ydis = stepS;
+//                slide_para.en_slide = 6;
+//                while(slide_para.en_slide!=0)
+//                {
+//                    rt_thread_delay(3000);
+//                }
+//                if(i>=6)    //过了初始位置再进行记录
+//                    allSharpness[i-3] =  device_status.focus_value;
+//            }
+//            //检索最大清晰度位置
+//            int max_i= findMaxIndex(allSharpness,6);
 //
 //
+//            for(int i = 0; i < 6-max_i; i++){
+//                slide_para.ydir = 1;        //1位反向,0位正向;
+//                slide_para.ydis = stepS;
+//                slide_para.en_slide = 6;
+//                while(slide_para.en_slide!=0)
+//                {
+//                    rt_thread_delay(3000);
 //                }
 //                }
 //            }
 //            }
-//            #endif
 
 
             //生成JSON指令
             //生成JSON指令
-            sprintf(tmp, "%f",device_status.focus_value);
-            char *photo = makeJson_Warn(tmp,"takephoto_done");
+            //sprintf(tmp, "%f",device_status.focus_value);
+            char *photo = makeJson_Warn("mov_init_y","takephoto_done");
             DTU_Write("%s",photo);
             DTU_Write("%s",photo);
             rt_free(photo);
             rt_free(photo);
             device_status.autotakepic = 0;
             device_status.autotakepic = 0;
@@ -1387,10 +1370,10 @@ static void Ctr_Mortor_entry(void* parameter)
         if(device_status.auto_test_sw==1)
         if(device_status.auto_test_sw==1)
         {
         {
             //开始采集风机持续5S
             //开始采集风机持续5S
-            ctr_Cold(ON);
-            rt_thread_delay(5000);
+            ctr_router(ON);
+            rt_thread_delay(1000*120);
             //关闭采集风机
             //关闭采集风机
-            ctr_Cold(OFF);
+            ctr_router(OFF);
             //胶带传送
             //胶带传送
             turnlimit();
             turnlimit();
             //滑台归位,自动对焦
             //滑台归位,自动对焦

+ 1 - 0
Application_BZYV2-NHT/applications/sht30_collect.c

@@ -236,6 +236,7 @@ static void Power_ReadCheck(void *parameter)
                 ctr_lamp(OFF,1);
                 ctr_lamp(OFF,1);
                 ctr_lamp(OFF,2);
                 ctr_lamp(OFF,2);
                 ctr_lamp(OFF,3);
                 ctr_lamp(OFF,3);
+                //关闭上仓门?
                 rain_cnt = 0;
                 rain_cnt = 0;
             }
             }
             else {
             else {

二進制
Application_BZYV2/Debug/Application_BZYV2.bin


二進制
Application_BZYV2/Debug/Application_BZYV2.elf


文件差異過大導致無法顯示
+ 1092 - 1094
Application_BZYV2/Debug/Application_BZYV2.map


二進制
Application_BZYV2/Debug/Application_BZYV2.rbl


二進制
Application_BZYV2/Debug/applications/control.o


二進制
Application_BZYV2/Debug/applications/dtu_uart2.o


二進制
Application_BZYV2/Debug/applications/hmi.o


二進制
Application_BZYV2/Debug/applications/main.o


二進制
Application_BZYV2/Debug/drivers/board.o


二進制
Application_BZYV2/Debug/rt-thread/src/kservice.o


+ 4 - 3
Application_BZYV2/applications/control.c

@@ -1971,7 +1971,6 @@ void WorkTask_BZYV2(void)
         while(device_status.work_status ==0){
         while(device_status.work_status ==0){
             rt_thread_delay(1000);
             rt_thread_delay(1000);
             LOG_W("等待设备进入工作");
             LOG_W("等待设备进入工作");
-            ctr_router(OFF);
         }
         }
         while(device_status.work_status ==1){
         while(device_status.work_status ==1){
             if(device_status.autotakepic==0){
             if(device_status.autotakepic==0){
@@ -1988,9 +1987,11 @@ void WorkTask_BZYV2(void)
             slide_para.en_slide = 5;               //滑台复位
             slide_para.en_slide = 5;               //滑台复位
             while(slide_para.en_slide!=0){
             while(slide_para.en_slide!=0){
                 LOG_D("等待电机完成复位!");
                 LOG_D("等待电机完成复位!");
-                rt_thread_delay(100);
+                rt_thread_delay(1000);
             }
             }
-            device_status.autotakepic = 1;          //相机自动对焦
+            rt_thread_delay(10000);
+//            device_status.autotakepic = 1;          //相机自动对焦
+//            device_status.step_focus = 1;
             char *take_start = makeJson_Warn("start", "autofocus");
             char *take_start = makeJson_Warn("start", "autofocus");
             DTU_Write(take_start);
             DTU_Write(take_start);
             rt_free(take_start);
             rt_free(take_start);

+ 1 - 1
Application_BZYV2/applications/control.h

@@ -33,7 +33,7 @@
 #define VERSION_V5          "1.2.5(HK)"             //5.0
 #define VERSION_V5          "1.2.5(HK)"             //5.0
 #define VERSION_Robot       "1.0(robot)"            //展厅机器人
 #define VERSION_Robot       "1.0(robot)"            //展厅机器人
 
 
-#define VERSION_BZY         "2.5"                   //孢子仪
+#define VERSION_BZY         "2.8.0"                   //孢子仪
 
 
 #define CompileTime         rt_sprintf(device_status.driver_compile,"%s-%s",__DATE__,__TIME__)              //编译时间,每次更新代码修改
 #define CompileTime         rt_sprintf(device_status.driver_compile,"%s-%s",__DATE__,__TIME__)              //编译时间,每次更新代码修改
 /*********************************************************************/
 /*********************************************************************/

+ 0 - 2
Application_BZYV2/applications/dtu_uart2.c

@@ -835,10 +835,8 @@ int parseDtu(char *json_string)
               }
               }
               //采集风机开和关
               //采集风机开和关
               if(strstr(item_cmd->valuestring,"windon")!=RT_NULL){
               if(strstr(item_cmd->valuestring,"windon")!=RT_NULL){
-
                   //ctr_Cold(ON);
                   //ctr_Cold(ON);
                   ctr_router(ON);
                   ctr_router(ON);
-
               }
               }
              if(strstr(item_cmd->valuestring,"windoff")!=RT_NULL){
              if(strstr(item_cmd->valuestring,"windoff")!=RT_NULL){
                    //ctr_Cold(OFF);
                    //ctr_Cold(OFF);

+ 3 - 102
Application_BZYV2/applications/hmi.c

@@ -1311,8 +1311,6 @@ static void Ctr_Mortor_entry(void* parameter)
                     rt_kprintf("-%s",tmp_s);
                     rt_kprintf("-%s",tmp_s);
                 }
                 }
                 maxIndex = findMaxIndex(allSharpness,maxIterations);
                 maxIndex = findMaxIndex(allSharpness,maxIterations);
-//                device_status.step_focus = maxIndex;
-//                ef_set_env_blob("step_focus",&device_status.step_focus,sizeof(device_status.step_focus));        //上传平台
             }else{
             }else{
                 maxIndex = device_status.step_focus;
                 maxIndex = device_status.step_focus;
             }
             }
@@ -1335,104 +1333,7 @@ static void Ctr_Mortor_entry(void* parameter)
             memset(allSharpness,0,sizeof(allSharpness));
             memset(allSharpness,0,sizeof(allSharpness));
 
 
 
 
-            //细对焦
-            #if 0
-            //滑台正向移动10个细对焦步数
-            for(int i = 0; i < 10; i++){
-                //currentSharpness = device_status.focus_value;
-                slide_para.ydir = 1;        //1位反向,0位正向;
-                slide_para.ydis = stepI/2;
-                slide_para.en_slide = 6;
-                while(slide_para.en_slide!=0)
-                {
-                    rt_thread_delay(50);
-                }
-                allSharpness[i] =  device_status.focus_value;
-
-            }
-
-            for(int i = 0; i < 10; i++){
-                sprintf(tmp_s, "%f",allSharpness[i]);
-                rt_kprintf("%s-",tmp_s);
-            }
-            maxIndex = findMaxIndex(allSharpness,10);
-            LOG_I("细对焦最大索引是:%d",maxIndex);
-            //滑台反向移动到细对焦索引的位置
-            for(int i = 0; i < 10 - maxIndex; i++){
-
-                slide_para.ydir = 0;        //1位反向,0位正向;
-                slide_para.ydis = stepI/2;
-                slide_para.en_slide = 6;
-                while(slide_para.en_slide!=0)
-                {
-                    rt_thread_delay(10);
-                }
-            }
-            for(int i = 0; i < 10; i++){
-                     sprintf(tmp, "%lf",allSharpness[i]);
-                     rt_kprintf("%s-",tmp);
-                 }
-
-            if(allSharpness[0]!=allSharpness[10])
-            {
-                for(int i = 0; i < maxIterations; ++i){
-                    slide_para.ydir = 0;        //1位反向,0位正向;
-                    slide_para.ydis = stepI/2;
-                    slide_para.en_slide = 6;
-                    while(slide_para.en_slide!=0)
-                    {
-                        rt_thread_delay(100);
-                    }
-                    if(device_status.focus_value-allSharpness[maxIndex] > EPS){ //如果清晰度增大,继续前进
-                        allSharpness[maxIndex] = device_status.focus_value;
-                    }else{
-                        slide_para.ydir = 1;        //1位反向,0位正向;
-                        slide_para.ydis = stepI/2;
-                        slide_para.en_slide = 6;
-                        while(slide_para.en_slide!=0)
-                        {
-                            rt_thread_delay(200);
-                        }
-                        break;
-                    }
-                }
-                for(int i = 0; i < maxIterations; ++i){
-                    slide_para.ydir = 1;        //1位反向,0位正向;
-                    slide_para.ydis = stepI/2;
-                    slide_para.en_slide = 6;
-                    while(slide_para.en_slide!=0)
-                    {
-                        rt_thread_delay(100);
-                    }
-                    if(device_status.focus_value-allSharpness[maxIndex] > EPS){ //如果清晰度增大,继续前进
-                        allSharpness[maxIndex] = device_status.focus_value;
-                    }else{
-                        slide_para.ydir = 0;        //1位反向,0位正向;
-                        slide_para.ydis = stepI/2;
-                        slide_para.en_slide = 6;
-                        while(slide_para.en_slide!=0)
-                        {
-                            rt_thread_delay(200);
-                        }
-                        break;
-                    }
-                }
-            }
-            //验证对焦,前进一个位置
-            {//如果当前位置相比前一个位置清晰度减少,则返回到前一个位置,{之后再往前前位置运行,再对比清晰度}
-                //如果当前位置比前一个位置清晰度增大,继续前进,直到减少再返回前一个位置
-                if(device_status.focus_value-allSharpness[maxIndex] > EPS){     //清晰度增大
 
 
-                    slide_para.ydir = 0;        //1位反向,0位正向;
-                    slide_para.ydis = stepI/2;
-                    slide_para.en_slide = 6;
-                    while(slide_para.en_slide!=0)
-                    {
-                        rt_thread_delay(200);
-                    }
-                }
-            }
-            #endif
 
 
             //生成JSON指令
             //生成JSON指令
             sprintf(tmp, "%f",device_status.focus_value);
             sprintf(tmp, "%f",device_status.focus_value);
@@ -1450,10 +1351,10 @@ static void Ctr_Mortor_entry(void* parameter)
         if(device_status.auto_test_sw==1)
         if(device_status.auto_test_sw==1)
         {
         {
             //开始采集风机持续5S
             //开始采集风机持续5S
-            ctr_Cold(ON);
-            rt_thread_delay(5000);
+            ctr_router(ON);
+            rt_thread_delay(1000*120);
             //关闭采集风机
             //关闭采集风机
-            ctr_Cold(OFF);
+            ctr_router(OFF);
             //胶带传送
             //胶带传送
             turnlimit();
             turnlimit();
             //滑台归位,自动对焦
             //滑台归位,自动对焦

+ 1 - 1
Application_BZYV2/drivers/board.c

@@ -161,7 +161,7 @@ void HAL_TIM_MspPostInit(TIM_HandleTypeDef* htim)
     GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
     GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
     HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
     HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
     //吸虫塔屏蔽下面这行,孢子仪打开
     //吸虫塔屏蔽下面这行,孢子仪打开
-    __HAL_AFIO_REMAP_TIM3_ENABLE();
+    //__HAL_AFIO_REMAP_TIM3_ENABLE();
 
 
   /* USER CODE BEGIN TIM3_MspPostInit 1 */
   /* USER CODE BEGIN TIM3_MspPostInit 1 */
 
 

二進制
Application_CBD/Debug/Application_CBD.bin


二進制
Application_CBD/Debug/Application_CBD.elf


+ 3 - 2
Application_CBD/Debug/Application_CBD.map

@@ -6277,11 +6277,12 @@ LOAD d:/rt-threadstudio/repo/extract/toolchain_support_packages/arm/gnu_tools_fo
  .rodata.__FUNCTION__.9365
  .rodata.__FUNCTION__.9365
                 0x0805fe9d        0xe ./packages/EasyFlash-latest/src/ef_fal_port.o
                 0x0805fe9d        0xe ./packages/EasyFlash-latest/src/ef_fal_port.o
  .rodata.str1.1
  .rodata.str1.1
-                0x0805feab      0x24f ./packages/EasyFlash-latest/src/ef_fal_port.o
+                0x0805feab      0x24c ./packages/EasyFlash-latest/src/ef_fal_port.o
                                 0x292 (size before relaxing)
                                 0x292 (size before relaxing)
  .rodata.str1.1
  .rodata.str1.1
-                0x080600fa      0x172 ./packages/EasyFlash-latest/src/ef_log.o
+                0x080600f7      0x172 ./packages/EasyFlash-latest/src/ef_log.o
                                 0x191 (size before relaxing)
                                 0x191 (size before relaxing)
+ *fill*         0x08060269        0x3 00000000
  .rodata.crc32_table
  .rodata.crc32_table
                 0x0806026c      0x400 ./packages/EasyFlash-latest/src/ef_utils.o
                 0x0806026c      0x400 ./packages/EasyFlash-latest/src/ef_utils.o
  .rodata.AHBPrescTable
  .rodata.AHBPrescTable

二進制
Application_CBD/Debug/applications/control.o


二進制
Application_CBD/Debug/applications/hmi.o


二進制
Application_CBD/Debug/applications/main.o


二進制
Application_CBD/Debug/rt-thread/src/kservice.o


二進制
Application_CBD/Debug/rtthread.rbl


+ 1 - 1
Application_CBD/applications/control.h

@@ -22,7 +22,7 @@
 #define BOOT_ERR         0              //1-新bootloader,0-旧bootloader()2023年9月份之前的设备升级需要设置为0
 #define BOOT_ERR         0              //1-新bootloader,0-旧bootloader()2023年9月份之前的设备升级需要设置为0
 ////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////
 #if LAMP_EN == 1
 #if LAMP_EN == 1
-    #define VERSION_HK          "1.(3ledv6).41(HK)" //4.0海康-三色光源
+    #define VERSION_HK          "1.(3ledv7).41(HK)" //4.0海康-三色光源
 #else
 #else
     #define VERSION_HK          "1.51.41(HK)"       //4.0海康-1200W
     #define VERSION_HK          "1.51.41(HK)"       //4.0海康-1200W
 #endif
 #endif

+ 1 - 1
Application_CBD/applications/hmi.c

@@ -1283,7 +1283,7 @@ static void Ctr_Mortor_entry(void* parameter)
         time(&time_reset12V);
         time(&time_reset12V);
         static struct tm alarm_reset12V;
         static struct tm alarm_reset12V;
         alarm_reset12V =*localtime(&time_reset12V);
         alarm_reset12V =*localtime(&time_reset12V);
-        if((alarm_reset12V.tm_hour)==7&&(alarm_reset12V.tm_min==19)&&(alarm_reset12V.tm_sec==50))
+        if((alarm_reset12V.tm_hour)==8&&(alarm_reset12V.tm_min==19)&&(alarm_reset12V.tm_sec==50))
         {
         {
             ctr_RTU_DTU(OFF);
             ctr_RTU_DTU(OFF);
             rt_thread_delay(1000*10);
             rt_thread_delay(1000*10);