zhunk 1 год назад
Родитель
Сommit
46ffcf90e5
27 измененных файлов с 384 добавлено и 343 удалено
  1. 1 1
      Application_CBD/.settings/language.settings.xml
  2. 5 207
      Application_CBD/applications/control.c
  3. 4 0
      Application_CBD/applications/control.h
  4. 8 0
      Application_CBD/applications/dtu_uart2.c
  5. 1 1
      Application_CBD/rt-thread/src/kservice.c
  6. 93 2
      Application_cbd_apm32f1/.config
  7. 93 2
      Application_cbd_apm32f1/.config.old
  8. 3 1
      Application_cbd_apm32f1/.cproject
  9. BIN
      Application_cbd_apm32f1/.settings/.rtmenus
  10. 1 1
      Application_cbd_apm32f1/.settings/language.settings.xml
  11. 1 1
      Application_cbd_apm32f1/.settings/projcfg.ini
  12. 3 2
      Application_cbd_apm32f1/applications/control.c
  13. 1 2
      Application_cbd_apm32f1/applications/control.h
  14. 1 0
      Application_cbd_apm32f1/applications/dtu_uart2.c
  15. 146 122
      Application_cbd_apm32f1/applications/hmi.c
  16. 4 0
      Application_cbd_apm32f1/applications/hmi.h
  17. 1 1
      Application_cbd_apm32f1/rt-thread/src/kservice.c
  18. BIN
      Application_cbd_apm32f1/rt-thread/tools/building.pyc
  19. BIN
      Application_cbd_apm32f1/rt-thread/tools/eclipse.pyc
  20. BIN
      Application_cbd_apm32f1/rt-thread/tools/gcc.pyc
  21. BIN
      Application_cbd_apm32f1/rt-thread/tools/menuconfig.pyc
  22. BIN
      Application_cbd_apm32f1/rt-thread/tools/mkdist.pyc
  23. BIN
      Application_cbd_apm32f1/rt-thread/tools/options.pyc
  24. BIN
      Application_cbd_apm32f1/rt-thread/tools/rt_studio.pyc
  25. BIN
      Application_cbd_apm32f1/rt-thread/tools/utils.pyc
  26. 18 0
      Application_cbd_apm32f1/rtconfig.h
  27. BIN
      Application_cbd_apm32f1/rtconfig.pyc

+ 1 - 1
Application_CBD/.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1271424796576257041" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-488933207592522130" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

+ 5 - 207
Application_CBD/applications/control.c

@@ -37,11 +37,8 @@ rt_thread_t tid_workloop = RT_NULL;
 rt_thread_t tid_wkstc = RT_NULL;
 rt_thread_t tid_ctr = RT_NULL;
 rt_thread_t tid_heat = RT_NULL;
-
 /***************************************************************************/
 
-
-
 int thread_delete_workloop(void)
 {
     rt_err_t result;
@@ -85,207 +82,6 @@ uint8_t ctr_Fan_IN(uint8_t status_ws)
 }
 
 
