From: @CHENG <2393524978@qq.com>
Date: Wed, 28 Feb 2024 10:05:22 +0000 (+0800)
Subject: Z5_K7_EN
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=44acc7b869e60eadc781b4bca4ddf582a6e2426b;p=mirrors%2FASR3603_Z5.git

Z5_K7_EN
---

diff --git a/2.sdk/sdk/gui/lv_drivers/display/st7789v2_spi.c b/2.sdk/sdk/gui/lv_drivers/display/st7789v2_spi.c
index ced0a659..bbe16c85 100644
--- a/2.sdk/sdk/gui/lv_drivers/display/st7789v2_spi.c
+++ b/2.sdk/sdk/gui/lv_drivers/display/st7789v2_spi.c
@@ -158,7 +158,7 @@ const static struct spi_write_t spi_init_watch[] = {
 
     { SPI_WRITE_CMD, 0x3a, 1 },
     { SPI_WRITE_DATA,0x05, 0 },
-#if DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_Z12 || DRV_PROJECT_Z5_I7 || DRV_PROJECT_Z5_HA_K7 || DRV_PROJECT_Z5_DS_Z12XW_QCB
+#if DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_K7_EN || DRV_PROJECT_Z5_Z12 || DRV_PROJECT_Z5_I7 || DRV_PROJECT_Z5_HA_K7 || DRV_PROJECT_Z5_DS_Z12XW_QCB
     { SPI_WRITE_CMD, 0xE7, 1 },//2通道
     { SPI_WRITE_DATA,0x11, 0 },
 #endif
@@ -265,7 +265,7 @@ const static struct spi_timing lcd_st7789v2_spi_timing = {
 const static struct spi_info lcd_st7789v2_spi_info_watch = {
 #if DRV_PROJECT_Z5_K6
     4,//4线
-#elif DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_Z12 || DRV_PROJECT_Z5_I7 || DRV_PROJECT_Z5_HA_K7 || DRV_PROJECT_Z5_DS_Z12XW_QCB
+#elif DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_K7_EN || DRV_PROJECT_Z5_Z12 || DRV_PROJECT_Z5_I7 || DRV_PROJECT_Z5_HA_K7 || DRV_PROJECT_Z5_DS_Z12XW_QCB
     3,//3线
 #else
     3,//3线
@@ -273,7 +273,7 @@ const static struct spi_info lcd_st7789v2_spi_info_watch = {
     1,
 #if DRV_PROJECT_Z5_K6
     1,//1通道
-#elif DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_Z12 ||DRV_PROJECT_Z5_I7 || DRV_PROJECT_Z5_HA_K7 || DRV_PROJECT_Z5_DS_Z12XW_QCB
+#elif DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_K7_EN || DRV_PROJECT_Z5_Z12 ||DRV_PROJECT_Z5_I7 || DRV_PROJECT_Z5_HA_K7 || DRV_PROJECT_Z5_DS_Z12XW_QCB
     2,//2通道
 #else
     2,//2通道
@@ -389,7 +389,7 @@ static void spi_write_function(const struct spi_write_t *spi_data, uint32_t leng
 static void st7789v2_panel_invalid(uint32_t start_x,
                                   uint32_t start_y,  uint32_t end_x, uint32_t end_y)
 {
-#if DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_I7 || DRV_PROJECT_Z5_HA_K7
+#if DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_K7_EN || DRV_PROJECT_Z5_I7 || DRV_PROJECT_Z5_HA_K7
 	start_y += 20;
 	end_y += 20;
 #endif
diff --git a/2.sdk/sdk/product/craneg_modem/config/watch/lv_drv_conf.h b/2.sdk/sdk/product/craneg_modem/config/watch/lv_drv_conf.h
index a1e5fea9..c1f4e0cd 100644
--- a/2.sdk/sdk/product/craneg_modem/config/watch/lv_drv_conf.h
+++ b/2.sdk/sdk/product/craneg_modem/config/watch/lv_drv_conf.h
@@ -328,20 +328,12 @@
 #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
-#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
-#endif
 
 #ifndef USE_LCD_RB_SWAP_DISABLE
 #define USE_LCD_RB_SWAP_DISABLE              0
diff --git a/2.sdk/sdk/product/craneg_modem/lv_gui_main.c b/2.sdk/sdk/product/craneg_modem/lv_gui_main.c
index dacd9167..b4a9fd42 100644
--- a/2.sdk/sdk/product/craneg_modem/lv_gui_main.c
+++ b/2.sdk/sdk/product/craneg_modem/lv_gui_main.c
@@ -253,7 +253,7 @@ static uint32_t lcd_poc_mfp_spi_4_1_cfgs[] = {
     MFP_EOC
 };
 #endif
-#if DRV_PROJECT_Z5_K7 || USE_LCD_PANEL_GC9A01_SPI_WATCH|| DRV_PROJECT_Z5_I7 || DRV_PROJECT_Z5_HA_K7
+#if DRV_PROJECT_Z5_K7 || USE_LCD_PANEL_GC9A01_SPI_WATCH|| DRV_PROJECT_Z5_I7 || DRV_PROJECT_Z5_HA_K7 || DRV_PROJECT_Z5_K7_EN
 static uint32_t lcd_poc_mfp_spi_3_2_cfgs[] = {
     MFP_REG(GPIO_20) | MFP_AF2 | MFP_PULL_HIGH | MFP_SLEEP_DIR | MFP_DRIVE_MEDIUM | MFP_LPM_EDGE_NONE, /* SPI_DCLK */
     MFP_REG(GPIO_21) | MFP_AF3 | MFP_PULL_HIGH | MFP_SLEEP_DIR | MFP_DRIVE_MEDIUM | MFP_LPM_EDGE_NONE, /* SPI_CS1 */
@@ -297,7 +297,7 @@ static struct lcd_info_t st7789v2_lcd_spi_4_1_info =
     .mfp = (uint32_t *)lcd_poc_mfp_spi_4_1_cfgs,
     .clk = 312000, /* 104000 */
 };
-#elif DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_I7 || DRV_PROJECT_Z5_HA_K7
+#elif DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_I7 || DRV_PROJECT_Z5_HA_K7 || DRV_PROJECT_Z5_K7_EN
 static struct lcd_info_t st7789v2_lcd_spi_3_2_info =
 {
     .mfp = (uint32_t *)lcd_poc_mfp_spi_3_2_cfgs,
@@ -351,7 +351,7 @@ static struct lcd_info_t *lcd_info_detect[]= {
     #if USE_LCD_PANEL_ST7789V2_SPI_WATCH
     #if DRV_PROJECT_Z5_K6
         &st7789v2_lcd_spi_4_1_info,
-    #elif DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_Z12 || DRV_PROJECT_Z5_I7 || DRV_PROJECT_Z5_HA_K7 || DRV_PROJECT_Z5_DS_Z12XW_QCB
+    #elif DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_K7_EN || DRV_PROJECT_Z5_Z12 || DRV_PROJECT_Z5_I7 || DRV_PROJECT_Z5_HA_K7 || DRV_PROJECT_Z5_DS_Z12XW_QCB
         &st7789v2_lcd_spi_3_2_info,
     #endif
     #endif