update
authorCCC <2393524978@qq.com>
Tue, 14 Nov 2023 08:14:40 +0000 (16:14 +0800)
committerCCC <2393524978@qq.com>
Tue, 14 Nov 2023 08:14:40 +0000 (16:14 +0800)
13 files changed:
2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/mmi_default_CUSTOM.h
2.sdk/project/Z5_DS_Z12XW_QCB/product/craneg_modem/config/watch/lv_drv_conf_CUSTOM.h
2.sdk/project/Z5_DS_Z12XW_QCB/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
2.sdk/project/Z5_HA_K7/product/craneg_modem/config/watch/lv_drv_conf_CUSTOM.h
2.sdk/project/Z5_HA_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
2.sdk/project/Z5_I7/product/craneg_modem/config/watch/lv_drv_conf_CUSTOM.h
2.sdk/project/Z5_I7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
2.sdk/project/Z5_K6/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
2.sdk/project/Z5_K7/product/craneg_modem/config/watch/lv_drv_conf_CUSTOM.h
2.sdk/project/Z5_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
2.sdk/project/Z5_Z12/gui/lv_watch/mmi_default_CUSTOM.h
2.sdk/project/Z5_Z12/product/craneg_modem/config/watch/lv_drv_conf_CUSTOM.h
2.sdk/project/Z5_Z12/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h

index a60e0da..919b9d8 100644 (file)
@@ -60,7 +60,7 @@
 #define MMI_CUSTOMER_LANGUAGE          (LANG_CH) // LANG_EN
 
 //ring volume
-#define MMI_CUSTOMER_RING_VOLUME               (8)
+#define MMI_CUSTOMER_RING_VOLUME               (10)
 
 //backlight level
 #define MMI_CUSTOMER_BACKLIGHT_LEVEL           (10)
index 1ef0447..4b38750 100644 (file)
 #define USE_LCD_PANEL_ILI9806E_MIPI      0
 
 #ifndef USE_LCD_PANEL_GC9A01_SPI_WATCH
-#ifdef DRV_PROJECT_Z5_Z12 || DRV_PROJECT_Z5_DS_Z12XW_QCB
-    #  define USE_LCD_PANEL_GC9A01_SPI_WATCH   1
-#else
-    #  define USE_LCD_PANEL_GC9A01_SPI_WATCH   0
-#endif
+#  define USE_LCD_PANEL_GC9A01_SPI_WATCH   1
 #endif
 
 #ifndef USE_LCD_PANEL_ST9A01_4_1_SPI_POC
 #endif
 
 #ifndef USE_LCD_PANEL_GC9307_4_1_SPI_POC
-#if DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_K5 || DRV_PROJECT_Z5_HA_K7
-    #  define USE_LCD_PANEL_GC9307_4_1_SPI_POC   1
-#else
-    #  define USE_LCD_PANEL_GC9307_4_1_SPI_POC   0
-#endif
+#  define USE_LCD_PANEL_GC9307_4_1_SPI_POC   0
 #endif
 
 #ifndef USE_LCD_PANEL_ST7789V2_SPI_WATCH
-#if DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_K5 || DRV_PROJECT_Z5_I7 || DRV_PROJECT_Z5_HA_K7
-    #  define USE_LCD_PANEL_ST7789V2_SPI_WATCH   1
-#else
-    #  define USE_LCD_PANEL_ST7789V2_SPI_WATCH   0
-#endif
+#  define USE_LCD_PANEL_ST7789V2_SPI_WATCH   0
 #endif
 
 #ifndef USE_LCD_RB_SWAP_DISABLE
 /****************temperature***********/
 /* GPS driver */
 #ifndef USE_GPS
-#  define USE_GPS          1
+#  define USE_GPS          0 // 1
 #endif
 
 #if USE_GPS
index b8c3b28..6a389d1 100644 (file)
 #define __MMI_MAIN_MENU_ONE_PAGE_STYLE__
 #define __MMI_MAIN_MENU_LIST_STYLE__
 
-#define __MMI_HEALTH_MEASURE_HEART_SUPPORT__
+//#define __MMI_ZHSX_SUPPORT_HEALTH_SENSOR__
 
-#define __MMI_HEALTH_MEASURE_SPO2_SUPPORT__
+//#define __MMI_HEALTH_MEASURE_HEART_SUPPORT__
 
-#define __MMI_HEALTH_MEASURE_TEMPERATURE_SUPPORT__
+//#define __MMI_HEALTH_MEASURE_SPO2_SUPPORT__
+
+//#define __MMI_HEALTH_MEASURE_TEMPERATURE_SUPPORT__
 
 #define __MMI_APP_QRCODE_MENU_SUPPORT__
 
