zhunk 1 рік тому
батько
коміт
a9b965e078

+ 48 - 16
Application_cbd_apm32f1/applications/control.c

@@ -140,9 +140,36 @@ void turnlimit(void)
 }
 }
 
 
 
 
+uint32_t mapSpeed(int a1) {
+    const int a1Min = 0;
+    const int a1Max = 100;
+    const int a2Min = 50000;   //20khz
+    const int a2Max = 200000;  //5khz
+
+    // 确保 a1 在有效范围内
+    if (a1 < a1Min) {
+        a1 = a1Min;
+    } else if (a1 > a1Max) {
+        a1 = a1Max;
+    }
+
+    // 执行线性映射
+    uint32_t a2 = a2Max - ((a2Max - a2Min) * a1) / (a1Max - a1Min);
+
+    return a2;
+}
+
+void stop_move(void)
+{
+    slide_para.stop_flag = 1;
+    slidelock();
+    rt_pin_mode(HK_IO, PIN_MODE_OUTPUT);              //PB14 EN
+    pwm_stop();
+    rt_pin_write(HK_IO, ON);
+}
 
 
 //DIR_ 轴选择(0-X,1-Y,2-Z)  dir 轴方向
 //DIR_ 轴选择(0-X,1-Y,2-Z)  dir 轴方向
