diff --git a/CMakeLists.txt b/CMakeLists.txt index 407802a..40986fc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ if(ESP_PLATFORM) file(GLOB SOURCES *.c) set(LVGL_INCLUDE_DIRS . lvgl_tft) list(APPEND SOURCES "lvgl_tft/disp_driver.c") -list(APPEND SOURCES "lvgl_tft/esp_lcd_backlight.c") +# list(APPEND SOURCES "lvgl_tft/esp_lcd_backlight.c") # Include only the source file of the selected # display controller. diff --git a/lvgl_helpers.h b/lvgl_helpers.h index c010174..78918d1 100644 --- a/lvgl_helpers.h +++ b/lvgl_helpers.h @@ -16,7 +16,7 @@ extern "C" { #include "lvgl_spi_conf.h" #include "lvgl_tft/disp_driver.h" -#include "lvgl_tft/esp_lcd_backlight.h" +// #include "lvgl_tft/esp_lcd_backlight.h" // 与IDF 5不兼容 #include "lvgl_touch/touch_driver.h" /********************* diff --git a/lvgl_tft/disp_driver.c b/lvgl_tft/disp_driver.c index 153ca31..81033f3 100644 --- a/lvgl_tft/disp_driver.c +++ b/lvgl_tft/disp_driver.c @@ -4,7 +4,7 @@ #include "disp_driver.h" #include "disp_spi.h" -#include "esp_lcd_backlight.h" +// #include "lvgl_tft/esp_lcd_backlight.h" // 与IDF 5不兼容 #include "sdkconfig.h" void *disp_driver_init(void) diff --git a/lvgl_tft/st7735s.c b/lvgl_tft/st7735s.c index 8be725b..f53c170 100644 --- a/lvgl_tft/st7735s.c +++ b/lvgl_tft/st7735s.c @@ -66,7 +66,7 @@ void st7735s_init(void) #endif lcd_init_cmd_t init_cmds[]={ - {ST7735_SWRESET, {0}, 0x80}, // Software reset, 0 args, w/delay 150 + {ST7735_SWRESET, {0}, 0x80}, // Soft ware reset, 0 args, w/delay 150 {ST7735_SLPOUT, {0}, 0x80}, // Out of sleep mode, 0 args, w/delay 500 {ST7735_FRMCTR1, {0x01, 0x2C, 0x2D}, 3}, // Frame rate ctrl - normal mode, 3 args: Rate = fosc/(1x2+40) * (LINE+2C+2D) {ST7735_FRMCTR2, {0x01, 0x2C, 0x2D}, 3}, // Frame rate control - idle mode, 3 args:Rate = fosc/(1x2+40) * (LINE+2C+2D) @@ -98,18 +98,18 @@ void st7735s_init(void) }; //Initialize non-SPI GPIOs - gpio_pad_select_gpio(ST7735S_DC); + esp_rom_gpio_pad_select_gpio(ST7735S_DC); gpio_set_direction(ST7735S_DC, GPIO_MODE_OUTPUT); #if ST7735S_USE_RST - gpio_pad_select_gpio(ST7735S_RST); + esp_rom_gpio_pad_select_gpio(ST7735S_RST); gpio_set_direction(ST7735S_RST, GPIO_MODE_OUTPUT); //Reset the display gpio_set_level(ST7735S_RST, 0); - vTaskDelay(100 / portTICK_RATE_MS); + vTaskDelay(100 / portTICK_PERIOD_MS); gpio_set_level(ST7735S_RST, 1); - vTaskDelay(100 / portTICK_RATE_MS); + vTaskDelay(100 / portTICK_PERIOD_MS); #endif ESP_LOGI(TAG, "ST7735S initialization."); @@ -120,7 +120,7 @@ void st7735s_init(void) st7735s_send_cmd(init_cmds[cmd].cmd); st7735s_send_data(init_cmds[cmd].data, init_cmds[cmd].databytes&0x1F); if (init_cmds[cmd].databytes & 0x80) { - vTaskDelay(100 / portTICK_RATE_MS); + vTaskDelay(100 / portTICK_PERIOD_MS); } cmd++; } diff --git a/lvgl_tft/st7735s.h b/lvgl_tft/st7735s.h index 2d02ed0..c4cfbef 100644 --- a/lvgl_tft/st7735s.h +++ b/lvgl_tft/st7735s.h @@ -37,8 +37,8 @@ extern "C" { // https://github.com/adafruit/Adafruit-ST7735-Library // #define ST7735_GREENTAB160x80 // For 160 x 80 display (BGR, inverted, 26 / 1 offset) -#define COLSTART 26 -#define ROWSTART 1 +#define COLSTART 24 // ST7735s是为128 x 160屏幕设计的,我们是160 x 80的屏幕,需要偏移一部分像素。 +#define ROWSTART 0 // ST7735s是为128 x 160屏幕设计的,我们是160 x 80的屏幕,需要偏移一部分像素。 // Delay between some initialisation commands #define TFT_INIT_DELAY 0x80