-/****************************定制色诱*************************************/
-/**/
-#if Color_EN == 1
-uint8_t Read_Color_Key(rt_base_t key_pin)
-{
-    rt_uint32_t sta_s = 0;
-    rt_pin_mode(key_pin, PIN_MODE_INPUT);
-    while(rt_pin_read(key_pin)==1)
-    {
-        sta_s++;
-        /*持续的*/
-        rt_thread_delay(50);
-    }
-    while(rt_pin_read(key_pin)==0)
-    {
-        rt_thread_delay(50);
-        if(sta_s>0) break;
-    }
-    LOG_W("检测到IO0翻转!!!");
-    return 1;
-
-}
-/*读限位开关状态*/
-uint8_t Read_Color_Limit(rt_base_t pin_limit)
-{
-    uint8_t l_sta = 0;
-    rt_pin_mode(pin_limit, PIN_MODE_INPUT);
-    l_sta = rt_pin_read(pin_limit);
-    rt_thread_delay(20);
-    l_sta = rt_pin_read(pin_limit);
-    return l_sta;
-}
-/*色诱板*/
-int ctr_Color_board(uint8_t forward,uint16_t time_board)
-{
-    if(forward==CLOSE)  //归位
-    {
-        if(device_status.cul_time>0)
-            device_status.cul_time--;
-        ctr_cangmen_down(OFF);
-        ctr_cangmen_up(OFF);
-        rt_thread_delay(1000);
-//        if(device_status.cul_time>7) device_status.cul_time=7;
-//        if(device_status.cul_time!=7)
-//        {
-//            uint8_t ct = device_status.cul_time;
-//            while(1)
-//            {
-//                Beep_Tip(100);
-//                rt_thread_delay(100);
-//                ct--;
-//                if(ct==0) break;
-//            }
-//            //return device_status.cul_time;
-//        }
-        if(Read_Color_Limit(LIMIT_RESET)==0)
-        {
-            device_status.cul_time = 0;
-            LOG_W("已在初始位置!");
-            Beep_Tip(1000);
-            return 0;
-            //黄板已经在复位状态,直接返回0;
-        }
-        ctr_cangmen_up(CLOSE);
-        rt_thread_delay(20000);
-        ctr_cangmen_up(OFF);
-
-//        if(device_status.cul_time==7&&Read_Color_Limit(LIMIT_BOARD)==0)
-//        {
-//            LOG_W("第七天!!!");
-//            ctr_cangmen_down(CLOSE);
-//            rt_thread_delay(500);
-//        }
-        LOG_W("先打开运行到限位的右侧!");
-        while(Read_Color_Limit(LIMIT_BOARD)==0)
-        {
-            LOG_W("归位:到达限位中间");
-            ctr_cangmen_down(CLOSE);
-            if(Read_Color_Limit(LIMIT_RESET)==0)
-            {
-                ctr_cangmen_down(OFF);
-                break;
-            }
-        }
-        //先打开运行到限位的右侧
-        while(Read_Color_Limit(LIMIT_BOARD)==1)
-        {
-            LOG_W("归位:运行!");
-            ctr_cangmen_down(CLOSE);
-            if(Read_Color_Limit(LIMIT_RESET)==0)
-            {
-                ctr_cangmen_down(OFF);
-                break;
-            }
-
-        }
-        while(Read_Color_Limit(LIMIT_BOARD)==0)    //到达限位中间 继续运行
-        {
-            LOG_W("归位:到达限位中间");
-            ctr_cangmen_down(CLOSE);
-            if(Read_Color_Limit(LIMIT_RESET)==0)
-            {
-                ctr_cangmen_down(OFF);
-                break;
-            }
-        }
-        if(Read_Color_Limit(LIMIT_RESET)==0) return 0;
-            LOG_W("到达限位左侧!");
-            //停止电机
-            ctr_cangmen_down(OFF);
-            rt_thread_delay(2000);
-            //将推杆电机归位
-            LOG_D("*推杆电机归位*");
-            /*推杆电机伸出*/
-            ctr_cangmen_up(OPEN);
-            rt_thread_delay(20000);
-            ctr_cangmen_up(OFF);
-        return 2;
-    }
-    else if(forward==OPEN)
-    {
-        ctr_cangmen_down(OFF);
-        ctr_cangmen_up(OFF);
-        rt_thread_delay(1000);
-        if(device_status.cul_time==7)
-        {
-            Beep_Tip(5000);
-            return 7;
-        }
-        LOG_W("打开推杆电机!");
-        //2023-04-18:add
-        //if(Read_Color_Limit(LIMIT_BOARD)==0)
-        {
-            LOG_D("*推杆电机归位*");
-            /*推杆电机归位*/
-            ctr_cangmen_up(CLOSE);
-            rt_thread_delay(20000);
-            ctr_cangmen_up(OFF);
-        }
-        if(device_status.cul_time<7)
-        device_status.cul_time++;
-        while(Read_Color_Limit(LIMIT_BOARD)==0)
-        {
-            ctr_cangmen_down(forward);
-            rt_thread_delay(50);
-        }
-        while(Read_Color_Limit(LIMIT_BOARD)==1)
-        {
-            time_board--;
-            if(time_board==0) break;
-            ctr_cangmen_down(forward);
-            rt_thread_delay(50);
-        }
-        ctr_cangmen_down(OFF);
-        rt_thread_delay(1000);
-
-        ctr_cangmen_up(OPEN);
-        rt_thread_delay(20000);
-        ctr_cangmen_up(OFF);
-//        ef_set_env_blob("cul_time",&device_status.cul_time,sizeof(device_status.cul_time));     //采集时间
-        return OPEN;
-    }
-    else if (forward==RESET) {
-        ctr_cangmen_up(OFF);
-        ctr_cangmen_down(OFF);
-        if(Read_Color_Limit(LIMIT_RESET)==0)
-        {
-            device_status.cul_time = 0;
-            //ef_set_env_blob("cul_time",&device_status.cul_time,sizeof(device_status.cul_time));     //采集时间
-            LOG_W("已在初始位置!");
-            Beep_Tip(1000);
-            ctr_cangmen_up(CLOSE);
-            rt_thread_delay(20000);
-            ctr_cangmen_up(OFF);
-            device_status.cul_time = 0;
-            return 0;
-            //黄板已经在复位状态,直接返回0;
-        }
-        //if(Read_Color_Limit(LIMIT_BOARD)==0)
-        {
-            LOG_D("*推杆电机归位*");
-            /*推杆电机归位*/
-            ctr_cangmen_up(CLOSE);
-            rt_thread_delay(20000);
-            ctr_cangmen_up(OFF);
-        }
-        while(Read_Color_Limit(LIMIT_RESET)==1)
-        {
-            time_board--;
-            if(time_board==0) break;
-            ctr_cangmen_down(CLOSE);
-            rt_thread_delay(20);
-        }
-        device_status.cul_time = 0;
-        ctr_cangmen_down(OFF);
-    }
-//    device_status.cul_time = 0;
-    //ef_set_env_blob("cul_time",&device_status.cul_time,sizeof(device_status.cul_time));     //采集时间
-    return RESET;   //复位返回0
-}
-#endif
 /****************************5.0***********************************/
 void ctr_turnv5(void)
 {
@@ -2677,6 +2473,8 @@ static void Control_Heat_thread_entry(void *parameter)
 
     }
 }
+
+
 /*清扫线程*/
 int Control_clear(void)
 {
@@ -2733,16 +2531,16 @@ int Work_Loop_Task(void)
                                 WORK_LOOP_THREAD_STACK_SIZE,       //2048
                                 WORK_LOOP_THREAD_PRIORITY,         //12
                                 WORK_LOOP_THREAD_TIMESLICE);       //5
-    #if Color_EN == 0
     if(tid_workloop!=RT_NULL)
     {
         result_loop = rt_thread_startup(tid_workloop);
     }
-    #endif
+
     return result_loop;
 }
+
+
 MSH_CMD_EXPORT(HardWare_Check,HardWare_Check<ON|OFF>);
 MSH_CMD_EXPORT(ctr_lamp,ctr_lamp<ON|OFF>);
 MSH_CMD_EXPORT(ctr_clear,ctr_clear<ON|OFF>);
 MSH_CMD_EXPORT(ctr_led,sample:ctr_led <ON|OFF>);
-//INIT_APP_EXPORT(Control_heat);

+ 4 - 0
Application_CBD/applications/control.h