index 1ef0447..f588b5a 100644 (file)
 #define USE_LCD_PANEL_ILI9806E_MIPI      0
 
 #ifndef USE_LCD_PANEL_GC9A01_SPI_WATCH
-#ifdef DRV_PROJECT_Z5_Z12 || DRV_PROJECT_Z5_DS_Z12XW_QCB
-    #  define USE_LCD_PANEL_GC9A01_SPI_WATCH   1
-#else
-    #  define USE_LCD_PANEL_GC9A01_SPI_WATCH   0
-#endif
+#  define USE_LCD_PANEL_GC9A01_SPI_WATCH   0
 #endif
 
 #ifndef USE_LCD_PANEL_ST9A01_4_1_SPI_POC
 #endif
 
 #ifndef USE_LCD_PANEL_GC9307_4_1_SPI_POC
-#if DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_K5 || DRV_PROJECT_Z5_HA_K7
-    #  define USE_LCD_PANEL_GC9307_4_1_SPI_POC   1
-#else
-    #  define USE_LCD_PANEL_GC9307_4_1_SPI_POC   0
-#endif
+#  define USE_LCD_PANEL_GC9307_4_1_SPI_POC   1
 #endif
 
 #ifndef USE_LCD_PANEL_ST7789V2_SPI_WATCH
-#if DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_K5 || DRV_PROJECT_Z5_I7 || DRV_PROJECT_Z5_HA_K7
-    #  define USE_LCD_PANEL_ST7789V2_SPI_WATCH   1
-#else
-    #  define USE_LCD_PANEL_ST7789V2_SPI_WATCH   0
-#endif
+#  define USE_LCD_PANEL_ST7789V2_SPI_WATCH   1
 #endif
 
 #ifndef USE_LCD_RB_SWAP_DISABLE
index 27c6749..aaaa16c 100644 (file)
 
 #define __MMI_MAIN_MENU_FOUR_GRID_STYLE__
 
+#define __MMI_ZHSX_SUPPORT_HEALTH_SENSOR__
+
 #define __MMI_HEALTH_MEASURE_HEART_SUPPORT__
 
 #define __MMI_HEALTH_MEASURE_SPO2_SUPPORT__
index 1ef0447..f588b5a 100644 (file)
 #define USE_LCD_PANEL_ILI9806E_MIPI      0
 
 #ifndef USE_LCD_PANEL_GC9A01_SPI_WATCH
-#ifdef DRV_PROJECT_Z5_Z12 || DRV_PROJECT_Z5_DS_Z12XW_QCB
-    #  define USE_LCD_PANEL_GC9A01_SPI_WATCH   1
-#else
-    #  define USE_LCD_PANEL_GC9A01_SPI_WATCH   0
-#endif
+#  define USE_LCD_PANEL_GC9A01_SPI_WATCH   0
 #endif
 
 #ifndef USE_LCD_PANEL_ST9A01_4_1_SPI_POC
 #endif
 
 #ifndef USE_LCD_PANEL_GC9307_4_1_SPI_POC
-#if DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_K5 || DRV_PROJECT_Z5_HA_K7
-    #  define USE_LCD_PANEL_GC9307_4_1_SPI_POC   1
-#else
-    #  define USE_LCD_PANEL_GC9307_4_1_SPI_POC   0
-#endif
+#  define USE_LCD_PANEL_GC9307_4_1_SPI_POC   1
 #endif
 
 #ifndef USE_LCD_PANEL_ST7789V2_SPI_WATCH
-#if DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_K5 || DRV_PROJECT_Z5_I7 || DRV_PROJECT_Z5_HA_K7
-    #  define USE_LCD_PANEL_ST7789V2_SPI_WATCH   1
-#else
-    #  define USE_LCD_PANEL_ST7789V2_SPI_WATCH   0
-#endif
+#  define USE_LCD_PANEL_ST7789V2_SPI_WATCH   1
 #endif
 
 #ifndef USE_LCD_RB_SWAP_DISABLE
index 7713039..2c91c76 100644 (file)
 
 #define __MMI_MAIN_MENU_FOUR_GRID_STYLE__
 
+#define __MMI_ZHSX_SUPPORT_HEALTH_SENSOR__
+
 #define __MMI_HEALTH_MEASURE_HEART_SUPPORT__
 
 #define __MMI_HEALTH_MEASURE_SPO2_SUPPORT__
index 5f8afa5..cb35cd8 100644 (file)
 
 #define __MMI_WECHAT_SUPPORT__
 
+#define __MMI_ZHSX_SUPPORT_HEALTH_SENSOR__
+
 #define __MMI_HEALTH_MEASURE_HEART_SUPPORT__
 
 #define __MMI_HEALTH_MEASURE_SPO2_SUPPORT__
index 1ef0447..f588b5a 100644 (file)
 #define USE_LCD_PANEL_ILI9806E_MIPI      0
 
 #ifndef USE_LCD_PANEL_GC9A01_SPI_WATCH
