From: p15692025051 <846603105@qq.com> Date: Thu, 20 Jul 2023 02:38:04 +0000 (+0800) Subject: k7屏幕调整 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=4e7bf255874dbc6649adfedb50489c149504d0af;p=mirrors%2FASR3603_Z5.git k7屏幕调整 --- 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 f13f181f..44abab81 100644 --- a/2.sdk/sdk/gui/lv_drivers/display/st7789v2_spi.c +++ b/2.sdk/sdk/gui/lv_drivers/display/st7789v2_spi.c @@ -37,29 +37,30 @@ static lcd_context g_lcd_ctx; const static struct spi_write_t spi_init_watch[] = { { SPI_WRITE_CMD, 0x11, 0 }, { SPI_WRITE_DELAY,120, 0 }, + { SPI_WRITE_CMD, 0x36, 1 }, { SPI_WRITE_DATA,0x00, 0 },//08 - - { SPI_WRITE_CMD, 0x35, 1 }, //tear effect - { SPI_WRITE_DATA,0x00, 0 }, - + { SPI_WRITE_CMD, 0x3a, 1 }, { SPI_WRITE_DATA,0x05, 0 }, - +#if DRV_PROJECT_Z5_K7 + { SPI_WRITE_CMD, 0xE7, 1 },//2通道 + { SPI_WRITE_DATA,0x11, 0 }, +#endif { SPI_WRITE_CMD, 0xb2, 5 }, - { SPI_WRITE_DATA,0x0c, 0 }, - { SPI_WRITE_DATA,0x0c, 0 }, + { SPI_WRITE_DATA,0x05, 0 }, + { SPI_WRITE_DATA,0x05, 0 }, { SPI_WRITE_DATA,0x00, 0 }, { SPI_WRITE_DATA,0x33, 0 }, { SPI_WRITE_DATA,0x33, 0 }, { SPI_WRITE_CMD, 0xb7, 1 }, - { SPI_WRITE_DATA,0x77, 0 }, + { SPI_WRITE_DATA,0x23, 0 }, { SPI_WRITE_CMD, 0xbb, 1 }, - { SPI_WRITE_DATA,0x2c, 0 }, + { SPI_WRITE_DATA,0x22, 0 }, { SPI_WRITE_CMD, 0xc0, 1 }, { SPI_WRITE_DATA,0x2c, 0 }, @@ -68,53 +69,62 @@ const static struct spi_write_t spi_init_watch[] = { { SPI_WRITE_DATA,0x01, 0 }, { SPI_WRITE_CMD, 0xc3, 1 }, - { SPI_WRITE_DATA,0x21, 0 }, + { SPI_WRITE_DATA,0x13, 0 }, { SPI_WRITE_CMD, 0xc4, 1 }, { SPI_WRITE_DATA,0x20, 0 }, { SPI_WRITE_CMD, 0xc6, 1 }, - { SPI_WRITE_DATA,0x10, 0 }, + { SPI_WRITE_DATA,0x0f, 0 }, + + { SPI_WRITE_CMD, 0xd0, 2 }, { SPI_WRITE_DATA,0xa4, 0 }, { SPI_WRITE_DATA,0xa1, 0 }, + { SPI_WRITE_CMD, 0xD6, 1 }, + { SPI_WRITE_DATA,0xA1, 0 }, + { SPI_WRITE_CMD, 0xe0, 14 }, - { SPI_WRITE_DATA,0xd0, 0 }, - { SPI_WRITE_DATA,0x03, 0 }, + { SPI_WRITE_DATA,0x70, 0 }, + { SPI_WRITE_DATA,0x06, 0 }, + { SPI_WRITE_DATA,0x0c, 0 }, { SPI_WRITE_DATA,0x08, 0 }, - { SPI_WRITE_DATA,0x0e, 0 }, - { SPI_WRITE_DATA,0x12, 0 }, - { SPI_WRITE_DATA,0x2d, 0 }, - { SPI_WRITE_DATA,0x42, 0 }, - { SPI_WRITE_DATA,0x45, 0 }, - { SPI_WRITE_DATA,0x53, 0 }, - { SPI_WRITE_DATA,0x29, 0 }, - { SPI_WRITE_DATA,0x16, 0 }, - { SPI_WRITE_DATA,0x15, 0 }, - { SPI_WRITE_DATA,0x22, 0 }, - { SPI_WRITE_DATA,0x24, 0 }, + { SPI_WRITE_DATA,0x09, 0 }, + { SPI_WRITE_DATA,0x27, 0 }, + { SPI_WRITE_DATA,0x2e, 0 }, + { SPI_WRITE_DATA,0x34, 0 }, + { SPI_WRITE_DATA,0x46, 0 }, + { SPI_WRITE_DATA,0x37, 0 }, + { SPI_WRITE_DATA,0x13, 0 }, + { SPI_WRITE_DATA,0x13, 0 }, + { SPI_WRITE_DATA,0x25, 0 }, + { SPI_WRITE_DATA,0x2a, 0 }, { SPI_WRITE_CMD, 0xe1, 14 }, - { SPI_WRITE_DATA,0xd0, 0 }, - { SPI_WRITE_DATA,0x03, 0 }, + { SPI_WRITE_DATA,0x70, 0 }, + { SPI_WRITE_DATA,0x04, 0 }, { SPI_WRITE_DATA,0x08, 0 }, - { SPI_WRITE_DATA,0x0e, 0 }, - { SPI_WRITE_DATA,0x13, 0 }, + { SPI_WRITE_DATA,0x09, 0 }, + { SPI_WRITE_DATA,0x07, 0 }, + { SPI_WRITE_DATA,0x03, 0 }, { SPI_WRITE_DATA,0x2c, 0 }, { SPI_WRITE_DATA,0x42, 0 }, - { SPI_WRITE_DATA,0x54, 0 }, - { SPI_WRITE_DATA,0x50, 0 }, - { SPI_WRITE_DATA,0x2c, 0 }, - { SPI_WRITE_DATA,0x16, 0 }, - { SPI_WRITE_DATA,0x16, 0 }, - { SPI_WRITE_DATA,0x20, 0 }, + { SPI_WRITE_DATA,0x42, 0 }, + { SPI_WRITE_DATA,0x38, 0 }, + { SPI_WRITE_DATA,0x14, 0 }, + { SPI_WRITE_DATA,0x14, 0 }, { SPI_WRITE_DATA,0x27, 0 }, + { SPI_WRITE_DATA,0x2c, 0 }, #if 1//反色 { SPI_WRITE_CMD, 0x21, 0 }, #endif + + { SPI_WRITE_CMD, 0x35, 1 }, //tear effect + { SPI_WRITE_DATA,0x00, 0 }, + { SPI_WRITE_CMD, 0x29, 0 }, }; @@ -133,18 +143,22 @@ const static struct spi_write_t spi_display_off_cmds[] = { }; const static struct spi_timing lcd_st7789v2_spi_timing = { - 80000, /* 52000, 62500, 31200, 26000 KHz */ + 52000, /* 52000, 62500, 31200, 26000 KHz */ 5000, /* KHz*/ }; const static struct spi_info lcd_st7789v2_spi_info_watch = { #if DRV_PROJECT_Z5_K6 - 4, -#else - 3, + 4,//4线 +#elif DRV_PROJECT_Z5_K7 + 3,//3线 #endif 1, - 1, +#if DRV_PROJECT_Z5_K6 + 1,//1通道 +#elif DRV_PROJECT_Z5_K7 + 2,//2通道 +#endif SPI_FORMAT_RGB565, 0, SPI_EDGE_RISING, 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 03db3095..c2fb249a 100644 --- a/2.sdk/sdk/product/craneg_modem/lv_gui_main.c +++ b/2.sdk/sdk/product/craneg_modem/lv_gui_main.c @@ -228,6 +228,7 @@ static struct lcd_info_t gc9c01_lcd_spi_3_2_info = #endif #if USE_LCD_PANEL_GC9A01_4_1_SPI_POC || USE_LCD_PANEL_ST9A01_4_1_SPI_POC || USE_LCD_PANEL_GC9307_4_1_SPI_POC || USE_LCD_PANEL_ST7789V2_SPI_WATCH + static uint32_t lcd_poc_mfp_spi_4_1_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_AF0 | MFP_PULL_HIGH | MFP_SLEEP_DIR | MFP_DRIVE_MEDIUM | MFP_LPM_EDGE_NONE, /* SPI_CS1 */ @@ -239,7 +240,19 @@ static uint32_t lcd_poc_mfp_spi_4_1_cfgs[] = { MFP_EOC }; #endif - +#if MMI_PROJECT_Z5_K7 +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 */ + MFP_REG(GPIO_22) | MFP_AF2 | MFP_PULL_HIGH | MFP_SLEEP_DIR | MFP_DRIVE_MEDIUM | MFP_LPM_EDGE_NONE, /* SPI_CS0 */ + //MFP_REG(GPIO_23) | MFP_AF2 | MFP_PULL_HIGH | MFP_SLEEP_DIR | MFP_DRIVE_MEDIUM | MFP_LPM_EDGE_NONE, /* SPI_DOUT */ + MFP_REG(GPIO_24) | MFP_AF2 | MFP_PULL_HIGH | MFP_SLEEP_DIR | MFP_DRIVE_MEDIUM | MFP_LPM_EDGE_NONE, /* SPI_DIN0 */ + MFP_REG(GPIO_25) | MFP_AF2 | MFP_PULL_HIGH | MFP_SLEEP_DIR | MFP_DRIVE_MEDIUM | MFP_LPM_EDGE_NONE, /* VSYNC */ + MFP_REG(GPIO_26) | MFP_AF2 | MFP_PULL_HIGH | MFP_SLEEP_DIR | MFP_DRIVE_MEDIUM | MFP_LPM_EDGE_NONE, /* SMPN_RST */ + //MFP_REG(GPIO_27) | MFP_AF0 | MFP_PULL_HIGH | MFP_SLEEP_DIR | MFP_DRIVE_MEDIUM | MFP_LPM_EDGE_NONE, /* SPI_DIN1 */ + MFP_EOC +}; +#endif #if USE_LCD_PANEL_GC9A01_4_1_SPI_POC static struct lcd_info_t gc9a01_lcd_spi_4_1_info = { @@ -265,11 +278,19 @@ static struct lcd_info_t gc9307_lcd_spi_4_1_info = #endif #if USE_LCD_PANEL_ST7789V2_SPI_WATCH +#if MMI_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 +static struct lcd_info_t st7789v2_lcd_spi_3_2_info = +{ + .mfp = (uint32_t *)lcd_poc_mfp_spi_3_2_cfgs, + .clk = 312000, /* 104000 */ +}; +#endif #endif #if USE_CRANE_LCD_MIPI @@ -310,7 +331,11 @@ 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 &st7789v2_lcd_spi_4_1_info, +#elif MMI_PROJECT_Z5_K7 + &st7789v2_lcd_spi_3_2_info, +#endif #endif };