zhunk vor 8 Monaten
Ursprung
Commit
9992e1ea87

+ 1 - 1
Application_cbd_apm32f1/applications/control.h

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

+ 0 - 26
Application_cbd_apm32f1/applications/hmi.c

@@ -1445,20 +1445,6 @@ static void Ctr_Mortor_entry(void* parameter)
         if(device_status.autotakepic==1)
         {
             device_status.step_focus = 1;
-            slide_para.en_slide =3;     //X轴复位
-            slide_para.pulse_period = mapSpeed(50);
-            while(slide_para.en_slide!=0){
-                LOG_D("等待X轴电机完成复位!");
-                rt_thread_delay(1000);
-            }
-
-            slide_para.en_slide = 4;     //Z轴复位
-            slide_para.pulse_period = mapSpeed(50);
-            while(slide_para.en_slide!=0){
-                LOG_D("等待Z轴电机完成复位!");
-                rt_thread_delay(1000);
-            }
-
             slide_para.en_slide = 7;    //Y轴复位
             slide_para.pulse_period = mapSpeed(50);
             while(slide_para.en_slide!=0){
@@ -1466,18 +1452,6 @@ static void Ctr_Mortor_entry(void* parameter)
                 rt_thread_delay(1000);
             }
 
-            //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;
-                while(slide_para.en_slide!=0){
-                    LOG_D("Again:等待X轴电机到位!");
-                    rt_thread_delay(1000);
-                }
-            }
             if(device_status.calibrate_slide==0){
                 device_status.autotakepic = 3;
             }else{