@@ -133,6 +133,7 @@ typedef struct  _packed
     rt_uint32_t data_plan;          //流量套餐
     rt_uint32_t expiry_date;        //到期时间
     int passWord;              //初始密码
+    double focus_value;
     double process;
     long photo_stamp;           //采集时间戳
     const char *coll_time[10];
@@ -168,6 +169,7 @@ typedef struct  _packed
     char photolink[128];        //图片地址
 }Device_Status_typedef;
 
+
 /************************************************/
 #define ON 1
 #define OFF 0
@@ -334,4 +336,6 @@ int Control_heat(void);
 int thread_delete_workloop(void);
 int thread_restart_workloop(void);
 
+/////////////////////////////////////
+
 #endif /* APPLICATIONS_INC_CONTROL_H_ */

+ 8 - 0
Application_CBD/applications/dtu_uart2.c

@@ -1032,6 +1032,7 @@ int parseDtu(char *json_string)
     cJSON* tmp = NULL;
     cJSON* link_sta = NULL;
     cJSON* value_commn= NULL;
+
     rt_kprintf("%s\n",json_string);
     cJSON *root = cJSON_Parse(json_string);
     if(!root)
@@ -1048,6 +1049,13 @@ int parseDtu(char *json_string)
           cJSON* ledsta = cJSON_GetObjectItem(root,"ledsta");
           cJSON* cam_cmd= cJSON_GetObjectItem(root,"cam_code");
           item_ext=cJSON_GetObjectItem(root,"ext");
