minor fixes
This commit is contained in:
parent
6a6fdcf289
commit
1cf7dd0876
3 changed files with 33 additions and 24 deletions
|
@ -18,7 +18,8 @@ extern "C" {
|
|||
#include "lvgl_tft/disp_driver.h"
|
||||
#include "lvgl_tft/esp_lcd_backlight.h"
|
||||
#include "lvgl_touch/touch_driver.h"
|
||||
|
||||
#include "hal/spi_hal.h"
|
||||
#include "esp_idf_version.h"
|
||||
/*********************
|
||||
* DEFINES
|
||||
*********************/
|
||||
|
@ -38,10 +39,9 @@ extern "C" {
|
|||
# endif
|
||||
#endif
|
||||
|
||||
#ifdef USE_PORT_TICK_PERIOD_MS
|
||||
#if ESP_IDF_VERSION_MAJOR >= 5
|
||||
#define portTICK_DELAY_MS portTICK_PERIOD_MS
|
||||
#else
|
||||
#ifdef USE_PORT_TICK_RATE_MS
|
||||
#elif USE_PORT_TICK_RATE_MS
|
||||
#define portTICK_DELAY_MS portTICK_RATE_MS
|
||||
#endif
|
||||
|
||||
|
@ -57,9 +57,17 @@ extern "C" {
|
|||
* When using the mono theme, the display pixels can be represented in one bit,
|
||||
* so the buffer size can be divided by 8, e.g. see SSD1306 display size. */
|
||||
|
||||
#define TFT_DISPLAY_BUFFER_SIZE (TFT_DISPLAY_BUFFER_SIZE_OVERFLOW_PROTECTION * 3 * 8)
|
||||
#define TFT_DISPLAY_BUFFER_SIZE_OVERFLOW_PROTECTION (TFT_DISPLAY_BUFFER_SIZE>SPI_LL_DMA_MAX_BIT_LEN)? SPI_LL_DMA_MAX_BIT_LEN-1000 :
|
||||
#include "spi_master.h"
|
||||
#define TFT_DISPLAY_BUFFER_SIZE_IN_BITS (LV_HOR_RES_MAX * 40 * 3 * 8)
|
||||
#define TFT_DISPLAY_BUFFER_SIZE (LV_HOR_RES_MAX * 40)
|
||||
|
||||
#if CONFIG_IDF_TARGET_ESP32S3
|
||||
#define DMA_MAX_BIT_LENGHT (1<<18) // according with SPI_LL_DMA_MAX_BIT_LEN in spi_ll.h
|
||||
#else
|
||||
#define DMA_MAX_BIT_LENGHT (1<<24) // according with SPI_LL_DMA_MAX_BIT_LEN in spi_ll.h
|
||||
#endif
|
||||
|
||||
#define TFT_DISPLAY_BUFFER_SIZE_OVERFLOW_PROTECTION ((TFT_DISPLAY_BUFFER_SIZE_IN_BITS>DMA_MAX_BIT_LENGHT)? (((DMA_MAX_BIT_LENGHT-1000)/8)/3) :TFT_DISPLAY_BUFFER_SIZE)
|
||||
|
||||
#if defined (CONFIG_CUSTOM_DISPLAY_BUFFER_SIZE)
|
||||
#define DISP_BUF_SIZE CONFIG_CUSTOM_DISPLAY_BUFFER_BYTES
|
||||
#else
|
||||
|
@ -82,15 +90,15 @@ extern "C" {
|
|||
#elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9341
|
||||
#define DISP_BUF_SIZE (TFT_DISPLAY_BUFFER_SIZE_OVERFLOW_PROTECTION)
|
||||
#elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_SSD1306
|
||||
#if defined (CONFIG_LV_THEME_MONO)
|
||||
#define TFT_DISPLAY_MONO_BUFFER_SIZE (LV_HOR_RES_MAX * (LV_VER_RES_MAX / 8))
|
||||
#define TFT_DISPLAY_MONO_BUFFER_SIZE_OVERFLOW_PROTECTION (TFT_DISPLAY_MONO_BUFFER_SIZE>SPI_LL_DMA_MAX_BIT_LEN)? SPI_LL_DMA_MAX_BIT_LEN-1000 :
|
||||
#define DISP_BUF_SIZE (TFT_DISPLAY_MONO_BUFFER_SIZE_OVERFLOW_PROTECTION)
|
||||
#else
|
||||
#define TFT_DISPLAY_MONO_BUFFER_SIZE (LV_HOR_RES_MAX * LV_VER_RES_MAX)
|
||||
#define TFT_DISPLAY_MONO_BUFFER_SIZE_OVERFLOW_PROTECTION (TFT_DISPLAY_MONO_BUFFER_SIZE>SPI_LL_DMA_MAX_BIT_LEN)? SPI_LL_DMA_MAX_BIT_LEN-1000 :
|
||||
#define DISP_BUF_SIZE (LV_HOR_RES_MAX * LV_VER_RES_MAX)
|
||||
#endif
|
||||
#if defined (CONFIG_LV_THEME_MONO)
|
||||
#define TFT_DISPLAY_MONO_BUFFER_SIZE (LV_HOR_RES_MAX * (LV_VER_RES_MAX / 8))
|
||||
#define TFT_DISPLAY_MONO_BUFFER_SIZE_OVERFLOW_PROTECTION (TFT_DISPLAY_MONO_BUFFER_SIZE>SPI_LL_DMA_MAX_BIT_LEN)? SPI_LL_DMA_MAX_BIT_LEN-1000 :
|
||||
#define DISP_BUF_SIZE (TFT_DISPLAY_MONO_BUFFER_SIZE_OVERFLOW_PROTECTION)
|
||||
#else
|
||||
#define TFT_DISPLAY_MONO_BUFFER_SIZE (LV_HOR_RES_MAX * LV_VER_RES_MAX)
|
||||
#define TFT_DISPLAY_MONO_BUFFER_SIZE_OVERFLOW_PROTECTION (TFT_DISPLAY_MONO_BUFFER_SIZE>SPI_LL_DMA_MAX_BIT_LEN)? SPI_LL_DMA_MAX_BIT_LEN-1000 :
|
||||
#define DISP_BUF_SIZE (LV_HOR_RES_MAX * LV_VER_RES_MAX)
|
||||
#endif
|
||||
#elif defined (CONFIG_LV_TFT_DISPLAY_CONTROLLER_FT81X)
|
||||
#define DISP_BUF_LINES 40
|
||||
#define DISP_BUF_SIZE (LV_HOR_RES_MAX * DISP_BUF_LINES)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue