zhunk 1 年之前
父节点
当前提交
7fd49df418

+ 26 - 25
Application_cbd_apm32f1/applications/control.c

@@ -218,6 +218,7 @@ uint8_t In_Rain_status(void)
 /*加热*/
 uint8_t ctr_Heat(uint8_t status_heat)
 {
+    LOG_I("操作加热:%d",status_heat);
     device_status.heat_status = status_heat;
     rt_pin_mode(Heat_Pin, PIN_MODE_OUTPUT);
     rt_pin_write(Heat_Pin,status_heat);
@@ -278,6 +279,7 @@ Others:         NULL
 *************************************************/
 uint8_t ctr_Collect_Fan(uint8_t status_collect)
 {
+    LOG_I("操作风机:%d",status_collect);
     device_status.collect_fan_status = status_collect;
     rt_pin_mode(Collect_Fan, PIN_MODE_OUTPUT);
     if(status_collect==OFF)
@@ -286,14 +288,7 @@ uint8_t ctr_Collect_Fan(uint8_t status_collect)
     }
     if(status_collect==ON)
     {
-       for(;;)
-       {
-           rt_pin_write(Collect_Fan,ON);
-           rt_thread_delay(10);
-           rt_pin_write(Collect_Fan,OFF);
-           rt_thread_delay(10);
-       }
-
+        rt_pin_write(Collect_Fan,ON);
     }
     return device_status.collect_fan_status;
 }
@@ -1280,9 +1275,9 @@ void ResetInit(void)
         ctr_led(OFF);       //补光灯关闭
         ctr_Heat(OFF);      //风机关闭
         ctr_Motor_Driver_Power(ON); //步进电机驱动电源开启
-        ctr_Motor86_move(50000, 100, 0);   //86电机复位
+        ctr_Motor86_move(0, 500000, 0);   //86电机复位
         device_status.ctr_up_motor = 1;  //推杆电机缩进去(落虫)
-        //ctr_Collect_Fan(OFF);
+        ctr_Collect_Fan(OFF);
         PWM2_CH3_PB10_Fan_LCTD(OFF);
         ctr_Motor_Driver_Power(OFF);
     }
@@ -1992,7 +1987,7 @@ uint16_t ctr_Motor86_move(uint32_t xdis,uint32_t pulse,uint8_t dir)
     rt_pin_write(Motor_EN, ON);                         //引脚输出高使能有效
 
     rt_pin_mode(CTR_RO_LIMIT, PIN_MODE_OUTPUT);       //CCW  PB15 配置为输出模式
-    rt_pin_mode(CTR_RC_LIMIT, PIN_MODE_OUTPUT);       //CW   PC6  配置为输出模式
+    //rt_pin_mode(CTR_RC_LIMIT, PIN_MODE_OUTPUT);       //CW   PC6  配置为输出模式
 
     rt_pin_mode(MOTOR_86, PIN_MODE_INPUT);
     //rt_kprintf("run here2");
@@ -2018,6 +2013,7 @@ uint16_t ctr_Motor86_move(uint32_t xdis,uint32_t pulse,uint8_t dir)
         rt_thread_delay(10);
         if(limit_tm>=1000) break;
     }
+    stop_motor_86();
     if(dir==0)
     {
         pwm_motor86_enable(pulse*2);
@@ -2050,6 +2046,7 @@ uint16_t ctr_Motor86_move(uint32_t xdis,uint32_t pulse,uint8_t dir)
 /*
  * 灯管
  *
+ *
  * */
 void WorkTask_CB5(void)
 {
@@ -2065,36 +2062,40 @@ void WorkTask_CB5(void)
             device_status.ctr_up_motor = 1;
             while(device_status.ctr_up_motor!=0)
             {
-                rt_thread_delay(2000);
+                rt_thread_delay(1000);
                 LOG_I("等待上仓门打开....");
             }
             //推杆电机2关闭,益虫仓门关闭
-            device_status.ctr_down_motor = 2;
-            while(device_status.ctr_down_motor!=0)
-            {
-                rt_thread_delay(2000);
-                LOG_I("等待益虫仓门打开....");
-            }
+//            device_status.ctr_down_motor = 2;
+//            while(device_status.ctr_down_motor!=0)
+//            {
+//                rt_thread_delay(2000);
+//                LOG_I("等待益虫仓门打开....");
+//            }
             //打开86步进电机驱动器供电
             ctr_Motor_Driver_Power(ON);
             //风机启动
+            rt_thread_delay(1000);
             //打开灯管
             ctr_lamp(ON,1);
+            DTU_Write("{\"cmd\":\"workstart\"}");
             //打开补光灯
             ctr_led(ON);
+            rt_thread_delay(1000);
             //光栅启动
             ctr_photo(ON);
-            //光栅检测启动
-            pin_guangshan_bind();
+            rt_thread_delay(1000);
             //上风机启动
-            PWM2_CH3_PB10_Fan_LCTD(ON);
+            //PWM2_CH3_PB10_Fan_LCTD(ON);
+            ctr_Collect_Fan(ON);
+            rt_thread_delay(1000);
             //下风机启动
             ctr_Heat(ON);
-            #if 0
-            pin_motor_86_bind();
-            #endif
+            rt_thread_delay(1000);
+            //光栅检测启动
+            pin_guangshan_bind();
+            rt_thread_delay(1000);
         }
-
         rt_thread_delay(1000);
     }
     device_status.work_status = 0;

+ 3 - 3
Application_cbd_apm32f1/applications/hmi.c

@@ -506,7 +506,7 @@ static void HMI_Decode(void)
     }
     else if (strstr(rx_buffer,"off_clear")!=NULL) {
         LOG_I("关闭清扫!");
-        //ctr_Collect_Fan(OFF);
+        ctr_Collect_Fan(OFF);
         PWM2_CH3_PB10_Fan_LCTD(OFF);
     }
     //清扫
@@ -522,7 +522,7 @@ static void HMI_Decode(void)
         else if (device_status.version_type==6) {
             ctr_JD_Clear(ON);
         }else if (device_status.version_type==5) {
-            //ctr_Collect_Fan(ON);
+            ctr_Collect_Fan(ON);
             PWM2_CH3_PB10_Fan_LCTD(ON);
         }
     }
@@ -1884,7 +1884,7 @@ void Check_ParamConfig(void)
             connect_num++;
             LOG_I("联网中......%d",connect_num);
             //超时时间为3分钟
-            if(connect_num==120) //180
+            if(connect_num==30) //180
             {
                 device_status.timeSwitch = 0;
                 LOG_W("Time not set:%04d-%02d-%02d %02d:%02d:%02d",tm.tm_year+1900,tm.tm_mon+1,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec);

+ 1 - 1
Application_cbd_apm32f1/drivers/board.c

@@ -506,7 +506,7 @@ static int SPI1_INIT(void)
 
 static int PWM_INIT(void)
 {
-    MX_TIM2_Init();
+    //MX_TIM2_Init();
     MX_TIM3_Init();
     MX_TIM8_Init();
     return RT_EOK;