-uint32_t ctr_move(uint8_t DIR_,uint8_t dir_,uint32_t dis_,uint8_t pulse)
+uint32_t ctr_move(uint8_t DIR_,uint8_t dir_,uint32_t dis_,uint32_t pulse)
 {
 {
     uint32_t j;
     uint32_t j;
     slidelock();
     slidelock();
@@ -156,9 +183,14 @@ uint32_t ctr_move(uint8_t DIR_,uint8_t dir_,uint32_t dis_,uint8_t pulse)
     rt_pin_mode(CTR_RO_LIMIT, PIN_MODE_OUTPUT);       //PB15 DIR
     rt_pin_mode(CTR_RO_LIMIT, PIN_MODE_OUTPUT);       //PB15 DIR
 
 
     //rt_pin_mode(CTR_RC_LIMIT, PIN_MODE_OUTPUT);     //PC6  PWM
     //rt_pin_mode(CTR_RC_LIMIT, PIN_MODE_OUTPUT);     //PC6  PWM
+//    if(dis_ >=1000){
+//        beep_set(500000, 250000); //PWM使能
+//    }else{
+//        beep_set(2000000, 1000000); //PWM使能
+//    }
 
 
     //驱动使能
     //驱动使能
-    rt_pin_write(HK_IO, ON);
+    //rt_pin_write(HK_IO, ON);
 
 
     //方向选择
     //方向选择
     if(dir_ == 1){
     if(dir_ == 1){
@@ -167,15 +199,10 @@ uint32_t ctr_move(uint8_t DIR_,uint8_t dir_,uint32_t dis_,uint8_t pulse)
         rt_pin_write(CTR_RO_LIMIT, OFF);
         rt_pin_write(CTR_RO_LIMIT, OFF);
     }
     }
 
 
-    if(dis_ >=1000){
-        beep_set(500000, 250000); //PWM使能
-    }else{
-        beep_set(2000000, 1000000); //PWM使能
-    }
     switch(DIR_){
     switch(DIR_){
         case X_:
         case X_:
             ctr_lamp(1, ON);   //X轴电源开关:开
             ctr_lamp(1, ON);   //X轴电源开关:开
-            rt_thread_delay(500);
+            rt_thread_delay(100);
             //判断限位
             //判断限位
             if(dir_== 0 && rt_pin_read(Limit_Motor_X)==1){
             if(dir_== 0 && rt_pin_read(Limit_Motor_X)==1){
                 for(int z =0;z < 3; z++){
                 for(int z =0;z < 3; z++){
@@ -184,10 +211,11 @@ uint32_t ctr_move(uint8_t DIR_,uint8_t dir_,uint32_t dis_,uint8_t pulse)
                 }
                 }
                 return 0;
                 return 0;
             }
             }
-
+            rt_pin_write(HK_IO, ON);
+            beep_set(pulse, pulse/2); //PWM使能
             for(j=0;j<dis_;j++){
             for(j=0;j<dis_;j++){
                 if(slide_para.stop_flag == 0){
                 if(slide_para.stop_flag == 0){
-                    rt_thread_delay(pulse);   //10ms
+                    rt_thread_delay(10);   //10ms
                    if(dir_==0&&rt_pin_read(Limit_Motor_X)==1){
                    if(dir_==0&&rt_pin_read(Limit_Motor_X)==1){
                        rt_thread_delay(10);   //10ms
                        rt_thread_delay(10);   //10ms
                        if(rt_pin_read(Limit_Motor_X)==1){
                        if(rt_pin_read(Limit_Motor_X)==1){
@@ -207,7 +235,7 @@ uint32_t ctr_move(uint8_t DIR_,uint8_t dir_,uint32_t dis_,uint8_t pulse)
             break;
             break;
         case Y_:
         case Y_:
             ctr_Collect_Fan(ON);           //Y轴电源开关:开
             ctr_Collect_Fan(ON);           //Y轴电源开关:开
-            rt_thread_delay(500);
+            rt_thread_delay(100);
             //判断限位
             //判断限位
             if(dir_== 0 && rt_pin_read(Limit_Motor_Y)==1){
             if(dir_== 0 && rt_pin_read(Limit_Motor_Y)==1){
                 for(int z =0;z < 3; z++){
                 for(int z =0;z < 3; z++){
@@ -216,10 +244,12 @@ uint32_t ctr_move(uint8_t DIR_,uint8_t dir_,uint32_t dis_,uint8_t pulse)
                 }
                 }
                 return 0;
                 return 0;
             }
             }
+            rt_pin_write(HK_IO, ON);
+            beep_set(pulse, pulse/2); //PWM使能
 
 
             for(j=0;j<dis_;j++){
             for(j=0;j<dis_;j++){
                 if(slide_para.stop_flag == 0){
                 if(slide_para.stop_flag == 0){
-                    rt_thread_delay(pulse);
+                    rt_thread_delay(10);
                    if(dir_==0&&rt_pin_read(Limit_Motor_Y)==1){
                    if(dir_==0&&rt_pin_read(Limit_Motor_Y)==1){
                        rt_thread_delay(10);
                        rt_thread_delay(10);
                        if(rt_pin_read(Limit_Motor_Y)==1){
                        if(rt_pin_read(Limit_Motor_Y)==1){
@@ -237,7 +267,7 @@ uint32_t ctr_move(uint8_t DIR_,uint8_t dir_,uint32_t dis_,uint8_t pulse)
             break;
             break;
         case Z_:
         case Z_:
             ctr_swz(ON);         //Z轴电源开关:开
             ctr_swz(ON);         //Z轴电源开关:开
-            rt_thread_delay(500);   //
+            rt_thread_delay(100);   //
             //判断限位
             //判断限位
             if(dir_== 0 && rt_pin_read(Limit_Motor_Z)==1){
             if(dir_== 0 && rt_pin_read(Limit_Motor_Z)==1){
                 for(int z =0;z < 3; z++){
                 for(int z =0;z < 3; z++){
@@ -246,10 +276,12 @@ uint32_t ctr_move(uint8_t DIR_,uint8_t dir_,uint32_t dis_,uint8_t pulse)
                 }
                 }
                 return 0;
                 return 0;
             }
             }
-
+            //驱动使能
+            rt_pin_write(HK_IO, ON);
+            beep_set(pulse, pulse/2); //PWM使能
             for(j=0;j<dis_;j++){
             for(j=0;j<dis_;j++){
                 if(slide_para.stop_flag == 0){
                 if(slide_para.stop_flag == 0){
-                    rt_thread_delay(pulse);
+                    rt_thread_delay(10);
                    if(dir_==0&&rt_pin_read(Limit_Motor_Z)==1){
                    if(dir_==0&&rt_pin_read(Limit_Motor_Z)==1){
                        rt_thread_delay(10);
                        rt_thread_delay(10);
                        if(rt_pin_read(Limit_Motor_Z)==1){
                        if(rt_pin_read(Limit_Motor_Z)==1){
@@ -1117,7 +1149,7 @@ void slide_thread_entry(void *parameter)
    slide_para.pulse_period = 1;  //默认滑台的脉宽为1ms
    slide_para.pulse_period = 1;  //默认滑台的脉宽为1ms
    while(1)
    while(1)
    {
    {
-    rt_thread_delay(100);
+    rt_thread_delay(10);
     switch(slide_para.en_slide){
     switch(slide_para.en_slide){
     case 1:{
     case 1:{
             ctr_move(X_,slide_para.xdir,slide_para.xdis,slide_para.pulse_period);
             ctr_move(X_,slide_para.xdir,slide_para.xdis,slide_para.pulse_period);

+ 4 - 4
Application_cbd_apm32f1/applications/control.h

@@ -177,6 +177,7 @@ typedef struct
     uint32_t xdis;           //x轴坐标移动距离
     uint32_t xdis;           //x轴坐标移动距离
     uint32_t ydis;
     uint32_t ydis;
     uint32_t zdis;           //z轴坐标移动距离
     uint32_t zdis;           //z轴坐标移动距离
+    uint32_t pulse_period;    //滑台的运动速度  1为最高
     uint16_t dxdis;          //x轴坐标蛇形移动间距距离
     uint16_t dxdis;          //x轴坐标蛇形移动间距距离
     uint16_t dzdis;          //z轴坐标蛇形移动间距距离
     uint16_t dzdis;          //z轴坐标蛇形移动间距距离
     uint8_t xdir;            //x轴坐标移动方向
     uint8_t xdir;            //x轴坐标移动方向
@@ -185,7 +186,6 @@ typedef struct
     uint8_t en_slide;        //
     uint8_t en_slide;        //
     uint8_t zccwl_on;        //z轴限位开关信号   高电平为触发限位
     uint8_t zccwl_on;        //z轴限位开关信号   高电平为触发限位
     uint8_t xccwl_on;        //x轴限位开关信号   高电平为触发限位
     uint8_t xccwl_on;        //x轴限位开关信号   高电平为触发限位
-    uint8_t pulse_period;    //滑台的运动速度  1为最高
     uint8_t stop_flag;       //滑台停止标志位
     uint8_t stop_flag;       //滑台停止标志位
 }Device_slide_typedef;
 }Device_slide_typedef;
 
 
@@ -337,9 +337,9 @@ void WorkTask(void);                //工作任务
 #define Limit_Motor_Y GET_PIN(B,8)     //IO输入,Z轴限位
 #define Limit_Motor_Y GET_PIN(B,8)     //IO输入,Z轴限位
 
 
 uint8_t ctr_swz(uint8_t status_swz);    //z轴的电机开关控制
 uint8_t ctr_swz(uint8_t status_swz);    //z轴的电机开关控制
-
-uint32_t ctr_move(uint8_t DIR_,uint8_t dir_,uint32_t dis_,uint8_t pulse);
-
+uint32_t mapSpeed(int a1);
+uint32_t ctr_move(uint8_t DIR_,uint8_t dir_,uint32_t dis_,uint32_t pulse);
+void stop_move(void);
 void slidelock();    //电机移动完毕后上锁
 void slidelock();    //电机移动完毕后上锁
 
 
 void turnlimit(void);   //位移兼限位开关功能
 void turnlimit(void);   //位移兼限位开关功能

+ 19 - 11
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -140,7 +140,7 @@ static void dtu_thread_entry_recv(void *parameter)
     {
     {
         rt_memset(&msg, 0, sizeof(msg));
         rt_memset(&msg, 0, sizeof(msg));
         // 从消息队列中获取被回调函数放入消息队列中的内容
         // 从消息队列中获取被回调函数放入消息队列中的内容
-        result = rt_mq_recv(&rx_mq_dtu, &msg, sizeof(struct rx_msg), 50);
+        result = rt_mq_recv(&rx_mq_dtu, &msg, sizeof(struct rx_msg), 20);
         if(result == RT_EOK)
         if(result == RT_EOK)
         {
         {
             rx_err = 0;
             rx_err = 0;
@@ -919,9 +919,12 @@ int parseDtu(char *json_string)
                  speed = cJSON_GetObjectItem(item_ext,"speed");
                  speed = cJSON_GetObjectItem(item_ext,"speed");
 
 
                  if(speed!=RT_NULL){
                  if(speed!=RT_NULL){
-                     if(speed->type==cJSON_Number)
-                     slide_para.pulse_period = 1;//speed->valueint;
-                     LOG_D("设置滑台速度:%d",slide_para.pulse_period);
+                     if(speed->type==cJSON_String)
+                     {
+                         LOG_D("设置滑台速度:%s%",speed->valuestring);
+                         slide_para.pulse_period = mapSpeed(atoi(speed->valuestring));
+                         LOG_D("设置滑台PWM:%d",slide_para.pulse_period);
+                     }
                  }
                  }
                  if(movx!=RT_NULL)
                  if(movx!=RT_NULL)
                  {
                  {
@@ -936,9 +939,13 @@ int parseDtu(char *json_string)
                              if(strstr(movx->valuestring,"b")!=RT_NULL) slide_para.xdir = 1;        //1位反向,0位正向;
                              if(strstr(movx->valuestring,"b")!=RT_NULL) slide_para.xdir = 1;        //1位反向,0位正向;
 
 
                              strncpy(dest,movx->valuestring+1,strlen(movx->valuestring)-1);
                              strncpy(dest,movx->valuestring+1,strlen(movx->valuestring)-1);
-                             slide_para.xdis = atoi(dest)/2;
-                             rt_kprintf("步进x:%d\n",slide_para.xdis);
-                             slide_para.en_slide = 1;
+                             slide_para.xdis = atoi(dest);
+                             if(slide_para.xdis==0){
+                                 stop_move();
+                             }else {
+                                 LOG_W("步进x:%d",slide_para.xdis);
+                                 slide_para.en_slide = 1;
+                             }
                          }
                          }
                      }
                      }
                  }
                  }
@@ -954,8 +961,8 @@ int parseDtu(char *json_string)
                              if(strstr(movy->valuestring,"b")!=RT_NULL)  slide_para.ydir = 1;        //1位反向,0位正向;
                              if(strstr(movy->valuestring,"b")!=RT_NULL)  slide_para.ydir = 1;        //1位反向,0位正向;
 
 
                              strncpy(dest,movy->valuestring+1,strlen(movy->valuestring)-1);
                              strncpy(dest,movy->valuestring+1,strlen(movy->valuestring)-1);
-                             slide_para.ydis = atoi(dest)/2;
-                             LOG_I("MOV Y STEP:%d",slide_para.ydis);
+                             slide_para.ydis = atoi(dest);
+                             LOG_W("步进 y:%d",slide_para.ydis);
                              slide_para.en_slide = 6;
                              slide_para.en_slide = 6;
                        }
                        }
                      }
                      }
@@ -971,8 +978,8 @@ int parseDtu(char *json_string)
                              if(strstr(movz->valuestring,"f")!=RT_NULL)  slide_para.zdir = 0;        //1位反向,0位正向;
                              if(strstr(movz->valuestring,"f")!=RT_NULL)  slide_para.zdir = 0;        //1位反向,0位正向;
                              if(strstr(movz->valuestring,"b")!=RT_NULL)  slide_para.zdir = 1;        //1位反向,0位正向;
                              if(strstr(movz->valuestring,"b")!=RT_NULL)  slide_para.zdir = 1;        //1位反向,0位正向;
                              strncpy(dest,movz->valuestring+1,strlen(movz->valuestring)-1);
                              strncpy(dest,movz->valuestring+1,strlen(movz->valuestring)-1);
-                             slide_para.zdis = atoi(dest)/2;
-                             rt_kprintf("步进z:%d\n",slide_para.zdis);
+                             slide_para.zdis = atoi(dest);
+                             LOG_W("步进z:%d",slide_para.zdis);
                              slide_para.en_slide = 2;
                              slide_para.en_slide = 2;
                          }
                          }
                      }
                      }
@@ -1044,6 +1051,7 @@ int parseDtu(char *json_string)
                   else if (strstr(type->valuestring,"led_off")!=RT_NULL)
                   else if (strstr(type->valuestring,"led_off")!=RT_NULL)
                   {
                   {
                       ctr_led(OFF);
                       ctr_led(OFF);
+                      stop_move();
                   }
                   }
                   else if(strstr(type->valuestring,"selfcheck")!=RT_NULL)
                   else if(strstr(type->valuestring,"selfcheck")!=RT_NULL)
                   {
                   {