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

+ 25 - 16
Application_cbd_apm32f1/applications/control.c

@@ -912,7 +912,6 @@ void SunTest(void)
 /*上电初始化*/
 void ResetInit(void)
 {
-    ctr_Motor_Driver(0, 0, 0, 0);
     //关闭电磁阀
     ctr_shake(OFF, 0);
     //关闭加热
@@ -1147,37 +1146,47 @@ 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)
+            {
+                rt_thread_delay(1000);
+                DTU_Write("{\"cmd\": \"takephoto\" }");
+            }else {
+                rt_thread_delay(1000);
+                char *photo = makeJson_Warn("movx","done");
+                LOG_I("%s",photo);
+                DTU_Write("%s",photo);
+                rt_free(photo);
+            }
             slide_para.stop_flag = 0;
             slide_para.en_slide = OFF;
-            rt_thread_delay(2000);
-            char *photo = makeJson_Warn("movx","done");
-            LOG_I("%s",photo);
-            DTU_Write("%s",photo);
-            rt_free(photo);
             break;
     }
 
     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)
+            {
+                rt_thread_delay(1000);
+                DTU_Write("{\"cmd\": \"takephoto\" }");
+            }else {
+                rt_thread_delay(1000);
+                char *photo = makeJson_Warn("movz","done");
+                LOG_I("%s",photo);
+                DTU_Write("%s",photo);
+                rt_free(photo);
+            }
             slide_para.zdir = 1;
             slide_para.zdis = 0;
             slide_para.stop_flag = 0;
             slide_para.en_slide = OFF;
-            rt_thread_delay(2000);
-            char *photo = makeJson_Warn("movz","done");
-            LOG_I("%s",photo);
-            DTU_Write("%s",photo);
-            rt_free(photo);
-
             break;
     }
 
     case 3:{  //复位X
                LOG_W("X轴复位!");
                slide_para.xdir = 0;
-               slide_para.xdis = 100000;
+               slide_para.xdis = 8000;
                ctr_move(X_,slide_para.xdir,slide_para.xdis,slide_para.pulse_period);
                LOG_I("The slide's X movement was done ok");
 
@@ -1191,7 +1200,7 @@ void slide_thread_entry(void *parameter)
                //复位Z
                 LOG_W("Z轴复位!");
                slide_para.zdir = 0;
-               slide_para.zdis = 100000;
+               slide_para.zdis = 5000;
                ctr_move(Z_,slide_para.zdir,slide_para.zdis,slide_para.pulse_period);
                LOG_I("The slide's Z movement was done ok");
 
@@ -1219,7 +1228,7 @@ void slide_thread_entry(void *parameter)
     case 7:{    //Y轴复位
                 LOG_W("Y轴复位!");
                 slide_para.ydir = 0;
-                slide_para.ydis = 100000;
+                slide_para.ydis = 8000;
                 ctr_move(Y_,slide_para.ydir,slide_para.ydis,slide_para.pulse_period);
                 LOG_I("The slide's Y movement was done ok");
 

+ 8 - 1
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -245,12 +245,18 @@ static void dtu_thread_entry_recv(void *parameter)
 {
     struct rx_msg msg;
     rt_memset(&msg, 0, sizeof(msg));
+    static int recv_cnt = 0;
     while(1)
     {
         //
         // 从消息队列中获取被回调函数放入消息队列中的内容
-        int result = rt_mq_recv(&rx_mq_dtu, &msg, sizeof(struct rx_msg), 50);
+        int result = rt_mq_recv(&rx_mq_dtu, &msg, sizeof(struct rx_msg), 100);
         if (result != RT_EOK){
+            recv_cnt++;
+            if(recv_cnt==15)
+            {
+                json_ctx.index = 0;
+            }
             continue;
         }
         // 动态分配接收缓冲区
@@ -265,6 +271,7 @@ static void dtu_thread_entry_recv(void *parameter)
             rt_free(rx_buffer);
             continue;
         }
+        recv_cnt = 0;
         rx_buffer[rx_length] = '\0';
         // 处理数据(新增调试接口)
         LOG_I("Raw Data:%s-%d",rx_buffer, rx_length);

+ 4 - 1
Application_cbd_apm32f1/applications/hmi.c

@@ -1436,7 +1436,7 @@ static void Ctr_Mortor_entry(void* parameter)
             }
             //Y轴电机运行到指定距离
             slide_para.ydir = 1;
-            slide_para.ydis = 3200;
+            slide_para.ydis = 3400;
             slide_para.pulse_period = mapSpeed(50);
             slide_para.en_slide = 6;
             while(slide_para.en_slide!=0){
@@ -1801,6 +1801,7 @@ void Check_ParamConfig(void)
         dtu_data_play();
         sht30_collect();
         slide_Fresh();
+
 #if SENSOR_EN==1
         mb_master_samlpe();
 #endif
@@ -1845,6 +1846,8 @@ void Check_ParamConfig(void)
         rt_thread_delay(1000);
         device_status.num_updata = 1;
         UpLoad_Data();
+        Workstatus_check();
+        Work_Loop_Task();
 #endif
     }
 }