zhunk 1 سال پیش
والد
کامیت
631ba38b0a

+ 1 - 1
Application_BZY/.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="1283133744603583975" 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="1329950507785336594" 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>

+ 3 - 3
Application_BZY/.settings/projcfg.ini

@@ -1,9 +1,9 @@
 #RT-Thread Studio Project Configuration
-#Fri Dec 27 10:56:04 CST 2024
-output_project_path=D\:\\RT-ThreadStudio\\workspace\\IOT_CBD_BZY_CTRL
+#Wed Jun 18 17:01:41 CST 2025
 mcu_name=STM32F101RETX
+output_project_path=D\:\\RT-ThreadStudio\\workspace\\iot_-cbd_-bzy_-ctrl
 hardware_adapter=ST-LINK
-mcu_base_nano_proj=false
 selected_rtt_version=v4.0.2
+mcu_base_nano_proj=false
 project_base_bsp=false
 cfg_version=v2.0

+ 1 - 1
Application_BZYV2-NHT/.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="1279170959373326186" 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="1349367779640654268" 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>

+ 3 - 3
Application_BZYV2-NHT/.settings/projcfg.ini

@@ -1,9 +1,9 @@
 #RT-Thread Studio Project Configuration
-#Fri Dec 27 10:56:04 CST 2024
-output_project_path=D\:\\RT-ThreadStudio\\workspace\\IOT_CBD_BZY_CTRL
+#Wed Jun 18 17:01:41 CST 2025
 mcu_name=STM32F103RETX
+output_project_path=D\:\\RT-ThreadStudio\\workspace\\iot_-cbd_-bzy_-ctrl
 hardware_adapter=ST-LINK
-mcu_base_nano_proj=false
 selected_rtt_version=v4.0.2
+mcu_base_nano_proj=false
 project_base_bsp=false
 cfg_version=v2.0

+ 1 - 1
Application_BZYV2/.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="1336815596739157319" 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="1332325041055680482" 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>

+ 3 - 3
Application_BZYV2/.settings/projcfg.ini

@@ -1,9 +1,9 @@
 #RT-Thread Studio Project Configuration
-#Fri Dec 27 10:56:04 CST 2024
+#Wed Jun 18 17:01:42 CST 2025
+output_project_path=D\:\\RT-ThreadStudio\\workspace\\iot_-cbd_-bzy_-ctrl
 mcu_name=STM32F103RETX
-output_project_path=D\:\\RT-ThreadStudio\\workspace\\IOT_CBD_BZY_CTRL
 hardware_adapter=ST-LINK
-selected_rtt_version=v4.0.2
 mcu_base_nano_proj=false
+selected_rtt_version=v4.0.2
 project_base_bsp=false
 cfg_version=v2.0

+ 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="1333949382373332970" 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>

+ 3 - 3
Application_CBD/.settings/projcfg.ini

@@ -1,9 +1,9 @@
 #RT-Thread Studio Project Configuration
-#Mon Mar 03 14:45:57 CST 2025
-output_project_path=D\:\\RT-ThreadStudio\\workspace\\IOT_CBD_BZY_CTRL
+#Wed Jun 18 17:01:42 CST 2025
 mcu_name=STM32F103RETX
+output_project_path=D\:\\RT-ThreadStudio\\workspace\\iot_-cbd_-bzy_-ctrl
 hardware_adapter=J-Link
-mcu_base_nano_proj=false
 selected_rtt_version=v4.0.2
+mcu_base_nano_proj=false
 project_base_bsp=false
 cfg_version=v2.0

+ 1 - 1
Application_GK_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="1263327003201175488" 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="1308801722298575801" 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>

+ 3 - 3
Application_GK_CBD/.settings/projcfg.ini

@@ -1,9 +1,9 @@
 #RT-Thread Studio Project Configuration
-#Fri Dec 27 10:56:04 CST 2024
-output_project_path=D\:\\RT-ThreadStudio\\workspace\\IOT_CBD_BZY_CTRL
+#Wed Jun 18 17:01:42 CST 2025
 mcu_name=STM32F101RETX
+output_project_path=D\:\\RT-ThreadStudio\\workspace\\iot_-cbd_-bzy_-ctrl
 hardware_adapter=ST-LINK
