zhunk 1 年之前
父節點
當前提交
ebf6ee6020

+ 1 - 1
Application_BZY/.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<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.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" 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="1297872936118873969" 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="1296825131319521479" 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.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
 			</provider>

+ 1 - 1
Application_CBD/.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<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.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" 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="-411634754427827492" 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="1348723249740951679" 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.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
 			</provider>

+ 1 - 1
Application_CBD/applications/control.h

@@ -30,7 +30,7 @@
 #endif
 #endif
 
 
 #define VERSION_ZP          "1.46.1(ZP)"            //1.0转盘
 #define VERSION_ZP          "1.46.1(ZP)"            //1.0转盘
-#define VERSION_GK          "1.42.1(GK)"            //1.0高空
+#define VERSION_GK          "1.43.1(GK)"            //1.0高空
 
 
 #define VERSION_XCT         "1.13.6(HK)"            //吸虫塔-海康
 #define VERSION_XCT         "1.13.6(HK)"            //吸虫塔-海康
 #define VERSION_V5          "1.2.5(HK)"             //5.0
 #define VERSION_V5          "1.2.5(HK)"             //5.0

+ 14 - 2
Application_CBD/applications/dtu_uart2.c

@@ -669,15 +669,27 @@ char * makeJson()
         #if LAMP_EN == 0
         #if LAMP_EN == 0
         LOG_I("Current is:%d",atoi(device_status.power));
         LOG_I("Current is:%d",atoi(device_status.power));
         if(atoi(device_status.power)>10)        //过滤电流检测芯片损坏导致电流直为0 的异常
         if(atoi(device_status.power)>10)        //过滤电流检测芯片损坏导致电流直为0 的异常
-        device_status.lamp_status = 1;
+        {
+            device_status.lamp_status = 1;
+        }
         #endif
         #endif
+        if(device_status.version_type==11||device_status.version_type==12)
+        {
+            device_status.lamp_status = 0;
+        }
     }
     }
     else {
     else {
         device_status.lamp_status = 0;
         device_status.lamp_status = 0;
     }
     }
+
+
+
+
+
     if(atoi(device_status.power)>5000)
     if(atoi(device_status.power)>5000)
+    {
         rt_sprintf(device_status.power,"0.01");
         rt_sprintf(device_status.power,"0.01");
-
+    }
     makejson_sta = 1;
     makejson_sta = 1;
     time_t stamp=time(RT_NULL);
     time_t stamp=time(RT_NULL);
     static struct tm tm;
     static struct tm tm;

+ 3 - 0
Application_CBD/readme.md

@@ -1,3 +1,6 @@
+# 2025-02-17 更新说明
+#define VERSION_GK          "1.43.1(GK)"             //1.0高空
+1. 取消针对高空测报灯的灯管检测功能字段展示;
 # 2024-12-21 更新说明
 # 2024-12-21 更新说明
 1. 雨控优化:监测阈值1500修改为250
 1. 雨控优化:监测阈值1500修改为250
 # 2024-12-20 更新说明
 # 2024-12-20 更新说明