+          cJSON* item_focus = cJSON_GetObjectItem(root,"focus");
+          //item_data = cJSON_GetObjectItem(root,"data");
+          if(item_focus!=RT_NULL){
+              device_status.focus_value = item_focus->valuedouble;
+              LOG_I("发送信号!");
+              //send_signal();
+          }
           if(cam_cmd!=NULL){
               //先检查定时器状态,否则会崩溃
               rt_timer_stop(timer_uart2);

+ 1 - 1
Application_CBD/rt-thread/src/kservice.c

@@ -1192,7 +1192,7 @@ void rt_kprintf(const char *fmt, ...)
      * large excluding the terminating null byte. If the output string
      * would be larger than the rt_log_buf, we have to adjust the output
      * length. */
-    length = rt_vsnprintf(rt_log_buf, sizeof(rt_log_buf) - 1, fmt, args);
+    length = vsnprintf(rt_log_buf, sizeof(rt_log_buf) - 1, fmt, args);
 //    if(device_status.dbgflag==1&&serial!=RT_NULL)
 //    {
 //        HMI_WRITE("debug.print.txt=%s",rt_log_buf);

+ 93 - 2
Application_cbd_apm32f1/.config

@@ -53,7 +53,7 @@ CONFIG_RT_USING_MUTEX=y
 CONFIG_RT_USING_EVENT=y
 CONFIG_RT_USING_MAILBOX=y
 CONFIG_RT_USING_MESSAGEQUEUE=y
-# CONFIG_RT_USING_SIGNALS is not set
+CONFIG_RT_USING_SIGNALS=y
 # end of Inter-Thread communication
 
 #
@@ -99,7 +99,7 @@ CONFIG_RT_USING_COMPONENTS_INIT=y
 CONFIG_RT_USING_USER_MAIN=y
 CONFIG_RT_MAIN_THREAD_STACK_SIZE=2048
 CONFIG_RT_MAIN_THREAD_PRIORITY=10
-# CONFIG_RT_USING_LEGACY is not set
+CONFIG_RT_USING_LEGACY=y
 CONFIG_RT_USING_MSH=y
 CONFIG_RT_USING_FINSH=y
 CONFIG_FINSH_USING_MSH=y
@@ -687,12 +687,44 @@ CONFIG_PKG_SYSWATCH_VER="latest"
 #
 # STM32 HAL & SDK Drivers
 #
+# CONFIG_PKG_USING_STM32F0_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32F0_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32F1_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32F1_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32F2_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32F2_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32F3_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32F3_CMSIS_DRIVER is not set
 # CONFIG_PKG_USING_STM32F4_HAL_DRIVER is not set
 # CONFIG_PKG_USING_STM32F4_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32F7_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32F7_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32G0_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32G0_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32G4_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32G4_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32H5_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32H5_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32H7_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32H7_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32H7RS_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32H7RS_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32L0_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32L0_CMSIS_DRIVER is not set
 # CONFIG_PKG_USING_STM32L4_HAL_DRIVER is not set
 # CONFIG_PKG_USING_STM32L4_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32L5_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32L5_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32U5_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32U5_CMSIS_DRIVER is not set
 # CONFIG_PKG_USING_STM32WB55_SDK is not set
 # CONFIG_PKG_USING_STM32_SDIO is not set
+# CONFIG_PKG_USING_STM32WL_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32WL_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32WB_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32WB_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32MP1_M4_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32MP1_M4_CMSIS_DRIVER is not set
 # end of STM32 HAL & SDK Drivers
 
 #
@@ -725,6 +757,59 @@ CONFIG_PKG_SYSWATCH_VER="latest"
 # CONFIG_PKG_USING_NRFX is not set
 # CONFIG_PKG_USING_RASPBERRYPI_PICO_SDK is not set
 # CONFIG_PKG_USING_MM32 is not set
+
+#
+# WCH HAL & SDK Drivers
+#
+# CONFIG_PKG_USING_CH32V20x_SDK is not set
+# CONFIG_PKG_USING_CH32V307_SDK is not set
+# end of WCH HAL & SDK Drivers
+
+#
+# AT32 HAL & SDK Drivers
+#
+# CONFIG_PKG_USING_AT32A403A_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32A403A_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32A423_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32A423_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F45x_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F45x_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F402_405_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F402_405_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F403A_407_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F403A_407_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F413_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F413_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F415_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F415_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F421_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F421_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F423_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F423_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F425_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F425_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F435_437_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F435_437_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32M412_416_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32M412_416_CMSIS_DRIVER is not set
+# end of AT32 HAL & SDK Drivers
+
+#
+# HC32 DDL Drivers
+#
+# end of HC32 DDL Drivers
+
+#
+# NXP HAL & SDK Drivers
+#
+# CONFIG_PKG_USING_NXP_MCX_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_NXP_MCX_SERIES_DRIVER is not set
+# CONFIG_PKG_USING_NXP_LPC_DRIVER is not set
+# CONFIG_PKG_USING_NXP_LPC55S_DRIVER is not set
+# CONFIG_PKG_USING_NXP_IMX6SX_DRIVER is not set
+# CONFIG_PKG_USING_NXP_IMX6UL_DRIVER is not set
+# CONFIG_PKG_USING_NXP_IMXRT_DRIVER is not set
+# end of NXP HAL & SDK Drivers
 # end of HAL & SDK Drivers
 
 #
@@ -762,6 +847,7 @@ CONFIG_PKG_SYSWATCH_VER="latest"
 # CONFIG_PKG_USING_BMI088 is not set
 # CONFIG_PKG_USING_HMC5883 is not set
 # CONFIG_PKG_USING_MAX6675 is not set
+# CONFIG_PKG_USING_MAX31855 is not set
 # CONFIG_PKG_USING_TMP1075 is not set
 # CONFIG_PKG_USING_SR04 is not set
 # CONFIG_PKG_USING_CCS811 is not set
@@ -797,6 +883,8 @@ CONFIG_PKG_SYSWATCH_VER="latest"
 # CONFIG_PKG_USING_ICM20608 is not set
 # CONFIG_PKG_USING_PAJ7620 is not set
 # CONFIG_PKG_USING_STHS34PF80 is not set
+# CONFIG_PKG_USING_P3T1755 is not set
+# CONFIG_PKG_USING_QMI8658 is not set
 # end of sensors drivers
 
 #
@@ -891,6 +979,8 @@ CONFIG_PKG_LEDBLINK_VER="latest"
 # CONFIG_PKG_USING_BT_MX02 is not set
 # CONFIG_PKG_USING_GC9A01 is not set
 # CONFIG_PKG_USING_IK485 is not set
+# CONFIG_PKG_USING_SERVO is not set
+# CONFIG_PKG_USING_SEAN_WS2812B is not set
 # end of peripheral libraries and drivers
 
 #
@@ -990,6 +1080,7 @@ CONFIG_PKG_LEDBLINK_VER="latest"
 # CONFIG_PKG_USING_SOEM is not set
 # CONFIG_PKG_USING_QPARAM is not set
 # CONFIG_PKG_USING_CorevMCU_CLI is not set
+# CONFIG_PKG_USING_DRMP is not set
 # end of miscellaneous packages
 
 #

+ 93 - 2
Application_cbd_apm32f1/.config.old

@@ -53,7 +53,7 @@ CONFIG_RT_USING_MUTEX=y
 CONFIG_RT_USING_EVENT=y
 CONFIG_RT_USING_MAILBOX=y
 CONFIG_RT_USING_MESSAGEQUEUE=y
-# CONFIG_RT_USING_SIGNALS is not set
+CONFIG_RT_USING_SIGNALS=y
 # end of Inter-Thread communication
 
 #
@@ -80,7 +80,7 @@ CONFIG_RT_USING_DEVICE=y
 # CONFIG_RT_USING_DEVICE_OPS is not set
 # CONFIG_RT_USING_INTERRUPT_INFO is not set
 CONFIG_RT_USING_CONSOLE=y
-CONFIG_RT_CONSOLEBUF_SIZE=256
+CONFIG_RT_CONSOLEBUF_SIZE=1024
 CONFIG_RT_CONSOLE_DEVICE_NAME="uart1"
 # end of Kernel Device Object
 
@@ -687,12 +687,44 @@ CONFIG_PKG_SYSWATCH_VER="latest"
 #
 # STM32 HAL & SDK Drivers
 #
+# CONFIG_PKG_USING_STM32F0_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32F0_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32F1_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32F1_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32F2_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32F2_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32F3_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32F3_CMSIS_DRIVER is not set
 # CONFIG_PKG_USING_STM32F4_HAL_DRIVER is not set
 # CONFIG_PKG_USING_STM32F4_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32F7_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32F7_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32G0_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32G0_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32G4_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32G4_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32H5_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32H5_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32H7_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32H7_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32H7RS_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32H7RS_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32L0_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32L0_CMSIS_DRIVER is not set
 # CONFIG_PKG_USING_STM32L4_HAL_DRIVER is not set
 # CONFIG_PKG_USING_STM32L4_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32L5_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32L5_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32U5_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32U5_CMSIS_DRIVER is not set
 # CONFIG_PKG_USING_STM32WB55_SDK is not set
 # CONFIG_PKG_USING_STM32_SDIO is not set
+# CONFIG_PKG_USING_STM32WL_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32WL_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32WB_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32WB_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_STM32MP1_M4_HAL_DRIVER is not set
+# CONFIG_PKG_USING_STM32MP1_M4_CMSIS_DRIVER is not set
 # end of STM32 HAL & SDK Drivers
 
 #
@@ -725,6 +757,59 @@ CONFIG_PKG_SYSWATCH_VER="latest"
 # CONFIG_PKG_USING_NRFX is not set
 # CONFIG_PKG_USING_RASPBERRYPI_PICO_SDK is not set
 # CONFIG_PKG_USING_MM32 is not set
+
+#
+# WCH HAL & SDK Drivers
+#
+# CONFIG_PKG_USING_CH32V20x_SDK is not set
+# CONFIG_PKG_USING_CH32V307_SDK is not set
+# end of WCH HAL & SDK Drivers
+
+#
+# AT32 HAL & SDK Drivers
+#
+# CONFIG_PKG_USING_AT32A403A_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32A403A_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32A423_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32A423_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F45x_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F45x_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F402_405_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F402_405_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F403A_407_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F403A_407_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F413_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F413_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F415_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F415_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F421_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F421_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F423_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F423_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F425_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F425_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32F435_437_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32F435_437_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_AT32M412_416_HAL_DRIVER is not set
+# CONFIG_PKG_USING_AT32M412_416_CMSIS_DRIVER is not set
+# end of AT32 HAL & SDK Drivers
+
+#
+# HC32 DDL Drivers
+#
+# end of HC32 DDL Drivers
+
+#
+# NXP HAL & SDK Drivers
+#
+# CONFIG_PKG_USING_NXP_MCX_CMSIS_DRIVER is not set
+# CONFIG_PKG_USING_NXP_MCX_SERIES_DRIVER is not set
+# CONFIG_PKG_USING_NXP_LPC_DRIVER is not set
+# CONFIG_PKG_USING_NXP_LPC55S_DRIVER is not set
+# CONFIG_PKG_USING_NXP_IMX6SX_DRIVER is not set
+# CONFIG_PKG_USING_NXP_IMX6UL_DRIVER is not set
+# CONFIG_PKG_USING_NXP_IMXRT_DRIVER is not set
+# end of NXP HAL & SDK Drivers
 # end of HAL & SDK Drivers
 
 #
@@ -762,6 +847,7 @@ CONFIG_PKG_SYSWATCH_VER="latest"
 # CONFIG_PKG_USING_BMI088 is not set
 # CONFIG_PKG_USING_HMC5883 is not set
 # CONFIG_PKG_USING_MAX6675 is not set
+# CONFIG_PKG_USING_MAX31855 is not set
 # CONFIG_PKG_USING_TMP1075 is not set
 # CONFIG_PKG_USING_SR04 is not set
 # CONFIG_PKG_USING_CCS811 is not set
@@ -797,6 +883,8 @@ CONFIG_PKG_SYSWATCH_VER="latest"
 # CONFIG_PKG_USING_ICM20608 is not set
 # CONFIG_PKG_USING_PAJ7620 is not set
 # CONFIG_PKG_USING_STHS34PF80 is not set
+# CONFIG_PKG_USING_P3T1755 is not set
+# CONFIG_PKG_USING_QMI8658 is not set
 # end of sensors drivers
 
 #
@@ -891,6 +979,8 @@ CONFIG_PKG_LEDBLINK_VER="latest"
 # CONFIG_PKG_USING_BT_MX02 is not set
 # CONFIG_PKG_USING_GC9A01 is not set
 # CONFIG_PKG_USING_IK485 is not set
+# CONFIG_PKG_USING_SERVO is not set
+# CONFIG_PKG_USING_SEAN_WS2812B is not set
 # end of peripheral libraries and drivers
 
 #
@@ -990,6 +1080,7 @@ CONFIG_PKG_LEDBLINK_VER="latest"
 # CONFIG_PKG_USING_SOEM is not set
 # CONFIG_PKG_USING_QPARAM is not set
 # CONFIG_PKG_USING_CorevMCU_CLI is not set
+# CONFIG_PKG_USING_DRMP is not set
 # end of miscellaneous packages
 
 #

Разница между файлами не показана из-за своего большого размера
+ 3 - 1
Application_cbd_apm32f1/.cproject


BIN
Application_cbd_apm32f1/.settings/.rtmenus


+ 1 - 1
Application_cbd_apm32f1/.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-504266412740595079" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-446626834515254951" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

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

@@ -1,5 +1,5 @@
 #RT-Thread Studio Project Configuration
-#Tue Mar 11 10:52:51 CST 2025
+#Mon May 19 16:14:09 CST 2025
 project_type=rtt
 chip_name=STM32F103RE
 cpu_name=None

+ 3 - 2
Application_cbd_apm32f1/applications/control.c

@@ -478,7 +478,6 @@ uint8_t ctr_cangmen_down(uint8_t status_down)
            rt_pin_write(C_DOWN_L,OFF);
            rt_pin_write(C_DOWN_R,OFF);
            rt_pin_write(C_DOWN_L,ON);
-
        }
        return device_status.down_status;
 }
