yf_zjb 5 лет назад
Родитель
Сommit
5344d2cdad

+ 1 - 1
Application_BZY/.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="-189375026113136009" 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="-127453641507294465" 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>

+ 0 - 4
Application_CBD/.settings/language.settings.xml

@@ -5,11 +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"/>
-<<<<<<< HEAD
 			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-164989539578436777" 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="-210075347803492721" 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">
->>>>>>> 3489195fa2c978b1652356a439fd2c8cb9579f4a
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

+ 4 - 9
Application_CBD/applications/control.h

@@ -13,17 +13,12 @@
 #include <board.h>
 
 #include <rtdevice.h>
-<<<<<<< HEAD
-#define VERSION_HK "1.15.41(HK)"         //版本
-#define VERSION_ZP "1.15.1(ZP)"         //版本
 
-#define CompileTime "20210601"
-=======
-#define VERSION_HK "1.16.41(HK)"         //版本
-#define VERSION_ZP "1.16.1(ZP)"         //版本
+#define VERSION_HK "1.17.41(HK)"         //版本
+#define VERSION_ZP "1.17.1(ZP)"         //版本
+
+#define CompileTime "20210602"
 
-#define CompileTime "20210527"
->>>>>>> 3489195fa2c978b1652356a439fd2c8cb9579f4a
 
 /*******************************测试任务****************************************/
 /*********************************************************************/

+ 1 - 1
Application_CBD/makefile.targets

@@ -4,4 +4,4 @@ clean2:
 	-@echo ' '
 
 
-*.elf: $(wildcard E:/WorkSpace/IOT_CBD_BZY_CTRL/Application_CBD/link.lds)
+*.elf: $(wildcard D:/RT-ThreadStudio/workspace/IOT_CBD_BZY_CTRL/Application_CBD/link.lds)

+ 5 - 16
Application_CBD/readme.md

@@ -115,21 +115,6 @@ static int num_updata = 60;
 Flash:         242604 B              236.92 KB
 RAM:            19072 B               18.62 KB
 
-<<<<<<< HEAD
-#define VERSION_HK "1.15.41(HK)"         //版本
-#define VERSION_ZP "1.15.1(ZP)"         //版本
-#define CompileTime "20210601"
-## 更新说明
-- 1.0转盘增加延时消抖
-
-
-
-
-
-
-
-
-
 =======
 #define VERSION_HK "1.16.41(HK)"         //版本
 #define VERSION_ZP "1.16.1(ZP)"         //版本
@@ -162,5 +147,9 @@ RAM:            19072 B               18.62 KB
 [2021-05-27 16:47:15.885] [I]-[testHttp.cbFncFile] fileSize=800336
 [2021-05-27 16:47:15.885] [W]-[update file size:] 800336
 [2021-05-27 16:47:15.885] [W]-[free system filesize:] 507000
->>>>>>> 3489195fa2c978b1652356a439fd2c8cb9579f4a
 
+#define VERSION_HK "1.17.41(HK)"         //版本
+#define VERSION_ZP "1.17.1(ZP)"         //版本
+#define CompileTime "20210602"
+## 更新说明
+- 1.0转盘增加延时消抖

+ 0 - 4
Application_GK_CBD/.settings/language.settings.xml

@@ -5,11 +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"/>
-<<<<<<< HEAD
 			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-139343116707329832" 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="-128865325716200071" 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">
->>>>>>> 3489195fa2c978b1652356a439fd2c8cb9579f4a
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

+ 1 - 1
CBD_FOTA_BootLoader/.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="-150875593399114980" 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="-168307560337915404" 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>