zhunk 7 месяцев назад
Родитель
Сommit
9a5973f313

+ 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="-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">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-467146910568853748" 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
-#Tue Dec 02 16:30:43 CST 2025
+#Wed Mar 25 11:51:28 CST 2026
 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=Application_cbd_apm32f1

+ 2 - 0
Application_cbd_apm32f1/applications/control.c

@@ -930,6 +930,8 @@ void WorkTask_BZYV2(void)
         ctr_router(OFF);
         if(device_status.work_done==1){
             turnlimit();                           //卷带电机转一圈
+            rt_thread_delay(1000);
+            turnlimit();
             slide_para.en_slide = 5;               //滑台复位
             while(slide_para.en_slide!=0){
                 LOG_D("等待电机完成复位!");

+ 2 - 0
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -720,6 +720,8 @@ int parseDtu(char *json_string)
               //卷带电机执行旋转一次
               if(strstr(item_cmd->valuestring,"translate")!=RT_NULL){
                  turnlimit();
+                 rt_thread_delay(1000);
+                 turnlimit();
               }
              //读取滑台控制指令
               if (strstr(item_cmd->valuestring,"slide")!=RT_NULL)

+ 14 - 3
Application_cbd_apm32f1/applications/hmi.c

@@ -1864,9 +1864,11 @@ void ResetParamDefault(void)
     device_status.passWord = 8888;
     device_status.dattim = 10;
     device_status.collecting_sh1 = 9;
-    device_status.collecting_eh1 = 10;
-    device_status.collecting_sh2 = 14;
-    device_status.collecting_eh2 = 16;
+    device_status.collecting_eh1 = 17;
+    device_status.collecting_sh2 = 00;
+    device_status.collecting_eh2 = 00;
+    device_status.collecting_sh3 = 00;
+    device_status.collecting_eh3 = 00;
     device_status.collt_min_sh1 = 0;
     device_status.collt_min_eh1 = 0;
     device_status.collt_min_sh2 = 0;
@@ -1890,6 +1892,14 @@ void ResetParamDefault(void)
         ef_set_env_blob("collecting_eh1", &device_status.collecting_eh1, sizeof(device_status.collecting_eh1));    //采集时间
         ef_set_env_blob("collecting_sh2", &device_status.collecting_sh2, sizeof(device_status.collecting_sh2));    //采集时间
         ef_set_env_blob("collecting_eh2", &device_status.collecting_eh2, sizeof(device_status.collecting_eh2));    //采集时间
+        ef_set_env_blob("collecting_sh3", &device_status.collecting_sh3, sizeof(device_status.collecting_sh3));    //采集时间
+        ef_set_env_blob("collecting_eh3", &device_status.collecting_eh3, sizeof(device_status.collecting_eh3));    //采集时间
+        ef_set_and_save_env("collt_min_sh1", "0");
+        ef_set_and_save_env("collt_min_eh1", "0");
+        ef_set_and_save_env("collt_min_sh2", "0");
+        ef_set_and_save_env("collt_min_eh2", "0");
+        ef_set_and_save_env("collt_min_sh3", "0");
+        ef_set_and_save_env("collt_min_eh3", "0");
         ef_set_env_blob("jheat", &device_status.heatvalue, sizeof(device_status.heatvalue));
     }
     ef_set_env_blob("ds", &device_status.ds, sizeof(device_status.ds));
@@ -2043,6 +2053,7 @@ void Debug_log_OFF(void)
          rt_thread_delete(ctr_motor);
      }
  }
+MSH_CMD_EXPORT(ResetParamDefault,ResetParamDefault);
 MSH_CMD_EXPORT(Debug_log_ON,Debug_log_ON);
 MSH_CMD_EXPORT(Debug_log_OFF,Debug_log_OFF);
 //

+ 6 - 0
Application_cbd_apm32f1/packages/EasyFlash-v4.1.0/src/ef_fal_port.c

@@ -87,6 +87,12 @@ static const ef_env default_env_set[] = {
         {"collecting_eh2","0"},    //
         {"collecting_sh3","0"},    //
         {"collecting_eh3","0"},    //
+        {"collt_min_sh1","0"},    //
+        {"collt_min_eh1","0"},    //
+        {"collt_min_sh2","0"},    //
+        {"collt_min_eh2","0"},    //
+        {"collt_min_sh3","0"},    //
+        {"collt_min_eh3","0"},    //
         {"Power_Type","0"},        //供电类型
         {"deviceId","0"},          //BDH设备编码
         {"handle_bugger","0"},      //虫子处理,收虫,排虫

+ 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="1302267756298846076" 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
-#Wed Feb 12 12:00:09 CST 2025
+#Wed Mar 25 11:51:28 CST 2026
 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