From: snickersun@163.com Date: Wed, 17 Apr 2024 08:11:55 +0000 (+0000) Subject: Merge #31 into xts_origin from refs/changes/31/head X-Git-Tag: release_V1.2.70_20241020_135402~1162^2~16^2 X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=e1ab7f86a8ec2c81e35f7cb1c4dab5d29244ddb4;p=mirrors%2FFD230.git Merge #31 into xts_origin from refs/changes/31/head 修复睡眠唤醒lcd背光会被修改的问题 * refs/changes/31/head: (1 commits squashed) - 修复睡眠唤醒lcd背光会被修改的问题 Signed-off-by: snickersun@163.com Reviewed-by: snickersun@163.com Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/31 --- diff --git a/code/sdk/drivers/peripheral/lcd/lcd_config.c b/code/sdk/drivers/peripheral/lcd/lcd_config.c index 1687a7a1f..9d396961c 100644 --- a/code/sdk/drivers/peripheral/lcd/lcd_config.c +++ b/code/sdk/drivers/peripheral/lcd/lcd_config.c @@ -142,7 +142,7 @@ const lcd_cmd_sequ g_edo_466x466_screen_init_on[] = { {1, 2, {0x3a, 0x77}, 0}, {1, 2, {0x35, 0x00}, 0}, {1, 2, {0x53, 0x20}, 0}, - {1, 2, {0x51, 0xff}, 0}, + // {1, 2, {0x51, 0xff}, 0}, {1, 2, {0x63, 0xff}, 0}, {1, 5, {0x2A, 0x00, 0x06, 0x01, 0xd7}, 0}, {1, 5, {0x2B, 0x00, 0x00, 0x01, 0xd1}, 0}, diff --git a/code/sdk/drivers/peripheral/lcd/soc_lcd_api.c b/code/sdk/drivers/peripheral/lcd/soc_lcd_api.c index 8761d3f46..63f223555 100644 --- a/code/sdk/drivers/peripheral/lcd/soc_lcd_api.c +++ b/code/sdk/drivers/peripheral/lcd/soc_lcd_api.c @@ -173,7 +173,8 @@ static ext_errno lcd_get_ops(void) } } - g_lcd_info.brightness = DEFAULT_BRIGHTNESS; + if (g_lcd_info.brightness == 0) + g_lcd_info.brightness = DEFAULT_BRIGHTNESS; return EXT_ERR_SUCCESS; fail: