zhunk 1 год назад
Родитель
Сommit
1f58f3381f

+ 1 - 1
Application_BZYV2-NHT/.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="1349367779640654268" 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="1301036781717101205" 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>

+ 1 - 1
Application_BZYV2/.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="1332325041055680482" 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="1367709844523504206" 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>

+ 1 - 1
Application_CBD/.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="1333949382373332970" 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="1269500222425246642" 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>

+ 1 - 1
Application_GK_CBD/.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="1308801722298575801" 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="1262571531216274854" 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>

+ 73 - 18
Application_cbd_apm32f1/applications/control.c

@@ -1438,6 +1438,7 @@ void ResetInit(void)
         ctr_Motor86_move(50000, 100, 0);   //86电机复位
         device_status.ctr_up_motor = 1;  //推杆电机缩进去(落虫)
         ctr_Collect_Fan(OFF);
+        ctr_Motor_Driver_Power(OFF);
     }
     if(device_status.version_type==3)
     {
@@ -1509,7 +1510,7 @@ void ResetInit(void)
         }
         //5.关闭加热
         //6.关闭补光灯
-        ctr_led(OFF);
+        //ctr_led(OFF);
     }
 }
 /*三色光源*/
@@ -2137,7 +2138,7 @@ void guanshan_on(void *args)
     rt_event_send(event_485_play, 0x01);
 }
 
-static void pin_guangshan_bind(void)
+void pin_guangshan_bind(void)
 {
     /* PC14引脚为输入模式 */
     rt_pin_mode(GUANG_SHAN, PIN_MODE_INPUT);
@@ -2147,7 +2148,7 @@ static void pin_guangshan_bind(void)
     rt_pin_irq_enable(GUANG_SHAN, PIN_IRQ_ENABLE);
 }
 
-static void pin_guangshan_unbind(void)
+void pin_guangshan_unbind(void)
 {
     rt_pin_detach_irq(GUANG_SHAN);
 }
@@ -2157,7 +2158,7 @@ static void pin_guangshan_unbind(void)
 void slidelock()
 {
     ctr_Motor_Driver_Power(ON);  //电机驱动供电
-    rt_thread_delay(10);
+    rt_thread_delay(100);
     rt_pin_mode(Motor_EN, PIN_MODE_OUTPUT);   //使能电机驱动引脚   PB14
     rt_pin_write(Motor_EN, ON);              //引脚输出高使能有效
 }
@@ -2214,8 +2215,7 @@ uint16_t ctr_Motor86_move(uint32_t xdis,uint16_t pulse,uint8_t dir)
     rt_pin_mode(MOTOR_86, PIN_MODE_INPUT);
     //rt_kprintf("run here2");
     rt_pin_write(CTR_RO_LIMIT, dir);             //CCW  置高
-    rt_thread_delay(100);
-
+    rt_thread_delay(50);
     while(rt_pin_read(MOTOR_86)==0)
     {
         rt_pin_write(CTR_RC_LIMIT, OFF);
@@ -2223,22 +2223,77 @@ uint16_t ctr_Motor86_move(uint32_t xdis,uint16_t pulse,uint8_t dir)
         rt_pin_write(CTR_RC_LIMIT, ON);
         rt_hw_us_delay(pulse);
     }
-
-    for(j=0;j<xtemp;j++)
+    while(rt_pin_read(MOTOR_86)==1){
+        rt_pin_write(CTR_RC_LIMIT, OFF);
+        rt_hw_us_delay(pulse*5);  //后10%以线性减速运动
+        rt_pin_write(CTR_RC_LIMIT, ON);
+        rt_hw_us_delay(pulse*5);
+    }
+    while(rt_pin_read(MOTOR_86)==0)
     {
-         rt_pin_write(CTR_RC_LIMIT, OFF);
-         rt_hw_us_delay(pulse);  //后10%以线性减速运动
-         rt_pin_write(CTR_RC_LIMIT, ON);
-         rt_hw_us_delay(pulse);
-         if(rt_pin_read(MOTOR_86)==0)
-         {
-             limit_tm++;
-         }
-         if(limit_tm==10) break;
+        rt_pin_write(CTR_RC_LIMIT, OFF);
+        rt_hw_us_delay(pulse);  //后10%以线性减速运动
+        rt_pin_write(CTR_RC_LIMIT, ON);
+        rt_hw_us_delay(pulse);
+    }
+    if(dir==0)
+    {
+        while(rt_pin_read(MOTOR_86)==1){
+            rt_pin_write(CTR_RC_LIMIT, OFF);
+            rt_hw_us_delay(pulse*5);  //后10%以线性减速运动
+            rt_pin_write(CTR_RC_LIMIT, ON);
+            rt_hw_us_delay(pulse*5);
+        }
+    }else {
+        rt_thread_delay(500);
+        rt_pin_write(CTR_RO_LIMIT, !dir);             //CCW  置高
+        rt_thread_delay(100);
+        while(rt_pin_read(MOTOR_86)==0){
+            rt_pin_write(CTR_RC_LIMIT, OFF);
+            rt_hw_us_delay(pulse*20);  //
+            rt_pin_write(CTR_RC_LIMIT, ON);
+            rt_hw_us_delay(pulse*20);
+        }
+        while(rt_pin_read(MOTOR_86)==1){
+            rt_pin_write(CTR_RC_LIMIT, OFF);
+            rt_hw_us_delay(pulse*10);  //
+            rt_pin_write(CTR_RC_LIMIT, ON);
+            rt_hw_us_delay(pulse*10);
+        }
     }
 
