zhunk 3 месяцев назад
Родитель
Сommit
4473f5aa71

+ 2 - 2
Application_cbd_apm32f1/applications/control.c

@@ -23,7 +23,7 @@
 #include <rtdbg.h> //must after of DBG_LVL, DBG_TAG or other options
 //工作检测
 #define WORK_CHECK_THREAD_PRIORITY        23      //线程优先级
-#define WORK_CHECK_THREAD_STACK_SIZE      1024    //栈大小
+#define WORK_CHECK_THREAD_STACK_SIZE      2024    //栈大小
 #define WORK_CHECK_THREAD_TIMESLICE       5       //时间片
 //工作流程
 #define WORK_LOOP_THREAD_PRIORITY         12      //线程优先级
@@ -906,7 +906,7 @@ void ResetInit(void)
     ctr_led(OFF);
     //关闭Y轴驱动电源
     ctr_Collect_Fan(OFF);
-    //关闭X轴驱动电源
+    //自清洁推杆打开
     ctr_cangmen_up(CLOSE);
 }
 

+ 1 - 1
Application_cbd_apm32f1/applications/control.h

@@ -19,7 +19,7 @@
 ///
 ///
 ///
-#define VERSION_BZY         "3.3.0"                   //孢子仪
+#define VERSION_BZY         "3.5.0"                   //孢子仪
 
 typedef struct  _packed
 {

+ 1 - 2
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -891,7 +891,7 @@ char * makeJson()
     cJSON_AddNumberToObject(pSubJson,"rcnt",device_status.rebootcnt);
     //电流(当前)
     cJSON_AddStringToObject(pSubJson,"current",device_status.power);
-    cJSON_AddStringToObject(pSubJson,"c_24V_1",device_status.heat_power);
+    cJSON_AddStringToObject(pSubJson,"fan_current",device_status.heat_power);
     //电压
     cJSON_AddStringToObject(pSubJson,"vbat",device_status.voltage);
     //数据上传间隔
@@ -1222,7 +1222,6 @@ int parseDtu(char *json_string)
                   rt_thread_delay(5000);
                   thread_delete_workloop();
                   thread_delete_adc();
-                  delete_mb_master_samlpe();
                   device_status.update_flag = 1;
                   ymodem_ota(1,0);
               }

+ 8 - 4
Application_cbd_apm32f1/applications/hmi.c

@@ -40,7 +40,7 @@
 #define HMI_THREAD_TIMESLICE        10           //时间片
 
 #define CONTROL_MOTOR_PRIORITY      7
-#define CONTROL_MOTOR_STACK_SIZE    2048
+#define CONTROL_MOTOR_STACK_SIZE    8192
 #define CONTROL_MOTOR_TIMESLICE     5
 
 static char msg_pool[512];
@@ -236,7 +236,9 @@ static int counter_sharpness_diff = 0;      //清晰度累计插值 次数变化
 
 void thread1_signal_handler(int sig)
 {
-    rt_timer_stop(timer_takephoto);
+    if(timer_takephoto){
+        rt_timer_stop(timer_takephoto);
+    }
     LOG_I("[对焦] 清晰度值更新:%.2f", device_status.focus_value);
     slide_para.pulse_period = mapSpeed(1);  // 更新电机速度参数
     maxIterations--;
@@ -362,7 +364,7 @@ void thread1_signal_handler(int sig)
         slide_para.ydis = stepSize;
         slide_para.en_slide = 6;  // 触发移动
         while (slide_para.en_slide != 0) {
-            rt_thread_delay(500); // 等待移动完成
+            rt_thread_delay(50); // 等待移动完成
         }
     }
 }
@@ -416,7 +418,7 @@ void thread2_signal_handler(int sig)
         slide_para.ystep += 80;
         slide_para.en_slide = 6;  // 触发移动
         while (slide_para.en_slide != 0) {
-            rt_thread_delay(500); // 等待移动完成
+            rt_thread_delay(50); // 等待移动完成
         }
     }
 
@@ -505,6 +507,7 @@ static void Ctr_Mortor_entry(void* parameter)
                 DTU_Write("%s",photo);
                 rt_free(photo);
                 device_status.autotakepic = 4;
+                rt_thread_delay(1000);
                 rt_timer_start(timer_takephoto);
             }
         }
@@ -532,6 +535,7 @@ static void Ctr_Mortor_entry(void* parameter)
             DTU_Write("%s",photo);
             rt_free(photo);
             device_status.autotakepic = 4;
+            rt_thread_delay(1000);
             rt_timer_start(timer_takephoto);
         }
         if(device_status.autotakepic == 4)

+ 8 - 0
Application_cbd_apm32f1/applications/main.c

@@ -27,6 +27,14 @@ int clock_information(void);
 
 int main(void)
 {
+    __HAL_RCC_PWR_CLK_ENABLE();
+    __HAL_RCC_BKP_CLK_ENABLE();
+    HAL_PWR_EnableBkUpAccess();
+    uint16_t boot_flag = *(__IO uint16_t *)(BKP_BASE + 4 * 2);  /* RTC_BKP_DR2, 16-bit */
+    //打印boot_flag的值
+    LOG_I("boot_flag:0x%04x\n",boot_flag);
+    /* 清除 bootloader 的启动标志,表示 app 启动成功 */
+    *(__IO uint16_t *)(0x40006C00 + 4 * 2) = 0x0000;
     CompileTime;      //读取固件的编译时间
     led_add_device(LED0_PIN);
     led_set_level(1,0);

+ 1 - 2
Application_cbd_apm32f1/applications/selfcheck.c

@@ -44,7 +44,6 @@ static void t_takephoto_callback(void *parameter)
     ctr_led(OFF);
     //关闭滑台驱动
     slidelock();
-    Beep_Tip(5000);
 }
 
 int selfcheck(uint8_t type)
@@ -290,7 +289,7 @@ int selfcheck(uint8_t type)
 int rt_software_timer_init(void)
 {
     //启动拍照超时定时器
-    timer_takephoto = rt_timer_create("t_takephoto",t_takephoto_callback,RT_NULL, 60000, RT_TIMER_FLAG_ONE_SHOT|RT_TIMER_FLAG_HARD_TIMER);
+    timer_takephoto = rt_timer_create("t_takephoto",t_takephoto_callback,RT_NULL, 60000, RT_TIMER_FLAG_ONE_SHOT|RT_TIMER_FLAG_SOFT_TIMER);
     if(timer_takephoto==RT_NULL)
     {
         LOG_E("rt_timer_create t_takephoto failed!");

+ 1 - 0
Application_cbd_apm32f1/rtconfig.h

@@ -37,6 +37,7 @@
 #define RT_USING_MAILBOX
 #define RT_USING_MESSAGEQUEUE
 #define RT_USING_SIGNALS
+#define RT_SIG_INFO_MAX 64
 /* end of Inter-Thread communication */
 
 /* Memory Management */