From: CCC <2393524978@qq.com>
Date: Tue, 5 Sep 2023 02:16:20 +0000 (+0800)
Subject: gengxin
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=89d4ff78ad8e89a176fb88425f03ce0b3ea1333e;p=mirrors%2FASR3603_Z5.git

gengxin
---

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 44abab81..db2c62df 100644
--- a/2.sdk/sdk/gui/lv_drivers/display/st7789v2_spi.c
+++ b/2.sdk/sdk/gui/lv_drivers/display/st7789v2_spi.c
@@ -44,7 +44,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
+#if DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_K12
     { SPI_WRITE_CMD, 0xE7, 1 },//2通道
     { SPI_WRITE_DATA,0x11, 0 },
 #endif
@@ -150,13 +150,13 @@ 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
+#elif DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_K12
     3,//3线
 #endif
     1,
 #if DRV_PROJECT_Z5_K6
     1,//1通道
-#elif DRV_PROJECT_Z5_K7
+#elif DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_K12
     2,//2通道
 #endif
     SPI_FORMAT_RGB565,
diff --git a/2.sdk/sdk/gui/lv_drivers/indev/bl6xx3_fw_update.h b/2.sdk/sdk/gui/lv_drivers/indev/bl6xx3_fw_update.h
index 568bf815..1677bbd6 100644
--- a/2.sdk/sdk/gui/lv_drivers/indev/bl6xx3_fw_update.h
+++ b/2.sdk/sdk/gui/lv_drivers/indev/bl6xx3_fw_update.h
@@ -7,7 +7,7 @@
 #include "lv_conf.h"
 #ifdef DRV_PROJECT_Z5_K6
 #define H81_TP 2
-#elif DRV_PROJECT_Z5_K7
+#elif DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_K12
 #define H81_TP 4
 #else
 #define H81_TP 2
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 40d5c405..7dd7c0a6 100644
--- a/2.sdk/sdk/product/craneg_modem/lv_gui_main.c
+++ b/2.sdk/sdk/product/craneg_modem/lv_gui_main.c
@@ -240,7 +240,7 @@ static uint32_t lcd_poc_mfp_spi_4_1_cfgs[] = {
     MFP_EOC
 };
 #endif
-#if MMI_PROJECT_Z5_K7
+#if DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_K12
 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 */
@@ -278,13 +278,13 @@ static struct lcd_info_t gc9307_lcd_spi_4_1_info =
 #endif
 
 #if USE_LCD_PANEL_ST7789V2_SPI_WATCH
-#if MMI_PROJECT_Z5_K6
+#if DRV_PROJECT_Z5_K6
 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 MMI_PROJECT_Z5_K7
+#elif DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_K12
 static struct lcd_info_t st7789v2_lcd_spi_3_2_info =
 {
     .mfp = (uint32_t *)lcd_poc_mfp_spi_3_2_cfgs,
@@ -331,9 +331,9 @@ static struct lcd_info_t *lcd_info_detect[]= {
     &gc9307_lcd_spi_4_1_info,
 #endif
 #if USE_LCD_PANEL_ST7789V2_SPI_WATCH
-#if MMI_PROJECT_Z5_K6
+#if DRV_PROJECT_Z5_K6
     &st7789v2_lcd_spi_4_1_info,
-#elif MMI_PROJECT_Z5_K7
+#elif DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_K12
     &st7789v2_lcd_spi_3_2_info,
 #endif
 #endif