Browse Source

2.40.4(2000W)

zhunk 5 tháng trước cách đây
mục cha
commit
5bee7f582a

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

+ 4 - 4
Application_cbd_apm32f1/applications/control.h

@@ -39,9 +39,9 @@
     #define VERSION_HK          "1.(3ledV9).41(HK)"      //4.0海康-三色光源
     #define VERSION_HK_2000W    "1.3led.40(2000W)"       //水稻
 #else
-    #define VERSION_HK          "2.39.41(HK)"            //4.0海康-1200W
+    #define VERSION_HK          "2.40.41(HK)"            //4.0海康-1200W
     #if TG_MODULE == 0
-    #define VERSION_HK_2000W    "2.39.000(2000W)"         //4.0水稻
+    #define VERSION_HK_2000W    "2.40.4(2000W)"         //4.0水稻
     #else
     #if MATCH_DEVICE == 1
     #define VERSION_HK_2000W    "3.3.4(TG)"             //推杆结构比赛设备
@@ -51,8 +51,8 @@
     #endif
 #endif
 
-#define VERSION_ZP          "2.39.1(ZP)"            //1.0转盘
-#define VERSION_GK          "2.39.1(GK)"            //1.0高空
+#define VERSION_ZP          "2.40.1(ZP)"            //1.0转盘
+#define VERSION_GK          "2.40.1(GK)"            //1.0高空
 
 extern rt_event_t event_485_play;
 

+ 8 - 8
Application_cbd_apm32f1/applications/hmi.c

@@ -1795,9 +1795,9 @@ void Check_ParamConfig(void)
         device_status.dtype = 3;
         device_status.version_type = 4; //4.0
         device_status.Power_Type = 0;   //0-交流供电;1-直流供电
-        device_status.clt_time = 10;    //收集时间
-        device_status.heattime = 10;    //加热时间
-        device_status.heatvalue=100;//加热温度
+        device_status.clt_time = 6;     //收集时间
+        device_status.heattime = 8;     //加热时间
+        device_status.heatvalue=100;    //加热温度
         device_status.thsp = 300;       //默认熄屏时间5分钟
         device_status.sunBar = 9;       //光控定时时长
         device_status.startBar = 20;    //定时开始时间
@@ -1812,7 +1812,7 @@ void Check_ParamConfig(void)
         #endif
         device_status.vol = 7;          //音量
         device_status.timeSwitch = 0;   //工作模式:光控
-        device_status.passWord = 8888;    //屏幕密码
+        device_status.passWord = 8888;  //屏幕密码
         device_status.dattim = 10;      //数据上传间隔
         device_status.ds = 1;           //设备状态
         device_status.update_flag = 0;
@@ -2102,12 +2102,12 @@ void ResetParamDefault(void)
     ef_set_env_blob("dattim",&device_status.dattim,sizeof(device_status.dattim));        //上传时间
     if(device_status.dtype==3)
     {
-        device_status.clt_time = 10;    //收集时间
+        device_status.clt_time = 6;    //收集时间
         #if LAMP_EN == 0
         device_status.startBar = 20;    //定时开始时间
         device_status.stopBar = 5;      //定时结束时间
         #endif
-        device_status.heattime = 10;    //加热时间
+        device_status.heattime = 8;    //加热时间
         device_status.shake_ws = 1;     //针对开关
         #if TG_MODULE == 0
         device_status.shake_sec = 1;    //震动时间,s
@@ -2161,13 +2161,13 @@ void ResetParamDefault_DC(void)
 {
     //将温度数据设置为-15摄氏度,以便上传的数据中包含温控数据
     rt_sprintf(device_status.tempture,"%d",-15);
-    device_status.clt_time = 10;    //收集时间
+    device_status.clt_time = 6;    //收集时间
     device_status.dattim = 10;      //数据上传间隔
     #if LAMP_EN == 0
     device_status.startBar = 20;    //定时开始时间
     device_status.stopBar = 0;      //定时结束时间
     #endif
-    device_status.heattime = 10;    //加热时间
+    device_status.heattime = 8;    //加热时间
     device_status.shake_ws = 1;     //针对开关
     #if TG_MODULE == 0
     device_status.shake_sec = 1;    //震动时间,s

+ 4 - 1
Application_cbd_apm32f1/readme.md

@@ -1,5 +1,8 @@
+# 2026-06-12 更新说明
+	#define VERSION_HK_2000W    "2.40.4(2000W)"         //4.0水稻
+	1、每小时上传4张照片,修改默认参数收集6分钟,加热8分钟;
 # 2026-06-10 更新说明
-	#define VERSION_HK_2000W    "2.40.000()"         //4.0水稻
+	#define VERSION_HK_2000W    "2.39.000(2000W)"         //4.0水稻
 	1、增加485多通道电机驱动模块适配,用于控制地笼上的接虫盒;
 # 2026-06-08 更新说明
 	#define VERSION_HK_2000W    "2.39.4(2000W-111)"         //4.0水稻