From d6465348ce44bab9a1cf85bf13104f7f2d197c88 Mon Sep 17 00:00:00 2001 From: Liu Zhongwei Date: Sat, 23 Dec 2023 16:14:14 +0800 Subject: [PATCH] lcd: remove unused structs --- components/lcd/esp_lcd_ili9341/esp_lcd_ili9341.c | 6 ------ components/lcd/esp_lcd_st7796/esp_lcd_st7796.c | 6 ------ .../lcd/esp_lcd_st7796/test_apps/main/test_esp_lcd_st7796.c | 5 +++++ 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/components/lcd/esp_lcd_ili9341/esp_lcd_ili9341.c b/components/lcd/esp_lcd_ili9341/esp_lcd_ili9341.c index c021a655..4690f7c6 100644 --- a/components/lcd/esp_lcd_ili9341/esp_lcd_ili9341.c +++ b/components/lcd/esp_lcd_ili9341/esp_lcd_ili9341.c @@ -171,12 +171,6 @@ static esp_err_t panel_ili9341_reset(esp_lcd_panel_t *panel) return ESP_OK; } -typedef struct { - uint8_t cmd; - uint8_t data[16]; - uint8_t data_bytes; // Length of data in above data array; 0xFF = end of cmds. -} lcd_init_cmd_t; - static const ili9341_lcd_init_cmd_t vendor_specific_init_default[] = { // {cmd, { data }, data_size, delay_ms} /* Power contorl B, power control = 0, DC_ENA = 1 */ diff --git a/components/lcd/esp_lcd_st7796/esp_lcd_st7796.c b/components/lcd/esp_lcd_st7796/esp_lcd_st7796.c index 3128776b..add69464 100644 --- a/components/lcd/esp_lcd_st7796/esp_lcd_st7796.c +++ b/components/lcd/esp_lcd_st7796/esp_lcd_st7796.c @@ -175,12 +175,6 @@ static esp_err_t panel_st7796_reset(esp_lcd_panel_t *panel) return ESP_OK; } -typedef struct { - uint8_t cmd; - uint8_t data[16]; - uint8_t data_bytes; // Length of data in above data array; 0xFF = end of cmds. -} lcd_init_cmd_t; - static const st7796_lcd_init_cmd_t vendor_specific_init_default[] = { // {cmd, { data }, data_size, delay_ms} {0xf0, (uint8_t []){0xc3}, 1, 0}, diff --git a/components/lcd/esp_lcd_st7796/test_apps/main/test_esp_lcd_st7796.c b/components/lcd/esp_lcd_st7796/test_apps/main/test_esp_lcd_st7796.c index c382fe64..d2ee8d8b 100644 --- a/components/lcd/esp_lcd_st7796/test_apps/main/test_esp_lcd_st7796.c +++ b/components/lcd/esp_lcd_st7796/test_apps/main/test_esp_lcd_st7796.c @@ -10,6 +10,7 @@ #include "freertos/task.h" #include "freertos/semphr.h" #include "driver/gpio.h" +#include "soc/soc_caps.h" #include "esp_heap_caps.h" #include "esp_log.h" #include "esp_lcd_panel_ops.h" @@ -32,7 +33,11 @@ #define TEST_PIN_NUM_LCD_DATA2 (GPIO_NUM_11) #define TEST_PIN_NUM_LCD_DATA3 (GPIO_NUM_14) #define TEST_PIN_NUM_LCD_DATA4 (GPIO_NUM_13) +#if CONFIG_IDF_TARGET_ESP32S2 +#define TEST_PIN_NUM_LCD_DATA5 (GPIO_NUM_8) +#else #define TEST_PIN_NUM_LCD_DATA5 (GPIO_NUM_47) +#endif #define TEST_PIN_NUM_LCD_DATA6 (GPIO_NUM_21) #define TEST_PIN_NUM_LCD_DATA7 (GPIO_NUM_45) #define TEST_PIN_NUM_LCD_DATA8 (-1)