Z5_HA_K18_NFC compile

diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_0.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_0.png
deleted file mode 100644 (file)
index e84a149..0000000
Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_0.png and /dev/null differ

diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_1.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_1.png
deleted file mode 100644 (file)
index a53f15a..0000000
Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_1.png and /dev/null differ

diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_2.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_2.png
deleted file mode 100644 (file)
index d68024f..0000000
Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_2.png and /dev/null differ

diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_3.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_3.png
deleted file mode 100644 (file)
index b746267..0000000
Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_3.png and /dev/null differ

diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_4.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_4.png
deleted file mode 100644 (file)
index fb0b3b9..0000000
Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_4.png and /dev/null differ

diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_5.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_5.png
deleted file mode 100644 (file)
index 0e81632..0000000
Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_5.png and /dev/null differ

diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_6.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_6.png
deleted file mode 100644 (file)
index 03a2746..0000000
Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_6.png and /dev/null differ

diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_7.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_7.png
deleted file mode 100644 (file)
index dcfc709..0000000
Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_7.png and /dev/null differ

diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_8.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_8.png
deleted file mode 100644 (file)
index c82fe05..0000000
Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_8.png and /dev/null differ

diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_9.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_9.png
deleted file mode 100644 (file)
index 782cf75..0000000
Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_9.png and /dev/null differ

diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_back.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_back.png
deleted file mode 100644 (file)
index 2fe41ea..0000000
Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_back.png and /dev/null differ

diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_back_pr.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_back_pr.png
deleted file mode 100644 (file)
index 848911f..0000000
Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_back_pr.png and /dev/null differ

diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_dial.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_dial.png
deleted file mode 100644 (file)
index f8aac83..0000000
Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_dial.png and /dev/null differ

diff --git a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_dial_pr.png b/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_dial_pr.png
deleted file mode 100644 (file)
index 84d1439..0000000
Binary files a/2.sdk/project/Z5_HA_K18_NFC/gui/lv_watch/resource/png/dialpad/icon_dialpad_dial_pr.png and /dev/null differ

diff --git a/2.sdk/project/Z5_HA_K18_NFC/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_HA_K18_NFC/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
index e85378f..34bf687 100644 (file)
--- a/2.sdk/project/Z5_HA_K18_NFC/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
+++ b/2.sdk/project/Z5_HA_K18_NFC/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
@@ -5,7 +5,6 @@
 #define __LV_WATCH_CONF_CUSTOM_H__
 
 
-
 #define USE_LV_WATCH 1
 #define USE_LV_WATCH_COMMON 1
 #define USE_LV_THEME_WATCH_NIGHT 1
@@ -44,7 +43,7 @@
 #define USE_LV_WATCH_ALARM 1
 #define USE_LV_WATCH_ALARM_SET 1
 #define USE_LV_WATCH_POWER_OFF_CHARGING 1
-#define USE_LV_WATCH_CALCULATOR 0 // 1
+#define USE_LV_WATCH_CALCULATOR 1
 #define USE_LV_WATCH_FACTORY_MODE 1
 #define USE_LV_WATCH_VOICE_MSG 0 // 1
 #define USE_LV_WATCH_RESTART_AND_RESET 1

diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/tool/tool.c b/2.sdk/sdk/gui/lv_watch/lv_apps/tool/tool.c
index 5a33a8d..15b8c99 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_apps/tool/tool.c
+++ b/2.sdk/sdk/gui/lv_watch/lv_apps/tool/tool.c
@@ -9,9 +9,15 @@ extern lv_watch_Activity_Id_t g_watch_list_actId;
 
 static const mmi_watch_list_item_t s_tool_menu_list[] = 
 {
+#if USE_LV_WATCH_ALARM_SET
        { ICON_TOOL_ALARM, WATCH_TEXT_ID_ALARM, alarm_create_event_cb },
+#endif
+#if USE_LV_WATCH_STOPWATCH != 0
        { ICON_TOOL_STOPWATCH, WATCH_TEXT_ID_STOPWATCH, stopwatch_create_event_cb },
+#endif
+#if USE_LV_WATCH_TIMER
        { ICON_TOOL_TIMER, WATCH_TEXT_ID_TIMER, timer_create_event_cb },
+#endif
 #ifdef __MMI_WEATHER_MENU_SUPPORT__
        { ICON_TOOL_WEATHER, WATCH_TEXT_ID_WEATHER, mmi_weather_create_event_cb },
 #endif