Compare commits
2 commits
develop_ol
...
master
Author | SHA1 | Date | |
---|---|---|---|
Andreas Mieke | 341b522b7b | ||
Andreas Mieke | 8592cb9d29 |
|
@ -44,6 +44,8 @@ elseif(CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9163C)
|
||||||
list(APPEND SOURCES "lvgl_tft/ili9163c.c")
|
list(APPEND SOURCES "lvgl_tft/ili9163c.c")
|
||||||
elseif(CONFIG_LV_TFT_DISPLAY_CONTROLLER_PCD8544)
|
elseif(CONFIG_LV_TFT_DISPLAY_CONTROLLER_PCD8544)
|
||||||
list(APPEND SOURCES "lvgl_tft/pcd8544.c")
|
list(APPEND SOURCES "lvgl_tft/pcd8544.c")
|
||||||
|
elseif(CONFIG_LV_TFT_DISPLAY_CONTROLLER_SCHMITT)
|
||||||
|
list(APPEND SOURCES "lvgl_tft/schmitt.c")
|
||||||
else()
|
else()
|
||||||
message(WARNING "LVGL ESP32 drivers: Display controller not defined.")
|
message(WARNING "LVGL ESP32 drivers: Display controller not defined.")
|
||||||
endif()
|
endif()
|
||||||
|
@ -86,7 +88,7 @@ endif()
|
||||||
|
|
||||||
idf_component_register(SRCS ${SOURCES}
|
idf_component_register(SRCS ${SOURCES}
|
||||||
INCLUDE_DIRS ${LVGL_INCLUDE_DIRS}
|
INCLUDE_DIRS ${LVGL_INCLUDE_DIRS}
|
||||||
REQUIRES lvgl)
|
REQUIRES lvgl driver esp_common log freertos esp_rom soc)
|
||||||
|
|
||||||
target_compile_definitions(${COMPONENT_LIB} PUBLIC "-DLV_LVGL_H_INCLUDE_SIMPLE")
|
target_compile_definitions(${COMPONENT_LIB} PUBLIC "-DLV_LVGL_H_INCLUDE_SIMPLE")
|
||||||
|
|
||||||
|
|
|
@ -154,7 +154,7 @@ bool lvgl_spi_driver_init(int host,
|
||||||
int dma_channel,
|
int dma_channel,
|
||||||
int quadwp_pin, int quadhd_pin)
|
int quadwp_pin, int quadhd_pin)
|
||||||
{
|
{
|
||||||
assert((0 <= host) && (SPI_HOST_MAX > host));
|
assert((0 <= host) && (3 > host));
|
||||||
const char *spi_names[] = {
|
const char *spi_names[] = {
|
||||||
"SPI1_HOST", "SPI2_HOST", "SPI3_HOST"
|
"SPI1_HOST", "SPI2_HOST", "SPI3_HOST"
|
||||||
};
|
};
|
||||||
|
|
|
@ -78,6 +78,8 @@ extern "C" {
|
||||||
#define DISP_BUF_SIZE (LV_HOR_RES_MAX * 40)
|
#define DISP_BUF_SIZE (LV_HOR_RES_MAX * 40)
|
||||||
#elif defined (CONFIG_LV_TFT_DISPLAY_CONTROLLER_PCD8544)
|
#elif defined (CONFIG_LV_TFT_DISPLAY_CONTROLLER_PCD8544)
|
||||||
#define DISP_BUF_SIZE (LV_HOR_RES_MAX * (LV_VER_RES_MAX / 8))
|
#define DISP_BUF_SIZE (LV_HOR_RES_MAX * (LV_VER_RES_MAX / 8))
|
||||||
|
#elif defined (CONFIG_LV_TFT_DISPLAY_CONTROLLER_SCHMITT)
|
||||||
|
#define DISP_BUF_SIZE (LV_HOR_RES_MAX * LV_VER_RES_MAX)
|
||||||
#else
|
#else
|
||||||
#error "No display controller selected"
|
#error "No display controller selected"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -114,7 +114,11 @@ extern "C" {
|
||||||
/**********************
|
/**********************
|
||||||
* TYPEDEFS
|
* TYPEDEFS
|
||||||
**********************/
|
**********************/
|
||||||
#if defined (CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9481) || \
|
#if defined (CONFIG_LV_TFT_DISPLAY_CONTROLLER_SCHMITT)
|
||||||
|
|
||||||
|
#define SPI_BUS_MAX_TRANSFER_SZ (DISP_BUF_SIZE * 4)
|
||||||
|
|
||||||
|
#elif defined (CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9481) || \
|
||||||
defined (CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9488)
|
defined (CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9488)
|
||||||
|
|
||||||
#define SPI_BUS_MAX_TRANSFER_SZ (DISP_BUF_SIZE * 3)
|
#define SPI_BUS_MAX_TRANSFER_SZ (DISP_BUF_SIZE * 3)
|
||||||
|
@ -161,7 +165,7 @@ extern "C" {
|
||||||
#elif defined (CONFIG_LV_TFT_DISPLAY_CONTROLLER_PCD8544)
|
#elif defined (CONFIG_LV_TFT_DISPLAY_CONTROLLER_PCD8544)
|
||||||
#define SPI_TFT_CLOCK_SPEED_HZ (4*1000*1000)
|
#define SPI_TFT_CLOCK_SPEED_HZ (4*1000*1000)
|
||||||
#else
|
#else
|
||||||
#define SPI_TFT_CLOCK_SPEED_HZ (40*1000*1000)
|
#define SPI_TFT_CLOCK_SPEED_HZ (5*1000*1000) // Set to 40 later
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -178,6 +178,10 @@ menu "LVGL TFT Display controller"
|
||||||
bool
|
bool
|
||||||
help
|
help
|
||||||
PCD8544 display controller (Nokia 3110/5110)
|
PCD8544 display controller (Nokia 3110/5110)
|
||||||
|
config LV_TFT_DISPLAY_CONTROLLER_SCHMITT
|
||||||
|
bool
|
||||||
|
help
|
||||||
|
Schmitt's display controller
|
||||||
# Display controller communication protocol
|
# Display controller communication protocol
|
||||||
#
|
#
|
||||||
# This symbols define the communication protocol used by the
|
# This symbols define the communication protocol used by the
|
||||||
|
@ -349,6 +353,10 @@ menu "LVGL TFT Display controller"
|
||||||
select LV_TFT_DISPLAY_CONTROLLER_PCD8544
|
select LV_TFT_DISPLAY_CONTROLLER_PCD8544
|
||||||
select LV_TFT_DISPLAY_PROTOCOL_SPI
|
select LV_TFT_DISPLAY_PROTOCOL_SPI
|
||||||
select LV_TFT_DISPLAY_MONOCHROME
|
select LV_TFT_DISPLAY_MONOCHROME
|
||||||
|
config LV_TFT_DISPLAY_USER_CONTROLLER_SCHMITT
|
||||||
|
bool "SCHMITT"
|
||||||
|
select LV_TFT_DISPLAY_CONTROLLER_SCHMITT
|
||||||
|
select LV_TFT_DISPLAY_PROTOCOL_SPI
|
||||||
endchoice
|
endchoice
|
||||||
|
|
||||||
config CUSTOM_DISPLAY_BUFFER_SIZE
|
config CUSTOM_DISPLAY_BUFFER_SIZE
|
||||||
|
|
|
@ -45,6 +45,8 @@ void *disp_driver_init(void)
|
||||||
ili9163c_init();
|
ili9163c_init();
|
||||||
#elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_PCD8544
|
#elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_PCD8544
|
||||||
pcd8544_init();
|
pcd8544_init();
|
||||||
|
#elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_SCHMITT
|
||||||
|
schmitt_init();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// We still use menuconfig for these settings
|
// We still use menuconfig for these settings
|
||||||
|
@ -111,6 +113,8 @@ void disp_driver_flush(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t *
|
||||||
ili9163c_flush(drv, area, color_map);
|
ili9163c_flush(drv, area, color_map);
|
||||||
#elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_PCD8544
|
#elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_PCD8544
|
||||||
pcd8544_flush(drv, area, color_map);
|
pcd8544_flush(drv, area, color_map);
|
||||||
|
#elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_SCHMITT
|
||||||
|
schmitt_flush(drv, area, color_map);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -54,6 +54,8 @@ extern "C" {
|
||||||
#include "ili9163c.h"
|
#include "ili9163c.h"
|
||||||
#elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_PCD8544
|
#elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_PCD8544
|
||||||
#include "pcd8544.h"
|
#include "pcd8544.h"
|
||||||
|
#elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_SCHMITT
|
||||||
|
#include "schmitt.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*********************
|
/*********************
|
||||||
|
|
|
@ -8,10 +8,12 @@
|
||||||
*********************/
|
*********************/
|
||||||
#include "esp_lcd_backlight.h"
|
#include "esp_lcd_backlight.h"
|
||||||
#include "driver/ledc.h"
|
#include "driver/ledc.h"
|
||||||
#include "driver/gpio.h"
|
#include "rom/gpio.h"
|
||||||
#include "esp_log.h"
|
#include "esp_log.h"
|
||||||
#include "soc/ledc_periph.h" // to invert LEDC output on IDF version < v4.3
|
#include "soc/ledc_periph.h" // to invert LEDC output on IDF version < v4.3
|
||||||
|
|
||||||
|
#define SIG_GPIO_OUT_IDX 128
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
bool pwm_control; // true: LEDC is used, false: GPIO is used
|
bool pwm_control; // true: LEDC is used, false: GPIO is used
|
||||||
int index; // Either GPIO or LEDC channel
|
int index; // Either GPIO or LEDC channel
|
||||||
|
@ -49,7 +51,7 @@ disp_backlight_h disp_backlight_new(const disp_backlight_config_t *config)
|
||||||
};
|
};
|
||||||
const ledc_timer_config_t LCD_backlight_timer = {
|
const ledc_timer_config_t LCD_backlight_timer = {
|
||||||
.speed_mode = LEDC_LOW_SPEED_MODE,
|
.speed_mode = LEDC_LOW_SPEED_MODE,
|
||||||
.bit_num = LEDC_TIMER_10_BIT,
|
.duty_resolution = LEDC_TIMER_10_BIT,
|
||||||
.timer_num = config->timer_idx,
|
.timer_num = config->timer_idx,
|
||||||
.freq_hz = 5000,
|
.freq_hz = 5000,
|
||||||
.clk_cfg = LEDC_AUTO_CLK};
|
.clk_cfg = LEDC_AUTO_CLK};
|
||||||
|
|
27
lvgl_tft/schmitt.c
Normal file
27
lvgl_tft/schmitt.c
Normal file
|
@ -0,0 +1,27 @@
|
||||||
|
#include <stdio.h>
|
||||||
|
|
||||||
|
#include "schmitt.h"
|
||||||
|
#include "disp_spi.h"
|
||||||
|
|
||||||
|
#include "esp_log.h"
|
||||||
|
|
||||||
|
static const char* TAG = "SCHMITT_DIS";
|
||||||
|
|
||||||
|
void schmitt_init(void)
|
||||||
|
{
|
||||||
|
disp_spi_acquire();
|
||||||
|
// Do things
|
||||||
|
ESP_LOGI(TAG, "schmitt_init() called");
|
||||||
|
disp_spi_release();
|
||||||
|
}
|
||||||
|
|
||||||
|
void schmitt_flush(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t * color_map)
|
||||||
|
{
|
||||||
|
disp_spi_acquire();
|
||||||
|
// Do things
|
||||||
|
uint32_t size = lv_area_get_width(area) * lv_area_get_height(area);
|
||||||
|
disp_spi_send_colors(color_map, size * 4);
|
||||||
|
ESP_LOGI(TAG, "schmitt_flush() called");
|
||||||
|
disp_spi_release();
|
||||||
|
lv_disp_flush_ready(drv);
|
||||||
|
}
|
20
lvgl_tft/schmitt.h
Normal file
20
lvgl_tft/schmitt.h
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
#ifndef SCHMITT_H_
|
||||||
|
#define SCHMITT_H_
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
|
||||||
|
#ifdef LV_LVGL_H_INCLUDE_SIMPLE
|
||||||
|
#include "lvgl.h"
|
||||||
|
#else
|
||||||
|
#include "lvgl/lvgl.h"
|
||||||
|
#endif
|
||||||
|
#include "../lvgl_helpers.h"
|
||||||
|
|
||||||
|
#define LV_HOR_RES_MAX 64
|
||||||
|
#define LV_VER_RES_MAX 64
|
||||||
|
|
||||||
|
void schmitt_init(void);
|
||||||
|
|
||||||
|
void schmitt_flush(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t * color_map);
|
||||||
|
|
||||||
|
#endif /* SCHMITT_H_ */
|
Loading…
Reference in a new issue