zhunk 1 rok temu
rodzic
commit
0834e2e95f

+ 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/applications/control.h

@@ -17,11 +17,11 @@
 
 
 #define LAMP_EN          0             //李新3灯管:0关闭,1打开
-#define PCB_V1           1             //1-旧PCB,0-新PCB(模块化)
+#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-启用
-#define TG_MODULE        1             //推杆电机结构模块化控制
+#define TG_MODULE        0             //推杆电机结构模块化控制
 #if MATCH_DEVICE == 1
 #define LAMP_CURRENT    600
 #else

+ 1 - 1
Application_cbd_apm32f1/applications/hmi.c

@@ -1490,7 +1490,7 @@ static void Ctr_Mortor_entry(void* parameter)
             {
                 ctr_led(OFF);
                 device_status.photo_ws = 0;
-                if(device_status.work_status==1&&device_status.up_status==1)
+                if(device_status.work_status==1)
                 {
                     device_status.clear_status = 1;
                 }

+ 2 - 0
Application_cbd_apm32f1/readme.md

@@ -1,4 +1,6 @@
 #define VERSION_HK_2000W    "2.24.4(2000W)"         //4.0水稻
+ 2025-07-18
+ 修复收集时间为1分钟时,拍照完不执行清扫;
  2025-07-07
  上仓门打开和关闭的方向调整
 # 2025-06-28 更新说明