|
|
@@ -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转盘增加延时消抖
|