+//    while(rt_pin_read(MOTOR_86)==0)
+//    {
+//        rt_pin_write(CTR_RC_LIMIT, OFF);
+//        rt_hw_us_delay(pulse);  //后10%以线性减速运动
+//        rt_pin_write(CTR_RC_LIMIT, ON);
+//        rt_hw_us_delay(pulse);
+//    }
+//    if(dir==1)
+//    {
+//        while(rt_pin_read(MOTOR_86)==1)
+//        {
+//            rt_pin_write(CTR_RC_LIMIT, OFF);
+//            rt_hw_us_delay(pulse*10);  //后10%以线性减速运动
+//            rt_pin_write(CTR_RC_LIMIT, ON);
+//            rt_hw_us_delay(pulse*10);
+//        }
+//    }
+//    for(j=0;j<xtemp;j++)
+//    {
+//         rt_pin_write(CTR_RC_LIMIT, OFF);
+//         rt_hw_us_delay(pulse);  //后10%以线性减速运动
+//         rt_pin_write(CTR_RC_LIMIT, ON);
+//         rt_hw_us_delay(pulse);
+//         if(rt_pin_read(MOTOR_86)==0)
+//         {
+//             limit_tm++;
+//         }
+//         if(limit_tm==10) break;
+//    }
+
     slidelock();
-     return xdis;
+    return xdis;
  }
 
 /*

+ 2 - 0
Application_cbd_apm32f1/applications/control.h

@@ -320,6 +320,8 @@ void ResetInit(void);                           //上电复位
 void SunTest(void);                             //光控测试
 /*****************************************************/
 uint16_t ctr_Motor86_move(uint32_t xdis,uint16_t pulse,uint8_t dir);
+void pin_guangshan_bind();
+void pin_guangshan_unbind();
 /***********************孢子仪****************************/
 
 /***************************************************/

+ 5 - 2
Application_cbd_apm32f1/applications/hmi.c

@@ -557,6 +557,8 @@ static void HMI_Decode(void)
         ctr_lamp(ON,2);
         ctr_lamp(ON,3);
         #endif
+        ctr_Motor_Driver_Power(ON);
+        pin_guangshan_bind();
         DTU_Write("{\"cmd\":\"workstart\"}");
         USHORT dkdg[] = {0xb4f2,0xbfaa,0xb5c6,0xb9dc};
         _485_play(dkdg,4);
@@ -565,6 +567,7 @@ static void HMI_Decode(void)
     //关闭灯管
     else if (strstr(rx_buffer,"putTest.switchLamp=0")!=NULL)
     {
+        pin_guangshan_unbind();
         device_status.test_flag=0;
         rt_kprintf("Close Lamp1!\n");
         ctr_lamp(OFF,1);
@@ -1564,13 +1567,13 @@ static void Ctr_Mortor_entry(void* parameter)
 
         if (device_status.autotakepic==10) {
             //hwtimer2_pwm3_output(1,500000,1,0);
-            ctr_Motor86_move(13000,50,1);
+            ctr_Motor86_move(13000,30,1);
             device_status.autotakepic = 0;
         }
 
         else if (device_status.autotakepic==11) {
             //hwtimer2_pwm3_output(1,500000,1,1);
-            ctr_Motor86_move(13000,50,0);
+            ctr_Motor86_move(13000,30,0);
             device_status.autotakepic = 0;
         }
         else if (device_status.autotakepic==12) {