-mcu_base_nano_proj=false
 selected_rtt_version=v4.0.2
+mcu_base_nano_proj=false
 project_base_bsp=false
 cfg_version=v2.0

+ 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="-406456977695124745" 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="-436559387563516312" 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>

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

@@ -1,5 +1,5 @@
 #RT-Thread Studio Project Configuration
-#Mon Apr 21 16:30:25 CST 2025
+#Wed Jun 18 17:01:42 CST 2025
 project_type=rtt
 chip_name=STM32F103RE
 cpu_name=None
@@ -18,6 +18,6 @@ tool_chain=gcc
 uart_name=uart1
 tx_pin_name=PA9
 rtt_nano_path=
-output_project_path=D\:\\RT-ThreadStudio\\workspace\\IOT_CBD_BZY_CTRL
+output_project_path=D\:\\RT-ThreadStudio\\workspace\\iot_-cbd_-bzy_-ctrl
 hardware_adapter=ST-LINK
 project_name=Application_cbd_apm32f1

+ 2 - 2
Application_cbd_apm32f1/applications/beep.c

@@ -179,7 +179,7 @@ int hwtimer2_pwm3_output(rt_uint32_t time,rt_uint32_t freq,uint8_t EN,uint8_t DI
 
 static void stop_motor_86(void)
 {
-    rt_kprintf("stop_motor_86!\n");
+    LOG_W("stop_motor_86!");
     rt_pwm_disable(pwm_device, BEEP_PWM_CH);
 }
 
@@ -297,7 +297,7 @@ void Motor_Qingsao_R_PWM(uint8_t on_off)
 void Motor_Qingsao_L_PWM(uint8_t on_off)
 {
     pwm8_init();
-    rt_pwm_set(pwm_tim8, PC8_TIM3_CH, 200000, 150000);//channel,period,pulse
+    rt_pwm_set(pwm_tim8, PC8_TIM3_CH, 200000, 180000);//channel,period,pulse
     if(on_off==ON)
     {
         rt_pwm_enable(pwm_tim8, PC8_TIM3_CH);

+ 47 - 44
Application_cbd_apm32f1/applications/control.c

@@ -1196,6 +1196,7 @@ void ctr_TG_Clear(uint16_t clear_timeout)
     HMI_WRITE("cangWei.rotateFlag.val=%d",0);
     HMI_WRITE("sysTest.switchClear.val=%d",0);
 }
+
 //DTU,RTU供电
 void ctr_RTU_DTU(uint8_t status_rtu)
 {
@@ -1428,7 +1429,17 @@ void ResetInit(void)
         if(device_status.run_sta==0)
             ctr_turn(0, 0);
     }
-    if(device_status.version_type!=6&&device_status.version_type!=7)
+    if(device_status.version_type==5)
+    {
+        ctr_lamp(OFF, 1);   //镇流器
+        ctr_led(OFF);       //补光灯关闭
+        ctr_Heat(OFF);      //风机关闭
+        ctr_Motor_Driver_Power(ON); //步进电机驱动电源开启
+        ctr_Motor86_move(50000, 100, 0);   //86电机复位
+        device_status.ctr_up_motor = 1;  //推杆电机缩进去(落虫)
+        ctr_Collect_Fan(OFF);
+    }
+    if(device_status.version_type==3)
     {
         device_status.work_done = 1;
            //1.打开路由器供电
@@ -1453,7 +1464,9 @@ void ResetInit(void)
                return;
            }
            //7.关闭上仓门
+
            device_status.ctr_up_motor = 2;
+
 //           while(device_status.ctr_up_motor!=0)
 //           {
 //               LOG_I("关闭上仓门...");
@@ -2149,7 +2162,6 @@ void slidelock()
     rt_pin_write(Motor_EN, ON);              //引脚输出高使能有效
 }
 
-
 void motor_zero()
 {
     rt_pin_mode(Motor_EN, PIN_MODE_OUTPUT); //使能电机驱动引脚   PB14
@@ -2186,61 +2198,46 @@ void motor_zero()
 }
 
 
-uint16_t ctr_xmove(uint32_t xdis,uint16_t pulse)
+uint16_t ctr_Motor86_move(uint32_t xdis,uint16_t pulse,uint8_t dir)
 {
     //rt_kprintf("run here1");
     uint32_t j;
     uint32_t xtemp = 0;
     xtemp = xdis;                                     //两个脉冲移动0.72度,轴方向上移动2um
-
+    uint32_t limit_tm= 0;
     rt_pin_mode(Motor_EN, PIN_MODE_OUTPUT);             //使能电机驱动引脚   PB14
     rt_pin_write(Motor_EN, ON);                         //引脚输出高使能有效
 
     rt_pin_mode(CTR_RO_LIMIT, PIN_MODE_OUTPUT);       //CCW  PB15 配置为输出模式
     rt_pin_mode(CTR_RC_LIMIT, PIN_MODE_OUTPUT);       //CW   PC6  配置为输出模式
 
-
+    rt_pin_mode(MOTOR_86, PIN_MODE_INPUT);
     //rt_kprintf("run here2");
-    rt_pin_write(CTR_RO_LIMIT, OFF);             //CCW  置高
-    rt_thread_delay(300);
+    rt_pin_write(CTR_RO_LIMIT, dir);             //CCW  置高
+    rt_thread_delay(100);
+
+    while(rt_pin_read(MOTOR_86)==0)
+    {
+        rt_pin_write(CTR_RC_LIMIT, OFF);
+        rt_hw_us_delay(pulse);  //后10%以线性减速运动
+        rt_pin_write(CTR_RC_LIMIT, ON);
+        rt_hw_us_delay(pulse);
+    }
 
     for(j=0;j<xtemp;j++)
     {
-        //rt_kprintf("run here4");
-       if((j <= 0.1*xtemp))
-       {
-           //rt_kprintf("run here5");
-           //rt_kprintf("xtemp is %d",xtemp );
-            rt_pin_write(CTR_RC_LIMIT, OFF);
-            //rt_kprintf("run here10");
-            //rt_kprintf("pulse is %d",pulse);
-            //rt_thread_delay(1);  //前10%以线性加速运动
-            rt_hw_us_delay(pulse*(0.1*xtemp - j + 20)/20);  //前10%以线性加速运动
-            rt_pin_write(CTR_RC_LIMIT, ON);
-            //rt_kprintf("run here11");
-            //rt_thread_delay(1);
-            rt_hw_us_delay(pulse*(0.1*xtemp - j + 20)/20);
-            //rt_kprintf("run here9");
-       }
-       if((j >0.1*xtemp)&&(j <= 0.9*xtemp))
-       {
-           //rt_kprintf("run here6");
-             rt_pin_write(CTR_RC_LIMIT, OFF);
-             rt_hw_us_delay(pulse);
-             rt_pin_write(CTR_RC_LIMIT, ON);
-             rt_hw_us_delay(pulse);
-        }
-        if((j > 0.9*xtemp))
-        {
-            //rt_kprintf("run here7");
-             rt_pin_write(CTR_RC_LIMIT, OFF);
-             rt_hw_us_delay(pulse*(j-0.9*xtemp + 20)/20);  //后10%以线性减速运动
-             rt_pin_write(CTR_RC_LIMIT, ON);
-             rt_hw_us_delay(pulse*(j-0.9*xtemp + 20)/20);
-        }
-        //rt_kprintf("run here8");
-     }
-     slidelock();
+         rt_pin_write(CTR_RC_LIMIT, OFF);
+         rt_hw_us_delay(pulse);  //后10%以线性减速运动
+         rt_pin_write(CTR_RC_LIMIT, ON);
+         rt_hw_us_delay(pulse);
+         if(rt_pin_read(MOTOR_86)==0)
+         {
+             limit_tm++;
+         }
+         if(limit_tm==10) break;
+    }
+
+    slidelock();
      return xdis;
  }
 