@@ -1150,6 +1149,7 @@ void slide_thread_entry(void *parameter)
             {
                 rt_thread_delay(1000);
                 DTU_Write("{\"cmd\": \"takephoto\" }");
+                device_status.autotakepic = 4;
             }else {
                 rt_thread_delay(1000);
                 char *photo = makeJson_Warn("movx","done");
@@ -1169,6 +1169,7 @@ void slide_thread_entry(void *parameter)
             {
                 rt_thread_delay(1000);
                 DTU_Write("{\"cmd\": \"takephoto\" }");
+                device_status.autotakepic = 4;
             }else {
                 rt_thread_delay(1000);
                 char *photo = makeJson_Warn("movz","done");
@@ -1213,7 +1214,7 @@ void slide_thread_entry(void *parameter)
                 ctr_move(Y_,slide_para.ydir,slide_para.ydis,slide_para.pulse_period);
                 rt_kprintf("The slide's y movement was done ok\n");
                 rt_thread_delay(1000);
-                if(slide_para.ydis==4||slide_para.ydis==50||slide_para.ydis==20){
+                if(1){
                     char *photo = makeJson_Warn("movy","done");
                     LOG_I("%s",photo);
                     DTU_Write("%s",photo);

+ 1 - 2
Application_cbd_apm32f1/applications/control.h

@@ -15,7 +15,7 @@
 #include <rtdevice.h>
 //定制相关//////////////////////////////////////////////////////
 #define LAMP_EN          0             //李新3灯管:0关闭,1打开
-#define SENSOR_EN        1              //温湿度:0关闭,1打开
+#define SENSOR_EN        0              //温湿度:0关闭,1打开
 #define ROBOT_EN         0              //机器人
 #define Color_EN         0              //定制色诱
 #define BZYV2_EN         0              //孢子仪2.0
@@ -132,7 +132,6 @@ typedef struct  _packed
     rt_uint32_t data_plan;          //流量套餐
     rt_uint32_t expiry_date;        //到期时间
     double focus_value;
-
     int passWord;              //初始密码
     double process;
     long photo_stamp;           //采集时间戳

+ 1 - 0
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -1034,6 +1034,7 @@ int parseDtu(char *json_string)
           item_focus = cJSON_GetObjectItem(root,"focus");
           if(item_focus!=RT_NULL){
               device_status.focus_value = item_focus->valuedouble;
+              send_signal();
           }
 
           if(item_cmd!=RT_NULL)

+ 146 - 122
Application_cbd_apm32f1/applications/hmi.c

@@ -26,6 +26,7 @@
 #include "dtu_uart2.h"
 #include <fal.h>
 #include "selfcheck.h"
+ #include <float.h>
 #define DBG_ENABLE
 #define DBG_COLOR
 #define DBG_TAG "hmi"
@@ -1342,65 +1343,133 @@ int findMaxIndex(double arr[], int size) {
 
     return maxIndex;
 }
-//入口函数-电机控制及
-static void Ctr_Mortor_entry(void* parameter)
-{
 
-   rt_uint8_t maxIndex = 0;
 
-   /*孢子仪2.0*/
-   const int maxIterations = 20; // 最大迭代次数,可根据实际情况调整
-   const int stepS = 2;    // 对焦步长
-   double allSharpness[maxIterations];    // 当前图像清晰度评价值
-   char tmp_s[10];
-   char tmp[10];
-    while(1)
-    {
-        if(device_status.autotakepic==2){
-            memset(allSharpness,0,sizeof(allSharpness));
-            for(int i = 0; i < 3; i++){
-                slide_para.ydir = 1;        //1位反向,0位正向;
-                slide_para.ydis = stepS;
-                slide_para.en_slide = 6;
-                while(slide_para.en_slide!=0)
-                {
-                    rt_thread_delay(3000);
-                }
-                allSharpness[i] =  device_status.focus_value;
+void send_signal(void)
+{
+    rt_thread_kill(ctr_motor, SIGUSR1);
+}
+
+// 全局状态变量(需在合适位置初始化)
+static float g_best_sharpness = -FLT_MAX;    // 全局最佳清晰度
+static int g_best_pos = 0;                   // 全局最佳位置
+static float g_last_sharpness = -FLT_MAX;    // 上一次移动后的清晰度
+static bool g_initial_move = true;           // 初始方向判断标志
+int maxIterations = 100;
+uint8_t dir = 1;
+uint8_t stepSize = 4;     // 初始步长(单位:步进电机脉冲数)
+int current_pos = 0;  // 根据实际类型修改(int/float等)
+static int g_peak_counter = 0;      // 连续上升后下降的计数器
+static bool g_last_rising = false;   // 记录上次是否上升
+static int counter_sharpness_reduce = 0;
+#define MAX(a, b) ((a) > (b) ? (a) : (b))  // 手动定义宏
+
+void thread1_signal_handler(int sig)
+{
+    LOG_I("[对焦] 清晰度值更新:%.2f", device_status.focus_value);
+    slide_para.pulse_period = mapSpeed(1);  // 更新电机速度参数
+    maxIterations--;
+
+    if (device_status.autotakepic == 2 && maxIterations >= 0) {
+        float current_sharpness = device_status.focus_value;
+
+        /* 更新全局最佳状态 */
+        if (current_sharpness > g_best_sharpness) {
+            g_best_sharpness = current_sharpness;
+            g_best_pos = current_pos;
+            LOG_I("[对焦] 发现更佳位置:%d (清晰度:%.2f)", g_best_pos, g_best_sharpness);
+        }
+
+        /* 初始方向判断(首步移动后) */
+        if (g_initial_move) {
+            if (current_sharpness > g_last_sharpness) {
+                LOG_I("[对焦] 初始方向正确,保持方向:%d", dir);
+            } else {
+                dir = !dir;             // 反转方向
+                LOG_I("[对焦] 初始方向错误,反转方向:%d", dir);
             }
-            //归位
-            for(int i = 3; i < 9; i++){
-                slide_para.ydir = 0;        //1位反向,0位正向;
-                slide_para.ydis = stepS;
-                slide_para.en_slide = 6;
-                while(slide_para.en_slide!=0)
-                {
-                    rt_thread_delay(3000);
+            g_initial_move = false;
+        } else {
+            if(current_sharpness< g_last_sharpness){    //持续3次清晰度降低,调整行进方向
+                counter_sharpness_reduce++;
+                LOG_I("[对焦] 清晰度下降,次数:%d", counter_sharpness_reduce);
+                if(counter_sharpness_reduce>=3){
+                    counter_sharpness_reduce = 0;
+                    dir = !dir;             // 清晰度下降,反转方向
+                    LOG_I("[对焦] 连续清晰度下降,调转行进方向!");
                 }
-                if(i>=6)    //过了初始位置再进行记录
-                    allSharpness[i-3] =  device_status.focus_value;
+            }else {
+                counter_sharpness_reduce = 0;
             }
-            //检索最大清晰度位置
-            int max_i = findMaxIndex(allSharpness,6);
-
-            for(int i = 0; i < 6-max_i; i++){
-                slide_para.ydir = 1;        //1位反向,0位正向;
-                slide_para.ydis = stepS;
-                slide_para.en_slide = 6;
-                while(slide_para.en_slide!=0)
-                {
-                    rt_thread_delay(3000);
+
+            /* 方向策略调整 */
+            if (current_sharpness > (g_last_sharpness - 3.5f)) { // 噪声容忍阈值3.0
+                // 保持方向,当接近峰值时自动减小步长
+                LOG_I("保持方向,当接近峰值时自动减小步长...");
+                g_last_rising = true;
+            } else {
+                if(g_last_rising){
+                    g_peak_counter++;
+                    LOG_I("[对焦] 检测到清晰度波动[%d/3]", g_peak_counter);
+                }else {
+                    g_peak_counter = 0;  // 连续下降则重置
                 }
+                g_last_rising = false;
+                dir = !dir;             // 清晰度下降,反转方向
+                LOG_I("[对焦] 清晰度下降,反转方向:%d 新步长:%d", dir, stepSize);
             }
-            char *photo_f = makeJson_Warn("auto_focus","focus_done");
-            DTU_Write("%s",photo_f);
-            rt_free(photo_f);
-            device_status.autotakepic = 0;
         }
-        /*对焦拍照*/
+
+        /* 记录本次清晰度值 */
+        g_last_sharpness = current_sharpness;
+
+        /* 计算并执行下一步移动 */
+        current_pos += dir ? stepSize : -stepSize;
+        LOG_I("[对焦] 方向:%d 移动步长:%d 新位置:%d", dir, stepSize, current_pos);
+
+        slide_para.ydir = dir;
+        slide_para.ydis = stepSize;
+        slide_para.en_slide = 6;  // 触发移动
+        while (slide_para.en_slide != 0) {
+            rt_thread_delay(500); // 等待移动完成
+        }
+
+
+        /* 终止条件检测 */
+        if (stepSize < 1 || maxIterations <= 0 || g_peak_counter >= 3) {
+            LOG_I("[对焦] 完成搜索,最佳位置:%d (清晰度:%.2f)", g_best_pos, g_best_sharpness);
+            if (g_peak_counter >= 3) {
+                LOG_I("[对焦] 连续三次波动确认峰值");
+            }
+
+            LOG_I("[对焦] 已到达最佳对焦位置");
+            if(maxIterations==0)
+            {
+                maxIterations = 120;
+                dir = !dir;
+            }else{
+                char *c0 = makeJson_Warn("auto_focus","auto_focus");
+                DTU_Write("%s",c0);
+                rt_free(c0);
+                device_status.autotakepic = 0; // 退出自动对焦模式
+            }
+            counter_sharpness_reduce = 0;
+        }
+    }
+}
+
+
+//入口函数-电机控制及
+static void Ctr_Mortor_entry(void* parameter)
+{
+   /*孢子仪2.0*/
+   rt_signal_install(SIGUSR1, thread1_signal_handler);
+   rt_signal_unmask(SIGUSR1);
+    while(1)
+    {
+        /*对焦拍照,滑台初始化*/
         if(device_status.autotakepic==1)
         {
-            memset(allSharpness,0,sizeof(allSharpness));
             device_status.step_focus = 1;
             slide_para.en_slide =3;     //X轴复位
             slide_para.pulse_period = mapSpeed(50);
@@ -1434,91 +1503,46 @@ static void Ctr_Mortor_entry(void* parameter)
                     rt_thread_delay(1000);
                 }
             }
+            device_status.autotakepic = 3;
+        }
+        if(device_status.autotakepic==3)
+        {
+            slide_para.en_slide = 7;    //Y轴复位
+            slide_para.pulse_period = mapSpeed(50);
+            while(slide_para.en_slide!=0){
+                LOG_D("等待Y轴电机完成复位!");
+                rt_thread_delay(1000);
+            }
             //Y轴电机运行到指定距离
             slide_para.ydir = 1;
-            slide_para.ydis = 3400;
+            slide_para.ydis = 3350;
             slide_para.pulse_period = mapSpeed(50);
             slide_para.en_slide = 6;
             while(slide_para.en_slide!=0){
                 LOG_D("Again:等待y轴电机到位!");
                 rt_thread_delay(1000);
             }
-#if 0
-            slide_para.pulse_period = 20;  //修改滑台的脉宽为20ms
-            //遍历所有位置,粗对焦
-            for(int i = 0; i < maxIterations; i++){
-                slide_para.ydir = 0;        //1位反向,0位正向;
-                slide_para.ydis = stepS;
-                slide_para.en_slide = 6;
-                while(slide_para.en_slide!=0)
-                {
-                    rt_thread_delay(2500);
-                }
-                allSharpness[i] =  device_status.focus_value;
-                if(device_status.focus_value > 10.0) break;
-            }
-            for(int i = 0; i < maxIterations; i++){
-                sprintf(tmp_s, "%f",allSharpness[i]);
-                rt_kprintf("-%s",tmp_s);
-            }
-            maxIndex = findMaxIndex(allSharpness,maxIterations);    //最大清晰度的位置
-
-
-            for(int i = 0; i < (maxIterations-maxIndex); i++){      //运动到该位置
-                slide_para.ydir = 1;        //1位反向,0位正向;
-                slide_para.ydis = stepS;
-                slide_para.en_slide = 6;
-                while(slide_para.en_slide!=0)
-                {
-                    rt_thread_delay(2500);
-                }
-            }
-            slide_para.pulse_period = 1;  //修改滑台的脉宽为20ms
-#endif
-
-//            //细对焦
-//            memset(allSharpness,0,sizeof(allSharpness));
-//            for(int i = 0; i < 3; i++){
-//                slide_para.ydir = 1;        //1位反向,0位正向;
-//                slide_para.ydis = stepS;
-//                slide_para.en_slide = 6;
-//                while(slide_para.en_slide!=0)
-//                {
-//                    rt_thread_delay(3000);
-//                }
-//                allSharpness[i] =  device_status.focus_value;
-//            }
-//            //归位
-//            for(int i = 3; i < 9; i++){
-//                slide_para.ydir = 0;        //1位反向,0位正向;
-//                slide_para.ydis = stepS;
-//                slide_para.en_slide = 6;
-//                while(slide_para.en_slide!=0)
-//                {
-//                    rt_thread_delay(3000);
-//                }
-//                if(i>=6)    //过了初始位置再进行记录
-//                    allSharpness[i-3] =  device_status.focus_value;
-//            }
-//            //检索最大清晰度位置
-//            int max_i= findMaxIndex(allSharpness,6);
-//
-//            for(int i = 0; i < 6-max_i; i++){
-//                slide_para.ydir = 1;        //1位反向,0位正向;
-//                slide_para.ydis = stepS;
-//                slide_para.en_slide = 6;
-//                while(slide_para.en_slide!=0)
-//                {
-//                    rt_thread_delay(3000);
-//                }
-//            }
-
             //生成JSON指令
-            //sprintf(tmp, "%f",device_status.focus_value);
             char *photo = makeJson_Warn("mov_init_y","takephoto_done");
             DTU_Write("%s",photo);
             rt_free(photo);
-            device_status.autotakepic = 0;
+            device_status.autotakepic = 4;
+
+        }
+        if(device_status.autotakepic == 4)
+        {
+            device_status.autotakepic = 2;
+            g_best_sharpness = -FLT_MAX;    // 全局最佳清晰度
+            g_best_pos = 0;                   // 全局最佳位置
+            g_last_sharpness = -FLT_MAX;    // 上一次移动后的清晰度
+            g_initial_move = true;           // 初始方向判断标志
+            maxIterations = 100;
+            dir = 1;
+            stepSize = 4;     // 初始步长(单位:步进电机脉冲数)
+            current_pos = 0;  // 根据实际类型修改(int/float等)
+
+            g_peak_counter = 0;
+            g_last_rising = false;
         }
         if(device_status.fsl_sw==1)
         {

+ 4 - 0
Application_cbd_apm32f1/applications/hmi.h

@@ -32,4 +32,8 @@ void app_partion_backup(void);
 void Debug_log_OFF(void);
 void Debug_log_ON(void);
 void bubblesort(int a[], int n);
+
+
+void send_signal(void);
+
 #endif /* APPLICATIONS_INC_HMI_H_ */

+ 1 - 1
Application_cbd_apm32f1/rt-thread/src/kservice.c

@@ -1315,7 +1315,7 @@ RT_WEAK int rt_kprintf(const char *fmt, ...)
      * large excluding the terminating null byte. If the output string
      * would be larger than the rt_log_buf, we have to adjust the output
      * length. */
-    length = rt_vsnprintf(rt_log_buf, sizeof(rt_log_buf) - 1, fmt, args);
+    length = vsnprintf(rt_log_buf, sizeof(rt_log_buf) - 1, fmt, args);
     if (length > RT_CONSOLEBUF_SIZE - 1)
         length = RT_CONSOLEBUF_SIZE - 1;
 #ifdef RT_USING_DEVICE

BIN
Application_cbd_apm32f1/rt-thread/tools/building.pyc


BIN
Application_cbd_apm32f1/rt-thread/tools/eclipse.pyc


BIN
Application_cbd_apm32f1/rt-thread/tools/gcc.pyc


BIN
Application_cbd_apm32f1/rt-thread/tools/menuconfig.pyc


BIN
Application_cbd_apm32f1/rt-thread/tools/mkdist.pyc


BIN
Application_cbd_apm32f1/rt-thread/tools/options.pyc


BIN
Application_cbd_apm32f1/rt-thread/tools/rt_studio.pyc


BIN
Application_cbd_apm32f1/rt-thread/tools/utils.pyc


+ 18 - 0
Application_cbd_apm32f1/rtconfig.h

@@ -36,6 +36,7 @@
 #define RT_USING_EVENT
 #define RT_USING_MAILBOX
 #define RT_USING_MESSAGEQUEUE
+#define RT_USING_SIGNALS
 /* end of Inter-Thread communication */
 
 /* Memory Management */
@@ -68,6 +69,7 @@
 #define RT_USING_USER_MAIN
 #define RT_MAIN_THREAD_STACK_SIZE 2048
 #define RT_MAIN_THREAD_PRIORITY 10
+#define RT_USING_LEGACY
 #define RT_USING_MSH
 #define RT_USING_FINSH
 #define FINSH_USING_MSH
@@ -286,6 +288,22 @@
 /* Kendryte SDK */
 
 /* end of Kendryte SDK */
+
+/* WCH HAL & SDK Drivers */
+
+/* end of WCH HAL & SDK Drivers */
+
+/* AT32 HAL & SDK Drivers */
+
+/* end of AT32 HAL & SDK Drivers */
+
+/* HC32 DDL Drivers */
+
+/* end of HC32 DDL Drivers */
+
+/* NXP HAL & SDK Drivers */
+
+/* end of NXP HAL & SDK Drivers */
 /* end of HAL & SDK Drivers */
 
 /* sensors drivers */

BIN
Application_cbd_apm32f1/rtconfig.pyc