zenermerps/lvgl_esp32_drivers
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

lvgl_interface_init: Initial cleanup

Browse source
This commit is contained in:
C47D 2022-01-11 18:42:48 -06:00
parent d327144300
commit 0cec50473a
1 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
lvgl_helpers.c
View file

@ -73,7 +73,9 @@ void lvgl_interface_init(void)
ESP_LOGI(TAG, "Display hor size: %d, ver size: %d", LV_HOR_RES_MAX, LV_VER_RES_MAX); ESP_LOGI(TAG, "Display hor size: %d, ver size: %d", LV_HOR_RES_MAX, LV_VER_RES_MAX);
#endif #endif
ESP_LOGI(TAG, "Display buffer size: %d", lvgl_get_display_buffer_size()); size_t display_buffer_size = lvgl_get_display_buffer_size();
ESP_LOGI(TAG, "Display buffer size: %d", display_buffer_size);
/* SPI DMA Channel selection /* SPI DMA Channel selection
* SPI_DMA_CH1 is only defined for ESP32, so let the driver choose which * SPI_DMA_CH1 is only defined for ESP32, so let the driver choose which
@ -93,19 +95,19 @@ void lvgl_interface_init(void)
ESP_LOGI(TAG, "Initializing SPI master"); ESP_LOGI(TAG, "Initializing SPI master");
int miso = DISP_SPI_MISO; int miso = DISP_SPI_MISO;
size_t display_buffer_size = lvgl_get_display_buffer_size();
int spi_max_transfer_size = calculate_spi_max_transfer_size(display_buffer_size); int spi_max_transfer_size = calculate_spi_max_transfer_size(display_buffer_size);
/* Set the miso signal to be the selected for the touch driver */
#if defined (SHARED_SPI_BUS) #if defined (SHARED_SPI_BUS)
miso = TP_SPI_MISO; miso = TP_SPI_MISO;
#endif #endif
lvgl_spi_driver_init(TFT_SPI_HOST, lvgl_spi_driver_init(TFT_SPI_HOST, miso, DISP_SPI_MOSI, DISP_SPI_CLK,
miso, DISP_SPI_MOSI, DISP_SPI_CLK, spi_max_transfer_size, dma_channel, DISP_SPI_IO2, DISP_SPI_IO3);
spi_max_transfer_size, dma_channel,
DISP_SPI_IO2, DISP_SPI_IO3);
disp_spi_add_device(TFT_SPI_HOST); disp_spi_add_device(TFT_SPI_HOST);
/* Add device for touch driver */
#if defined (SHARED_SPI_BUS) #if defined (SHARED_SPI_BUS)
tp_spi_add_device(TOUCH_SPI_HOST); tp_spi_add_device(TOUCH_SPI_HOST);
touch_driver_init(); touch_driver_init();
@ -120,30 +122,28 @@ void lvgl_interface_init(void)
/* Touch controller initialization */ /* Touch controller initialization */
#if CONFIG_LV_TOUCH_CONTROLLER != TOUCH_CONTROLLER_NONE #if CONFIG_LV_TOUCH_CONTROLLER != TOUCH_CONTROLLER_NONE
#if defined (CONFIG_LV_TOUCH_DRIVER_PROTOCOL_SPI) #if defined (CONFIG_LV_TOUCH_DRIVER_PROTOCOL_SPI)
ESP_LOGI(TAG, "Initializing SPI master for touch"); ESP_LOGI(TAG, "Initializing SPI master for touch");
#if defined (CONFIG_IDF_TARGET_ESP32) #if defined (CONFIG_IDF_TARGET_ESP32)
dma_channel = SPI_DMA_CH2; dma_channel = SPI_DMA_CH2;
#endif #endif
lvgl_spi_driver_init(TOUCH_SPI_HOST, lvgl_spi_driver_init(TOUCH_SPI_HOST, TP_SPI_MISO, TP_SPI_MOSI, TP_SPI_CLK,
TP_SPI_MISO, TP_SPI_MOSI, TP_SPI_CLK, DMA_DEFAULT_TRANSFER_SIZE, dma_channel, GPIO_NOT_USED, GPIO_NOT_USED);
DMA_DEFAULT_TRANSFER_SIZE, dma_channel,
GPIO_NOT_USED, GPIO_NOT_USED);
tp_spi_add_device(TOUCH_SPI_HOST); tp_spi_add_device(TOUCH_SPI_HOST);
touch_driver_init(); touch_driver_init();
#elif defined (CONFIG_LV_I2C_TOUCH) #elif defined (CONFIG_LV_I2C_TOUCH)
touch_driver_init(); touch_driver_init();
#elif defined (CONFIG_LV_TOUCH_DRIVER_ADC) #elif defined (CONFIG_LV_TOUCH_DRIVER_ADC)
touch_driver_init(); touch_driver_init();
#elif defined (CONFIG_LV_TOUCH_DRIVER_DISPLAY) #elif defined (CONFIG_LV_TOUCH_DRIVER_DISPLAY)
touch_driver_init(); touch_driver_init();
#else #else
#error "No protocol defined for touch controller" #error "No protocol defined for touch controller"
#endif #endif
#else #else
#endif #endif
} }