From: CCC <2393524978@qq.com> Date: Tue, 14 Nov 2023 08:14:40 +0000 (+0800) Subject: update X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=53f00e99a9842fa61a2b040675e3f152270e4338;p=mirrors%2FASR3603_Z5.git update --- diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/mmi_default_CUSTOM.h b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/mmi_default_CUSTOM.h index a60e0dae..919b9d80 100644 --- a/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/mmi_default_CUSTOM.h +++ b/2.sdk/project/Z5_DS_Z12XW_QCB/gui/lv_watch/mmi_default_CUSTOM.h @@ -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) diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/product/craneg_modem/config/watch/lv_drv_conf_CUSTOM.h b/2.sdk/project/Z5_DS_Z12XW_QCB/product/craneg_modem/config/watch/lv_drv_conf_CUSTOM.h index 1ef0447d..4b38750a 100644 --- a/2.sdk/project/Z5_DS_Z12XW_QCB/product/craneg_modem/config/watch/lv_drv_conf_CUSTOM.h +++ b/2.sdk/project/Z5_DS_Z12XW_QCB/product/craneg_modem/config/watch/lv_drv_conf_CUSTOM.h @@ -282,11 +282,7 @@ #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 @@ -298,19 +294,11 @@ #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 @@ -575,7 +563,7 @@ /****************temperature***********/ /* GPS driver */ #ifndef USE_GPS -# define USE_GPS 1 +# define USE_GPS 0 // 1 #endif #if USE_GPS diff --git a/2.sdk/project/Z5_DS_Z12XW_QCB/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_DS_Z12XW_QCB/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h index b8c3b285..6a389d1c 100644 --- a/2.sdk/project/Z5_DS_Z12XW_QCB/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h +++ b/2.sdk/project/Z5_DS_Z12XW_QCB/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h @@ -168,11 +168,13 @@ #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__ diff --git a/2.sdk/project/Z5_HA_K7/product/craneg_modem/config/watch/lv_drv_conf_CUSTOM.h b/2.sdk/project/Z5_HA_K7/product/craneg_modem/config/watch/lv_drv_conf_CUSTOM.h index 1ef0447d..f588b5a0 100644 --- a/2.sdk/project/Z5_HA_K7/product/craneg_modem/config/watch/lv_drv_conf_CUSTOM.h +++ b/2.sdk/project/Z5_HA_K7/product/craneg_modem/config/watch/lv_drv_conf_CUSTOM.h @@ -282,11 +282,7 @@ #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 @@ -298,19 +294,11 @@ #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 diff --git a/2.sdk/project/Z5_HA_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_HA_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h index 27c67497..aaaa16c2 100644 --- a/2.sdk/project/Z5_HA_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h +++ b/2.sdk/project/Z5_HA_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h @@ -166,6 +166,8 @@ #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__ diff --git a/2.sdk/project/Z5_I7/product/craneg_modem/config/watch/lv_drv_conf_CUSTOM.h b/2.sdk/project/Z5_I7/product/craneg_modem/config/watch/lv_drv_conf_CUSTOM.h index 1ef0447d..f588b5a0 100644 --- a/2.sdk/project/Z5_I7/product/craneg_modem/config/watch/lv_drv_conf_CUSTOM.h +++ b/2.sdk/project/Z5_I7/product/craneg_modem/config/watch/lv_drv_conf_CUSTOM.h @@ -282,11 +282,7 @@ #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 @@ -298,19 +294,11 @@ #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 diff --git a/2.sdk/project/Z5_I7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_I7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h index 7713039f..2c91c764 100644 --- a/2.sdk/project/Z5_I7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h +++ b/2.sdk/project/Z5_I7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h @@ -166,6 +166,8 @@ #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__ diff --git a/2.sdk/project/Z5_K6/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_K6/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h index 5f8afa50..cb35cd81 100644 --- a/2.sdk/project/Z5_K6/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h +++ b/2.sdk/project/Z5_K6/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h @@ -159,6 +159,8 @@ #define __MMI_WECHAT_SUPPORT__ +#define __MMI_ZHSX_SUPPORT_HEALTH_SENSOR__ + #define __MMI_HEALTH_MEASURE_HEART_SUPPORT__ #define __MMI_HEALTH_MEASURE_SPO2_SUPPORT__ diff --git a/2.sdk/project/Z5_K7/product/craneg_modem/config/watch/lv_drv_conf_CUSTOM.h b/2.sdk/project/Z5_K7/product/craneg_modem/config/watch/lv_drv_conf_CUSTOM.h index 1ef0447d..f588b5a0 100644 --- a/2.sdk/project/Z5_K7/product/craneg_modem/config/watch/lv_drv_conf_CUSTOM.h +++ b/2.sdk/project/Z5_K7/product/craneg_modem/config/watch/lv_drv_conf_CUSTOM.h @@ -282,11 +282,7 @@ #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 @@ -298,19 +294,11 @@ #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 diff --git a/2.sdk/project/Z5_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h index 7713039f..2c91c764 100644 --- a/2.sdk/project/Z5_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h +++ b/2.sdk/project/Z5_K7/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h @@ -166,6 +166,8 @@ #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__ diff --git a/2.sdk/project/Z5_Z12/gui/lv_watch/mmi_default_CUSTOM.h b/2.sdk/project/Z5_Z12/gui/lv_watch/mmi_default_CUSTOM.h index a60e0dae..919b9d80 100644 --- a/2.sdk/project/Z5_Z12/gui/lv_watch/mmi_default_CUSTOM.h +++ b/2.sdk/project/Z5_Z12/gui/lv_watch/mmi_default_CUSTOM.h @@ -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) diff --git a/2.sdk/project/Z5_Z12/product/craneg_modem/config/watch/lv_drv_conf_CUSTOM.h b/2.sdk/project/Z5_Z12/product/craneg_modem/config/watch/lv_drv_conf_CUSTOM.h index 1ef0447d..770db46d 100644 --- a/2.sdk/project/Z5_Z12/product/craneg_modem/config/watch/lv_drv_conf_CUSTOM.h +++ b/2.sdk/project/Z5_Z12/product/craneg_modem/config/watch/lv_drv_conf_CUSTOM.h @@ -282,11 +282,7 @@ #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 @@ -298,19 +294,11 @@ #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 diff --git a/2.sdk/project/Z5_Z12/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_Z12/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h index b8c3b285..8fa13f82 100644 --- a/2.sdk/project/Z5_Z12/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h +++ b/2.sdk/project/Z5_Z12/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h @@ -168,6 +168,8 @@ #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__