zhunk 2 місяців тому
батько
коміт
5badcc404f

+ 1 - 6
Application_cbd_apm32f1/.cproject

@@ -236,12 +236,6 @@
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
 		<project id="qemu-vexpress-a9.ilg.gnuarmeclipse.managedbuild.cross.target.elf.860020518" name="Executable" projectType="ilg.gnuarmeclipse.managedbuild.cross.target.elf"/>
 	</storageModule>
-	<storageModule moduleId="scannerConfiguration">
-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.553091094;ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.553091094.;ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.1570350559;ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input.992053063">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="refreshScope" versionNumber="2">
 		<configuration configurationName="Debug">
@@ -254,4 +248,5 @@
 			<path value=""/>
 		</doc-comment-owner>
 	</storageModule>
+	<storageModule moduleId="scannerConfiguration"/>
 </cproject>

+ 1 - 1
Application_cbd_apm32f1/applications/control.h

@@ -21,7 +21,7 @@
 #define MATCH_DEVICE     0             //比赛设备1-开启 0-关闭
 #define SENSOR_EN        0             //温湿度:0关闭,1打开
 #define UART_TEST_EN     0             ///串口测试0-关闭,1-启用
-#define TG_MODULE        1             //推杆电机结构模块化控制
+#define TG_MODULE        0             //推杆电机结构模块化控制
 #define DINGZHI_0722     0             //控制一个电机每天12点20工作12秒
 #define QINGSAO_IO       1             //调整清扫顺序20250801
 #define WENKONG          1             //温控功能1-开启 0-关闭

+ 1 - 1
Application_cbd_apm32f1/packages/EasyFlash-v4.1.0/inc/ef_cfg.h

@@ -92,7 +92,7 @@
 #define EF_START_ADDR             PKG_EASYFLASH_START_ADDR
 
 /* ENV area size. It's at least one empty sector for GC. So it's definition must more then or equal 2 flash sector size. */
-#define ENV_AREA_SIZE             (EF_ERASE_MIN_SIZE * 256) /* default is the double erase min size */
+#define ENV_AREA_SIZE             (EF_ERASE_MIN_SIZE * 16) /* default is the double erase min size */
 
 /* print debug information of flash */
 #ifdef PKG_EASYFLASH_DEBUG

+ 0 - 1
Application_cbd_apm32f1/readme.md

@@ -1,7 +1,6 @@
 # 2026-08-11
 	#define VERSION_HK_2000W    "2.13.4(TG111)"      //推杆结构
 	1、取消定时重启RTU;
-	2、
 # 2026-07-31
 	#if QINGSAO_YUGUAQI == 1
     #define VERSION_HK_2000W    "2.42.4(y)"         //4.0水稻