zhunk 1 éve
szülő
commit
0874d920cd

+ 12 - 5
Application_cbd_apm32f1/applications/beep.c

@@ -151,7 +151,7 @@ static int init_tim2(void)
 
     /* 设置定时器超时值为5s并启动定时器 */
     timeout_s.sec = 1;      /* 秒 */
-    timeout_s.usec = 100000;     /* 微秒 */ //100ms
+    timeout_s.usec = 1000000;     /* 微秒 */ //1000ms
     if (rt_device_write(hw_dev, 0, &timeout_s, sizeof(timeout_s)) != sizeof(timeout_s))
     {
         rt_kprintf("set timeout value failed\n");
@@ -162,15 +162,22 @@ static int init_tim2(void)
 
 int hwtimer2_pwm3_output(rt_uint32_t time,rt_uint32_t freq,uint8_t EN,uint8_t DIR)
 {
+    ctr_Motor_Driver_Power(ON);
+    rt_thread_delay(100);
+    init_pwm3();
+
+    rt_pwm_set(pwm_device, BEEP_PWM_CH, freq, freq);//channel,period,pulse
+    rt_pwm_enable(pwm_device, BEEP_PWM_CH); //使能蜂鸣器对应的 PWM 通道
+    rt_thread_delay(10);
     rt_pin_mode(Motor_EN, PIN_MODE_OUTPUT);
     rt_pin_mode(Motor_DIR, PIN_MODE_OUTPUT);
     rt_pin_write(Motor_EN, EN);
-    rt_pin_write(Motor_DIR, DIR);
-    init_pwm3();
 
-    rt_pwm_set(pwm_device, BEEP_PWM_CH, freq, freq/2);//channel,period,pulse
+
+    rt_pin_write(Motor_DIR, OFF);
+
     if(init_tim2()==0)
-        rt_pwm_enable(pwm_device, BEEP_PWM_CH); //使能蜂鸣器对应的 PWM 通道
+        rt_pwm_set(pwm_device, BEEP_PWM_CH, freq, freq/2);//channel,period,pulse
     return 0;
 }
 

+ 1 - 1
Application_cbd_apm32f1/applications/control.c

@@ -2047,7 +2047,7 @@ static void pin_guangshan_unbind(void)
 void slidelock()
 {
     ctr_Motor_Driver_Power(ON);  //电机驱动供电
-    rt_thread_delay(300);
+    rt_thread_delay(10);
     rt_pin_mode(Motor_EN, PIN_MODE_OUTPUT);   //使能电机驱动引脚   PB14
     rt_pin_write(Motor_EN, ON);              //引脚输出高使能有效
 }

+ 8 - 8
Application_cbd_apm32f1/applications/hmi.c

@@ -1295,18 +1295,18 @@ static void HMI_Decode(void)
     {
         _485_play(sound122, 4);
         HMI_WRITE("sysTest.result.txt=\"害虫测试!\"");
-        ctr_Motor_Driver_Power(ON);
-        ctr_xmove(400,200);//旋转清虫
+//        ctr_Motor_Driver_Power(ON);
+//        ctr_xmove(400,200);//旋转清虫
         //使用硬件定时器控制
-        //device_status.autotakepic = 10;
+        device_status.autotakepic = 10;
 
     }else if(strstr(rx_buffer,"yichong")!=NULL)
     {
         _485_play(sound122, 4);
         HMI_WRITE("sysTest.result.txt=\"益虫测试!\"");
-        ctr_Motor_Driver_Power(ON);
-        ctr_xmove(400,200);//旋转清虫
-        //device_status.autotakepic = 11;
+//        ctr_Motor_Driver_Power(ON);
+//        ctr_xmove(400,200);//旋转清虫
+        device_status.autotakepic = 11;
     }
 }
 
@@ -1558,12 +1558,12 @@ static void Ctr_Mortor_entry(void* parameter)
             ef_set_env_blob("run_sta", &device_status.run_sta, sizeof(device_status.run_sta));
          }
         else if (device_status.autotakepic==10) {
-            hwtimer2_pwm3_output(1,10000,1,0);
+            hwtimer2_pwm3_output(1,20000,1,0);
             device_status.autotakepic = 0;
         }
 
         else if (device_status.autotakepic==11) {
-            hwtimer2_pwm3_output(1,10000,1,1);
+            hwtimer2_pwm3_output(1,20000,1,1);
             device_status.autotakepic = 0;
         }