@@ -2282,9 +2279,15 @@ void WorkTask_CB5(void)
             ctr_led(ON);
             //光栅启动
             ctr_photo(ON);
-            //
+            //光栅检测启动
             pin_guangshan_bind();
+            //上风机启动
+            ctr_Collect_Fan(ON);
+            //下风机启动
+            ctr_Heat(ON);
+            #if 0
             pin_motor_86_bind();
+            #endif
         }
 
         rt_thread_delay(1000);
@@ -2294,7 +2297,7 @@ void WorkTask_CB5(void)
     if(device_status.work_done==0&&device_status.work_status==0)
     {
         pin_guangshan_unbind();
-        pin_motor_86_unbind();
+        //pin_motor_86_unbind();
         //打开推杆电机,益虫放生
         device_status.ctr_down_motor = 1;
         DTU_Write("{\"cmd\":\"workdone\"}");

+ 3 - 3
Application_cbd_apm32f1/applications/control.h

@@ -17,8 +17,8 @@
 
 
 #define LAMP_EN          0             //李新3灯管:0关闭,1打开
-#define PCB_V1           1             //1-旧PCB,0-新PCB(模块化)
-#define MATCH_DEVICE     1             //比赛设备
+#define PCB_V1           0             //1-旧PCB,0-新PCB(模块化)
+#define MATCH_DEVICE     0             //比赛设备
 #define SENSOR_EN        1             //温湿度:0关闭,1打开
 #define UART_TEST_EN     0             ///串口测试0-关闭,1-启用
 
@@ -319,7 +319,7 @@ void HardWare_Check(uint8_t boot);              //自检
 void ResetInit(void);                           //上电复位
 void SunTest(void);                             //光控测试
 /*****************************************************/
-uint16_t ctr_xmove(uint32_t xdis,uint16_t pulse);
+uint16_t ctr_Motor86_move(uint32_t xdis,uint16_t pulse,uint8_t dir);
 /***********************孢子仪****************************/
 
 /***************************************************/

+ 44 - 11
Application_cbd_apm32f1/applications/hmi.c

@@ -504,6 +504,10 @@ static void HMI_Decode(void)
         LOG_I("停止一键测试!!!");
         device_status.auto_test_sw=0;
     }
