From: CCC <2393524978@qq.com>
Date: Thu, 21 Sep 2023 09:37:16 +0000 (+0800)
Subject: gengxin
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=343efbf0a7c1a609c5a88bb4eeee24241e8a369d;p=mirrors%2FASR3603_Z5.git

gengxin
---

diff --git a/2.sdk/project/Z5_K12/product/craneg_modem/config/watch/lv_conf_CUSTOM.h b/2.sdk/project/Z5_K12/product/craneg_modem/config/watch/lv_conf_CUSTOM.h
index c04423d5..ca4041d8 100644
--- a/2.sdk/project/Z5_K12/product/craneg_modem/config/watch/lv_conf_CUSTOM.h
+++ b/2.sdk/project/Z5_K12/product/craneg_modem/config/watch/lv_conf_CUSTOM.h
@@ -11,10 +11,10 @@
 #define USE_LV_WATCH_UI_240_240_CIRCLE 1
 
 //project
-#define MMI_PROJECT_Z5_K12 1
+#define MMI_PROJECT_Z5_D12 1
 
 //drv
-#define DRV_PROJECT_Z5_K12 1
+#define DRV_PROJECT_Z5_D12 1
 
 
 
diff --git a/2.sdk/sdk/gui/lv_drivers/display/gc9a01_spi.c b/2.sdk/sdk/gui/lv_drivers/display/gc9a01_spi.c
index b7bca0a4..ec4e4448 100644
--- a/2.sdk/sdk/gui/lv_drivers/display/gc9a01_spi.c
+++ b/2.sdk/sdk/gui/lv_drivers/display/gc9a01_spi.c
@@ -314,7 +314,7 @@ const static struct spi_write_t spi_init_poc[] = {
     {  SPI_WRITE_CMD,   0x29,  0  },
     //{  SPI_WRITE_DELAY, 120,   0  },
     {  SPI_WRITE_CMD,   0x2C,  0  },
-#elif DRV_PROJECT_Z5_K12
+#elif DRV_PROJECT_Z5_D12
     /****  ZH128H16209A LCD  ****/
     {  SPI_WRITE_CMD,   0xFE,  0  },
     {  SPI_WRITE_CMD,   0xEF,  0  }, 
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 db2c62df..ef105b3c 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 || DRV_PROJECT_Z5_K12
+#if DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_D12
     { 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 || DRV_PROJECT_Z5_K12
+#elif DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_D12
     3,//3线
 #endif
     1,
 #if DRV_PROJECT_Z5_K6
     1,//1通道
-#elif DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_K12
+#elif DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_D12
     2,//2通道
 #endif
     SPI_FORMAT_RGB565,
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 54a4176c..cedb1581 100644
--- a/2.sdk/sdk/product/craneg_modem/lv_gui_main.c
+++ b/2.sdk/sdk/product/craneg_modem/lv_gui_main.c
@@ -333,7 +333,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_K12
+#elif DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_D12
     &st7789v2_lcd_spi_3_2_info,
 #endif
 #endif