-#ifdef DRV_PROJECT_Z5_Z12 || DRV_PROJECT_Z5_DS_Z12XW_QCB
-    #  define USE_LCD_PANEL_GC9A01_SPI_WATCH   1
-#else
-    #  define USE_LCD_PANEL_GC9A01_SPI_WATCH   0
-#endif
+#  define USE_LCD_PANEL_GC9A01_SPI_WATCH   0
 #endif
 
 #ifndef USE_LCD_PANEL_ST9A01_4_1_SPI_POC
 #endif
 
 #ifndef USE_LCD_PANEL_GC9307_4_1_SPI_POC
-#if DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_K5 || DRV_PROJECT_Z5_HA_K7
-    #  define USE_LCD_PANEL_GC9307_4_1_SPI_POC   1
-#else
-    #  define USE_LCD_PANEL_GC9307_4_1_SPI_POC   0
-#endif
+#  define USE_LCD_PANEL_GC9307_4_1_SPI_POC   1
 #endif
 
 #ifndef USE_LCD_PANEL_ST7789V2_SPI_WATCH
-#if DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_K5 || DRV_PROJECT_Z5_I7 || DRV_PROJECT_Z5_HA_K7
-    #  define USE_LCD_PANEL_ST7789V2_SPI_WATCH   1
-#else
-    #  define USE_LCD_PANEL_ST7789V2_SPI_WATCH   0
-#endif
+#  define USE_LCD_PANEL_ST7789V2_SPI_WATCH   1
 #endif
 
 #ifndef USE_LCD_RB_SWAP_DISABLE
index 7713039..2c91c76 100644 (file)
 
 #define __MMI_MAIN_MENU_FOUR_GRID_STYLE__
 
+#define __MMI_ZHSX_SUPPORT_HEALTH_SENSOR__
+
 #define __MMI_HEALTH_MEASURE_HEART_SUPPORT__
 
 #define __MMI_HEALTH_MEASURE_SPO2_SUPPORT__
index a60e0da..919b9d8 100644 (file)
@@ -60,7 +60,7 @@
 #define MMI_CUSTOMER_LANGUAGE          (LANG_CH) // LANG_EN
 
 //ring volume
-#define MMI_CUSTOMER_RING_VOLUME               (8)
+#define MMI_CUSTOMER_RING_VOLUME               (10)
 
 //backlight level
 #define MMI_CUSTOMER_BACKLIGHT_LEVEL           (10)
index 1ef0447..770db46 100644 (file)
 #define USE_LCD_PANEL_ILI9806E_MIPI      0
 
 #ifndef USE_LCD_PANEL_GC9A01_SPI_WATCH
-#ifdef DRV_PROJECT_Z5_Z12 || DRV_PROJECT_Z5_DS_Z12XW_QCB
-    #  define USE_LCD_PANEL_GC9A01_SPI_WATCH   1
-#else
-    #  define USE_LCD_PANEL_GC9A01_SPI_WATCH   0
-#endif
+#  define USE_LCD_PANEL_GC9A01_SPI_WATCH   1
 #endif
 
 #ifndef USE_LCD_PANEL_ST9A01_4_1_SPI_POC
 #endif
 
 #ifndef USE_LCD_PANEL_GC9307_4_1_SPI_POC
-#if DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_K5 || DRV_PROJECT_Z5_HA_K7
-    #  define USE_LCD_PANEL_GC9307_4_1_SPI_POC   1
-#else
-    #  define USE_LCD_PANEL_GC9307_4_1_SPI_POC   0
-#endif
+#  define USE_LCD_PANEL_GC9307_4_1_SPI_POC   0
 #endif
 
 #ifndef USE_LCD_PANEL_ST7789V2_SPI_WATCH
-#if DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_K5 || DRV_PROJECT_Z5_I7 || DRV_PROJECT_Z5_HA_K7
-    #  define USE_LCD_PANEL_ST7789V2_SPI_WATCH   1
-#else
-    #  define USE_LCD_PANEL_ST7789V2_SPI_WATCH   0
-#endif
+#  define USE_LCD_PANEL_ST7789V2_SPI_WATCH   0
 #endif
 
 #ifndef USE_LCD_RB_SWAP_DISABLE
index b8c3b28..8fa13f8 100644 (file)
 #define __MMI_MAIN_MENU_ONE_PAGE_STYLE__
 #define __MMI_MAIN_MENU_LIST_STYLE__
 
+#define __MMI_ZHSX_SUPPORT_HEALTH_SENSOR__
+
 #define __MMI_HEALTH_MEASURE_HEART_SUPPORT__
 
 #define __MMI_HEALTH_MEASURE_SPO2_SUPPORT__