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

+ 1 - 1
Application_cbd_apm32f1/.settings/projcfg.ini

@@ -1,5 +1,5 @@
 #RT-Thread Studio Project Configuration
-#Wed Feb 12 11:59:53 CST 2025
+#Tue Mar 11 10:52:51 CST 2025
 project_type=rtt
 chip_name=STM32F103RE
 cpu_name=None

+ 6 - 13
Application_cbd_apm32f1/applications/control.c

@@ -245,13 +245,13 @@ uint32_t ctr_move(uint8_t DIR_,uint8_t dir_,uint32_t dis_,uint32_t pulse)
                 return 0;
             }
             rt_pin_write(HK_IO, ON);
-            beep_set(pulse, pulse/2); //PWM使能
+            beep_set(pulse, pulse/3); //PWM使能
 
             for(j=0;j<dis_;j++){
                 if(slide_para.stop_flag == 0){
-                    rt_thread_delay(10);
+                    rt_thread_delay(1);
                    if(dir_==0&&rt_pin_read(Limit_Motor_Y)==1){
-                       rt_thread_delay(10);
+                       rt_thread_delay(1);
                        if(rt_pin_read(Limit_Motor_Y)==1){
                            j = dis_;
                        }
@@ -303,7 +303,7 @@ uint32_t ctr_move(uint8_t DIR_,uint8_t dir_,uint32_t dis_,uint32_t pulse)
 
     switch(DIR_){
         case X_:
-            ctr_lamp(ON,1);          //X轴开关:关
+            ctr_lamp(ON,1);           //X轴开关:关
             ctr_swz(OFF);             //Z轴开关:关
             ctr_Collect_Fan(OFF);     //Y轴开关:关
             break;
@@ -924,20 +924,13 @@ void ResetInit(void)
     //关闭Y轴驱动电源
     ctr_Collect_Fan(OFF);
     //关闭X轴驱动电源
-
 }
 
 //出厂前自检 0-开机自检  1-屏幕或指令下发手动自检
 void HardWare_Check(uint8_t boot)
 {
-    if(boot==0&&device_status.version_type!=6)
-    {
-        //停止所有动作                                      -完成
-        HardWare_Init(boot);
-    }
-    else {
-    }
-
+   //停止所有动作                                      -完成
+   HardWare_Init(boot);
 }
 //工作状态检测
 /*孢子仪多段定时功能函数

+ 29 - 28
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -90,40 +90,41 @@ static int DTU_uart2_init(void)
 /*数据发送*/
 void DTU_Write(char *fmt, ...)
 {
-    const char dtu_conf[4] = {device_status.vol,0x00,0x00,0x00};
-    va_list arg;
-    static char dtu_str[800];
+    //static const char dtu_conf[4] = {device_status.vol,0x00,0x00,0x00};
+    va_list ap;
+    static char dtu_str[1024];
     rt_size_t str_length;
-    va_start(arg,fmt);
-    str_length = rt_vsnprintf(dtu_str, sizeof(dtu_str) - 1, fmt, arg);
-    if (str_length > 800 - 1)
-        str_length = 800 - 1;
+    va_start(ap,fmt);
+    //str_length = rt_vsnprintf(dtu_str, sizeof(dtu_str) - 1, fmt, arg);
+    str_length = rt_vsnprintf(dtu_str, sizeof(dtu_str) - 1, fmt, ap);
+    va_end(ap);
+    if (str_length > 1024 - 1)
+        str_length = 1024 - 1;
     rt_device_write(dtuserial, 0, dtu_str, str_length);
-    if(strstr(dtu_str,"volume")!=RT_NULL)
-    {
-        rt_device_write(dtuserial,0,dtu_conf,4);
-    }
-    else if (strstr(dtu_str,"reset")!=RT_NULL) {
-        const char dtu_conf[4] = {7,0x00,0x00,0x00};
-        rt_device_write(dtuserial,0,dtu_conf,4);
-    }
-    va_end(arg);
-    memset(dtu_str,'\0',sizeof(dtu_str));
+    rt_thread_mdelay(10);
+//    if(strstr(dtu_str,"volume")!=RT_NULL)
+//    {
+//        rt_device_write(dtuserial,0,dtu_conf,4);
+//    }
+//    else if (strstr(dtu_str,"reset")!=RT_NULL) {
+//        const char dtu_conf[4] = {7,0x00,0x00,0x00};
+//        rt_device_write(dtuserial,0,dtu_conf,4);
+//    }
 }
 /* 接收数据回调函数 */
 static rt_err_t dtu_input(rt_device_t dev, rt_size_t size)
 {
-        struct rx_msg msg;
-        rt_err_t result;
-        msg.dev = dev;
-        msg.size = size;
-        result = rt_mq_send(&rx_mq_dtu,&msg, sizeof(struct rx_msg));
-        if ( result == -RT_EFULL)
-        {
-            /* 消息队列满 */
-            rt_kprintf("message queue full!\n");
-        }
-        return result;
+    struct rx_msg msg;
+    rt_err_t result;
+    msg.dev = dev;
+    msg.size = size;
+    result = rt_mq_send(&rx_mq_dtu,&msg, sizeof(struct rx_msg));
+    if ( result == -RT_EFULL)
+    {
+        /* 消息队列满 */
+        rt_kprintf("message queue full!\n");
+    }
+    return result;
 }
 /* 入口函数-指令接收*/
 static void dtu_thread_entry_recv(void *parameter)