瀏覽代碼

放两个表盘进watch分区,尽量利用watch分区的空间,留出udisk分区的空间给后续下载表盘用
更新表盘相关的内容
1.当前表盘被删除找不到时,自动换成其他表盘
2.去掉表盘删除功能

robbin 2 周之前
父節點
當前提交
5e194ca112

二進制
application/aem_watch/boards/ats3085s4_dev_watch_ext_nor/watch/1223.wf


+ 1 - 1
application/aem_watch/src/user_cfg/device_info_cfg.h

@@ -5,7 +5,7 @@
 #define __DEVICE_INFO_CONFIG_H__
 #define MAJOR_VERSION 1
 #define MINOR_VERSION 0
-#define MICRO_VERSION 5
+#define MICRO_VERSION 6
 #define DEVICE_ID "CJ01"//3085
 #define DEVICE_NAME "Catsights"//"3085S WATCH"
 #define DEVICE_NAME_UI "Catsights"//"3085S WATCH"

+ 4 - 6
thirdparty/lib/aem/adapter/def_settings/aem_adapter_def_settings.c

@@ -26,22 +26,20 @@ const static aem_language_table_t s_aem_language_table[] =
 #ifdef CONFIG_BOARD_ATS3085S4_DEV_WATCH_EXT_NOR
 // 预置表盘,文件不可删除,默认表盘为此数组第一个表盘
 const static uint32_t s_inside_wf[] = {
-    1221,//79,
+    1221,1223,
 };
 // 预置表盘,文件可删除
 const static uint32_t s_outside_wf[] = {
-    1223,
-    1224,//80,
+    1224,
 };
 #else
 // 预置表盘,文件不可删除,默认表盘为此数组第一个表盘
 const static uint32_t s_inside_wf[] = {
-    1221,//79,
+    1221,1223,
 };
 // 预置表盘,文件可删除
 const static uint32_t s_outside_wf[] = {
-    1223,
-    1224,//80,
+    1224,
 };
 #endif
 

+ 1 - 1
thirdparty/lib/aem/config/aem_project.h

@@ -4,7 +4,7 @@
 #pragma warning(error : 4013)
 #endif
 #define AEM_VERSION "BL_Develop_NOR"
-#define BUILD_TIME "202503121835"
+#define BUILD_TIME "202503182115"
 #define AEM_GUI_FWK_LIB_VER "2.0.0.0"
 #define APP_DOWNLOAD_URL "https://customer.com"
 #define AEM_APP_TRANS_ANIMATION 1

二進制
thirdparty/lib/aem/libgui_fwk_s4.a