+    else if (strstr(rx_buffer,"off_clear")!=NULL) {
+        LOG_I("关闭清扫!");
+        ctr_Collect_Fan(OFF);
+    }
     //清扫
     else if (strstr(rx_buffer,"clear")!=NULL) {
         rt_kprintf("\n清扫!\n");
@@ -516,6 +520,8 @@ static void HMI_Decode(void)
         }
         else if (device_status.version_type==6) {
             ctr_JD_Clear(ON);
+        }else if (device_status.version_type==5) {
+            ctr_Collect_Fan(ON);
         }
     }
     //震动
@@ -542,8 +548,10 @@ static void HMI_Decode(void)
     //打开灯管
     else if (strstr(rx_buffer,"putTest.switchLamp=1")!=NULL)
     {
+        if(device_status.temp_status==1)
+            rt_sprintf(device_status.tempture, "30");
         device_status.test_flag=1;
-        rt_kprintf("Open Lamp!\n");
+        LOG_I("Open Lamp!\n");
         ctr_lamp(ON,1);
         #if LAMP_EN == 1
         ctr_lamp(ON,2);
@@ -1343,6 +1351,9 @@ static void HMI_Decode(void)
 //        ctr_Motor_Driver_Power(ON);
 //        ctr_xmove(400,200);//旋转清虫
         device_status.autotakepic = 11;
+    }else if (strstr(rx_buffer,"cc_reset")!=NULL) {
+        device_status.autotakepic = 12;
+        HMI_WRITE("sysTest.result.txt=\"虫仓复位!\"");
     }
 }
 
