zhunk 4 месяцев назад
Родитель
Сommit
1582adbc56

+ 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="1293618710119634749" 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="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">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

+ 6 - 6
Application_cbd_apm32f1/applications/control.h

@@ -18,15 +18,15 @@
 
 #define LAMP_EN          0             //李新3灯管:0关闭,1打开
 #define PCB_V1           0             //1-旧PCB,0-新PCB(模块化)
-#define MATCH_DEVICE     1             //比赛设备1-开启 0-关闭
+#define MATCH_DEVICE     0             //比赛设备1-开启 0-关闭
 #define SENSOR_EN        0             //温湿度:0关闭,1打开
 #define UART_TEST_EN     0             ///串口测试0-关闭,1-启用
-#define TG_MODULE        0             //推杆电机结构模块化控制
+#define TG_MODULE        1             //推杆电机结构模块化控制
 #define DINGZHI_0722     0             //控制一个电机每天12点20工作12秒
 #define QINGSAO_IO       1             //调整清扫顺序20250801
-#define WENKONG          0             //温控功能1-开启 0-关闭
-#define YUKONG           0             //雨控功能1-开启 0-关闭
-#define QIANYA           0             //欠压功能1-开启 0-关闭
+#define WENKONG          1             //温控功能1-开启 0-关闭
+#define YUKONG           1             //雨控功能1-开启 0-关闭
+#define QIANYA           1             //欠压功能1-开启 0-关闭
 
 
 #if MATCH_DEVICE == 1
@@ -46,7 +46,7 @@
     #if MATCH_DEVICE == 1
     #define VERSION_HK_2000W    "3.3.4(TG)"             //推杆结构比赛设备
     #else
-    #define VERSION_HK_2000W    "2.11.4(TG111)"         //推杆结构
+    #define VERSION_HK_2000W    "2.12.4(TG111)"         //推杆结构
     #endif
     #endif
 #endif

+ 2 - 0
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -242,7 +242,9 @@ void DTU_Write(char *fmt, ...)
     rt_mutex_release(&dtu_write_mutex);
     system_status.uart2_tx_bytes +=str_length;
     LOG_D("DTU_Write:%s",dtu_str);
+#if MATCH_DEVICE == 1
     Uart5_Write(dtu_str);
+#endif
 }
 /* 接收数据回调函数 */
 static rt_err_t dtu_input(rt_device_t dev, rt_size_t size)

+ 3 - 0
Application_cbd_apm32f1/readme.md

@@ -1,3 +1,6 @@
+# 2026-06-24 更新说明
+	#define VERSION_HK_2000W    "2.12.4(TG111)"         //推杆结构
+	1、修复不是别赛设备发送串口数据串口异常导致死机;
 # 2026-06-12 更新说明
 	#define VERSION_HK_2000W    "2.40.4(2000W)"         //4.0水稻
 	1、每小时上传4张照片,修改默认参数收集6分钟,加热8分钟;