zhunk 1 year ago
parent
commit
64d4de7ad7

+ 21 - 26
Application_cbd_apm32f1/applications/control.c

@@ -172,7 +172,23 @@ void stop_move(void)
 uint32_t ctr_move(uint8_t DIR_,uint8_t dir_,uint32_t dis_,uint32_t pulse)
 {
     uint32_t j;
-    slidelock();
+    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;
+    }
     //限位检测初始化
     rt_pin_mode(Limit_Motor_X, PIN_MODE_INPUT);
     rt_pin_mode(Limit_Motor_Y, PIN_MODE_INPUT);
@@ -231,8 +247,6 @@ uint32_t ctr_move(uint8_t DIR_,uint8_t dir_,uint32_t dis_,uint32_t pulse)
                 }
             }
 
-
-
             break;
         case Y_:
             ctr_Collect_Fan(ON);           //Y轴电源开关:开
@@ -249,9 +263,9 @@ uint32_t ctr_move(uint8_t DIR_,uint8_t dir_,uint32_t dis_,uint32_t pulse)
             beep_set(pulse, pulse/2); //PWM使能
             for(j=0;j<dis_;j++){
                 if(slide_para.stop_flag == 0){
-                    rt_thread_delay(1);
+                    if(dis_>=8000){rt_thread_delay(10);}else{rt_thread_delay(1);}
                    if(dir_==0&&rt_pin_read(Limit_Motor_Y)==1){
-                       rt_thread_delay(1);
+                       if(dis_>=8000){rt_thread_delay(10);}else{rt_thread_delay(1);}
                        if(rt_pin_read(Limit_Motor_Y)==1){
                            j = dis_;
                        }
@@ -278,7 +292,6 @@ uint32_t ctr_move(uint8_t DIR_,uint8_t dir_,uint32_t dis_,uint32_t pulse)
             }
             //驱动使能
             rt_pin_write(HK_IO, ON);
-            rt_thread_delay(100);
             beep_set(pulse, pulse/3); //PWM使能
             for(j=0;j<dis_;j++){
                 if(slide_para.stop_flag == 0){
@@ -302,24 +315,6 @@ uint32_t ctr_move(uint8_t DIR_,uint8_t dir_,uint32_t dis_,uint32_t pulse)
     pwm_stop();
     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_;
 }
 
@@ -1070,7 +1065,7 @@ void slide_thread_entry(void *parameter)
     case 1:{
             ctr_move(X_,slide_para.xdir,slide_para.xdis,slide_para.pulse_period);
             LOG_I("The slide's x movement was done ok");
-            if(slide_para.xdis==55)
+            if(slide_para.xdis==55||slide_para.xdis==80)
             {
                 DTU_Write("{\"cmd\": \"takephoto\" }");
                 device_status.autotakepic = 4;
@@ -1088,7 +1083,7 @@ void slide_thread_entry(void *parameter)
     case 2:{
             ctr_move(Z_,slide_para.zdir,slide_para.zdis,slide_para.pulse_period);
             rt_kprintf("The slide's z movement was done ok\n");
-            if(slide_para.zdis==55)
+            if(slide_para.zdis==55||slide_para.zdis==80)
             {
                 DTU_Write("{\"cmd\": \"takephoto\" }");
                 device_status.autotakepic = 4;

+ 1 - 1
Application_cbd_apm32f1/applications/control.h

@@ -21,7 +21,7 @@
 #define BZYV2_EN         0              //孢子仪2.0
 ////////////////////////////////////////////////////////////////
 
-#define VERSION_BZY         "2.1.0"                   //孢子仪
+#define VERSION_BZY         "2.2.0"                   //孢子仪
 
 
 /*********************************************************************/

+ 1 - 1
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -1340,7 +1340,7 @@ int parseDtu(char *json_string)
                           if(y_init_dis!=NULL)
                           {
                               if(y_init_dis->valueint>0){
-                                   device_status.y_init_dis = x_init_dis->valueint;
+                                   device_status.y_init_dis = y_init_dis->valueint;
                                    LOG_I("设置Y轴初始位置:%d",device_status.y_init_dis);
                                    ef_set_env_blob("y_init_dis", &device_status.y_init_dis, sizeof(device_status.y_init_dis));
 

+ 3 - 3
Application_cbd_apm32f1/applications/hmi.c

@@ -1361,7 +1361,7 @@ void thread1_signal_handler(int sig)
 
         LOG_I("[对焦] 最佳位置:%d (清晰度:%.2f)", g_best_pos, g_best_sharpness);
 
-        if(g_peak_counter>=3&&current_sharpness>g_best_sharpness-3.0f){
+        if(g_peak_counter>=3&&current_sharpness>g_best_sharpness*0.95){
             focus_done = true;
         }else{
             focus_done = false;
@@ -1440,7 +1440,7 @@ static void Ctr_Mortor_entry(void* parameter)
             if(rt_pin_read(Limit_Motor_X)==1){
                 slide_para.xdir = 1;        //1位反向,0位正向;
 
-                slide_para.xdis = 1200;
+                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){
@@ -1461,7 +1461,7 @@ static void Ctr_Mortor_entry(void* parameter)
             //Y轴电机运行到指定距离
             slide_para.ydir = 1;
             //slide_para.ydis = 3350;
-            slide_para.ydis = 9000;
+            slide_para.ydis = device_status.y_init_dis;  //9000
             slide_para.pulse_period = mapSpeed(50);
             slide_para.en_slide = 6;
             while(slide_para.en_slide!=0){

+ 1 - 1
CBD_FOTA_BootLoader/.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1369183061114295484" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1370363418186249174" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>