@@ -1350,6 +1361,7 @@ static void HMI_Decode(void)
 //入口函数-电机控制及
 static void Ctr_Mortor_entry(void* parameter)
 {
+   rt_thread_delay(1000);
    rt_uint16_t num_up_open = 200;    //20s
    rt_uint16_t num_up_close = 200;   //
    rt_uint16_t num_down_open = 200;  //
@@ -1360,6 +1372,11 @@ static void Ctr_Mortor_entry(void* parameter)
    //int current_t[200];
    /*孢子仪拍照数量*/
    rt_uint16_t photo_setup = 0;
+   if(device_status.version_type==5)
+   {
+       num_up_close = 100;  //落虫
+       num_up_open = 50; //排水
+   }
     while(1)
     {
         #if 1
@@ -1391,7 +1408,13 @@ static void Ctr_Mortor_entry(void* parameter)
             if (num_up_open == 0)
             {
                 ctr_cangmen_up(OFF);
-                num_up_open = 200;
+                if(device_status.version_type==5)
+                {
+                    num_up_open = 50;
+                }else {
+                    num_up_open = 200;
+                }
+
 //                bubblesort(current_t, 200);
 //                if(current_t[199]-motor_current<100&&device_status.clear_status==0&&device_status.work_status==1&&motor_current!=0&&motor_current<5000)
 //                {
@@ -1419,7 +1442,13 @@ static void Ctr_Mortor_entry(void* parameter)
             if (num_up_close == 0)
             {
                 ctr_cangmen_up(OFF);
-                num_up_close= 200;
+                if(device_status.version_type==5)
+                {
+                    num_up_close= 100;
+                }else {
+                    num_up_close= 200;
+                }
+
 //                bubblesort(current_t, 200);
 //                if(current_t[199]-motor_current<100&&device_status.clear_status==0&&device_status.work_status==1&&motor_current!=0&&motor_current<5000)
 //                {
@@ -1594,17 +1623,20 @@ static void Ctr_Mortor_entry(void* parameter)
             ef_set_env_blob("run_sta", &device_status.run_sta, sizeof(device_status.run_sta));
          }
         else if (device_status.autotakepic==10) {
-            hwtimer2_pwm3_output(1,500000,1,0);
-            //ctr_xmove(400,200);
+            //hwtimer2_pwm3_output(1,500000,1,0);
+            ctr_Motor86_move(13000,50,1);
             device_status.autotakepic = 0;
         }
 
         else if (device_status.autotakepic==11) {
-            hwtimer2_pwm3_output(1,500000,1,1);
-            //ctr_xmove(400,200);
+            //hwtimer2_pwm3_output(1,500000,1,1);
+            ctr_Motor86_move(13000,50,0);
+            device_status.autotakepic = 0;
+        }
+        else if (device_status.autotakepic==12) {
+            ctr_Motor86_move(50000, 100, 0);
             device_status.autotakepic = 0;
         }
-
         if(device_status.fsl_sw==1)
         {
             ctr_Petroleum_jelly(10);
@@ -2088,7 +2120,7 @@ void Check_ParamConfig(void)
             connect_num++;
             LOG_I("联网中......%d",connect_num);
             //超时时间为3分钟
-            #ifdef MATCH_DEVICE == 1
+            #if MATCH_DEVICE == 1
             if(connect_num==30) //180
             {
                 device_status.timeSwitch = 1;
@@ -2100,7 +2132,7 @@ void Check_ParamConfig(void)
                 break;
             }
             #else
-            if(connect_num==180) //180
+            if(connect_num==30) //180
             {
                 device_status.timeSwitch = 0;
                 LOG_W("Time not set:%04d-%02d-%02d %02d:%02d:%02d",tm.tm_year+1900,tm.tm_mon+1,tm.tm_mday,tm.tm_hour,tm.tm_min,tm.tm_sec);
@@ -2137,8 +2169,9 @@ void Check_ParamConfig(void)
         {
             Work_Loop_Task();
         }
-
+        #if MATCH_DEVICE == 1
         device_status.selfcheck_ws = 3;
+        #endif
 #endif
     }
 }

+ 1 - 1
CBD_FOTA_BootLoader/.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="1369183061114295484" 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="1370363418186249174" 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>

+ 2 - 2
CBD_FOTA_BootLoader/.settings/projcfg.ini

@@ -1,5 +1,5 @@
 #RT-Thread Studio Project Configuration
-#Mon Apr 21 16:30:36 CST 2025
+#Wed Jun 18 17:01:42 CST 2025
 project_type=rtt
 chip_name=STM32F103RE
 cpu_name=None
@@ -17,6 +17,6 @@ tool_chain=gcc
 uart_name=uart1
 tx_pin_name=PA9
 rtt_nano_path=
-output_project_path=D\:\\RT-ThreadStudio\\workspace\\IOT_CBD_BZY_CTRL
+output_project_path=D\:\\RT-ThreadStudio\\workspace\\iot_-cbd_-bzy_-ctrl
 hardware_adapter=ST-LINK
 project_name=CBD_FOTA_BootLoader