zhunk 1 год назад
Родитель
Сommit
4abea26cb9

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

+ 7 - 3
Application_cbd_apm32f1/applications/control.h

@@ -17,14 +17,14 @@
 
 
 #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        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       0             //调整清扫顺序20250801
+#define QINGSAO_IO       1             //调整清扫顺序20250801
 #define WENKONG          1             //温控功能1-开启 0-关闭
 #if MATCH_DEVICE == 1
 #define LAMP_CURRENT    600
@@ -37,7 +37,11 @@
     #define VERSION_HK_2000W    "1.3led.40(2000W)"       //水稻
 #else
     #define VERSION_HK          "2.5.41(HK)"            //4.0海康-1200W
+    #if TG_MODULE == 0
     #define VERSION_HK_2000W    "2.31.4(2000W)"         //4.0水稻
+    #else
+    #define VERSION_HK_2000W    "2.1.4(TG)"             //推杆结构
+    #endif
 #endif
 
 #define VERSION_ZP          "2.29.1(ZP)"            //1.0转盘

+ 14 - 2
Application_cbd_apm32f1/applications/hmi.c

@@ -1540,7 +1540,11 @@ void Check_ParamConfig(void)
         device_status.tph = 70;         //高温保护阈值
         device_status.tpl = 5;          //低温保护阈值
         device_status.shake_ws = 1;     //震动开关,默认开
+        #if TG_MODULE == 0
         device_status.shake_sec = 1;    //震动时间,s
+        #else
+        device_status.shake_sec = 2;    //震动时间,s
+        #endif
         device_status.vol = 7;          //音量
         device_status.timeSwitch = 0;   //工作模式:光控
         device_status.passWord = 8888;    //屏幕密码
@@ -1846,7 +1850,11 @@ void ResetParamDefault(void)
         #endif
         device_status.heattime = 10;    //加热时间
         device_status.shake_ws = 1;     //针对开关
-        device_status.shake_sec = 1;    //震动时间1-100ms
+        #if TG_MODULE == 0
+        device_status.shake_sec = 1;    //震动时间,s
+        #else
+        device_status.shake_sec = 2;    //震动时间,s
+        #endif
         #if LAMP_EN == 1
         device_status.sunBar = 3;       //光控定时时长
         #else
@@ -1902,7 +1910,11 @@ void ResetParamDefault_DC(void)
     #endif
     device_status.heattime = 10;    //加热时间
     device_status.shake_ws = 1;     //针对开关
-    device_status.shake_sec = 1;    //震动时间1-100ms
+    #if TG_MODULE == 0
+    device_status.shake_sec = 1;    //震动时间,s
+    #else
+    device_status.shake_sec = 2;    //震动时间,s
+    #endif
     #if LAMP_EN == 1
     device_status.sunBar = 3;       //光控定时时长
     #else