diff --git a/.gitignore b/.gitignore
index c6127b3..3c4910f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,13 @@ modules.order
Module.symvers
Mkfile.old
dkms.conf
+
+# MacOS
+.DS_Store
+
+# ESP-IDF build dir
+build
+
+# Kconfig files
+sdkconfig
+sdkconfig.old
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d86bd33..407802a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,8 +3,7 @@ if(ESP_PLATFORM)
file(GLOB SOURCES *.c)
set(LVGL_INCLUDE_DIRS . lvgl_tft)
list(APPEND SOURCES "lvgl_tft/disp_driver.c")
-
-#@todo add SimleInclude macro here
+list(APPEND SOURCES "lvgl_tft/esp_lcd_backlight.c")
# Include only the source file of the selected
# display controller.
@@ -41,6 +40,10 @@ elseif(CONFIG_LV_TFT_DISPLAY_CONTROLLER_RA8875)
list(APPEND SOURCES "lvgl_tft/ra8875.c")
elseif(CONFIG_LV_TFT_DISPLAY_CONTROLLER_GC9A01)
list(APPEND SOURCES "lvgl_tft/GC9A01.c")
+elseif(CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9163C)
+ list(APPEND SOURCES "lvgl_tft/ili9163c.c")
+elseif(CONFIG_LV_TFT_DISPLAY_CONTROLLER_PCD8544)
+ list(APPEND SOURCES "lvgl_tft/pcd8544.c")
else()
message(WARNING "LVGL ESP32 drivers: Display controller not defined.")
endif()
@@ -68,19 +71,23 @@ if(CONFIG_LV_TOUCH_CONTROLLER)
list(APPEND SOURCES "lvgl_touch/FT81x.c")
elseif(CONFIG_LV_TOUCH_CONTROLLER_RA8875)
list(APPEND SOURCES "lvgl_touch/ra8875_touch.c")
+ elseif(CONFIG_LV_TOUCH_CONTROLLER_GT911)
+ list(APPEND SOURCES "lvgl_touch/gt911.c")
endif()
if(CONFIG_LV_TOUCH_DRIVER_PROTOCOL_SPI)
list(APPEND SOURCES "lvgl_touch/tp_spi.c")
- elseif(CONFIG_LV_TOUCH_DRIVER_PROTOCOL_I2C)
- list(APPEND SOURCES "lvgl_touch/tp_i2c.c")
endif()
endif()
+if(CONFIG_LV_I2C)
+ list(APPEND SOURCES "lvgl_i2c/i2c_manager.c")
+endif()
+
idf_component_register(SRCS ${SOURCES}
INCLUDE_DIRS ${LVGL_INCLUDE_DIRS}
REQUIRES lvgl)
-
+
target_compile_definitions(${COMPONENT_LIB} PUBLIC "-DLV_LVGL_H_INCLUDE_SIMPLE")
else()
diff --git a/Kconfig b/Kconfig
index ae11925..36b4526 100644
--- a/Kconfig
+++ b/Kconfig
@@ -1,2 +1,14 @@
-rsource "lvgl_tft/Kconfig"
-rsource "lvgl_touch/Kconfig"
+menu "LVGL ESP Drivers"
+
+ rsource "lvgl_tft/Kconfig"
+
+ rsource "lvgl_touch/Kconfig"
+
+endmenu
+
+menu "I2C Port Settings"
+ depends on LV_I2C && !HAVE_I2C_MANAGER
+
+ rsource "lvgl_i2c/Kconfig"
+
+endmenu
diff --git a/README.md b/README.md
index 6aeec91..522c0e1 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,8 @@ For a ready to use ESP32 project take look at the [lv_port_esp32](https://github
- [Supported display controllers](#supported-display-controllers)
- [Supported indev controllers](#supported-indev-controllers)
- [Support for predefined development kits](#support-for-predefined-development-kits)
+- [Thread-safe I2C with I2C Manager](#thread-safe-i2c-with-i2c-manager)
+- [Backlight control](#backlight-control)
**NOTE:** You need to set the display horizontal and vertical size, color depth and
swap of RGB565 color on the LVGL configuration menuconfig (it's not handled automatically).
@@ -17,6 +19,7 @@ swap of RGB565 color on the LVGL configuration menuconfig (it's not handled auto
| Display Controller | Type | Interface | Color depth (LV_COLOR_DEPTH) | Swap RGB565 color (LV_COLOR_16_SWAP) |
|---------------------------------------------|------------|------------------------|------------------------------|----------------------------------------|
| ILI9341 | TFT | SPI | 16: RGB565 | Yes |
+| ILI9163C | TFT | SPI | 16: RGB565 | Yes |
| ILI9486 | TFT | SPI | 16: RGB565 | Yes |
| ILI9488 | TFT | SPI | 16: RGB565 | No |
| HX8357B/HX8357D | TFT | SPI | 16: RGB565 | Yes |
@@ -27,6 +30,7 @@ swap of RGB565 color on the LVGL configuration menuconfig (it's not handled auto
| RA8875 | TFT | SPI | 16: RGB565 | Yes |
| SH1107 | Monochrome | SPI | 1: 1byte per pixel | No |
| SSD1306 | Monochrome | I2C | 1: 1byte per pixel | No |
+| PCD8544 | Monochrome | SPI | 1: 1byte per pixel | No |
| IL3820 | e-Paper | SPI | 1: 1byte per pixel | No |
| UC8151D/ GoodDisplay GDEW0154M10 DES | e-Paper | SPI | 1: 1byte per pixel | No |
| FitiPower JD79653A/ GoodDisplay GDEW0154M09 | e-Paper | SPI | 1: 1byte per pixel | No |
@@ -34,8 +38,8 @@ swap of RGB565 color on the LVGL configuration menuconfig (it's not handled auto
## Supported indev controllers
- XPT2046
-- FT3236
-- other FT6X36 or the FT6206 controllers should work as well (not tested)
+- FT3236, FT6X36
+- FT6206 controllers should work as well (not tested)
- STMPE610
- FT81x (Single, Dual, and Quad SPI)
@@ -51,6 +55,7 @@ and sets the gpio numbers for the interface.
|---------------------------|-----------------------|-----------|-----------|-----------|
| ESP Wrover Kit v4.1 | ILI9341 | SPI | 240 | 320 |
| M5Stack | ILI9341 | SPI | 240 | 320 |
+| M5Stack Core2 | ILI9341 | SPI | 240 | 320 |
| M5Stick | SH1107 | SPI | - | - |
| M5StickC | ST7735S | SPI | 80 | 160 |
| Adafruit 3.5 Featherwing | HX8357 | SPI | 480 | 320 |
@@ -63,3 +68,27 @@ and sets the gpio numbers for the interface.
**NOTE:** See [Supported display controllers](#supported-display-controllers) for more information on display configuration.
**NOTE:** See [Supported indev controllers](#supported-indev-controllers) for more information about indev configuration.
+
+
+## Thread-safe I2C with I2C Manager
+
+LVGL can use I2C to read from a touch sensor or write to a display, possibly
+many times a second. Meanwhile, other tasks may also want to read from i2c
+devices on the same bus. I2C using the ESP-IDF is not thread-safe.
+
+I2C Manager (`i2c_manager`) is a component that will let code in multiple threads
+talk to devices on the I2C ports without getting in each other's way. These drivers
+use a built-in copy of I2C Manager to talk to the I2C port, but you can also use
+the I2C Manager component itself and have others play nice with LVGL and vice-versa.
+[Click here](i2c_manager/README.md) for details.
+
+
+## Backlight control
+
+Control of LCD's backlight is provided by separate module that is independent from the display driver.
+Configuration of the backlight controller can be found in menuconfig `LVGL ESP Drivers -> LVGL TFT Display controller`.
+
+There are three modes of operation:
+1. Off - No backlight control
+2. Switch - Allows ON/OFF control
+3. PWM - Allows brightness control (by Pulse-Width-Modulated signal)
diff --git a/component.mk b/component.mk
index dbd1105..0017d0b 100644
--- a/component.mk
+++ b/component.mk
@@ -1,7 +1,7 @@
# LVGL ESP32 drivers
# Define sources and include dirs
-COMPONENT_SRCDIRS := . lvgl_tft lvgl_touch
+COMPONENT_SRCDIRS := . lvgl_tft lvgl_touch lvgl_i2c
COMPONENT_ADD_INCLUDEDIRS := .
# LVGL is supposed to be used as a ESP-IDF component
@@ -44,4 +44,6 @@ $(call compile_only_if,$(and $(CONFIG_LV_TOUCH_CONTROLLER),$(CONFIG_LV_TOUCH_CON
$(call compile_only_if,$(and $(CONFIG_LV_TOUCH_CONTROLLER),$(CONFIG_LV_TOUCH_CONTROLLER_RA8875)), lvgl_touch/ra8875_touch.o)
$(call compile_only_if,$(and $(CONFIG_LV_TOUCH_CONTROLLER),$(CONFIG_LV_TOUCH_DRIVER_PROTOCOL_SPI)), lvgl_touch/tp_spi.o)
-$(call compile_only_if,$(and $(CONFIG_LV_TOUCH_CONTROLLER),$(CONFIG_LV_TOUCH_DRIVER_PROTOCOL_I2C)), lvgl_touch/tp_i2c.o)
+
+# I2C Manager
+$(call compile_only_if,$(CONFIG_LV_I2C), lvgl_i2c/i2c_manager.o)
diff --git a/lvgl_helpers.c b/lvgl_helpers.c
index 4125330..57ab7dd 100644
--- a/lvgl_helpers.c
+++ b/lvgl_helpers.c
@@ -14,14 +14,13 @@
#include "lvgl_touch/tp_spi.h"
#include "lvgl_spi_conf.h"
-#include "lvgl_i2c_conf.h"
-#include "driver/i2c.h"
+#include "lvgl_i2c/i2c_manager.h"
#ifdef LV_LVGL_H_INCLUDE_SIMPLE
-#include "src/lv_core/lv_refr.h"
+#include "lvgl.h"
#else
-#include "lvgl/src/lv_core/lv_refr.h"
+#include "lvgl/lvgl.h"
#endif
/*********************
@@ -53,7 +52,12 @@
/* Interface and driver initialization */
void lvgl_driver_init(void)
{
+ /* Since LVGL v8 LV_HOR_RES_MAX and LV_VER_RES_MAX are not defined, so
+ * print it only if they are defined. */
+#if (LVGL_VERSION_MAJOR < 8)
ESP_LOGI(TAG, "Display hor size: %d, ver size: %d", LV_HOR_RES_MAX, LV_VER_RES_MAX);
+#endif
+
ESP_LOGI(TAG, "Display buffer size: %d", DISP_BUF_SIZE);
#if defined (CONFIG_LV_TFT_DISPLAY_CONTROLLER_FT81X)
@@ -63,7 +67,7 @@ void lvgl_driver_init(void)
DISP_SPI_MISO, DISP_SPI_MOSI, DISP_SPI_CLK,
SPI_BUS_MAX_TRANSFER_SZ, 1,
DISP_SPI_IO2, DISP_SPI_IO3);
-
+
disp_spi_add_device(TFT_SPI_HOST);
disp_driver_init();
@@ -81,48 +85,29 @@ void lvgl_driver_init(void)
TP_SPI_MISO, DISP_SPI_MOSI, DISP_SPI_CLK,
SPI_BUS_MAX_TRANSFER_SZ, 1,
-1, -1);
-
+
disp_spi_add_device(TFT_SPI_HOST);
tp_spi_add_device(TOUCH_SPI_HOST);
-
+
disp_driver_init();
touch_driver_init();
return;
#endif
-#if defined (SHARED_I2C_BUS)
- ESP_LOGI(TAG, "Initializing shared I2C master");
-
- lvgl_i2c_driver_init(DISP_I2C_PORT,
- DISP_I2C_SDA, DISP_I2C_SCL,
- DISP_I2C_SPEED_HZ);
-
- disp_driver_init();
- touch_driver_init();
-
- return;
-#endif
-
/* Display controller initialization */
#if defined CONFIG_LV_TFT_DISPLAY_PROTOCOL_SPI
ESP_LOGI(TAG, "Initializing SPI master for display");
-
+
lvgl_spi_driver_init(TFT_SPI_HOST,
DISP_SPI_MISO, DISP_SPI_MOSI, DISP_SPI_CLK,
SPI_BUS_MAX_TRANSFER_SZ, 1,
DISP_SPI_IO2, DISP_SPI_IO3);
-
+
disp_spi_add_device(TFT_SPI_HOST);
-
+
disp_driver_init();
-#elif defined (CONFIG_LV_TFT_DISPLAY_PROTOCOL_I2C)
- ESP_LOGI(TAG, "Initializing I2C master for display");
- /* Init the i2c master on the display driver code */
- lvgl_i2c_driver_init(DISP_I2C_PORT,
- DISP_I2C_SDA, DISP_I2C_SCL,
- DISP_I2C_SPEED_HZ);
-
+#elif defined (CONFIG_LV_I2C_DISPLAY)
disp_driver_init();
#else
#error "No protocol defined for display controller"
@@ -132,22 +117,16 @@ void lvgl_driver_init(void)
#if CONFIG_LV_TOUCH_CONTROLLER != TOUCH_CONTROLLER_NONE
#if defined (CONFIG_LV_TOUCH_DRIVER_PROTOCOL_SPI)
ESP_LOGI(TAG, "Initializing SPI master for touch");
-
+
lvgl_spi_driver_init(TOUCH_SPI_HOST,
TP_SPI_MISO, TP_SPI_MOSI, TP_SPI_CLK,
0 /* Defaults to 4094 */, 2,
-1, -1);
-
+
tp_spi_add_device(TOUCH_SPI_HOST);
-
+
touch_driver_init();
- #elif defined (CONFIG_LV_TOUCH_DRIVER_PROTOCOL_I2C)
- ESP_LOGI(TAG, "Initializing I2C master for touch");
-
- lvgl_i2c_driver_init(TOUCH_I2C_PORT,
- TOUCH_I2C_SDA, TOUCH_I2C_SCL,
- TOUCH_I2C_SPEED_HZ);
-
+ #elif defined (CONFIG_LV_I2C_TOUCH)
touch_driver_init();
#elif defined (CONFIG_LV_TOUCH_DRIVER_ADC)
touch_driver_init();
@@ -160,63 +139,27 @@ void lvgl_driver_init(void)
#endif
}
-/* Config the i2c master
+
+/* Initialize spi bus master
*
- * This should init the i2c master to be used on display and touch controllers.
- * So we should be able to know if the display and touch controllers shares the
- * same i2c master.
+ * NOTE: dma_chan type and value changed to int instead of spi_dma_chan_t
+ * for backwards compatibility with ESP-IDF versions prior v4.3.
+ *
+ * We could use the ESP_IDF_VERSION_VAL macro available in the "esp_idf_version.h"
+ * header available since ESP-IDF v4.
*/
-bool lvgl_i2c_driver_init(int port, int sda_pin, int scl_pin, int speed_hz)
-{
- esp_err_t err;
-
- ESP_LOGI(TAG, "Initializing I2C master port %d...", port);
- ESP_LOGI(TAG, "SDA pin: %d, SCL pin: %d, Speed: %d (Hz)",
- sda_pin, scl_pin, speed_hz);
-
- i2c_config_t conf = {
- .mode = I2C_MODE_MASTER,
- .sda_io_num = sda_pin,
- .sda_pullup_en = GPIO_PULLUP_ENABLE,
- .scl_io_num = scl_pin,
- .scl_pullup_en = GPIO_PULLUP_ENABLE,
- .master.clk_speed = speed_hz,
- };
-
- ESP_LOGI(TAG, "Setting I2C master configuration...");
- err = i2c_param_config(port, &conf);
- assert(ESP_OK == err);
-
- ESP_LOGI(TAG, "Installing I2C master driver...");
- err = i2c_driver_install(port,
- I2C_MODE_MASTER,
- 0, 0 /*I2C_MASTER_RX_BUF_DISABLE, I2C_MASTER_TX_BUF_DISABLE */,
- 0 /* intr_alloc_flags */);
- assert(ESP_OK == err);
-
- return ESP_OK != err;
-}
-
-/* Initialize spi bus master */
bool lvgl_spi_driver_init(int host,
int miso_pin, int mosi_pin, int sclk_pin,
int max_transfer_sz,
int dma_channel,
int quadwp_pin, int quadhd_pin)
{
-#if defined (CONFIG_IDF_TARGET_ESP32)
- assert((SPI_HOST <= host) && (VSPI_HOST >= host));
+ assert((0 <= host) && (SPI_HOST_MAX > host));
const char *spi_names[] = {
- "SPI_HOST", "HSPI_HOST", "VSPI_HOST"
+ "SPI1_HOST", "SPI2_HOST", "SPI3_HOST"
};
-#elif defined (CONFIG_IDF_TARGET_ESP32S2)
- assert((SPI_HOST <= host) && (HSPI_HOST >= host));
- const char *spi_names[] = {
- "SPI_HOST", "", ""
- };
-#endif
- ESP_LOGI(TAG, "Configuring SPI host %s (%d)", spi_names[host], host);
+ ESP_LOGI(TAG, "Configuring SPI host %s", spi_names[host]);
ESP_LOGI(TAG, "MISO pin: %d, MOSI pin: %d, SCLK pin: %d, IO2/WP pin: %d, IO3/HD pin: %d",
miso_pin, mosi_pin, sclk_pin, quadwp_pin, quadhd_pin);
@@ -224,17 +167,19 @@ bool lvgl_spi_driver_init(int host,
spi_bus_config_t buscfg = {
.miso_io_num = miso_pin,
- .mosi_io_num = mosi_pin,
- .sclk_io_num = sclk_pin,
- .quadwp_io_num = quadwp_pin,
- .quadhd_io_num = quadhd_pin,
+ .mosi_io_num = mosi_pin,
+ .sclk_io_num = sclk_pin,
+ .quadwp_io_num = quadwp_pin,
+ .quadhd_io_num = quadhd_pin,
.max_transfer_sz = max_transfer_sz
};
ESP_LOGI(TAG, "Initializing SPI bus...");
- esp_err_t ret = spi_bus_initialize(host, &buscfg, dma_channel);
+ #if defined (CONFIG_IDF_TARGET_ESP32C3)
+ dma_channel = SPI_DMA_CH_AUTO;
+ #endif
+ esp_err_t ret = spi_bus_initialize(host, &buscfg, (spi_dma_chan_t)dma_channel);
assert(ret == ESP_OK);
return ESP_OK != ret;
}
-
diff --git a/lvgl_helpers.h b/lvgl_helpers.h
index 70ef353..c010174 100644
--- a/lvgl_helpers.h
+++ b/lvgl_helpers.h
@@ -16,6 +16,7 @@ extern "C" {
#include "lvgl_spi_conf.h"
#include "lvgl_tft/disp_driver.h"
+#include "lvgl_tft/esp_lcd_backlight.h"
#include "lvgl_touch/touch_driver.h"
/*********************
@@ -73,6 +74,10 @@ extern "C" {
#define DISP_BUF_SIZE ((LV_VER_RES_MAX * LV_VER_RES_MAX) / 8) // 5KB
#elif defined (CONFIG_LV_TFT_DISPLAY_CONTROLLER_UC8151D)
#define DISP_BUF_SIZE ((LV_VER_RES_MAX * LV_VER_RES_MAX) / 8) // 2888 bytes
+#elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9163C
+#define DISP_BUF_SIZE (LV_HOR_RES_MAX * 40)
+#elif defined (CONFIG_LV_TFT_DISPLAY_CONTROLLER_PCD8544)
+#define DISP_BUF_SIZE (LV_HOR_RES_MAX * (LV_VER_RES_MAX / 8))
#else
#error "No display controller selected"
#endif
@@ -86,14 +91,14 @@ extern "C" {
* GLOBAL PROTOTYPES
**********************/
+void lvgl_i2c_locking(void* leader);
+
/* Initialize detected SPI and I2C bus and devices */
void lvgl_driver_init(void);
/* Initialize SPI master */
bool lvgl_spi_driver_init(int host, int miso_pin, int mosi_pin, int sclk_pin,
int max_transfer_sz, int dma_channel, int quadwp_pin, int quadhd_pin);
-/* Initialize I2C master */
-bool lvgl_i2c_driver_init(int port, int sda_pin, int scl_pin, int speed);
/**********************
* MACROS
diff --git a/lvgl_i2c/Kconfig b/lvgl_i2c/Kconfig
new file mode 100644
index 0000000..48df924
--- /dev/null
+++ b/lvgl_i2c/Kconfig
@@ -0,0 +1,98 @@
+menu "I2C Port 0"
+
+ config I2C_MANAGER_0_ENABLED
+ bool "Enable I2C port 0"
+
+ if I2C_MANAGER_0_ENABLED
+ config I2C_MANAGER_0_SDA
+ int "SDA (GPIO pin)"
+ default 0
+ config I2C_MANAGER_0_SCL
+ int "SCL (GPIO pin)"
+ default 0
+ config I2C_MANAGER_0_FREQ_HZ
+ int "Frequency (Hz)"
+ default 400000
+ range 100000 5000000
+ help
+ The clock speed in Hz. Ranges from 100000 (100 kHz) to
+ 5000000 (5 Mhz). I2C busses that involve external wires may
+ have to be slower, and the real maximum speed the bus will
+ support depends on the value of the pullup resistors and the
+ design of the overall circuit.
+ config I2C_MANAGER_0_TIMEOUT
+ int "R/W timeout (ms)"
+ default 20
+ range 10 1000
+ help
+ Timeout for I2C read and write operations. This does not
+ include the time waiting for a lock.
+ config I2C_MANAGER_0_LOCK_TIMEOUT
+ int "Stale lock override (ms)"
+ default 50
+ range 10 1000
+ help
+ Timeout at which point an operation waiting for its turn on
+ the port will assume that whatever set the lock has died and
+ overrides it. Set this somewhat larger than the previous
+ timeout.
+ config I2C_MANAGER_0_PULLUPS
+ bool "Use ESP32 built-in bus pull-up resistors"
+ help
+ The I2C bus needs resistors to make sure it's in a defined
+ state when nobody is talking. Many circuits have external
+ pullup resistors already and turning these on will increase
+ power consumption slightly and may limit the speed your bus
+ can attain. Try with these off first if you don't know.
+ endif
+
+endmenu
+
+
+menu "I2C Port 1"
+
+ config I2C_MANAGER_1_ENABLED
+ bool "Enable I2C port 1"
+
+ if I2C_MANAGER_1_ENABLED
+ config I2C_MANAGER_1_SDA
+ int "SDA (GPIO pin)"
+ config I2C_MANAGER_1_SCL
+ int "SCL (GPIO pin)"
+ config I2C_MANAGER_1_FREQ_HZ
+ int "Frequency (Hz)"
+ default 1000000
+ range 100000 5000000
+ help
+ The clock speed in Hz. Ranges from 100000 (100 kHz) to
+ 5000000 (5 Mhz). I2C busses that involve external wires may
+ have to be slower, and the real maximum speed the bus will
+ support depends on the value of the pullup resistors and the
+ design of the overall circuit.
+ config I2C_MANAGER_1_TIMEOUT
+ int "R/W timeout (ms)"
+ default 20
+ range 10 1000
+ help
+ Timeout for I2C read and write operations. This does not
+ include the time waiting for a lock. Default should be fine.
+ config I2C_MANAGER_1_LOCK_TIMEOUT
+ int "Stale lock override (ms)"
+ default 50
+ help
+ Timeout at which point an operation waiting for its turn on
+ the port will assume that whatever set the lock has died and
+ overrides it. Set this somewhat larger than the previous
+ timeout. Default should be fine.
+ range 30 1000
+ config I2C_MANAGER_1_PULLUPS
+ bool "Use ESP32 built-in bus pull-up resistors"
+ help
+ The I2C bus needs resistors to make sure it's in a defined
+ state when nobody is talking. Many circuits have external
+ pullup resistors already and turning these on will increase
+ power consumption slightly and may limit the speed your bus
+ can attain. Try with these off first if you don't know.
+ endif
+
+endmenu
diff --git a/lvgl_i2c/README.md b/lvgl_i2c/README.md
new file mode 100644
index 0000000..90f3728
--- /dev/null
+++ b/lvgl_i2c/README.md
@@ -0,0 +1,90 @@
+# I2C in `lvgl_esp32_drivers`
+
+
+
+
+
+## Information for users
+
+### I2C Manager support
+
+`lvgl_esp32_drivers` integrates [I2C Manager](https://github.com/ropg/i2c_manager), which is used in case you select a touch sensor or screen that uses the I2C bus.
+
+I2C Manager is also available as a separate ESP-IDF component and can help if you are in a situation where you want to avoid "bus conflicts" on the I2C bus. **If in your application nothing outside of LVGL needs to talk to the I2C bus, you can stop reading here.**
+
+Suppose you use LVGL with a touch sensor that uses I2C, and your device also has another I2C device that needs to be read frequently, such as a 3D-accelerometer. ESP-IDF is not inherently "thread-safe". So if you read that from another task than the one LVGL uses to read the touch data, you need some kind of mechanism to keep these communications from interfering.
+
+If you have (or write) a driver for that 3D-accelerometer that can use I2C Manager (or the I2C HAL and i2cdev abstraction layers that I2C Manager is compatible with) then put I2C Manager in your components directory by cloning the repository from below and in your main program do:
+
+```c
+#include "i2c_manager.h"
+#include "lvgl_helpers.h"
+
+[...]
+
+lvgl_i2c_locking(i2c_manager_locking());
+lv_init();
+lvgl_driver_init();
+```
+
+The `lvgl_i2c_locking` part will cause the LVGL I2C driver to play nice with anything else that uses the I2C port(s) through I2C Manager.
+
+
+
+
+
+## Information for LVGL driver developers
+
+I2C support in the LVGL ESP drivers is provided exclusively by the files in this directory. Driver code that uses I2C communicates through the functions provided in `i2c_manager.h`.
+
+
+
+
+
+### Using I2C in an LVGL driver, a multi-step guide
+
+
+
+- Step 1
+
+-
+The Kconfig entries for your driver only need to specify that you will be using I2C. This is done by adding `select LV_I2C_DISPLAY` or `select LV_I2C_TOUCH`.
+
+
+
+- Step 2
+
+-
+To use the I2C port in your code you would do something like:
+
+
+```c
+#include "lvgl_i2c/i2c_manager.h"
+
+uint8_t data[2];
+lvgl_i2c_read(CONFIG_LV_I2C_TOUCH_PORT, 0x23, 0x42, &data, 2);
+```
+
+This causes a touch driver to read two bytes at register `0x42` from the IC at address `0x23`. Replace `CONFIG_LV_I2C_TOUCH_PORT` by `CONFIG_LV_I2C_DISPLAY_PORT` when this is a display instead of a touch driver. `lvgl_i2c_write` works much the same way, except it writes the bytes from the buffer instead of reading them. _(It's ignored above but these functions return `esp_err_t` so you can check if the I2C communication worked.)_
+
+
+- Step 3
+
+-
+There is no step 3, you are already done.
+
+
+
+
+
+### Meanwhile, behind the scenes ...
+
+If any of the drivers selected by the user uses I2C, the menuconfig system will show an extra menu to select I2C port(s) for screen and/or touch sensor. An additional menu allows for setting of GPIO pins and bus speed of any port selected for use with LVGL. It's perfectly fine for a display and a touch sensor to be on the same I2C port or different ones.
+
+
+
+
+
+## More information
+
+If you need more documentation, please refer to the [I2C Manager GitHub repository](https://github.com/ropg/i2c_manager) for more detailed information on how I2C manager works. There are features not in the simple example above, such as reads and writes without specifying a register, 16-bit registers, 10-bit I2C addressing and more.
diff --git a/lvgl_i2c/i2c_manager.c b/lvgl_i2c/i2c_manager.c
new file mode 100644
index 0000000..080d81a
--- /dev/null
+++ b/lvgl_i2c/i2c_manager.c
@@ -0,0 +1,368 @@
+/*
+
+SPDX-License-Identifier: MIT
+
+MIT License
+
+Copyright (c) 2021 Rop Gonggrijp. Based on esp_i2c_helper by Mika Tuupola.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+*/
+
+#include
+#include
+
+#include
+
+#include "freertos/FreeRTOS.h"
+#include "freertos/semphr.h"
+#include "freertos/task.h"
+#include
+
+#include "sdkconfig.h"
+
+#include "i2c_manager.h"
+
+
+#if defined __has_include
+ #if __has_include ("esp_idf_version.h")
+ #include "esp_idf_version.h"
+ #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 3, 0)
+ #define HAS_CLK_FLAGS
+ #endif
+ #endif
+#endif
+
+
+static const char* TAG = I2C_TAG;
+
+static SemaphoreHandle_t I2C_FN(_local_mutex)[2] = { NULL, NULL };
+static SemaphoreHandle_t* I2C_FN(_mutex) = &I2C_FN(_local_mutex)[0];
+
+static const uint8_t ACK_CHECK_EN = 1;
+
+#if defined (I2C_NUM_0) && defined (CONFIG_I2C_MANAGER_0_ENABLED)
+ #define I2C_ZERO I2C_NUM_0
+ #if defined (CONFIG_I2C_MANAGER_0_PULLUPS)
+ #define I2C_MANAGER_0_PULLUPS true
+ #else
+ #define I2C_MANAGER_0_PULLUPS false
+ #endif
+
+ #define I2C_MANAGER_0_TIMEOUT ( CONFIG_I2C_MANAGER_0_TIMEOUT / portTICK_RATE_MS )
+ #define I2C_MANAGER_0_LOCK_TIMEOUT ( CONFIG_I2C_MANAGER_0_LOCK_TIMEOUT / portTICK_RATE_MS )
+#endif
+
+
+#if defined (I2C_NUM_1) && defined (CONFIG_I2C_MANAGER_1_ENABLED)
+ #define I2C_ONE I2C_NUM_1
+ #if defined (CONFIG_I2C_MANAGER_1_PULLUPS)
+ #define I2C_MANAGER_1_PULLUPS true
+ #else
+ #define I2C_MANAGER_1_PULLUPS false
+ #endif
+
+ #define I2C_MANAGER_1_TIMEOUT ( CONFIG_I2C_MANAGER_1_TIMEOUT / portTICK_RATE_MS )
+ #define I2C_MANAGER_1_LOCK_TIMEOUT ( CONFIG_I2C_MANAGER_1_LOCK_TIMEOUT / portTICK_RATE_MS )
+#endif
+
+#define ERROR_PORT(port, fail) { \
+ ESP_LOGE(TAG, "Invalid port or not configured for I2C Manager: %d", (int)port); \
+ return fail; \
+}
+
+#if defined(I2C_ZERO) && defined (I2C_ONE)
+ #define I2C_PORT_CHECK(port, fail) \
+ if (port != I2C_NUM_0 && port != I2C_NUM_1) ERROR_PORT(port, fail);
+#else
+ #if defined(I2C_ZERO)
+ #define I2C_PORT_CHECK(port, fail) \
+ if (port != I2C_NUM_0) ERROR_PORT(port, fail);
+ #elif defined(I2C_ONE)
+ #define I2C_PORT_CHECK(port, fail) \
+ if (port != I2C_NUM_1) ERROR_PORT(port, fail);
+ #else
+ #define I2C_PORT_CHECK(port, fail) \
+ ERROR_PORT(port, fail);
+ #endif
+#endif
+
+static void i2c_send_address(i2c_cmd_handle_t cmd, uint16_t addr, i2c_rw_t rw) {
+ if (addr & I2C_ADDR_10) {
+ i2c_master_write_byte(cmd, 0xF0 | ((addr & 0x3FF) >> 7) | rw, ACK_CHECK_EN);
+ i2c_master_write_byte(cmd, addr & 0xFF, ACK_CHECK_EN);
+ } else {
+ i2c_master_write_byte(cmd, (addr << 1) | rw, ACK_CHECK_EN);
+ }
+}
+
+static void i2c_send_register(i2c_cmd_handle_t cmd, uint32_t reg) {
+ if (reg & I2C_REG_16) {
+ i2c_master_write_byte(cmd, (reg & 0xFF00) >> 8, ACK_CHECK_EN);
+ }
+ i2c_master_write_byte(cmd, reg & 0xFF, ACK_CHECK_EN);
+}
+
+esp_err_t I2C_FN(_init)(i2c_port_t port) {
+
+ I2C_PORT_CHECK(port, ESP_FAIL);
+
+ esp_err_t ret = ESP_OK;
+
+ if (I2C_FN(_mutex)[port] == 0) {
+
+ ESP_LOGI(TAG, "Starting I2C master at port %d.", (int)port);
+
+ I2C_FN(_mutex)[port] = xSemaphoreCreateMutex();
+
+ i2c_config_t conf = {0};
+
+ #ifdef HAS_CLK_FLAGS
+ conf.clk_flags = 0;
+ #endif
+
+ #if defined (I2C_ZERO)
+ if (port == I2C_NUM_0) {
+ conf.sda_io_num = CONFIG_I2C_MANAGER_0_SDA;
+ conf.scl_io_num = CONFIG_I2C_MANAGER_0_SCL;
+ conf.sda_pullup_en = I2C_MANAGER_0_PULLUPS ? GPIO_PULLUP_ENABLE : GPIO_PULLUP_DISABLE;
+ conf.scl_pullup_en = conf.sda_pullup_en;
+ conf.master.clk_speed = CONFIG_I2C_MANAGER_0_FREQ_HZ;
+ }
+ #endif
+
+ #if defined (I2C_ONE)
+ if (port == I2C_NUM_1) {
+ conf.sda_io_num = CONFIG_I2C_MANAGER_1_SDA;
+ conf.scl_io_num = CONFIG_I2C_MANAGER_1_SCL;
+ conf.sda_pullup_en = I2C_MANAGER_1_PULLUPS ? GPIO_PULLUP_ENABLE : GPIO_PULLUP_DISABLE;
+ conf.scl_pullup_en = conf.sda_pullup_en;
+ conf.master.clk_speed = CONFIG_I2C_MANAGER_1_FREQ_HZ;
+ }
+ #endif
+
+ conf.mode = I2C_MODE_MASTER;
+
+ ret = i2c_param_config(port, &conf);
+ ret |= i2c_driver_install(port, conf.mode, 0, 0, 0);
+
+ if (ret != ESP_OK) {
+ ESP_LOGE(TAG, "Failed to initialise I2C port %d.", (int)port);
+ ESP_LOGW(TAG, "If it was already open, we'll use it with whatever settings were used "
+ "to open it. See I2C Manager README for details.");
+ } else {
+ ESP_LOGI(TAG, "Initialised port %d (SDA: %d, SCL: %d, speed: %d Hz.)",
+ port, conf.sda_io_num, conf.scl_io_num, conf.master.clk_speed);
+ }
+
+ }
+
+ return ret;
+}
+
+esp_err_t I2C_FN(_read)(i2c_port_t port, uint16_t addr, uint32_t reg, uint8_t *buffer, uint16_t size) {
+
+ I2C_PORT_CHECK(port, ESP_FAIL);
+
+ esp_err_t result;
+
+ // May seem weird, but init starts with a check if it's needed, no need for that check twice.
+ I2C_FN(_init)(port);
+
+ ESP_LOGV(TAG, "Reading port %d, addr 0x%03x, reg 0x%04x", port, addr, reg);
+
+ TickType_t timeout = 0;
+ #if defined (I2C_ZERO)
+ if (port == I2C_NUM_0) {
+ timeout = I2C_MANAGER_0_TIMEOUT;
+ }
+ #endif
+ #if defined (I2C_ONE)
+ if (port == I2C_NUM_1) {
+ timeout = I2C_MANAGER_1_TIMEOUT;
+ }
+ #endif
+
+ if (I2C_FN(_lock)((int)port) == ESP_OK) {
+ i2c_cmd_handle_t cmd = i2c_cmd_link_create();
+ if (!(reg & I2C_NO_REG)) {
+ /* When reading specific register set the addr pointer first. */
+ i2c_master_start(cmd);
+ i2c_send_address(cmd, addr, I2C_MASTER_WRITE);
+ i2c_send_register(cmd, reg);
+ }
+ /* Read size bytes from the current pointer. */
+ i2c_master_start(cmd);
+ i2c_send_address(cmd, addr, I2C_MASTER_READ);
+ i2c_master_read(cmd, buffer, size, I2C_MASTER_LAST_NACK);
+ i2c_master_stop(cmd);
+ result = i2c_master_cmd_begin(port, cmd, timeout);
+ i2c_cmd_link_delete(cmd);
+ I2C_FN(_unlock)((int)port);
+ } else {
+ ESP_LOGE(TAG, "Lock could not be obtained for port %d.", (int)port);
+ return ESP_ERR_TIMEOUT;
+ }
+
+ if (result != ESP_OK) {
+ ESP_LOGW(TAG, "Error: %d", result);
+ }
+
+ ESP_LOG_BUFFER_HEX_LEVEL(TAG, buffer, size, ESP_LOG_VERBOSE);
+
+ return result;
+}
+
+esp_err_t I2C_FN(_write)(i2c_port_t port, uint16_t addr, uint32_t reg, const uint8_t *buffer, uint16_t size) {
+
+ I2C_PORT_CHECK(port, ESP_FAIL);
+
+ esp_err_t result;
+
+ // May seem weird, but init starts with a check if it's needed, no need for that check twice.
+ I2C_FN(_init)(port);
+
+ ESP_LOGV(TAG, "Writing port %d, addr 0x%03x, reg 0x%04x", port, addr, reg);
+
+ TickType_t timeout = 0;
+ #if defined (I2C_ZERO)
+ if (port == I2C_NUM_0) {
+ timeout = (CONFIG_I2C_MANAGER_0_TIMEOUT) / portTICK_RATE_MS;
+ }
+ #endif
+ #if defined (I2C_ONE)
+ if (port == I2C_NUM_1) {
+ timeout = (CONFIG_I2C_MANAGER_1_TIMEOUT) / portTICK_RATE_MS;
+ }
+ #endif
+
+ if (I2C_FN(_lock)((int)port) == ESP_OK) {
+ i2c_cmd_handle_t cmd = i2c_cmd_link_create();
+ i2c_master_start(cmd);
+ i2c_send_address(cmd, addr, I2C_MASTER_WRITE);
+ if (!(reg & I2C_NO_REG)) {
+ i2c_send_register(cmd, reg);
+ }
+ i2c_master_write(cmd, (uint8_t *)buffer, size, ACK_CHECK_EN);
+ i2c_master_stop(cmd);
+ result = i2c_master_cmd_begin( port, cmd, timeout);
+ i2c_cmd_link_delete(cmd);
+ I2C_FN(_unlock)((int)port);
+ } else {
+ ESP_LOGE(TAG, "Lock could not be obtained for port %d.", (int)port);
+ return ESP_ERR_TIMEOUT;
+ }
+
+ if (result != ESP_OK) {
+ ESP_LOGW(TAG, "Error: %d", result);
+ }
+
+ ESP_LOG_BUFFER_HEX_LEVEL(TAG, buffer, size, ESP_LOG_VERBOSE);
+
+ return result;
+}
+
+esp_err_t I2C_FN(_close)(i2c_port_t port) {
+ I2C_PORT_CHECK(port, ESP_FAIL);
+ vSemaphoreDelete(I2C_FN(_mutex)[port]);
+ I2C_FN(_mutex)[port] = NULL;
+ ESP_LOGI(TAG, "Closing I2C master at port %d", port);
+ return i2c_driver_delete(port);
+}
+
+esp_err_t I2C_FN(_lock)(i2c_port_t port) {
+ I2C_PORT_CHECK(port, ESP_FAIL);
+ ESP_LOGV(TAG, "Mutex lock set for %d.", (int)port);
+
+ TickType_t timeout;
+ #if defined (I2C_ZERO)
+ if (port == I2C_NUM_0) {
+ timeout = (CONFIG_I2C_MANAGER_0_LOCK_TIMEOUT) / portTICK_RATE_MS;
+ }
+ #endif
+ #if defined (I2C_ONE)
+ if (port == I2C_NUM_1) {
+ timeout = (CONFIG_I2C_MANAGER_1_LOCK_TIMEOUT) / portTICK_RATE_MS;
+ }
+ #endif
+
+ if (xSemaphoreTake(I2C_FN(_mutex)[port], timeout) == pdTRUE) {
+ return ESP_OK;
+ } else {
+ ESP_LOGE(TAG, "Removing stale mutex lock from port %d.", (int)port);
+ I2C_FN(_force_unlock)(port);
+ return (xSemaphoreTake(I2C_FN(_mutex)[port], timeout) == pdTRUE ? ESP_OK : ESP_FAIL);
+ }
+}
+
+esp_err_t I2C_FN(_unlock)(i2c_port_t port) {
+ I2C_PORT_CHECK(port, ESP_FAIL);
+ ESP_LOGV(TAG, "Mutex lock removed for %d.", (int)port);
+ return (xSemaphoreGive(I2C_FN(_mutex)[port]) == pdTRUE) ? ESP_OK : ESP_FAIL;
+}
+
+esp_err_t I2C_FN(_force_unlock)(i2c_port_t port) {
+ I2C_PORT_CHECK(port, ESP_FAIL);
+ if (I2C_FN(_mutex)[port]) {
+ vSemaphoreDelete(I2C_FN(_mutex)[port]);
+ }
+ I2C_FN(_mutex)[port] = xSemaphoreCreateMutex();
+ return ESP_OK;
+}
+
+
+
+#ifdef I2C_OEM
+
+ void I2C_FN(_locking)(void* leader) {
+ if (leader) {
+ ESP_LOGI(TAG, "Now following I2C Manager for locking");
+ I2C_FN(_mutex) = (SemaphoreHandle_t*)leader;
+ }
+ }
+
+#else
+
+ void* i2c_manager_locking() {
+ return (void*)i2c_manager_mutex;
+ }
+
+ int32_t i2c_hal_read(void *handle, uint8_t address, uint8_t reg, uint8_t *buffer, uint16_t size) {
+ return i2c_manager_read(*(i2c_port_t*)handle, address, reg, buffer, size);
+ }
+
+ int32_t i2c_hal_write(void *handle, uint8_t address, uint8_t reg, const uint8_t *buffer, uint16_t size) {
+ return i2c_manager_write(*(i2c_port_t*)handle, address, reg, buffer, size);
+ }
+
+ static i2c_port_t port_zero = (i2c_port_t)0;
+ static i2c_port_t port_one = (i2c_port_t)1;
+
+ static i2c_hal_t _i2c_hal[2] = {
+ {&i2c_hal_read, &i2c_hal_write, &port_zero},
+ {&i2c_hal_read, &i2c_hal_write, &port_one}
+ };
+
+ void* i2c_hal(i2c_port_t port) {
+ I2C_PORT_CHECK(port, NULL);
+ return (void*)&_i2c_hal[port];
+ }
+
+#endif
diff --git a/lvgl_i2c/i2c_manager.h b/lvgl_i2c/i2c_manager.h
new file mode 100644
index 0000000..f9ce585
--- /dev/null
+++ b/lvgl_i2c/i2c_manager.h
@@ -0,0 +1,76 @@
+#ifndef _I2C_MANAGER_H
+#define _I2C_MANAGER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/*
+
+ If you copy the i2c_manager files to your own component instead of
+ depending on i2c_manager, you MUST uncomment the define below
+ and put in some short string that identifies your component (such
+ as 'xyz'). This will cause i2c_manager to create functions named
+ xyz_i2c_* instead of i2c_manager_*. See README.md for details.
+
+*/
+
+#define I2C_OEM lvgl
+
+
+// Only here to get the I2C_NUM_0 and I2C_NUM_1 defines.
+#include
+
+#define CONCATX(A, B) A ## B
+#define CONCAT(A, B) CONCATX(A, B)
+#define STR_LITERAL(s) # s
+#define STR_EXPAND(s) STR_LITERAL(s)
+#define STR_QUOTE(s) STR_EXPAND(STR_EXPAND(s))
+
+#ifdef I2C_OEM
+ #define I2C_NAME_PREFIX CONCAT(I2C_OEM, _i2c)
+#else
+ #define I2C_NAME_PREFIX i2c_manager
+#endif
+#define I2C_TAG STR_EXPAND(I2C_NAME_PREFIX)
+
+#define I2C_FN(s) CONCAT(I2C_NAME_PREFIX, s)
+
+
+#define I2C_ADDR_10 ( 1 << 15 )
+#define I2C_REG_16 ( 1 << 31 )
+#define I2C_NO_REG ( 1 << 30 )
+
+esp_err_t I2C_FN(_init)(i2c_port_t port);
+esp_err_t I2C_FN(_read)(i2c_port_t port, uint16_t addr, uint32_t reg, uint8_t *buffer, uint16_t size);
+esp_err_t I2C_FN(_write)(i2c_port_t port, uint16_t addr, uint32_t reg, const uint8_t *buffer, uint16_t size);
+esp_err_t I2C_FN(_close)(i2c_port_t port);
+esp_err_t I2C_FN(_lock)(i2c_port_t port);
+esp_err_t I2C_FN(_unlock)(i2c_port_t port);
+esp_err_t I2C_FN(_force_unlock)(i2c_port_t port);
+
+
+#ifdef I2C_OEM
+
+ void I2C_FN(_locking)(void* leader);
+
+#else
+
+ void* i2c_manager_locking();
+
+ typedef struct {
+ int32_t (* read)(void *handle, uint8_t address, uint8_t reg, uint8_t *buffer, uint16_t size);
+ int32_t (* write)(void *handle, uint8_t address, uint8_t reg, const uint8_t *buffer, uint16_t size);
+ void *handle;
+ } i2c_hal_t;
+
+ void* i2c_hal(i2c_port_t port);
+
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/lvgl_i2c_conf.h b/lvgl_i2c_conf.h
deleted file mode 100644
index cf8ac45..0000000
--- a/lvgl_i2c_conf.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/**
- * @file lvgl_i2c_config.h
- */
-
-#ifndef LVGL_I2C_CONF_H
-#define LVGL_I2C_CONF_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*********************
- * INCLUDES
- *********************/
-#ifdef LV_LVGL_H_INCLUDE_SIMPLE
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-/*********************
- * DEFINES
- *********************/
-
-/* TODO: Define the I2C bus clock based on the selected display or touch
- * controllers. */
-
-/* Do both display and touch controllers uses I2C? */
-#if defined (CONFIG_LV_TOUCH_DRIVER_PROTOCOL_I2C) && \
- defined (CONFIG_LV_TFT_DISPLAY_PROTOCOL_I2C)
-
-#if defined (CONFIG_LV_DISPLAY_I2C_PORT_0) && \
- defined (CONFIG_LV_TOUCH_I2C_PORT_0)
-#define SHARED_I2C_PORT
-#define DISP_I2C_PORT I2C_NUM_0
-#endif
-
-#if defined (CONFIG_LV_DISPLAY_I2C_PORT_1) && \
- defined (CONFIG_LV_TOUCH_I2C_PORT_1)
-#define SHARED_I2C_PORT
-#define DISP_I2C_PORT I2C_NUM_1
-#endif
-
-#if !defined (SHARED_I2C_PORT)
-#endif
-#endif
-
-#if defined (SHARED_I2C_PORT)
-/* If the port is shared the display and touch controllers must use the same
- * SCL and SDA pins, otherwise let the user know with an error. */
-#if (CONFIG_LV_DISP_PIN_SDA != CONFIG_LV_TOUCH_I2C_SDA) || \
- (CONFIG_LV_DISP_PIN_SCL != CONFIG_LV_TOUCH_I2C_SCL)
-#error "To share I2C port you need to choose the same SDA and SCL pins on both display and touch configurations"
-#endif
-
-#define DISP_I2C_SDA CONFIG_LV_DISP_PIN_SDA
-#define DISP_I2C_SCL CONFIG_LV_DISP_PIN_SCL
-#define DISP_I2C_ORIENTATION TFT_ORIENTATION_LANDSCAPE
-
-/* Setting the I2C speed to the slowest one */
-#if DISP_I2C_SPEED_HZ < TOUCH_I2C_SPEED_HZ
-#define DISP_I2C_SPEED_HZ 400000 /* DISP_I2C_SPEED_HZ */
-#else
-#define DISP_I2C_SPEED_HZ 400000 /* DISP_I2C_SPEED_HZ */
-#endif
-
-#else
-
-/* lets check if the touch controller uses I2C... */
-#if defined (CONFIG_LV_TOUCH_DRIVER_PROTOCOL_I2C)
-#if defined (CONFIG_LV_TOUCH_I2C_PORT_0)
-#define TOUCH_I2C_PORT I2C_NUM_0
-#else
-#define TOUCH_I2C_PORT I2C_NUM_1
-#endif
-#define TOUCH_I2C_SDA CONFIG_LV_TOUCH_I2C_SDA
-#define TOUCH_I2C_SCL CONFIG_LV_TOUCH_I2C_SCL
-#define TOUCH_I2C_SPEED_HZ 400000
-#endif
-
-/* lets check if the display controller uses I2C... */
-#if defined (CONFIG_LV_TFT_DISPLAY_PROTOCOL_I2C)
-#if defined (CONFIG_LV_DISPLAY_I2C_PORT_0)
-#define DISP_I2C_PORT I2C_NUM_0
-#else
-#define DISP_I2C_PORT I2C_NUM_1
-#endif
-
-#define DISP_I2C_SDA CONFIG_LV_DISP_PIN_SDA
-#define DISP_I2C_SCL CONFIG_LV_DISP_PIN_SCL
-#define DISP_I2C_ORIENTATION TFT_ORIENTATION_LANDSCAPE
-#define DISP_I2C_SPEED_HZ 400000
-#endif
-
-#endif
-
-/**********************
- * TYPEDEFS
- **********************/
-
-
-/**********************
- * GLOBAL PROTOTYPES
- **********************/
-
-
-/**********************
- * MACROS
- **********************/
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /*LVGL_I2C_CONF_H*/
diff --git a/lvgl_spi_conf.h b/lvgl_spi_conf.h
index 16e63b4..662be98 100644
--- a/lvgl_spi_conf.h
+++ b/lvgl_spi_conf.h
@@ -64,12 +64,10 @@ extern "C" {
#define ENABLE_TOUCH_INPUT CONFIG_LV_ENABLE_TOUCH
-#if defined (CONFIG_LV_TFT_DISPLAY_SPI_HSPI)
-#define TFT_SPI_HOST HSPI_HOST
-#elif defined (CONFIG_LV_TFT_DISPLAY_SPI_VSPI)
-#define TFT_SPI_HOST VSPI_HOST
-#elif defined (CONFIG_LV_TFT_DISPLAY_SPI_FSPI)
-#define TFT_SPI_HOST FSPI_HOST
+#if defined (CONFIG_LV_TFT_DISPLAY_SPI2_HOST)
+#define TFT_SPI_HOST SPI2_HOST
+#elif defined (CONFIG_LV_TFT_DISPLAY_SPI3_HOST)
+#define TFT_SPI_HOST SPI3_HOST
#endif
#if defined (CONFIG_LV_TFT_DISPLAY_SPI_HALF_DUPLEX)
@@ -86,12 +84,10 @@ extern "C" {
#define DISP_SPI_TRANS_MODE_SIO
#endif
-#if defined (CONFIG_LV_TOUCH_CONTROLLER_SPI_HSPI)
-#define TOUCH_SPI_HOST HSPI_HOST
-#elif defined (CONFIG_LV_TOUCH_CONTROLLER_SPI_VSPI)
-#define TOUCH_SPI_HOST VSPI_HOST
-#elif defined (CONFIG_LV_TOUCH_CONTROLLER_SPI_FSPI)
-#define TOUCH_SPI_HOST FSPI_HOST
+#if defined (CONFIG_LV_TOUCH_CONTROLLER_SPI2_HOST)
+#define TOUCH_SPI_HOST SPI2_HOST
+#elif defined (CONFIG_LV_TOUCH_CONTROLLER_SPI3_HOST)
+#define TOUCH_SPI_HOST SPI3_HOST
#endif
/* Handle the FT81X Special case */
@@ -107,7 +103,7 @@ extern "C" {
// Detect the use of a shared SPI Bus and verify the user specified the same SPI bus for both touch and tft
#if defined (CONFIG_LV_TOUCH_DRIVER_PROTOCOL_SPI) && TP_SPI_MOSI == DISP_SPI_MOSI && TP_SPI_CLK == DISP_SPI_CLK
#if TFT_SPI_HOST != TOUCH_SPI_HOST
-#error You must specify the same SPI host (HSPI, VSPI or FSPI) for both display and touch driver
+#error You must specify the same SPI host (SPIx_HOST) for both display and touch driver
#endif
#define SHARED_SPI_BUS
@@ -130,7 +126,8 @@ extern "C" {
defined (CONFIG_LV_TFT_DISPLAY_CONTROLLER_SH1107) || \
defined (CONFIG_LV_TFT_DISPLAY_CONTROLLER_FT81X) || \
defined (CONFIG_LV_TFT_DISPLAY_CONTROLLER_IL3820) || \
- defined (CONFIG_LV_TFT_DISPLAY_CONTROLLER_JD79653A)
+ defined (CONFIG_LV_TFT_DISPLAY_CONTROLLER_JD79653A) || \
+ defined (CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9163C)
#define SPI_BUS_MAX_TRANSFER_SZ (DISP_BUF_SIZE * 2)
@@ -157,8 +154,12 @@ extern "C" {
#define SPI_TFT_CLOCK_SPEED_HZ (40*1000*1000)
#elif defined (CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9341)
#define SPI_TFT_CLOCK_SPEED_HZ (40*1000*1000)
-#elif defined (CONFIG_LV_TFT_DISPLAY_CONTROLLER_FT81X)
+#elif defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9163C)
+#define SPI_TFT_CLOCK_SPEED_HZ (40 * 1000 * 1000)
+#elif defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_FT81X)
#define SPI_TFT_CLOCK_SPEED_HZ (32*1000*1000)
+#elif defined (CONFIG_LV_TFT_DISPLAY_CONTROLLER_PCD8544)
+#define SPI_TFT_CLOCK_SPEED_HZ (4*1000*1000)
#else
#define SPI_TFT_CLOCK_SPEED_HZ (40*1000*1000)
#endif
diff --git a/lvgl_tft/EVE_commands.c b/lvgl_tft/EVE_commands.c
index 9e458f4..2a93efa 100644
--- a/lvgl_tft/EVE_commands.c
+++ b/lvgl_tft/EVE_commands.c
@@ -144,7 +144,7 @@ void DELAY_MS(uint16_t ms)
vTaskDelay(ms / portTICK_PERIOD_MS);
}
-
+#if EVE_USE_PDN
void EVE_pdn_set(void)
{
gpio_set_level(EVE_PDN, 0); /* Power-Down low */
@@ -155,7 +155,7 @@ void EVE_pdn_clear(void)
{
gpio_set_level(EVE_PDN, 1); /* Power-Down high */
}
-
+#endif
void spi_acquire()
{
@@ -841,11 +841,13 @@ uint8_t EVE_init(void)
uint8_t chipid = 0;
uint16_t timeout = 0;
+#if EVE_USE_PDN
EVE_pdn_set();
DELAY_MS(6); /* minimum time for power-down is 5ms */
EVE_pdn_clear();
DELAY_MS(21); /* minimum time to allow from rising PD_N to first access is 20ms */
+#endif
/* EVE_cmdWrite(EVE_CORERST,0); */ /* reset, only required for warm-start if PowerDown line is not used */
diff --git a/lvgl_tft/EVE_commands.h b/lvgl_tft/EVE_commands.h
index 3c5c104..aa9d061 100644
--- a/lvgl_tft/EVE_commands.h
+++ b/lvgl_tft/EVE_commands.h
@@ -39,8 +39,12 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR TH
#define BLOCK_TRANSFER_SIZE 3840 // block transfer size when write data to CMD buffer
void DELAY_MS(uint16_t ms);
+
+#if EVE_USE_PDN
void EVE_pdn_set(void);
void EVE_pdn_clear(void);
+#endif
+
void spi_acquire();
void spi_release();
@@ -64,7 +68,7 @@ void EVE_get_cmdoffset(void);
/* commands to operate on memory: */
void EVE_cmd_memzero(uint32_t ptr, uint32_t num);
void EVE_cmd_memset(uint32_t ptr, uint8_t value, uint32_t num);
-void EVE_cmd_memwrite(uint32_t dest, uint32_t num, const uint8_t *data);
+void EVE_cmd_memwrite(uint32_t dest, uint32_t num, const uint8_t *data);
void EVE_cmd_memcpy(uint32_t dest, uint32_t src, uint32_t num);
#if FT81X_FULL
diff --git a/lvgl_tft/EVE_config.h b/lvgl_tft/EVE_config.h
index 53225a2..386edb9 100644
--- a/lvgl_tft/EVE_config.h
+++ b/lvgl_tft/EVE_config.h
@@ -44,11 +44,12 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR TH
#include "FT81x.h"
-#define EVE_CLK DISP_SPI_CLK // orange
-#define EVE_MISO DISP_SPI_MISO // yellow
-#define EVE_MOSI DISP_SPI_MOSI // green
-#define EVE_CS DISP_SPI_CS // blue
-#define EVE_PDN CONFIG_LV_DISP_PIN_RST // grey
+#define EVE_CLK DISP_SPI_CLK // orange
+#define EVE_MISO DISP_SPI_MISO // yellow
+#define EVE_MOSI DISP_SPI_MOSI // green
+#define EVE_CS DISP_SPI_CS // blue
+#define EVE_PDN CONFIG_LV_DISP_PIN_RST // grey
+#define EVE_USE_PDN CONFIG_LV_DISP_USE_RST
#define SPI_TRANSER_SIZE (DISP_BUF_SIZE * (LV_COLOR_DEPTH / 8))
diff --git a/lvgl_tft/FT81x.c b/lvgl_tft/FT81x.c
index 96ea221..d896e3a 100644
--- a/lvgl_tft/FT81x.c
+++ b/lvgl_tft/FT81x.c
@@ -250,7 +250,7 @@ void TFT_bitmap_display(void)
EVE_cmd_dl(TAG(0));
EVE_cmd_dl(DL_DISPLAY); /* instruct the graphics processor to show the list */
-
+
EVE_cmd_dl(CMD_SWAP); /* make this list active */
EVE_end_cmd_burst(); /* stop writing to the cmd-fifo */
@@ -262,12 +262,18 @@ void TFT_bitmap_display(void)
void FT81x_init(void)
{
+#if EVE_USE_PDN
gpio_reset_pin(EVE_PDN);
+#endif
+
gpio_set_level(EVE_CS, 1);
+
+#if EVE_USE_PDN
gpio_set_direction(EVE_PDN, GPIO_MODE_OUTPUT);
+#endif
spi_acquire();
-
+
if(EVE_init())
{
tft_active = 1;
@@ -278,7 +284,7 @@ void FT81x_init(void)
EVE_cmd_memset(SCREEN_BITMAP_ADDR, BLACK, SCREEN_BUFFER_SIZE); // clear screen buffer
EVE_cmd_execute();
-
+
TFT_bitmap_display(); // set DL for fullscreen bitmap display
}
@@ -320,4 +326,4 @@ void TFT_WriteBitmap(uint8_t* Bitmap, uint16_t X, uint16_t Y, uint16_t Width, ui
void FT81x_flush(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t * color_map)
{
TFT_WriteBitmap((uint8_t*)color_map, area->x1, area->y1, lv_area_get_width(area), lv_area_get_height(area));
-}
\ No newline at end of file
+}
diff --git a/lvgl_tft/GC9A01.c b/lvgl_tft/GC9A01.c
index bd87197..18cfe92 100644
--- a/lvgl_tft/GC9A01.c
+++ b/lvgl_tft/GC9A01.c
@@ -111,31 +111,25 @@ void GC9A01_init(void)
};
-#if GC9A01_BCKL == 15
- gpio_config_t io_conf;
- io_conf.intr_type = GPIO_PIN_INTR_DISABLE;
- io_conf.mode = GPIO_MODE_OUTPUT;
- io_conf.pin_bit_mask = GPIO_SEL_15;
- io_conf.pull_down_en = GPIO_PULLDOWN_DISABLE;
- io_conf.pull_up_en = GPIO_PULLUP_DISABLE;
- gpio_config(&io_conf);
-#endif
-
//Initialize non-SPI GPIOs
- gpio_reset_pin(GC9A01_DC);
+ gpio_reset_pin(GC9A01_DC);
gpio_set_direction(GC9A01_DC, GPIO_MODE_OUTPUT);
- gpio_reset_pin(GC9A01_RST);
+
+#if GC9A01_USE_RST
+ gpio_reset_pin(GC9A01_RST);
gpio_set_direction(GC9A01_RST, GPIO_MODE_OUTPUT);
-#if GC9A01_ENABLE_BACKLIGHT_CONTROL
- gpio_reset_pin(GC9A01_BCKL);
- gpio_set_direction(GC9A01_BCKL, GPIO_MODE_OUTPUT);
-#endif
//Reset the display
gpio_set_level(GC9A01_RST, 0);
vTaskDelay(100 / portTICK_PERIOD_MS);
gpio_set_level(GC9A01_RST, 1);
vTaskDelay(100 / portTICK_PERIOD_MS);
+#endif
+
+#if GC9A01_ENABLE_BACKLIGHT_CONTROL
+ gpio_reset_pin(GC9A01_BCKL);
+ gpio_set_direction(GC9A01_BCKL, GPIO_MODE_OUTPUT);
+#endif
ESP_LOGI(TAG, "Initialization.");
@@ -150,8 +144,6 @@ void GC9A01_init(void)
cmd++;
}
- GC9A01_enable_backlight(true);
-
GC9A01_set_orientation(CONFIG_LV_DISPLAY_ORIENTATION);
#if GC9A01_INVERT_COLORS == 1
@@ -167,7 +159,7 @@ void GC9A01_flush(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t * colo
uint8_t data[4];
/*Column addresses*/
- GC9A01_send_cmd(0x2A); //0x2A
+ GC9A01_send_cmd(0x2A); //0x2A
data[0] = (area->x1 >> 8) & 0xFF;
data[1] = area->x1 & 0xFF;
data[2] = (area->x2 >> 8) & 0xFF;
@@ -175,7 +167,7 @@ void GC9A01_flush(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t * colo
GC9A01_send_data(data, 4);
/*Page addresses*/
- GC9A01_send_cmd(0x2B); //0x2B
+ GC9A01_send_cmd(0x2B); //0x2B
data[0] = (area->y1 >> 8) & 0xFF;
data[1] = area->y1 & 0xFF;
data[2] = (area->y2 >> 8) & 0xFF;
@@ -183,7 +175,7 @@ void GC9A01_flush(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t * colo
GC9A01_send_data(data, 4);
/*Memory write*/
- GC9A01_send_cmd(0x2C); //0x2C
+ GC9A01_send_cmd(0x2C); //0x2C
uint32_t size = lv_area_get_width(area) * lv_area_get_height(area);
@@ -191,27 +183,11 @@ void GC9A01_flush(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t * colo
GC9A01_send_color((void*)color_map, size * 2);
}
-void GC9A01_enable_backlight(bool backlight)
-{
-#if GC9A01_ENABLE_BACKLIGHT_CONTROL
- ESP_LOGI(TAG, "%s backlight.", backlight ? "Enabling" : "Disabling");
- uint32_t tmp = 0;
-
-#if (GC9A01_BCKL_ACTIVE_LVL==1)
- tmp = backlight ? 1 : 0;
-#else
- tmp = backlight ? 0 : 1;
-#endif
-
- gpio_set_level(GC9A01_BCKL, tmp);
-#endif
-}
-
void GC9A01_sleep_in()
{
uint8_t data[] = {0x08};
GC9A01_send_cmd(0x10); //0x10 Enter Sleep Mode
- GC9A01_send_data(&data, 1);
+ GC9A01_send_data(&data, 1);
}
void GC9A01_sleep_out()
diff --git a/lvgl_tft/GC9A01.h b/lvgl_tft/GC9A01.h
index d462c8d..e39c14d 100644
--- a/lvgl_tft/GC9A01.h
+++ b/lvgl_tft/GC9A01.h
@@ -25,18 +25,9 @@ extern "C" {
/*********************
* DEFINES
*********************/
-#define GC9A01_DC CONFIG_LV_DISP_PIN_DC
-#define GC9A01_RST CONFIG_LV_DISP_PIN_RST
-#define GC9A01_BCKL CONFIG_LV_DISP_PIN_BCKL
-
-#define GC9A01_ENABLE_BACKLIGHT_CONTROL CONFIG_LV_ENABLE_BACKLIGHT_CONTROL
-
-#if CONFIG_LV_BACKLIGHT_ACTIVE_LVL
- #define GC9A01_BCKL_ACTIVE_LVL 1
-#else
- #define GC9A01_BCKL_ACTIVE_LVL 0
-#endif
-
+#define GC9A01_DC CONFIG_LV_DISP_PIN_DC
+#define GC9A01_RST CONFIG_LV_DISP_PIN_RST
+#define GC9A01_USE_RST CONFIG_LV_DISP_USE_RST
#define GC9A01_INVERT_COLORS CONFIG_LV_INVERT_COLORS
/**********************
@@ -49,7 +40,6 @@ extern "C" {
void GC9A01_init(void);
void GC9A01_flush(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t * color_map);
-void GC9A01_enable_backlight(bool backlight);
void GC9A01_sleep_in(void);
void GC9A01_sleep_out(void);
diff --git a/lvgl_tft/Kconfig b/lvgl_tft/Kconfig
index ddd7f51..4a74ad2 100644
--- a/lvgl_tft/Kconfig
+++ b/lvgl_tft/Kconfig
@@ -21,6 +21,10 @@ menu "LVGL TFT Display controller"
bool "M5Stack"
select LV_TFT_DISPLAY_CONTROLLER_ILI9341
select LV_TFT_DISPLAY_PROTOCOL_SPI
+ config LV_PREDEFINED_DISPLAY_M5CORE2
+ bool "M5Core2"
+ select LV_TFT_DISPLAY_CONTROLLER_ILI9341
+ select LV_TFT_DISPLAY_PROTOCOL_SPI
config LV_PREDEFINED_DISPLAY_M5STICK
bool "M5Stick"
select LV_TFT_DISPLAY_CONTROLLER_SH1107
@@ -46,7 +50,7 @@ menu "LVGL TFT Display controller"
config LV_PREDEFINED_DISPLAY_WEMOS_LOLIN
bool "Wemos Lolin OLED"
select LV_TFT_DISPLAY_CONTROLLER_SSD1306
- select LV_TFT_DISPLAY_PROTOCOL_I2C
+ select LV_I2C_DISPLAY
select LV_TFT_DISPLAY_MONOCHROME
select LV_THEME_MONO
config LV_PREDEFINED_DISPLAY_ATAG
@@ -165,6 +169,15 @@ menu "LVGL TFT Display controller"
help
ST7796S display controller.
+ config LV_TFT_DISPLAY_CONTROLLER_ILI9163C
+ bool
+ help
+ ILI9163C display controller.
+
+ config LV_TFT_DISPLAY_CONTROLLER_PCD8544
+ bool
+ help
+ PCD8544 display controller (Nokia 3110/5110)
# Display controller communication protocol
#
# This symbols define the communication protocol used by the
@@ -178,7 +191,7 @@ menu "LVGL TFT Display controller"
help
Display controller protocol SPI
- config LV_TFT_DISPLAY_PROTOCOL_I2C
+ config LV_I2C_DISPLAY
bool
help
Display controller protocol I2C
@@ -186,24 +199,24 @@ menu "LVGL TFT Display controller"
# Used in display init function to send display orientation commands
choice DISPLAY_ORIENTATION
prompt "Display orientation"
- default DISPLAY_ORIENTATION_PORTRAIT if !LV_TFT_DISPLAY_CONTROLLER_SSD1306
- default DISPLAY_ORIENTATION_LANDSCAPE if LV_TFT_DISPLAY_CONTROLLER_SSD1306
- config DISPLAY_ORIENTATION_PORTRAIT
+ default LV_DISPLAY_ORIENTATION_PORTRAIT if !LV_TFT_DISPLAY_CONTROLLER_SSD1306
+ default LV_DISPLAY_ORIENTATION_LANDSCAPE if LV_TFT_DISPLAY_CONTROLLER_SSD1306
+ config LV_DISPLAY_ORIENTATION_PORTRAIT
bool "Portrait" if !LV_TFT_DISPLAY_CONTROLLER_SSD1306
- config DISPLAY_ORIENTATION_PORTRAIT_INVERTED
+ config LV_DISPLAY_ORIENTATION_PORTRAIT_INVERTED
bool "Portrait inverted" if !LV_TFT_DISPLAY_CONTROLLER_SSD1306
- config DISPLAY_ORIENTATION_LANDSCAPE
+ config LV_DISPLAY_ORIENTATION_LANDSCAPE
bool "Landscape"
- config DISPLAY_ORIENTATION_LANDSCAPE_INVERTED
+ config LV_DISPLAY_ORIENTATION_LANDSCAPE_INVERTED
bool "Landscape inverted"
endchoice
config LV_DISPLAY_ORIENTATION
int
- default 0 if DISPLAY_ORIENTATION_PORTRAIT
- default 1 if DISPLAY_ORIENTATION_PORTRAIT_INVERTED
- default 2 if DISPLAY_ORIENTATION_LANDSCAPE
- default 3 if DISPLAY_ORIENTATION_LANDSCAPE_INVERTED
+ default 0 if LV_DISPLAY_ORIENTATION_PORTRAIT
+ default 1 if LV_DISPLAY_ORIENTATION_PORTRAIT_INVERTED
+ default 2 if LV_DISPLAY_ORIENTATION_LANDSCAPE
+ default 3 if LV_DISPLAY_ORIENTATION_LANDSCAPE_INVERTED
config LV_TFT_DISPLAY_OFFSETS
bool
@@ -212,14 +225,14 @@ menu "LVGL TFT Display controller"
config LV_TFT_DISPLAY_X_OFFSET
depends on LV_TFT_DISPLAY_OFFSETS
- int
+ int "X offset"
default 40 if LV_PREDEFINED_DISPLAY_TTGO && (LV_DISPLAY_ORIENTATION_LANDSCAPE || LV_DISPLAY_ORIENTATION_LANDSCAPE_INVERTED)
default 53 if LV_PREDEFINED_DISPLAY_TTGO && (LV_DISPLAY_ORIENTATION_PORTRAIT || LV_DISPLAY_ORIENTATION_PORTRAIT_INVERTED)
default 0
config LV_TFT_DISPLAY_Y_OFFSET
depends on LV_TFT_DISPLAY_OFFSETS
- int
+ int "Y offset"
default 53 if LV_PREDEFINED_DISPLAY_TTGO && (LV_DISPLAY_ORIENTATION_LANDSCAPE || LV_DISPLAY_ORIENTATION_LANDSCAPE_INVERTED)
default 40 if LV_PREDEFINED_DISPLAY_TTGO && (LV_DISPLAY_ORIENTATION_PORTRAIT || LV_DISPLAY_ORIENTATION_PORTRAIT_INVERTED)
default 0
@@ -302,7 +315,7 @@ menu "LVGL TFT Display controller"
config LV_TFT_DISPLAY_USER_CONTROLLER_SSD1306
bool "SSD1306"
select LV_TFT_DISPLAY_CONTROLLER_SSD1306
- select LV_TFT_DISPLAY_PROTOCOL_I2C
+ select LV_I2C_DISPLAY
select LV_TFT_DISPLAY_MONOCHROME
config LV_TFT_DISPLAY_USER_CONTROLLER_FT81X
bool "FT81X"
@@ -327,6 +340,15 @@ menu "LVGL TFT Display controller"
bool "RA8875"
select LV_TFT_DISPLAY_CONTROLLER_RA8875
select LV_TFT_DISPLAY_PROTOCOL_SPI
+ config LV_TFT_DISPLAY_USER_CONTROLLER_ILI9163C
+ bool "ILI9163C"
+ select LV_TFT_DISPLAY_CONTROLLER_ILI9163C
+ select LV_TFT_DISPLAY_PROTOCOL_SPI
+ config LV_TFT_DISPLAY_USER_CONTROLLER_PCD8544
+ bool "PCD8544"
+ select LV_TFT_DISPLAY_CONTROLLER_PCD8544
+ select LV_TFT_DISPLAY_PROTOCOL_SPI
+ select LV_TFT_DISPLAY_MONOCHROME
endchoice
config CUSTOM_DISPLAY_BUFFER_SIZE
@@ -446,20 +468,15 @@ menu "LVGL TFT Display controller"
endchoice
choice
- prompt "TFT SPI Bus." if LV_TFT_DISPLAY_PROTOCOL_SPI && \
- !LV_PREDEFINED_DISPLAY_TTGO
- default LV_TFT_DISPLAY_SPI_VSPI if LV_PREDEFINED_DISPLAY_TTGO && \
- !IDF_TARGET_ESP32S2
- default LV_TFT_DISPLAY_SPI_FSPI if IDF_TARGET_ESP32S2
+ prompt "TFT SPI Bus." if LV_TFT_DISPLAY_PROTOCOL_SPI
+ default LV_TFT_DISPLAY_SPI2_HOST
help
Select the SPI Bus the TFT Display is attached to.
- config LV_TFT_DISPLAY_SPI_HSPI
- bool "HSPI"
- config LV_TFT_DISPLAY_SPI_VSPI
- bool "VSPI" if !IDF_TARGET_ESP32S2
- config LV_TFT_DISPLAY_SPI_FSPI
- bool "FSPI" if IDF_TARGET_ESP32S2
+ config LV_TFT_DISPLAY_SPI2_HOST
+ bool "SPI2_HOST"
+ config LV_TFT_DISPLAY_SPI3_HOST
+ bool "SPI3_HOST"
endchoice
choice
@@ -490,18 +507,6 @@ menu "LVGL TFT Display controller"
depends on LV_TFT_DISPLAY_SPI_TRANS_MODE_SIO
endchoice
- choice
- prompt "Display I2C port" if LV_TFT_DISPLAY_PROTOCOL_I2C
- default LV_DISPLAY_I2C_PORT_0
- help
- Select the I2C port used by the display controller.
-
- config LV_DISPLAY_I2C_PORT_0
- bool "I2C PORT 0"
- config LV_DISPLAY_I2C_PORT_1
- bool "I2C PORT 1"
- endchoice
-
config LV_TFT_USE_CUSTOM_SPI_CLK_DIVIDER
bool "Use custom SPI clock frequency." if LV_TFT_DISPLAY_PROTOCOL_SPI
default n
@@ -579,6 +584,16 @@ menu "LVGL TFT Display controller"
default 80 if LV_TFT_SPI_CLK_DIVIDER_80
default 2
+ config LV_M5STICKC_HANDLE_AXP192
+ bool "Handle Backlight and TFT power for M5StickC using AXP192." if LV_PREDEFINED_DISPLAY_M5STICKC || LV_TFT_DISPLAY_CONTROLLER_ST7735S
+ default y if LV_PREDEFINED_DISPLAY_M5STICKC
+ select LV_I2C_DISPLAY
+ help
+ Display and TFT power supply on M5StickC is controlled using an
+ AXP192 Power Mangerment IC. Select yes if you want to enable TFT IC
+ (LDO3) and backlight power using AXP192 by LVGL, or select no if you
+ want to take care of power management in your own code.
+
config LV_INVERT_DISPLAY
bool "IN DEPRECATION - Invert display." if LV_TFT_DISPLAY_CONTROLLER_RA8875
default n
@@ -586,37 +601,12 @@ menu "LVGL TFT Display controller"
If text is backwards on your display, try enabling this.
config LV_INVERT_COLORS
- bool "Invert colors in display" if LV_TFT_DISPLAY_CONTROLLER_ILI9341 || LV_TFT_DISPLAY_CONTROLLER_ST7735S || LV_TFT_DISPLAY_CONTROLLER_ILI9481 || LV_TFT_DISPLAY_CONTROLLER_ST7789 || LV_TFT_DISPLAY_CONTROLLER_SSD1306 || LV_TFT_DISPLAY_CONTROLLER_SH1107 || LV_TFT_DISPLAY_CONTROLLER_HX8357
+ bool "Invert colors in display" if LV_TFT_DISPLAY_CONTROLLER_ILI9341 || LV_TFT_DISPLAY_CONTROLLER_ST7735S || LV_TFT_DISPLAY_CONTROLLER_ILI9481 || LV_TFT_DISPLAY_CONTROLLER_ST7789 || LV_TFT_DISPLAY_CONTROLLER_SSD1306 || LV_TFT_DISPLAY_CONTROLLER_SH1107 || LV_TFT_DISPLAY_CONTROLLER_HX8357 || LV_TFT_DISPLAY_CONTROLLER_GC9A01 || LV_TFT_DISPLAY_CONTROLLER_ILI9163C
default y if LV_PREDEFINED_DISPLAY_M5STACK || LV_PREDEFINED_DISPLAY_M5STICKC
help
If the colors look inverted on your display, try enabling this.
If it didn't help try LVGL configuration -> Swap the 2 bytes of RGB565 color.
- config LV_M5STICKC_HANDLE_AXP192
- bool "Handle Backlight and TFT power for M5StickC using AXP192." if LV_PREDEFINED_DISPLAY_M5STICKC || LV_TFT_DISPLAY_CONTROLLER_ST7735S
- default y if LV_PREDEFINED_DISPLAY_M5STICKC
- help
- Display and TFT power supply on M5StickC is controlled using an AXP192 Power Mangerment IC.
- Select yes if you want to enable TFT IC (LDO3) and backlight power using AXP192 by LVGL, or select no if you want to take care of
- power management in your own code.
-
- config LV_AXP192_PIN_SDA
- int "GPIO for AXP192 I2C SDA"
- depends on LV_M5STICKC_HANDLE_AXP192
- range 0 39
- default 21 if LV_PREDEFINED_DISPLAY_M5STICKC
- default 21
- help
- Configure the AXP192 I2C SDA pin here.
-
- config LV_AXP192_PIN_SCL
- int "GPIO for AXP192 I2C SCL"
- depends on LV_M5STICKC_HANDLE_AXP192
- range 0 39
- default 22 if LV_PREDEFINED_DISPLAY_M5STICKC
- default 22
- help
- Configure the AXP192 I2C SDA pin here.
# menu will be visible only when LV_PREDEFINED_DISPLAY_NONE is y
menu "Display RA8875 Configuration"
@@ -744,11 +734,11 @@ menu "LVGL TFT Display controller"
config LV_DISP_ST7789_SOFT_RESET
bool "Soft reset - use software reset instead of reset pin"
- depends on LV_TFT_DISPLAY_CONTROLLER_ST7789
+ depends on LV_TFT_DISPLAY_CONTROLLER_ST7789
default n
help
Use software reset and ignores configured reset pin (some hardware does not use a reset pin).
-
+
endmenu
# menu will be visible only when LV_PREDEFINED_DISPLAY_NONE is y
@@ -757,12 +747,10 @@ menu "LVGL TFT Display controller"
config LV_DISP_SPI_MOSI
int "GPIO for MOSI (Master Out Slave In)" if LV_TFT_DISPLAY_PROTOCOL_SPI
- range 0 39 if IDF_TARGET_ESP32
- range 0 43 if IDF_TARGET_ESP32S2
-
default 23 if LV_PREDEFINED_DISPLAY_WROVER4
default 23 if LV_PREDEFINED_DISPLAY_ATAG
default 23 if LV_PREDEFINED_DISPLAY_M5STACK || LV_PREDEFINED_DISPLAY_M5STICK
+ default 23 if LV_PREDEFINED_DISPLAY_M5CORE2
default 15 if LV_PREDEFINED_DISPLAY_M5STICKC
default 18 if LV_PREDEFINED_DISPLAY_ADA_FEATHERWING
default 23 if LV_PREDEFINED_PINS_TKOALA
@@ -770,13 +758,13 @@ menu "LVGL TFT Display controller"
default 19 if LV_PREDEFINED_DISPLAY_TTGO_CAMERA_PLUS
default 13 if LV_PREDEFINED_DISPLAY_WT32_SC01
default 13
-
help
Configure the display MOSI pin here.
config LV_DISPLAY_USE_SPI_MISO
bool "GPIO for MISO (Master In Slave Out)" if LV_TFT_DISPLAY_PROTOCOL_SPI
default y if LV_PREDEFINED_PINS_TKOALA
+ default y if LV_PREDEFINED_DISPLAY_M5CORE2
help
Enable the MISO signal to control the display. You can disable
it when the display does not need MISO signal to be controlled.
@@ -784,10 +772,8 @@ menu "LVGL TFT Display controller"
config LV_DISP_SPI_MISO
int "GPIO for MISO (Master In Slave Out)" if LV_TFT_DISPLAY_PROTOCOL_SPI
depends on LV_DISPLAY_USE_SPI_MISO
- range 0 39 if IDF_TARGET_ESP32
- range 0 43 if IDF_TARGET_ESP32S2
-
default 19 if LV_PREDEFINED_PINS_TKOALA
+ default 38 if LV_PREDEFINED_DISPLAY_M5CORE2
default 0
help
@@ -805,9 +791,6 @@ menu "LVGL TFT Display controller"
config LV_DISP_SPI_IO2
int "GPIO for Quad SPI IO2/WP" if LV_TFT_DISPLAY_PROTOCOL_SPI
depends on LV_TFT_DISPLAY_SPI_TRANS_MODE_QIO
- range -1 39 if IDF_TARGET_ESP32
- range -1 43 if IDF_TARGET_ESP32S2
-
default 22 if LV_PREDEFINED_PINS_TKOALA && LV_TFT_DISPLAY_SPI_TRANS_MODE_QIO
default -1
help
@@ -816,9 +799,6 @@ menu "LVGL TFT Display controller"
config LV_DISP_SPI_IO3
int "GPIO for Quad SPI IO3/HD" if LV_TFT_DISPLAY_PROTOCOL_SPI
depends on LV_TFT_DISPLAY_SPI_TRANS_MODE_QIO
- range -1 39 if IDF_TARGET_ESP32
- range -1 43 if IDF_TARGET_ESP32S2
-
default 21 if LV_PREDEFINED_PINS_TKOALA && LV_TFT_DISPLAY_SPI_TRANS_MODE_QIO
default -1
help
@@ -826,10 +806,8 @@ menu "LVGL TFT Display controller"
config LV_DISP_SPI_CLK
int "GPIO for CLK (SCK / Serial Clock)" if LV_TFT_DISPLAY_PROTOCOL_SPI
- range 0 39 if IDF_TARGET_ESP32
- range 0 43 if IDF_TARGET_ESP32S2
-
default 18 if LV_PREDEFINED_DISPLAY_M5STACK || LV_PREDEFINED_DISPLAY_M5STICK
+ default 18 if LV_PREDEFINED_DISPLAY_M5CORE2
default 13 if LV_PREDEFINED_DISPLAY_M5STICKC
default 18 if LV_PREDEFINED_DISPLAY_ATAG
default 19 if LV_PREDEFINED_DISPLAY_WROVER4
@@ -853,11 +831,9 @@ menu "LVGL TFT Display controller"
config LV_DISP_SPI_CS
int "GPIO for CS (Slave Select)" if LV_TFT_DISPLAY_PROTOCOL_SPI
depends on LV_DISPLAY_USE_SPI_CS
- range 0 39 if IDF_TARGET_ESP32
- range 0 43 if IDF_TARGET_ESP32S2
-
default 5 if LV_PREDEFINED_PINS_38V1
default 14 if LV_PREDEFINED_DISPLAY_M5STACK || LV_PREDEFINED_DISPLAY_M5STICK
+ default 5 if LV_PREDEFINED_DISPLAY_M5CORE2
default 5 if LV_PREDEFINED_DISPLAY_M5STICKC
default 22 if LV_PREDEFINED_DISPLAY_WROVER4
default 15 if LV_PREDEFINED_DISPLAY_ADA_FEATHERWING
@@ -880,13 +856,11 @@ menu "LVGL TFT Display controller"
config LV_DISP_PIN_DC
int "GPIO for DC (Data / Command)" if LV_TFT_DISPLAY_PROTOCOL_SPI
- range 0 39 if IDF_TARGET_ESP32
- range 0 43 if IDF_TARGET_ESP32S2
-
depends on LV_DISPLAY_USE_DC
default 19 if LV_PREDEFINED_PINS_38V1
default 17 if LV_PREDEFINED_PINS_38V4
default 27 if LV_PREDEFINED_DISPLAY_M5STACK || LV_PREDEFINED_DISPLAY_M5STICK
+ default 15 if LV_PREDEFINED_DISPLAY_M5CORE2
default 23 if LV_PREDEFINED_DISPLAY_M5STICKC
default 21 if LV_PREDEFINED_DISPLAY_WROVER4
default 21 if LV_PREDEFINED_DISPLAY_WT32_SC01
@@ -900,11 +874,22 @@ menu "LVGL TFT Display controller"
help
Configure the display DC pin here.
+ config LV_DISP_USE_RST
+ bool "Use a GPIO for resetting the display" if LV_TFT_DISPLAY_PROTOCOL_SPI
+ default n if LV_PREDEFINED_DISPLAY_M5CORE2
+ default y
+ help
+ Enable display reset control. Set this if the reset pin of the
+ display is connected to the host. If this is not set, then it is
+ the user's responsibility to ensure that the display is reset
+ before initialisation.
+ You may want to disable this option because the reset pin is not
+ connected, or is connected to an external component such as the
+ power management IC.
+
config LV_DISP_PIN_RST
int "GPIO for Reset" if LV_TFT_DISPLAY_PROTOCOL_SPI && !LV_DISP_ST7789_SOFT_RESET
- range 0 39 if IDF_TARGET_ESP32
- range 0 43 if IDF_TARGET_ESP32S2
-
+ depends on LV_DISP_USE_RST
default 18 if LV_PREDEFINED_PINS_38V1
default 25 if LV_PREDEFINED_PINS_38V4
default 33 if LV_PREDEFINED_DISPLAY_M5STACK || LV_PREDEFINED_DISPLAY_M5STICK
@@ -923,84 +908,103 @@ menu "LVGL TFT Display controller"
config LV_DISP_PIN_BUSY
int "GPIO for Busy" if LV_TFT_DISPLAY_CONTROLLER_IL3820 || LV_TFT_DISPLAY_CONTROLLER_JD79653A || LV_TFT_DISPLAY_CONTROLLER_UC8151D
- range 0 39 if IDF_TARGET_ESP32
- range 0 43 if IDF_TARGET_ESP32S2
-
default 35 if LV_TFT_DISPLAY_CONTROLLER_IL3820 || LV_TFT_DISPLAY_CONTROLLER_JD79653A || LV_TFT_DISPLAY_CONTROLLER_UC8151D
- default 35
+ default 35 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32S2
+ default 21 if IDF_TARGET_ESP32C3
help
Configure the display Busy pin here.
- config LV_ENABLE_BACKLIGHT_CONTROL
- bool "Enable control of the display backlight by using an GPIO." if \
- ( LV_PREDEFINED_DISPLAY_NONE && ! ( LV_TFT_DISPLAY_CONTROLLER_SH1107 || LV_TFT_DISPLAY_CONTROLLER_SSD1306 ) ) \
- || LV_PREDEFINED_DISPLAY_RPI_MPI3501
- default y if LV_PREDEFINED_DISPLAY_M5STACK
- default y if LV_PREDEFINED_DISPLAY_WROVER4
- default y if LV_PREDEFINED_DISPLAY_ERTFT0356
- default y if LV_PREDEFINED_DISPLAY_TTGO
- default y if LV_PREDEFINED_DISPLAY_TTGO_CAMERA_PLUS
- default y if LV_PREDEFINED_DISPLAY_WT32_SC01
- help
- Enable controlling the display backlight using an GPIO
-
- config LV_BACKLIGHT_ACTIVE_LVL
- bool "Is backlight turn on with a HIGH (1) logic level?"
- depends on LV_ENABLE_BACKLIGHT_CONTROL
- default y if LV_PREDEFINED_DISPLAY_M5STACK
- default y if LV_PREDEFINED_DISPLAY_ERTFT0356
- default y if LV_PREDEFINED_DISPLAY_TTGO
- default y if LV_PREDEFINED_DISPLAY_TTGO_CAMERA_PLUS
- default y if LV_PREDEFINED_DISPLAY_WT32_SC01
- help
- Some backlights are turned on with a high signal, others held low.
- If enabled, a value of 1 will be sent to the display to enable the backlight,
- otherwise a 0 will be expected to enable it.
-
- config LV_DISP_PIN_BCKL
- int "GPIO for Backlight Control"
- depends on LV_ENABLE_BACKLIGHT_CONTROL
- range 0 39 if IDF_TARGET_ESP32
- range 0 43 if IDF_TARGET_ESP32S2
-
- default 23 if LV_PREDEFINED_PINS_38V1
- default 26 if LV_PREDEFINED_PINS_38V4
- default 32 if LV_PREDEFINED_DISPLAY_M5STACK
- default 5 if LV_PREDEFINED_DISPLAY_WROVER4
- default 2 if LV_PREDEFINED_DISPLAY_ADA_FEATHERWING
- default 27 if LV_PREDEFINED_DISPLAY_ERTFT0356
- default 0 if LV_PREDEFINED_PINS_TKOALA
- default 4 if LV_PREDEFINED_DISPLAY_TTGO
- default 2 if LV_PREDEFINED_DISPLAY_TTGO_CAMERA_PLUS
- default 23 if LV_PREDEFINED_DISPLAY_WT32_SC01
- default 27
-
- help
- Configure the display BCLK (LED) pin here.
-
- config LV_DISP_PIN_SDA
- int "GPIO for I2C SDA" if LV_TFT_DISPLAY_PROTOCOL_I2C
- range 0 39 if IDF_TARGET_ESP32
- range 0 43 if IDF_TARGET_ESP32S2
-
- default 5 if LV_PREDEFINED_DISPLAY_WEMOS_LOLIN
- default 5
-
- help
- Configure the I2C SDA pin here.
-
- config LV_DISP_PIN_SCL
- int "GPIO for I2C SCL" if LV_TFT_DISPLAY_PROTOCOL_I2C
- range 0 39 if IDF_TARGET_ESP32
- range 0 43 if IDF_TARGET_ESP32S2
-
- default 4 if LV_PREDEFINED_DISPLAY_WEMOS_LOLIN
- default 4
-
- help
- Configure the I2C SCL pin here.
-
endmenu
+ choice
+ prompt "Select an I2C port for the display"
+ default LV_I2C_DISPLAY_PORT_0
+ depends on LV_I2C_DISPLAY
+
+ config LV_I2C_DISPLAY_PORT_0
+ bool
+ prompt "I2C port 0"
+ help
+ I2C is shared peripheral managed by I2C Manager. In order to configure I2C Manager (pinout, etc.) see menu
+ Component config->I2C Port Settings.
+
+ config LV_I2C_DISPLAY_PORT_1
+ bool
+ prompt "I2C port 1"
+ help
+ I2C is shared peripheral managed by I2C Manager. In order to configure I2C Manager (pinout, etc.) see menu
+ Component config->I2C Port Settings.
+
+ endchoice
+
+ choice
+ default LV_DISP_BACKLIGHT_SWITCH
+ prompt "Backlight Control" if \
+ (! ( LV_TFT_DISPLAY_CONTROLLER_SH1107 || LV_TFT_DISPLAY_CONTROLLER_SSD1306 ) )
+
+ config LV_DISP_BACKLIGHT_OFF
+ bool
+ prompt "Not Used"
+ help
+ Display backlight is not controlled by this driver, must be hardwired in hardware.
+
+ config LV_DISP_BACKLIGHT_SWITCH
+ bool
+ prompt "Switch control"
+ help
+ Display backlight can be switched on or off.
+
+ config LV_DISP_BACKLIGHT_PWM
+ bool
+ prompt "PWM control"
+ help
+ Display backlight is controlled by pulse-width modulation, allowing brightness settings.
+
+ endchoice
+
+ config LV_BACKLIGHT_ACTIVE_LVL
+ bool "Is backlight turn on with a HIGH (1) logic level?" if \
+ ( LV_PREDEFINED_DISPLAY_NONE && ! ( LV_TFT_DISPLAY_CONTROLLER_SH1107 || LV_TFT_DISPLAY_CONTROLLER_SSD1306 ) ) \
+ || LV_PREDEFINED_DISPLAY_RPI_MPI3501
+ depends on !LV_DISP_BACKLIGHT_OFF
+ default y if LV_PREDEFINED_DISPLAY_M5STACK
+ default y if LV_PREDEFINED_DISPLAY_ERTFT0356
+ default y if LV_PREDEFINED_DISPLAY_TTGO
+ default y if LV_PREDEFINED_DISPLAY_TTGO_CAMERA_PLUS
+ default y if LV_PREDEFINED_DISPLAY_WT32_SC01
+ help
+ Some backlights are turned on with a high signal, others held low.
+ If enabled, a value of 1 will be sent to the display to enable the backlight,
+ otherwise a 0 will be expected to enable it.
+
+ config LV_DISP_PIN_BCKL
+ int "GPIO for Backlight Control" if \
+ ( LV_PREDEFINED_DISPLAY_NONE && ! ( LV_TFT_DISPLAY_CONTROLLER_SH1107 || LV_TFT_DISPLAY_CONTROLLER_SSD1306 ) ) \
+ || LV_PREDEFINED_DISPLAY_RPI_MPI3501
+ depends on !LV_DISP_BACKLIGHT_OFF
+ default 23 if LV_PREDEFINED_PINS_38V1
+ default 26 if LV_PREDEFINED_PINS_38V4
+ default 32 if LV_PREDEFINED_DISPLAY_M5STACK
+ default 5 if LV_PREDEFINED_DISPLAY_WROVER4
+ default 2 if LV_PREDEFINED_DISPLAY_ADA_FEATHERWING
+ default 27 if LV_PREDEFINED_DISPLAY_ERTFT0356
+ default 0 if LV_PREDEFINED_PINS_TKOALA
+ default 4 if LV_PREDEFINED_DISPLAY_TTGO
+ default 2 if LV_PREDEFINED_DISPLAY_TTGO_CAMERA_PLUS
+ default 23 if LV_PREDEFINED_DISPLAY_WT32_SC01
+ default -1
+
+ help
+ Configure the display BCLK (LED) pin here.
+
+ config LV_I2C
+ bool
+ default y if LV_I2C_DISPLAY
+
+ config LV_I2C_DISPLAY_PORT
+ int
+ default 1 if LV_I2C_DISPLAY_PORT_1
+ default 0
+
endmenu
diff --git a/lvgl_tft/disp_driver.c b/lvgl_tft/disp_driver.c
index 9f8e857..5c5b2b9 100644
--- a/lvgl_tft/disp_driver.c
+++ b/lvgl_tft/disp_driver.c
@@ -4,8 +4,10 @@
#include "disp_driver.h"
#include "disp_spi.h"
+#include "esp_lcd_backlight.h"
+#include "sdkconfig.h"
-void disp_driver_init(void)
+void *disp_driver_init(void)
{
#if defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9341
ili9341_init();
@@ -21,7 +23,7 @@ void disp_driver_init(void)
st7735s_init();
#elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_HX8357
hx8357_init();
-#elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9486
+#elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9486
ili9486_init();
#elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_SH1107
sh1107_init();
@@ -34,11 +36,40 @@ void disp_driver_init(void)
#elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_RA8875
ra8875_init();
#elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_GC9A01
- GC9A01_init();
+ GC9A01_init();
#elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_JD79653A
- jd79653a_init();
+ jd79653a_init();
#elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_UC8151D
- uc8151d_init();
+ uc8151d_init();
+#elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9163C
+ ili9163c_init();
+#elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_PCD8544
+ pcd8544_init();
+#endif
+
+ // We still use menuconfig for these settings
+ // It will be set up during runtime in the future
+#if (defined(CONFIG_LV_DISP_BACKLIGHT_SWITCH) || defined(CONFIG_LV_DISP_BACKLIGHT_PWM))
+ const disp_backlight_config_t bckl_config = {
+ .gpio_num = CONFIG_LV_DISP_PIN_BCKL,
+#if defined CONFIG_LV_DISP_BACKLIGHT_PWM
+ .pwm_control = true,
+#else
+ .pwm_control = false,
+#endif
+#if defined CONFIG_LV_BACKLIGHT_ACTIVE_LVL
+ .output_invert = false, // Backlight on high
+#else
+ .output_invert = true, // Backlight on low
+#endif
+ .timer_idx = 0,
+ .channel_idx = 0 // @todo this prevents us from having two PWM controlled displays
+ };
+ disp_backlight_h bckl_handle = disp_backlight_new(&bckl_config);
+ disp_backlight_set(bckl_handle, 100);
+ return bckl_handle;
+#else
+ return NULL;
#endif
}
@@ -76,6 +107,10 @@ void disp_driver_flush(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t *
jd79653a_lv_fb_flush(drv, area, color_map);
#elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_UC8151D
uc8151d_lv_fb_flush(drv, area, color_map);
+#elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9163C
+ ili9163c_flush(drv, area, color_map);
+#elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_PCD8544
+ pcd8544_flush(drv, area, color_map);
#endif
}
@@ -91,11 +126,13 @@ void disp_driver_rounder(lv_disp_drv_t * disp_drv, lv_area_t * area)
jd79653a_lv_rounder_cb(disp_drv, area);
#elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_UC8151D
uc8151d_lv_rounder_cb(disp_drv, area);
+#elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_PCD8544
+ pcd8544_rounder(disp_drv, area);
#endif
}
void disp_driver_set_px(lv_disp_drv_t * disp_drv, uint8_t * buf, lv_coord_t buf_w, lv_coord_t x, lv_coord_t y,
- lv_color_t color, lv_opa_t opa)
+ lv_color_t color, lv_opa_t opa)
{
#if defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_SSD1306
ssd1306_set_px_cb(disp_drv, buf, buf_w, x, y, color, opa);
@@ -107,5 +144,7 @@ void disp_driver_set_px(lv_disp_drv_t * disp_drv, uint8_t * buf, lv_coord_t buf_
jd79653a_lv_set_fb_cb(disp_drv, buf, buf_w, x, y, color, opa);
#elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_UC8151D
uc8151d_lv_set_fb_cb(disp_drv, buf, buf_w, x, y, color, opa);
+#elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_PCD8544
+ pcd8544_set_px_cb(disp_drv, buf, buf_w, x, y, color, opa);
#endif
}
diff --git a/lvgl_tft/disp_driver.h b/lvgl_tft/disp_driver.h
index e48d05e..2f5bcdf 100644
--- a/lvgl_tft/disp_driver.h
+++ b/lvgl_tft/disp_driver.h
@@ -50,6 +50,10 @@ extern "C" {
#include "jd79653a.h"
#elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_UC8151D
#include "uc8151d.h"
+#elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9163C
+#include "ili9163c.h"
+#elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_PCD8544
+#include "pcd8544.h"
#endif
/*********************
@@ -65,7 +69,7 @@ extern "C" {
**********************/
/* Initialize display */
-void disp_driver_init(void);
+void *disp_driver_init(void);
/* Display flush callback */
void disp_driver_flush(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t * color_map);
diff --git a/lvgl_tft/disp_spi.c b/lvgl_tft/disp_spi.c
index 0e4e548..9b70806 100644
--- a/lvgl_tft/disp_spi.c
+++ b/lvgl_tft/disp_spi.c
@@ -310,7 +310,12 @@ static void IRAM_ATTR spi_ready(spi_transaction_t *trans)
disp = lv_refr_get_disp_refreshing();
#endif
+#if LVGL_VERSION_MAJOR < 8
lv_disp_flush_ready(&disp->driver);
+#else
+ lv_disp_flush_ready(disp->driver);
+#endif
+
}
if (chained_post_cb) {
diff --git a/lvgl_tft/esp_lcd_backlight.c b/lvgl_tft/esp_lcd_backlight.c
new file mode 100644
index 0000000..f4395bd
--- /dev/null
+++ b/lvgl_tft/esp_lcd_backlight.c
@@ -0,0 +1,107 @@
+/**
+ * @file esp_lcd_backlight.c
+ *
+ */
+
+/*********************
+ * INCLUDES
+ *********************/
+#include "esp_lcd_backlight.h"
+#include "driver/ledc.h"
+#include "driver/gpio.h"
+#include "esp_log.h"
+#include "soc/ledc_periph.h" // to invert LEDC output on IDF version < v4.3
+
+typedef struct {
+ bool pwm_control; // true: LEDC is used, false: GPIO is used
+ int index; // Either GPIO or LEDC channel
+} disp_backlight_t;
+
+static const char *TAG = "disp_backlight";
+
+disp_backlight_h disp_backlight_new(const disp_backlight_config_t *config)
+{
+ // Check input parameters
+ if (config == NULL)
+ return NULL;
+ if (!GPIO_IS_VALID_OUTPUT_GPIO(config->gpio_num)) {
+ ESP_LOGW(TAG, "Invalid GPIO number");
+ return NULL;
+ }
+ disp_backlight_t *bckl_dev = calloc(1, sizeof(disp_backlight_t));
+ if (bckl_dev == NULL){
+ ESP_LOGW(TAG, "Not enough memory");
+ return NULL;
+ }
+
+ if (config->pwm_control){
+ // Configure LED (Backlight) pin as PWM for Brightness control.
+ bckl_dev->pwm_control = true;
+ bckl_dev->index = config->channel_idx;
+ const ledc_channel_config_t LCD_backlight_channel = {
+ .gpio_num = config->gpio_num,
+ .speed_mode = LEDC_LOW_SPEED_MODE,
+ .channel = config->channel_idx,
+ .intr_type = LEDC_INTR_DISABLE,
+ .timer_sel = config->timer_idx,
+ .duty = 0,
+ .hpoint = 0
+ };
+ const ledc_timer_config_t LCD_backlight_timer = {
+ .speed_mode = LEDC_LOW_SPEED_MODE,
+ .bit_num = LEDC_TIMER_10_BIT,
+ .timer_num = config->timer_idx,
+ .freq_hz = 5000,
+ .clk_cfg = LEDC_AUTO_CLK};
+
+ ESP_ERROR_CHECK(ledc_timer_config(&LCD_backlight_timer));
+ ESP_ERROR_CHECK(ledc_channel_config(&LCD_backlight_channel));
+ gpio_matrix_out(config->gpio_num, ledc_periph_signal[LEDC_LOW_SPEED_MODE].sig_out0_idx + config->channel_idx, config->output_invert, 0);
+ }
+ else
+ {
+ // Configure GPIO for output
+ bckl_dev->index = config->gpio_num;
+ gpio_pad_select_gpio(config->gpio_num);
+ ESP_ERROR_CHECK(gpio_set_direction(config->gpio_num, GPIO_MODE_OUTPUT));
+ gpio_matrix_out(config->gpio_num, SIG_GPIO_OUT_IDX, config->output_invert, false);
+ }
+
+ return (disp_backlight_h)bckl_dev;
+}
+
+void disp_backlight_set(disp_backlight_h bckl, int brightness_percent)
+{
+ // Check input paramters
+ if (bckl == NULL)
+ return;
+ if (brightness_percent > 100)
+ brightness_percent = 100;
+ if (brightness_percent < 0)
+ brightness_percent = 0;
+
+ disp_backlight_t *bckl_dev = (disp_backlight_t *) bckl;
+ ESP_LOGI(TAG, "Setting LCD backlight: %d%%", brightness_percent);
+
+ if (bckl_dev->pwm_control) {
+ uint32_t duty_cycle = (1023 * brightness_percent) / 100; // LEDC resolution set to 10bits, thus: 100% = 1023
+ ESP_ERROR_CHECK(ledc_set_duty(LEDC_LOW_SPEED_MODE, bckl_dev->index, duty_cycle));
+ ESP_ERROR_CHECK(ledc_update_duty(LEDC_LOW_SPEED_MODE, bckl_dev->index));
+ } else {
+ ESP_ERROR_CHECK(gpio_set_level(bckl_dev->index, brightness_percent));
+ }
+}
+
+void disp_backlight_delete(disp_backlight_h bckl)
+{
+ if (bckl == NULL)
+ return;
+
+ disp_backlight_t *bckl_dev = (disp_backlight_t *) bckl;
+ if (bckl_dev->pwm_control) {
+ ledc_stop(LEDC_LOW_SPEED_MODE, bckl_dev->index, 0);
+ } else {
+ gpio_reset_pin(bckl_dev->index);
+ }
+ free (bckl);
+}
diff --git a/lvgl_tft/esp_lcd_backlight.h b/lvgl_tft/esp_lcd_backlight.h
new file mode 100644
index 0000000..8deda9f
--- /dev/null
+++ b/lvgl_tft/esp_lcd_backlight.h
@@ -0,0 +1,67 @@
+/**
+ * @file esp_lcd_backlight.h
+ */
+
+#ifndef ESP_LCD_BACKLIGHT_H
+#define ESP_LCD_BACKLIGHT_H
+
+/*********************
+ * INCLUDES
+ *********************/
+#include
+
+#ifdef __cplusplus
+extern "C" { /* extern "C" */
+#endif
+
+/**********************
+ * GLOBAL PROTOTYPES
+ **********************/
+
+/**
+ * @brief Display backlight controller handle
+ *
+ */
+typedef void * disp_backlight_h;
+
+/**
+ * @brief Configuration structure of backlight controller
+ *
+ * Must be passed to disp_backlight_new() for correct configuration
+ */
+typedef struct {
+ bool pwm_control;
+ bool output_invert;
+ int gpio_num; // see gpio_num_t
+
+ // Relevant only for PWM controlled backlight
+ // Ignored for switch (ON/OFF) backlight control
+ int timer_idx; // ledc_timer_t
+ int channel_idx; // ledc_channel_t
+} disp_backlight_config_t;
+
+/**
+ * @brief Create new backlight controller
+ *
+ * @param[in] config Configuration structure of backlight controller
+ * @return Display backlight controller handle
+ */
+disp_backlight_h disp_backlight_new(const disp_backlight_config_t *config);
+
+/**
+ * @brief Set backlight
+ *
+ * Brightness parameter can be 0-100 for PWM controlled backlight.
+ * GPIO controlled backlight (ON/OFF) is turned off witch value 0 and turned on with any positive value.
+ *
+ * @param bckl Backlight controller handle
+ * @param[in] brightness_percent Brightness in [%]
+ */
+void disp_backlight_set(disp_backlight_h bckl, int brightness_percent);
+void disp_backlight_delete(disp_backlight_h bckl);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /*ESP_LCD_BACKLIGHT_H*/
diff --git a/lvgl_tft/hx8357.c b/lvgl_tft/hx8357.c
index f6db12e..131f0a9 100644
--- a/lvgl_tft/hx8357.c
+++ b/lvgl_tft/hx8357.c
@@ -160,21 +160,24 @@ static uint8_t displayType = HX8357D;
void hx8357_init(void)
{
//Initialize non-SPI GPIOs
- gpio_reset_pin(HX8357_DC);
+ gpio_reset_pin(HX8357_DC);
gpio_set_direction(HX8357_DC, GPIO_MODE_OUTPUT);
- gpio_reset_pin(HX8357_RST);
- gpio_set_direction(HX8357_RST, GPIO_MODE_OUTPUT);
-#if HX8357_ENABLE_BACKLIGHT_CONTROL
- gpio_reset_pin(HX8357_BCKL);
- gpio_set_direction(HX8357_BCKL, GPIO_MODE_OUTPUT);
-#endif
+#if HX8357_USE_RST
+ gpio_reset_pin(HX8357_RST);
+ gpio_set_direction(HX8357_RST, GPIO_MODE_OUTPUT);
//Reset the display
gpio_set_level(HX8357_RST, 0);
vTaskDelay(10 / portTICK_PERIOD_MS);
gpio_set_level(HX8357_RST, 1);
vTaskDelay(120 / portTICK_PERIOD_MS);
+#endif
+
+#if HX8357_ENABLE_BACKLIGHT_CONTROL
+ gpio_reset_pin(HX8357_BCKL);
+ gpio_set_direction(HX8357_BCKL, GPIO_MODE_OUTPUT);
+#endif
ESP_LOGI(TAG, "Initialization.");
@@ -205,8 +208,6 @@ void hx8357_init(void)
#else
hx8357_send_cmd(HX8357_INVOFF);
#endif
-
- hx8357_enable_backlight(true);
}
@@ -243,23 +244,6 @@ void hx8357_flush(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t * colo
hx8357_send_color((void*)color_map, size * 2);
}
-void hx8357_enable_backlight(bool backlight)
-{
-#if HX8357_ENABLE_BACKLIGHT_CONTROL
- ESP_LOGD(TAG, "%s backlight.\n", backlight ? "Enabling" : "Disabling");
- uint32_t tmp = 0;
-
-#if (HX8357_BCKL_ACTIVE_LVL==1)
- tmp = backlight ? 1 : 0;
-#else
- tmp = backlight ? 0 : 1;
-#endif
-
- gpio_set_level(HX8357_BCKL, tmp);
-#endif
-}
-
-
void hx8357_set_rotation(uint8_t r)
{
r = r & 3; // can't be higher than 3
diff --git a/lvgl_tft/hx8357.h b/lvgl_tft/hx8357.h
index 6bad32d..34cbaf9 100644
--- a/lvgl_tft/hx8357.h
+++ b/lvgl_tft/hx8357.h
@@ -35,18 +35,10 @@ extern "C" {
/*********************
* DEFINES
*********************/
-#define HX8357_DC CONFIG_LV_DISP_PIN_DC
-#define HX8357_RST CONFIG_LV_DISP_PIN_RST
-#define HX8357_BCKL CONFIG_LV_DISP_PIN_BCKL
-
-#define HX8357_ENABLE_BACKLIGHT_CONTROL CONFIG_LV_ENABLE_BACKLIGHT_CONTROL
-#define HX8357_INVERT_COLORS CONFIG_LV_INVERT_COLORS
-
-#if CONFIG_LV_BACKLIGHT_ACTIVE_LVL
- #define HX8357_BCKL_ACTIVE_LVL 1
-#else
- #define HX8357_BCKL_ACTIVE_LVL 0
-#endif
+#define HX8357_DC CONFIG_LV_DISP_PIN_DC
+#define HX8357_RST CONFIG_LV_DISP_PIN_RST
+#define HX8357_USE_RST CONFIG_LV_DISP_USE_RST
+#define HX8357_INVERT_COLORS CONFIG_LV_INVERT_COLORS
/*******************
@@ -135,7 +127,6 @@ extern "C" {
void hx8357_init(void);
void hx8357_flush(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t * color_map);
-void hx8357_enable_backlight(bool backlight);
void hx8357_set_rotation(uint8_t r);
/**********************
diff --git a/lvgl_tft/il3820.c b/lvgl_tft/il3820.c
index 4999250..3edfdf4 100644
--- a/lvgl_tft/il3820.c
+++ b/lvgl_tft/il3820.c
@@ -73,9 +73,9 @@ static uint8_t il3820_lut_initial[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
static uint8_t il3820_lut_default[] = {
- 0x10, 0x18, 0x18, 0x08, 0x18, 0x18,
- 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x10, 0x18, 0x18, 0x08, 0x18, 0x18,
+ 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x13, 0x14, 0x44, 0x12,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};
@@ -113,7 +113,7 @@ void il3820_flush(lv_disp_drv_t *drv, const lv_area_t *area, lv_color_t *color_m
uint8_t *buffer = (uint8_t*) color_map;
uint16_t x_addr_counter = 0;
uint16_t y_addr_counter = 0;
-
+
/* Configure entry mode */
il3820_write_cmd(IL3820_CMD_ENTRY_MODE, &il3820_scan_mode, 1);
@@ -131,7 +131,7 @@ void il3820_flush(lv_disp_drv_t *drv, const lv_area_t *area, lv_color_t *color_m
il3820_set_cursor(x_addr_counter, y_addr_counter);
il3820_send_cmd(IL3820_CMD_WRITE_RAM);
-
+
/* Write the pixel data to graphic RAM, linelen bytes at the time. */
for(size_t row = 0; row <= (EPD_PANEL_HEIGHT - 1); row++){
il3820_send_data(buffer, linelen);
@@ -139,7 +139,7 @@ void il3820_flush(lv_disp_drv_t *drv, const lv_area_t *area, lv_color_t *color_m
}
il3820_set_window(0, EPD_PANEL_WIDTH - 1, 0, EPD_PANEL_HEIGHT - 1);
-
+
il3820_update_display();
/* IMPORTANT!!!
@@ -152,7 +152,7 @@ void il3820_flush(lv_disp_drv_t *drv, const lv_area_t *area, lv_color_t *color_m
* BIT_SET(byte_index, bit_index) clears the bit_index pixel at byte_index of
* the display buffer.
* BIT_CLEAR(byte_index, bit_index) sets the bit_index pixel at the byte_index
- * of the display buffer. */
+ * of the display buffer. */
void il3820_set_px_cb(lv_disp_drv_t * disp_drv, uint8_t* buf,
lv_coord_t buf_w, lv_coord_t x, lv_coord_t y,
lv_color_t color, lv_opa_t opa)
@@ -198,20 +198,24 @@ void il3820_init(void)
/* Initialize non-SPI GPIOs */
gpio_reset_pin(IL3820_DC_PIN);
gpio_set_direction(IL3820_DC_PIN, GPIO_MODE_OUTPUT);
- gpio_reset_pin(IL3820_RST_PIN);
- gpio_set_direction(IL3820_RST_PIN, GPIO_MODE_OUTPUT);
+
gpio_reset_pin(IL3820_BUSY_PIN);
gpio_set_direction(IL3820_BUSY_PIN, GPIO_MODE_INPUT);
+#if IL3820_USE_RST
+ gpio_reset_pin(IL3820_RST_PIN);
+ gpio_set_direction(IL3820_RST_PIN, GPIO_MODE_OUTPUT);
+
/* Harware reset */
gpio_set_level( IL3820_RST_PIN, 0);
vTaskDelay(IL3820_RESET_DELAY / portTICK_PERIOD_MS);
gpio_set_level( IL3820_RST_PIN, 1);
vTaskDelay(IL3820_RESET_DELAY / portTICK_PERIOD_MS);
+#endif
/* Software reset */
il3820_write_cmd(IL3820_CMD_SW_RESET, NULL, 0);
-
+
/* Busy wait for the BUSY signal to go low */
il3820_waitbusy(IL3820_WAIT);
@@ -239,10 +243,10 @@ void il3820_init(void)
// allow partial updates now
il3820_partial = true;
-
+
/* Update LUT */
il3820_write_cmd(IL3820_CMD_UPDATE_LUT, il3820_lut_default, sizeof(il3820_lut_default));
-
+
/* Clear control memory and update */
il3820_clear_cntlr_mem(IL3820_CMD_WRITE_RAM, true);
}
@@ -251,10 +255,10 @@ void il3820_init(void)
void il3820_sleep_in(void)
{
uint8_t data[] = {0x01};
-
+
/* Wait for the BUSY signal to go low */
il3820_waitbusy(IL3820_WAIT);
-
+
il3820_write_cmd(IL3820_CMD_SLEEP_MODE, data, 1);
}
@@ -264,15 +268,15 @@ static void il3820_waitbusy(int wait_ms)
int i = 0;
vTaskDelay(10 / portTICK_PERIOD_MS); // 10ms delay
-
+
for(i = 0; i < (wait_ms * 10); i++) {
- if(gpio_get_level(IL3820_BUSY_PIN) != IL3820_BUSY_LEVEL) {
+ if(gpio_get_level(IL3820_BUSY_PIN) != IL3820_BUSY_LEVEL) {
return;
}
-
+
vTaskDelay(10 / portTICK_PERIOD_MS);
}
-
+
ESP_LOGE( TAG, "busy exceeded %dms", i*10 );
}
@@ -288,10 +292,10 @@ static inline void il3820_data_mode(void)
gpio_set_level(IL3820_DC_PIN, 1);
}
-static inline void il3820_write_cmd(uint8_t cmd, uint8_t *data, size_t len)
+static inline void il3820_write_cmd(uint8_t cmd, uint8_t *data, size_t len)
{
disp_wait_for_pending_transactions();
-
+
il3820_command_mode();
disp_spi_send_data(&cmd, 1);
@@ -302,10 +306,10 @@ static inline void il3820_write_cmd(uint8_t cmd, uint8_t *data, size_t len)
}
/* Send cmd to the display */
-static inline void il3820_send_cmd(uint8_t cmd)
+static inline void il3820_send_cmd(uint8_t cmd)
{
disp_wait_for_pending_transactions();
-
+
il3820_command_mode();
disp_spi_send_data(&cmd, 1);
}
@@ -314,14 +318,14 @@ static inline void il3820_send_cmd(uint8_t cmd)
static void il3820_send_data(uint8_t *data, uint16_t length)
{
disp_wait_for_pending_transactions();
-
+
il3820_data_mode();
disp_spi_send_colors(data, length);
}
/* Specify the start/end positions of the window address in the X and Y
* directions by an address unit.
- *
+ *
* @param sx: X Start position.
* @param ex: X End position.
* @param ys: Y Start position.
@@ -330,7 +334,7 @@ static void il3820_send_data(uint8_t *data, uint16_t length)
static inline void il3820_set_window( uint16_t sx, uint16_t ex, uint16_t ys, uint16_t ye)
{
uint8_t tmp[4] = {0};
-
+
tmp[0] = sx / 8;
tmp[1] = ex / 8;
@@ -378,7 +382,7 @@ static void il3820_update_display(void)
} else {
tmp = (IL3820_CTRL2_ENABLE_CLK | IL3820_CTRL2_ENABLE_ANALOG | IL3820_CTRL2_TO_PATTERN);
}
-
+
il3820_write_cmd(IL3820_CMD_UPDATE_CTRL2, &tmp, 1);
il3820_write_cmd(IL3820_CMD_MASTER_ACTIVATION, NULL, 0);
@@ -394,10 +398,10 @@ static void il3820_clear_cntlr_mem(uint8_t ram_cmd, bool update)
/* Arrays used by SPI must be word alligned */
WORD_ALIGNED_ATTR uint8_t clear_page[IL3820_COLUMNS];
memset(clear_page, 0xff, sizeof clear_page);
-
+
/* Configure entry mode */
il3820_write_cmd(IL3820_CMD_ENTRY_MODE, &il3820_scan_mode, 1);
-
+
/* Configure the window */
il3820_set_window(0, EPD_PANEL_WIDTH - 1, 0, EPD_PANEL_HEIGHT - 1);
diff --git a/lvgl_tft/il3820.h b/lvgl_tft/il3820.h
index e0b73cd..f77ffb4 100644
--- a/lvgl_tft/il3820.h
+++ b/lvgl_tft/il3820.h
@@ -28,6 +28,7 @@ extern "C"
#define IL3820_DC_PIN CONFIG_LV_DISP_PIN_DC
#define IL3820_RST_PIN CONFIG_LV_DISP_PIN_RST
+#define IL3820_USE_RST CONFIG_LV_DISP_USE_RST
#define IL3820_BUSY_PIN CONFIG_LV_DISP_PIN_BUSY
#define IL3820_BUSY_LEVEL 1
diff --git a/lvgl_tft/ili9163c.c b/lvgl_tft/ili9163c.c
new file mode 100644
index 0000000..2941636
--- /dev/null
+++ b/lvgl_tft/ili9163c.c
@@ -0,0 +1,248 @@
+/**
+ * @file ILI9163C.c
+ *
+ */
+
+/*********************
+ * INCLUDES
+ *********************/
+#include "ili9163c.h"
+#include "disp_spi.h"
+#include "driver/gpio.h"
+#include "esp_log.h"
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include "assert.h"
+
+/*********************
+ * DEFINES
+ *********************/
+#define TAG "ILI9163C"
+
+// ILI9163C specific commands used in init
+#define ILI9163C_NOP 0x00
+#define ILI9163C_SWRESET 0x01
+#define ILI9163C_RDDID 0x04
+#define ILI9163C_RDDST 0x09
+
+#define ILI9163C_SLPIN 0x10
+#define ILI9163C_SLPOUT 0x11
+#define ILI9163C_PTLON 0x12
+#define ILI9163C_NORON 0x13
+
+#define ILI9163C_INVOFF 0x20
+#define ILI9163C_INVON 0x21
+#define ILI9163C_CMD_GAMST 0x26
+#define ILI9163C_DISPOFF 0x28
+#define ILI9163C_DISPON 0x29
+#define ILI9163C_CASET 0x2A
+#define ILI9163C_RASET 0x2B
+#define ILI9163C_RAMWR 0x2C
+#define ILI9163C_COLORSET 0x2D
+#define ILI9163C_RAMRD 0x2E
+
+#define ILI9163C_PTLAR 0x30
+#define ILI9163C_VSCRDEF 0x33
+#define ILI9163C_COLMOD 0x3A
+#define ILI9163C_MADCTL 0x36
+#define ILI9163C_VSCRSADD 0x37
+
+#define ILI9163C_FRMCTR1 0xB1
+#define ILI9163C_FRMCTR2 0xB2
+#define ILI9163C_FRMCTR3 0xB3
+#define ILI9163C_INVCTR 0xB4
+#define ILI9163C_DISSET5 0xB6
+#define ILI9163C_SDDC 0xB7
+
+#define ILI9163C_PWCTR1 0xC0
+#define ILI9163C_PWCTR2 0xC1
+#define ILI9163C_PWCTR3 0xC2
+#define ILI9163C_PWCTR4 0xC3
+#define ILI9163C_PWCTR5 0xC4
+#define ILI9163C_VMCTR1 0xC5
+#define ILI9163C_VMCOFFS 0xC7
+
+#define ILI9163C_GAMCTL 0xF2
+
+#define ILI9163C_GMCTRP1 0xE0
+#define ILI9163C_GMCTRN1 0xE1
+
+#define ST77XX_MADCTL_MY 0x80
+#define ST77XX_MADCTL_MX 0x40
+#define ST77XX_MADCTL_MV 0x20 #define
+#define ST77XX_MADCTL_ML 0x10
+#define ST77XX_MADCTL_RGB 0x00
+#define ST77XX_MADCTL_BGR 0x08
+
+/**********************
+ * TYPEDEFS
+ **********************/
+
+/*The LCD needs a bunch of command/argument values to be initialized. They are stored in this struct. */
+typedef struct
+{
+ uint8_t cmd;
+ uint8_t data[16];
+ uint8_t databytes; //No of data in data; bit 7 = delay after set; 0xFF = end of cmds.
+} lcd_init_cmd_t;
+
+/**********************
+ * STATIC PROTOTYPES
+ **********************/
+static void ili9163c_set_orientation(uint8_t orientation);
+
+static void ili9163c_send_cmd(uint8_t cmd);
+static void ili9163c_send_data(void *data, uint16_t length);
+static void ili9163c_send_color(void *data, uint16_t length);
+
+/**********************
+ * STATIC VARIABLES
+ **********************/
+
+/**********************
+ * MACROS
+ **********************/
+
+/**********************
+ * GLOBAL FUNCTIONS
+ **********************/
+
+void ili9163c_init(void)
+{
+ ESP_LOGD(TAG, "Init");
+
+ lcd_init_cmd_t ili_init_cmds[] = {
+ {ILI9163C_SWRESET, {0}, 0x80}, // Software reset, 0 args, w/delay 120ms
+ {ILI9163C_SLPOUT, {0}, 0x80}, // Out of sleep mode, 0 args, w/delay 5ms
+ {ILI9163C_CMD_GAMST, {0x04}, 1}, // Gamma Curve
+ {ILI9163C_FRMCTR1, {0x0C, 0x14}, 2}, // Frame rate ctrl - normal mode
+ {ILI9163C_INVCTR, {0x07}, 1}, // Display inversion ctrl, 1 arg, no delay:No inversion
+ {ILI9163C_PWCTR1, {0x0C, 0x05}, 2}, // Power control, 2 args, no delay
+ {ILI9163C_PWCTR2, {0x02}, 1}, // Power control, 1 arg
+ {ILI9163C_PWCTR3, {0x02}, 1}, // Power control, 1 arg
+ {ILI9163C_VMCTR1, {0x20, 0x55}, 2}, // Power control, 1 arg, no delay:
+ {ILI9163C_VMCOFFS, {0x40}, 1}, // VCOM Offset
+#if ILI9163C_INVERT_COLORS == 1
+ {ILI9163C_INVON, {0}, 0}, // set inverted mode
+#else
+ {ILI9163C_INVOFF, {0}, 0}, // set non-inverted mode
+#endif
+ {ILI9163C_COLMOD, {0x5}, 1}, // set color mode, 1 arg, no delay: 16-bit color
+ {ILI9163C_SDDC, {0}, 1}, // set source driver direction control
+ {ILI9163C_GAMCTL, {0x01}, 1}, // set source driver direction control
+ {ILI9163C_GMCTRP1, {0x36, 0x29, 0x12, 0x22, 0x1C, 0x15, 0x42, 0xB7, 0x2F, 0x13, 0x12, 0x0A, 0x11, 0x0B, 0x06}, 16}, // 16 args, no delay:
+ {ILI9163C_GMCTRN1, {0x09, 0x16, 0x2D, 0x0D, 0x13, 0x15, 0x40, 0x48, 0x53, 0x0C, 0x1D, 0x25, 0x2E, 0x34, 0x39}, 16}, // 16 args, no delay:
+ {ILI9163C_NORON, {0}, 0x80}, // Normal display on, no args, w/delay 10 ms delay
+ {ILI9163C_DISPON, {0}, 0x80}, // Main screen turn on, no args w/delay 100 ms delay
+ {0, {0}, 0xff}
+ };
+
+ //Initialize non-SPI GPIOs
+ gpio_reset_pin(ILI9163C_DC);
+ gpio_set_direction(ILI9163C_DC, GPIO_MODE_OUTPUT);
+ gpio_reset_pin(ILI9163C_RST);
+ gpio_set_direction(ILI9163C_RST, GPIO_MODE_OUTPUT);
+
+ //Reset the display
+ gpio_set_level(ILI9163C_RST, 0);
+ vTaskDelay(100 / portTICK_RATE_MS);
+ gpio_set_level(ILI9163C_RST, 1);
+ vTaskDelay(150 / portTICK_RATE_MS);
+
+ //Send all the commands
+ uint16_t cmd = 0;
+ while (ili_init_cmds[cmd].databytes != 0xff)
+ {
+ ili9163c_send_cmd(ili_init_cmds[cmd].cmd);
+ ili9163c_send_data(ili_init_cmds[cmd].data, ili_init_cmds[cmd].databytes & 0x1F);
+ if (ili_init_cmds[cmd].databytes & 0x80)
+ {
+ vTaskDelay(150 / portTICK_RATE_MS);
+ }
+ cmd++;
+ }
+
+ ili9163c_set_orientation(CONFIG_LV_DISPLAY_ORIENTATION);
+}
+
+void ili9163c_flush(lv_disp_drv_t *drv, const lv_area_t *area, lv_color_t *color_map)
+{
+ uint8_t data[4];
+
+ /*Column addresses*/
+ ili9163c_send_cmd(ILI9163C_CASET);
+ data[0] = (area->x1 >> 8) & 0xFF;
+ data[1] = area->x1 & 0xFF;
+ data[2] = (area->x2 >> 8) & 0xFF;
+ data[3] = area->x2 & 0xFF;
+ ili9163c_send_data(data, 4);
+
+ /*Page addresses*/
+ ili9163c_send_cmd(ILI9163C_RASET);
+ data[0] = (area->y1 >> 8) & 0xFF;
+ data[1] = area->y1 & 0xFF;
+ data[2] = (area->y2 >> 8) & 0xFF;
+ data[3] = area->y2 & 0xFF;
+ ili9163c_send_data(data, 4);
+
+ /*Memory write*/
+ ili9163c_send_cmd(ILI9163C_RAMWR);
+
+ uint32_t size = lv_area_get_width(area) * lv_area_get_height(area);
+
+ ili9163c_send_color((void *)color_map, size * 2);
+}
+
+void ili9163c_sleep_in()
+{
+ uint8_t data[] = {0x08};
+ ili9163c_send_cmd(ILI9163C_SLPIN);
+ ili9163c_send_data(&data, 1);
+}
+
+void ili9163c_sleep_out()
+{
+ uint8_t data[] = {0x08};
+ ili9163c_send_cmd(ILI9163C_SLPOUT);
+ ili9163c_send_data(&data, 1);
+}
+
+/**********************
+ * STATIC FUNCTIONS
+ **********************/
+
+static void ili9163c_send_cmd(uint8_t cmd)
+{
+ disp_wait_for_pending_transactions();
+ gpio_set_level(ILI9163C_DC, 0); /*Command mode*/
+ disp_spi_send_data(&cmd, 1);
+}
+
+static void ili9163c_send_data(void *data, uint16_t length)
+{
+ disp_wait_for_pending_transactions();
+ gpio_set_level(ILI9163C_DC, 1); /*Data mode*/
+ disp_spi_send_data(data, length);
+}
+
+static void ili9163c_send_color(void *data, uint16_t length)
+{
+ disp_wait_for_pending_transactions();
+ gpio_set_level(ILI9163C_DC, 1); /*Data mode*/
+ disp_spi_send_colors(data, length);
+}
+
+static void ili9163c_set_orientation(uint8_t orientation)
+{
+ assert(orientation < 4);
+
+ const char *orientation_str[] = {
+ "PORTRAIT", "PORTRAIT_INVERTED", "LANDSCAPE", "LANDSCAPE_INVERTED"};
+
+ ESP_LOGD(TAG, "Display orientation: %s", orientation_str[orientation]);
+
+ uint8_t data[] = {0x48, 0x88, 0xA8, 0x68};
+
+ ili9163c_send_cmd(ILI9163C_MADCTL);
+ ili9163c_send_data((void *)&data[orientation], 1);
+}
diff --git a/lvgl_tft/ili9163c.h b/lvgl_tft/ili9163c.h
new file mode 100644
index 0000000..d6edf57
--- /dev/null
+++ b/lvgl_tft/ili9163c.h
@@ -0,0 +1,54 @@
+/**
+ * @file lv_templ.h
+ *
+ */
+
+#ifndef ILI9163C_H
+#define ILI9163C_H
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/*********************
+ * INCLUDES
+ *********************/
+#include
+
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
+#include "lvgl/lvgl.h"
+#endif
+#include "../lvgl_helpers.h"
+
+/*********************
+ * DEFINES
+ *********************/
+#define ILI9163C_DC CONFIG_LV_DISP_PIN_DC
+#define ILI9163C_RST CONFIG_LV_DISP_PIN_RST
+#define ILI9163C_INVERT_COLORS CONFIG_LV_INVERT_COLORS
+
+/**********************
+ * TYPEDEFS
+ **********************/
+
+/**********************
+ * GLOBAL PROTOTYPES
+ **********************/
+
+void ili9163c_init(void);
+void ili9163c_flush(lv_disp_drv_t *drv, const lv_area_t *area, lv_color_t *color_map);
+void ili9163c_sleep_in(void);
+void ili9163c_sleep_out(void);
+
+/**********************
+ * MACROS
+ **********************/
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /*ILI9163C_H*/
diff --git a/lvgl_tft/ili9341.c b/lvgl_tft/ili9341.c
index 1929d94..df75a51 100644
--- a/lvgl_tft/ili9341.c
+++ b/lvgl_tft/ili9341.c
@@ -80,31 +80,25 @@ void ili9341_init(void)
{0, {0}, 0xff},
};
-#if ILI9341_BCKL == 15
- gpio_config_t io_conf;
- io_conf.intr_type = GPIO_PIN_INTR_DISABLE;
- io_conf.mode = GPIO_MODE_OUTPUT;
- io_conf.pin_bit_mask = GPIO_SEL_15;
- io_conf.pull_down_en = GPIO_PULLDOWN_DISABLE;
- io_conf.pull_up_en = GPIO_PULLUP_DISABLE;
- gpio_config(&io_conf);
-#endif
-
//Initialize non-SPI GPIOs
- gpio_reset_pin(ILI9341_DC);
+ gpio_reset_pin(ILI9341_DC);
gpio_set_direction(ILI9341_DC, GPIO_MODE_OUTPUT);
- gpio_reset_pin(ILI9341_RST);
+
+#if ILI9341_USE_RST
+ gpio_reset_pin(ILI9341_RST);
gpio_set_direction(ILI9341_RST, GPIO_MODE_OUTPUT);
-#if ILI9341_ENABLE_BACKLIGHT_CONTROL
- gpio_reset_pin(ILI9341_BCKL);
- gpio_set_direction(ILI9341_BCKL, GPIO_MODE_OUTPUT);
-#endif
//Reset the display
gpio_set_level(ILI9341_RST, 0);
vTaskDelay(100 / portTICK_PERIOD_MS);
gpio_set_level(ILI9341_RST, 1);
vTaskDelay(100 / portTICK_PERIOD_MS);
+#endif
+
+#if ILI9341_ENABLE_BACKLIGHT_CONTROL
+ gpio_reset_pin(ILI9341_BCKL);
+ gpio_set_direction(ILI9341_BCKL, GPIO_MODE_OUTPUT);
+#endif
ESP_LOGI(TAG, "Initialization.");
@@ -119,9 +113,7 @@ void ili9341_init(void)
cmd++;
}
- ili9341_enable_backlight(true);
-
- ili9341_set_orientation(CONFIG_LV_DISPLAY_ORIENTATION);
+ ili9341_set_orientation(CONFIG_LV_DISPLAY_ORIENTATION);
#if ILI9341_INVERT_COLORS == 1
ili9341_send_cmd(0x21);
@@ -153,29 +145,10 @@ void ili9341_flush(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t * col
/*Memory write*/
ili9341_send_cmd(0x2C);
-
-
uint32_t size = lv_area_get_width(area) * lv_area_get_height(area);
-
ili9341_send_color((void*)color_map, size * 2);
}
-void ili9341_enable_backlight(bool backlight)
-{
-#if ILI9341_ENABLE_BACKLIGHT_CONTROL
- ESP_LOGI(TAG, "%s backlight.", backlight ? "Enabling" : "Disabling");
- uint32_t tmp = 0;
-
-#if (ILI9341_BCKL_ACTIVE_LVL==1)
- tmp = backlight ? 1 : 0;
-#else
- tmp = backlight ? 0 : 1;
-#endif
-
- gpio_set_level(ILI9341_BCKL, tmp);
-#endif
-}
-
void ili9341_sleep_in()
{
uint8_t data[] = {0x08};
@@ -228,8 +201,10 @@ static void ili9341_set_orientation(uint8_t orientation)
#if defined CONFIG_LV_PREDEFINED_DISPLAY_M5STACK
uint8_t data[] = {0x68, 0x68, 0x08, 0x08};
+#elif defined (CONFIG_LV_PREDEFINED_DISPLAY_M5CORE2)
+ uint8_t data[] = {0x08, 0x88, 0x28, 0xE8};
#elif defined (CONFIG_LV_PREDEFINED_DISPLAY_WROVER4)
- uint8_t data[] = {0x4C, 0x88, 0x28, 0xE8};
+ uint8_t data[] = {0x6C, 0xEC, 0xCC, 0x4C};
#elif defined (CONFIG_LV_PREDEFINED_DISPLAY_NONE)
uint8_t data[] = {0x48, 0x88, 0x28, 0xE8};
#endif
diff --git a/lvgl_tft/ili9341.h b/lvgl_tft/ili9341.h
index 4beb4f3..62317e8 100644
--- a/lvgl_tft/ili9341.h
+++ b/lvgl_tft/ili9341.h
@@ -20,23 +20,15 @@ extern "C" {
#else
#include "lvgl/lvgl.h"
#endif
-#include "../lvgl_helpers.h"
+
+#include "sdkconfig.h"
/*********************
* DEFINES
*********************/
-#define ILI9341_DC CONFIG_LV_DISP_PIN_DC
-#define ILI9341_RST CONFIG_LV_DISP_PIN_RST
-#define ILI9341_BCKL CONFIG_LV_DISP_PIN_BCKL
-
-#define ILI9341_ENABLE_BACKLIGHT_CONTROL CONFIG_LV_ENABLE_BACKLIGHT_CONTROL
-
-#if CONFIG_LV_BACKLIGHT_ACTIVE_LVL
- #define ILI9341_BCKL_ACTIVE_LVL 1
-#else
- #define ILI9341_BCKL_ACTIVE_LVL 0
-#endif
-
+#define ILI9341_DC CONFIG_LV_DISP_PIN_DC
+#define ILI9341_USE_RST CONFIG_LV_DISP_USE_RST
+#define ILI9341_RST CONFIG_LV_DISP_PIN_RST
#define ILI9341_INVERT_COLORS CONFIG_LV_INVERT_COLORS
/**********************
@@ -49,7 +41,6 @@ extern "C" {
void ili9341_init(void);
void ili9341_flush(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t * color_map);
-void ili9341_enable_backlight(bool backlight);
void ili9341_sleep_in(void);
void ili9341_sleep_out(void);
diff --git a/lvgl_tft/ili9481.c b/lvgl_tft/ili9481.c
index 2e6f02d..c939c7c 100644
--- a/lvgl_tft/ili9481.c
+++ b/lvgl_tft/ili9481.c
@@ -76,19 +76,22 @@ void ili9481_init(void)
//Initialize non-SPI GPIOs
gpio_reset_pin(ILI9481_DC);
gpio_set_direction(ILI9481_DC, GPIO_MODE_OUTPUT);
+
+#if ILI9481_USE_RST
gpio_reset_pin(ILI9481_RST);
gpio_set_direction(ILI9481_RST, GPIO_MODE_OUTPUT);
-#if ILI9481_ENABLE_BACKLIGHT_CONTROL
- gpio_reset_pin(ILI9481_BCKL);
- gpio_set_direction(ILI9481_BCKL, GPIO_MODE_OUTPUT);
-#endif
-
//Reset the display
gpio_set_level(ILI9481_RST, 0);
vTaskDelay(100 / portTICK_PERIOD_MS);
gpio_set_level(ILI9481_RST, 1);
vTaskDelay(100 / portTICK_PERIOD_MS);
+#endif
+
+#if ILI9481_ENABLE_BACKLIGHT_CONTROL
+ gpio_reset_pin(ILI9481_BCKL);
+ gpio_set_direction(ILI9481_BCKL, GPIO_MODE_OUTPUT);
+#endif
ESP_LOGI(TAG, "ILI9481 initialization.");
@@ -107,8 +110,6 @@ void ili9481_init(void)
cmd++;
}
- ili9481_enable_backlight(true);
-
ili9481_set_orientation(ILI9481_DISPLAY_ORIENTATION);
}
@@ -168,22 +169,6 @@ void ili9481_flush(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t * col
heap_caps_free(mybuf);
}
-void ili9481_enable_backlight(bool backlight)
-{
-#if ILI9481_ENABLE_BACKLIGHT_CONTROL
- ESP_LOGI(TAG, "%s backlight.", backlight ? "Enabling" : "Disabling");
- uint32_t tmp = 0;
-
-#if (ILI9481_BCKL_ACTIVE_LVL==1)
- tmp = backlight ? 1 : 0;
-#else
- tmp = backlight ? 0 : 1;
-#endif
-
- gpio_set_level(ILI9481_BCKL, tmp);
-#endif
-}
-
/**********************
* STATIC FUNCTIONS
**********************/
diff --git a/lvgl_tft/ili9481.h b/lvgl_tft/ili9481.h
index 7932190..1562398 100644
--- a/lvgl_tft/ili9481.h
+++ b/lvgl_tft/ili9481.h
@@ -25,19 +25,12 @@ extern "C" {
/*********************
* DEFINES
*********************/
-#define ILI9481_DC CONFIG_LV_DISP_PIN_DC
-#define ILI9481_RST CONFIG_LV_DISP_PIN_RST
-#define ILI9481_BCKL CONFIG_LV_DISP_PIN_BCKL
-
-#define ILI9481_ENABLE_BACKLIGHT_CONTROL CONFIG_LV_ENABLE_BACKLIGHT_CONTROL
-#define ILI9481_INVERT_COLORS CONFIG_LV_INVERT_COLORS
+#define ILI9481_DC CONFIG_LV_DISP_PIN_DC
+#define ILI9481_RST CONFIG_LV_DISP_PIN_RST
+#define ILI9481_USE_RST CONFIG_LV_DISP_USE_RST
+#define ILI9481_INVERT_COLORS CONFIG_LV_INVERT_COLORS
#define ILI9481_DISPLAY_ORIENTATION CONFIG_LV_DISPLAY_ORIENTATION
-#if CONFIG_LV_BACKLIGHT_ACTIVE_LVL
- #define ILI9481_BCKL_ACTIVE_LVL 1
-#else
- #define ILI9481_BCKL_ACTIVE_LVL 0
-#endif
/*******************
* ILI9481 REGS
@@ -117,7 +110,6 @@ extern "C" {
void ili9481_init(void);
void ili9481_flush(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t * color_map);
-void ili9481_enable_backlight(bool backlight);
/**********************
* MACROS
diff --git a/lvgl_tft/ili9486.c b/lvgl_tft/ili9486.c
index e4b9c65..3873f72 100644
--- a/lvgl_tft/ili9486.c
+++ b/lvgl_tft/ili9486.c
@@ -60,37 +60,30 @@ void ili9486_init(void)
{0xE0, {0x0F, 0x1F, 0x1C, 0x0C, 0x0F, 0x08, 0x48, 0x98, 0x37, 0x0A, 0x13, 0x04, 0x11, 0x0D, 0x00}, 15},
{0XE1, {0x0F, 0x32, 0x2E, 0x0B, 0x0D, 0x05, 0x47, 0x75, 0x37, 0x06, 0x10, 0x03, 0x24, 0x20, 0x00}, 15},
{0x20, {0}, 0}, /* display inversion OFF */
- {0x36, {0x48}, 1},
- {0x29, {0}, 0x80}, /* display on */
+ {0x36, {0x48}, 1},
+ {0x29, {0}, 0x80}, /* display on */
{0x00, {0}, 0xff},
};
-#if ILI9486_BCKL == 15
- gpio_config_t io_conf;
- io_conf.intr_type = GPIO_PIN_INTR_DISABLE;
- io_conf.mode = GPIO_MODE_OUTPUT;
- io_conf.pin_bit_mask = GPIO_SEL_15;
- io_conf.pull_down_en = GPIO_PULLDOWN_DISABLE;
- io_conf.pull_up_en = GPIO_PULLUP_DISABLE;
- gpio_config(&io_conf);
-#endif
-
//Initialize non-SPI GPIOs
- gpio_reset_pin(ILI9486_DC);
+ gpio_reset_pin(ILI9486_DC);
gpio_set_direction(ILI9486_DC, GPIO_MODE_OUTPUT);
- gpio_reset_pin(ILI9486_RST);
- gpio_set_direction(ILI9486_RST, GPIO_MODE_OUTPUT);
-#if ILI9486_ENABLE_BACKLIGHT_CONTROL
- gpio_reset_pin(ILI9486_BCKL);
- gpio_set_direction(ILI9486_BCKL, GPIO_MODE_OUTPUT);
-#endif
+#if ILI9486_USE_RST
+ gpio_reset_pin(ILI9486_RST);
+ gpio_set_direction(ILI9486_RST, GPIO_MODE_OUTPUT);
//Reset the display
gpio_set_level(ILI9486_RST, 0);
vTaskDelay(100 / portTICK_PERIOD_MS);
gpio_set_level(ILI9486_RST, 1);
vTaskDelay(100 / portTICK_PERIOD_MS);
+#endif
+
+#if ILI9486_ENABLE_BACKLIGHT_CONTROL
+ gpio_reset_pin(ILI9486_BCKL);
+ gpio_set_direction(ILI9486_BCKL, GPIO_MODE_OUTPUT);
+#endif
ESP_LOGI(TAG, "ILI9486 Initialization.");
@@ -105,9 +98,7 @@ void ili9486_init(void)
cmd++;
}
- ili9486_enable_backlight(true);
-
- ili9486_set_orientation(CONFIG_LV_DISPLAY_ORIENTATION);
+ ili9486_set_orientation(CONFIG_LV_DISPLAY_ORIENTATION);
}
void ili9486_flush(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t * color_map)
@@ -135,26 +126,10 @@ void ili9486_flush(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t * col
ili9486_send_cmd(0x2C);
size = lv_area_get_width(area) * lv_area_get_height(area);
-
+
ili9486_send_color((void*) color_map, size * 2);
}
-void ili9486_enable_backlight(bool backlight)
-{
-#if ILI9486_ENABLE_BACKLIGHT_CONTROL
- ESP_LOGI(TAG, "%s backlight.", backlight ? "Enabling" : "Disabling");
- uint32_t tmp = 0;
-
-#if (ILI9486_BCKL_ACTIVE_LVL==1)
- tmp = backlight ? 1 : 0;
-#else
- tmp = backlight ? 0 : 1;
-#endif
-
- gpio_set_level(ILI9486_BCKL, tmp);
-#endif
-}
-
/**********************
* STATIC FUNCTIONS
**********************/
diff --git a/lvgl_tft/ili9486.h b/lvgl_tft/ili9486.h
index f65dd80..0b3f4fb 100644
--- a/lvgl_tft/ili9486.h
+++ b/lvgl_tft/ili9486.h
@@ -25,17 +25,10 @@ extern "C" {
/*********************
* DEFINES
*********************/
-#define ILI9486_DC CONFIG_LV_DISP_PIN_DC
-#define ILI9486_RST CONFIG_LV_DISP_PIN_RST
-#define ILI9486_BCKL CONFIG_LV_DISP_PIN_BCKL
+#define ILI9486_DC CONFIG_LV_DISP_PIN_DC
+#define ILI9486_RST CONFIG_LV_DISP_PIN_RST
+#define ILI9486_USE_RST CONFIG_LV_DISP_USE_RST
-#define ILI9486_ENABLE_BACKLIGHT_CONTROL CONFIG_LV_ENABLE_BACKLIGHT_CONTROL
-
-#if CONFIG_LV_BACKLIGHT_ACTIVE_LVL
- #define ILI9486_BCKL_ACTIVE_LVL 1
-#else
- #define ILI9486_BCKL_ACTIVE_LVL 0
-#endif
/**********************
* TYPEDEFS
@@ -47,7 +40,6 @@ extern "C" {
void ili9486_init(void);
void ili9486_flush(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t * color_map);
-void ili9486_enable_backlight(bool backlight);
/**********************
* MACROS
diff --git a/lvgl_tft/ili9488.c b/lvgl_tft/ili9488.c
index 5257f16..bc3ec12 100644
--- a/lvgl_tft/ili9488.c
+++ b/lvgl_tft/ili9488.c
@@ -50,7 +50,7 @@ static void ili9488_send_color(void * data, uint16_t length);
/**********************
* GLOBAL FUNCTIONS
**********************/
-// From github.com/jeremyjh/ESP32_TFT_library
+// From github.com/jeremyjh/ESP32_TFT_library
// From github.com/mvturnho/ILI9488-lvgl-ESP32-WROVER-B
void ili9488_init(void)
{
@@ -76,28 +76,31 @@ void ili9488_init(void)
};
//Initialize non-SPI GPIOs
- gpio_reset_pin(ILI9488_DC);
+ gpio_reset_pin(ILI9488_DC);
gpio_set_direction(ILI9488_DC, GPIO_MODE_OUTPUT);
- gpio_reset_pin(ILI9488_RST);
- gpio_set_direction(ILI9488_RST, GPIO_MODE_OUTPUT);
-#if ILI9488_ENABLE_BACKLIGHT_CONTROL
- gpio_reset_pin(ILI9488_BCKL);
- gpio_set_direction(ILI9488_BCKL, GPIO_MODE_OUTPUT);
-#endif
+#if ILI9488_USE_RST
+ gpio_reset_pin(ILI9488_RST);
+ gpio_set_direction(ILI9488_RST, GPIO_MODE_OUTPUT);
//Reset the display
gpio_set_level(ILI9488_RST, 0);
vTaskDelay(100 / portTICK_PERIOD_MS);
gpio_set_level(ILI9488_RST, 1);
vTaskDelay(100 / portTICK_PERIOD_MS);
+#endif
+
+#if ILI9488_ENABLE_BACKLIGHT_CONTROL
+ gpio_reset_pin(ILI9488_BCKL);
+ gpio_set_direction(ILI9488_BCKL, GPIO_MODE_OUTPUT);
+#endif
ESP_LOGI(TAG, "ILI9488 initialization.");
// Exit sleep
ili9488_send_cmd(0x01); /* Software reset */
vTaskDelay(100 / portTICK_PERIOD_MS);
-
+
//Send all the commands
uint16_t cmd = 0;
while (ili_init_cmds[cmd].databytes!=0xff) {
@@ -109,9 +112,7 @@ void ili9488_init(void)
cmd++;
}
- ili9488_enable_backlight(true);
-
- ili9488_set_orientation(CONFIG_LV_DISPLAY_ORIENTATION);
+ ili9488_set_orientation(CONFIG_LV_DISPLAY_ORIENTATION);
}
// Flush function based on mvturnho repo
@@ -146,7 +147,7 @@ void ili9488_flush(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t * col
(uint8_t) (area->x2 >> 8) & 0xFF,
(uint8_t) (area->x2) & 0xFF,
};
-
+
/* Page addresses */
uint8_t yb[] = {
(uint8_t) (area->y1 >> 8) & 0xFF,
@@ -170,22 +171,6 @@ void ili9488_flush(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t * col
heap_caps_free(mybuf);
}
-void ili9488_enable_backlight(bool backlight)
-{
-#if ILI9488_ENABLE_BACKLIGHT_CONTROL
- ESP_LOGI(TAG, "%s backlight.", backlight ? "Enabling" : "Disabling");
- uint32_t tmp = 0;
-
-#if (ILI9488_BCKL_ACTIVE_LVL==1)
- tmp = backlight ? 1 : 0;
-#else
- tmp = backlight ? 0 : 1;
-#endif
-
- gpio_set_level(ILI9488_BCKL, tmp);
-#endif
-}
-
/**********************
* STATIC FUNCTIONS
**********************/
diff --git a/lvgl_tft/ili9488.h b/lvgl_tft/ili9488.h
index 45a7045..1c6c6f9 100644
--- a/lvgl_tft/ili9488.h
+++ b/lvgl_tft/ili9488.h
@@ -25,17 +25,9 @@ extern "C" {
/*********************
* DEFINES
*********************/
-#define ILI9488_DC CONFIG_LV_DISP_PIN_DC
-#define ILI9488_RST CONFIG_LV_DISP_PIN_RST
-#define ILI9488_BCKL CONFIG_LV_DISP_PIN_BCKL
-
-#define ILI9488_ENABLE_BACKLIGHT_CONTROL CONFIG_LV_ENABLE_BACKLIGHT_CONTROL
-
-#if CONFIG_LV_BACKLIGHT_ACTIVE_LVL
- #define ILI9488_BCKL_ACTIVE_LVL 1
-#else
- #define ILI9488_BCKL_ACTIVE_LVL 0
-#endif
+#define ILI9488_DC CONFIG_LV_DISP_PIN_DC
+#define ILI9488_RST CONFIG_LV_DISP_PIN_RST
+#define ILI9488_USE_RST CONFIG_LV_DISP_USE_RSTS
/*******************
* ILI9488 REGS
@@ -154,7 +146,6 @@ typedef struct {
void ili9488_init(void);
void ili9488_flush(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t * color_map);
-void ili9488_enable_backlight(bool backlight);
/**********************
* MACROS
diff --git a/lvgl_tft/pcd8544.c b/lvgl_tft/pcd8544.c
new file mode 100644
index 0000000..13b357c
--- /dev/null
+++ b/lvgl_tft/pcd8544.c
@@ -0,0 +1,148 @@
+/**
+ * @file pcd8544.c
+ *
+ * Roughly based on:
+ * https://github.com/adafruit/Adafruit-PCD8544-Nokia-5110-LCD-library
+ * https://github.com/olikraus/u8g2
+ */
+
+#include "disp_spi.h"
+#include "driver/gpio.h"
+
+#include
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+
+#include "pcd8544.h"
+
+#define TAG "lv_pcd8544"
+
+/**********************
+ * MACROS
+ **********************/
+
+#define BIT_SET(a,b) ((a) |= (1U<<(b)))
+#define BIT_CLEAR(a,b) ((a) &= ~(1U<<(b)))
+
+/**********************
+ * STATIC FUNCTIONS
+ **********************/
+
+static void pcd8544_send_cmd(uint8_t cmd)
+{
+ disp_wait_for_pending_transactions();
+ gpio_set_level(PCD8544_DC, 0); /*Command mode*/
+ disp_spi_send_data(&cmd, 1);
+}
+
+static void pcd8544_send_data(void * data, uint16_t length)
+{
+ disp_wait_for_pending_transactions();
+ gpio_set_level(PCD8544_DC, 1); /*Data mode*/
+ disp_spi_send_data(data, length);
+}
+
+static void pcd8544_send_colors(void * data, uint16_t length)
+{
+ gpio_set_level(PCD8544_DC, 1); /*Data mode*/
+ disp_spi_send_colors(data, length);
+}
+
+/**********************
+ * GLOBAL FUNCTIONS
+ **********************/
+
+void pcd8544_init(void){
+
+ // TODO: orientation
+
+ // Initialize non-SPI GPIOs
+ gpio_reset_pin(PCD8544_DC);
+ gpio_set_direction(PCD8544_DC, GPIO_MODE_OUTPUT);
+ gpio_reset_pin(PCD8544_RST);
+ gpio_set_direction(PCD8544_RST, GPIO_MODE_OUTPUT);
+
+ // Reset the display
+ gpio_set_level(PCD8544_RST, 0);
+ vTaskDelay(100 / portTICK_RATE_MS);
+ gpio_set_level(PCD8544_RST, 1);
+ vTaskDelay(100 / portTICK_RATE_MS);
+
+ pcd8544_send_cmd(0x21); /* activate chip (PD=0), horizontal increment (V=0), enter extended command set (H=1) */
+ pcd8544_send_cmd(0x06); /* temp. control: b10 = 2 */
+ pcd8544_send_cmd(0x13); /* bias system 1:48 */
+ pcd8544_send_cmd(0xc0); /* medium Vop = Contrast 0x40 = 64 */
+
+ pcd8544_send_cmd(0x20); /* activate chip (PD=0), horizontal increment (V=0), enter extended command set (H=0) */
+ pcd8544_send_cmd(0x0c); /* display mode normal */
+}
+
+void pcd8544_set_contrast (uint8_t contrast){
+ if (contrast > 0x7f){
+ contrast = 0x7f;
+ }
+ pcd8544_send_cmd(0x21); /* activate chip (PD=0), horizontal increment (V=0), enter extended command set (H=1) */
+ pcd8544_send_cmd(0x80 | contrast); /* medium Vop = Contrast */
+}
+
+void pcd8544_rounder(lv_disp_drv_t * disp_drv, lv_area_t *area){
+ uint8_t hor_max = disp_drv->hor_res;
+ uint8_t ver_max = disp_drv->ver_res;
+
+ area->x1 = 0;
+ area->y1 = 0;
+ area->x2 = hor_max - 1;
+ area->y2 = ver_max - 1;
+}
+
+void pcd8544_set_px_cb(lv_disp_drv_t * disp_drv, uint8_t * buf, lv_coord_t buf_w, lv_coord_t x, lv_coord_t y,
+ lv_color_t color, lv_opa_t opa){
+
+ uint8_t set = (color.full == 0) && (LV_OPA_TRANSP != opa);
+
+ uint16_t byte_index = x + (( y>>3 ) * buf_w);
+ uint8_t bit_index = y & 0x7;
+
+ if (set) {
+ BIT_SET(buf[byte_index], bit_index);
+ } else {
+ BIT_CLEAR(buf[byte_index], bit_index);
+ }
+}
+
+void pcd8544_flush(lv_disp_drv_t * disp_drv, const lv_area_t * area, lv_color_t * color_map){
+
+ pcd8544_send_cmd(0x20); /* activate chip (PD=0), horizontal increment (V=0), enter extended command set (H=0) */
+
+ uint8_t * buf = (uint8_t *) color_map;
+
+ // Check if the whole frame buffer can be sent in a single SPI transaction
+
+ if ((area->x1 == 0) && (area->y1 == 0) && (area->x2 == (disp_drv->hor_res - 1)) && (area->y2 == (disp_drv->ver_res - 1))){
+
+ // send complete frame buffer at once.
+ // NOTE: disp_spi_send_colors triggers lv_disp_flush_ready
+
+ pcd8544_send_cmd(0x40); /* set Y address */
+ pcd8544_send_cmd(0x80); /* set X address */
+ pcd8544_send_colors(buf, disp_drv->hor_res * disp_drv->ver_res / 8);
+
+ } else {
+
+ // send horizontal tiles
+
+ uint16_t bank_start = area->y1 / 8;
+ uint16_t bank_end = area->y2 / 8;
+
+ uint16_t bank;
+ uint16_t cols_to_update = area->x2 - area->x1 + 1;
+ for (bank = bank_start ; bank <= bank_end ; bank++ ){
+ pcd8544_send_cmd(0x40 | bank ); /* set Y address */
+ pcd8544_send_cmd(0x80 | area->x1 ); /* set X address */
+ uint16_t offset = bank * disp_drv->hor_res + area->x1;
+ pcd8544_send_data(&buf[offset], cols_to_update);
+ }
+
+ lv_disp_flush_ready(disp_drv);
+ }
+}
diff --git a/lvgl_tft/pcd8544.h b/lvgl_tft/pcd8544.h
new file mode 100644
index 0000000..24fcc71
--- /dev/null
+++ b/lvgl_tft/pcd8544.h
@@ -0,0 +1,57 @@
+
+/**
+ * @file pcd8544.h
+ *
+ */
+
+#ifndef PCD8544_H
+#define PCD8544_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*********************
+ * INCLUDES
+ *********************/
+#include
+
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
+#include "lvgl/lvgl.h"
+#endif
+
+/*********************
+ * DEFINES
+ *********************/
+
+#define PCD8544_DC CONFIG_LV_DISP_PIN_DC
+#define PCD8544_RST CONFIG_LV_DISP_PIN_RST
+#define PCD8544_BCKL CONFIG_LV_DISP_PIN_BCKL
+
+/**********************
+ * TYPEDEFS
+ **********************/
+
+/**********************
+ * GLOBAL PROTOTYPES
+ **********************/
+
+void pcd8544_init(void);
+void pcd8544_flush(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t * color_map);
+void pcd8544_rounder(lv_disp_drv_t * disp_drv, lv_area_t *area);
+void pcd8544_set_px_cb(lv_disp_drv_t * disp_drv, uint8_t * buf, lv_coord_t buf_w, lv_coord_t x, lv_coord_t y,
+ lv_color_t color, lv_opa_t opa);
+void pcd8544_set_contrast(uint8_t contrast);
+
+/**********************
+ * MACROS
+ **********************/
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /*PCD8544_H*/
diff --git a/lvgl_tft/ra8875.c b/lvgl_tft/ra8875.c
index b6848dd..55d83f1 100644
--- a/lvgl_tft/ra8875.c
+++ b/lvgl_tft/ra8875.c
@@ -148,29 +148,23 @@ void ra8875_init(void)
ESP_LOGI(TAG, "Initializing RA8875...");
-#if (CONFIG_LV_DISP_PIN_BCKL == 15)
- gpio_config_t io_conf;
- io_conf.intr_type = GPIO_PIN_INTR_DISABLE;
- io_conf.mode = GPIO_MODE_OUTPUT;
- io_conf.pin_bit_mask = GPIO_SEL_15;
- io_conf.pull_down_en = GPIO_PULLDOWN_DISABLE;
- io_conf.pull_up_en = GPIO_PULLUP_DISABLE;
- gpio_config(&io_conf);
-#endif
-
// Initialize non-SPI GPIOs
+
+#if RA8875_USE_RST
gpio_reset_pin(RA8875_RST);
gpio_set_direction(RA8875_RST, GPIO_MODE_OUTPUT);
-#ifdef CONFIG_LV_DISP_PIN_BCKL
- gpio_reset_pin(CONFIG_LV_DISP_PIN_BCKL);
- gpio_set_direction(CONFIG_LV_DISP_PIN_BCKL, GPIO_MODE_OUTPUT);
-#endif
// Reset the RA8875
gpio_set_level(RA8875_RST, 0);
vTaskDelay(DIV_ROUND_UP(100, portTICK_PERIOD_MS));
gpio_set_level(RA8875_RST, 1);
vTaskDelay(DIV_ROUND_UP(100, portTICK_PERIOD_MS));
+#endif
+
+#ifdef CONFIG_LV_DISP_PIN_BCKL
+ gpio_reset_pin(CONFIG_LV_DISP_PIN_BCKL);
+ gpio_set_direction(CONFIG_LV_DISP_PIN_BCKL, GPIO_MODE_OUTPUT);
+#endif
// Initalize RA8875 clocks (SPI must be decelerated before initializing clocks)
disp_spi_change_device_speed(SPI_CLOCK_SPEED_SLOW_HZ);
@@ -194,28 +188,8 @@ void ra8875_init(void)
ESP_LOGW(TAG, "WARNING: Memory clear timed out; RA8875 may be unresponsive.");
}
- // Enable the display and backlight
+ // Enable the display
ra8875_enable_display(true);
- ra8875_enable_backlight(true);
-}
-
-void ra8875_enable_backlight(bool backlight)
-{
-#if CONFIG_LV_ENABLE_BACKLIGHT_CONTROL
- ESP_LOGI(TAG, "%s backlight.", backlight ? "Enabling" : "Disabling");
- uint32_t tmp = 0;
-
- #if CONFIG_LV_BACKLIGHT_ACTIVE_LVL
- tmp = backlight ? 1 : 0;
- #else
- tmp = backlight ? 0 : 1;
- #endif
-
-#ifdef CONFIG_LV_DISP_PIN_BCKL
- gpio_set_level(CONFIG_LV_DISP_PIN_BCKL, tmp);
-#endif
-
-#endif
}
void ra8875_enable_display(bool enable)
diff --git a/lvgl_tft/ra8875.h b/lvgl_tft/ra8875.h
index a6d1fe5..28c77f9 100644
--- a/lvgl_tft/ra8875.h
+++ b/lvgl_tft/ra8875.h
@@ -24,7 +24,8 @@ extern "C" {
/*********************
* DEFINES
*********************/
-#define RA8875_RST CONFIG_LV_DISP_PIN_RST
+#define RA8875_RST CONFIG_LV_DISP_PIN_RST
+#define RA8875_USE_RST CONFIG_LV_DISP_USE_RST
// System & Configuration Registers
#define RA8875_REG_PWRR (0x01) // Power and Display Control Register (PWRR)
@@ -96,7 +97,6 @@ extern "C" {
**********************/
void ra8875_init(void);
-void ra8875_enable_backlight(bool backlight);
void ra8875_enable_display(bool enable);
void ra8875_flush(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t * color_map);
diff --git a/lvgl_tft/sh1107.c b/lvgl_tft/sh1107.c
index ac1b3e5..aaef792 100644
--- a/lvgl_tft/sh1107.c
+++ b/lvgl_tft/sh1107.c
@@ -94,7 +94,9 @@ void sh1107_init(void)
//Initialize non-SPI GPIOs
gpio_reset_pin(SH1107_DC);
gpio_set_direction(SH1107_DC, GPIO_MODE_OUTPUT);
- gpio_reset_pin(SH1107_RST);
+
+#if SH1107_USE_RST
+ gpio_reset_pin(SH1107_RST);
gpio_set_direction(SH1107_RST, GPIO_MODE_OUTPUT);
//Reset the display
@@ -102,6 +104,7 @@ void sh1107_init(void)
vTaskDelay(100 / portTICK_PERIOD_MS);
gpio_set_level(SH1107_RST, 1);
vTaskDelay(100 / portTICK_PERIOD_MS);
+#endif
//Send all the commands
uint16_t cmd = 0;
diff --git a/lvgl_tft/sh1107.h b/lvgl_tft/sh1107.h
index 7a0db68..ba77a61 100644
--- a/lvgl_tft/sh1107.h
+++ b/lvgl_tft/sh1107.h
@@ -25,8 +25,9 @@ extern "C" {
/*********************
* DEFINES
*********************/
-#define SH1107_DC CONFIG_LV_DISP_PIN_DC
-#define SH1107_RST CONFIG_LV_DISP_PIN_RST
+#define SH1107_DC CONFIG_LV_DISP_PIN_DC
+#define SH1107_RST CONFIG_LV_DISP_PIN_RST
+#define SH1107_USE_RST CONFIG_LV_DISP_USE_RST
/**********************
* TYPEDEFS
diff --git a/lvgl_tft/ssd1306.c b/lvgl_tft/ssd1306.c
index 58fb88e..c845eac 100644
--- a/lvgl_tft/ssd1306.c
+++ b/lvgl_tft/ssd1306.c
@@ -13,10 +13,9 @@
/*********************
* INCLUDES
*********************/
-#include "driver/i2c.h"
#include "assert.h"
-#include "lvgl_i2c_conf.h"
+#include "lvgl_i2c/i2c_manager.h"
#include "ssd1306.h"
@@ -25,6 +24,7 @@
*********************/
#define TAG "SSD1306"
+#define OLED_I2C_PORT (CONFIG_LV_I2C_DISPLAY_PORT)
// SLA (0x3C) + WRITE_MODE (0x00) = 0x78 (0b01111000)
#define OLED_I2C_ADDRESS 0x3C
#define OLED_WIDTH 128
@@ -70,8 +70,6 @@
// Charge Pump (pg.62)
#define OLED_CMD_SET_CHARGE_PUMP 0x8D // follow with 0x14
-#define OLED_IIC_FREQ_HZ 400000 // I2C colock frequency
-
/**********************
* TYPEDEFS
**********************/
@@ -126,8 +124,8 @@ void ssd1306_init(void)
orientation_1,
orientation_2,
OLED_CMD_SET_CONTRAST,
- display_mode,
0xFF,
+ display_mode,
OLED_CMD_DISPLAY_ON
};
@@ -213,44 +211,15 @@ void ssd1306_sleep_out(void)
static uint8_t send_data(lv_disp_drv_t *disp_drv, void *bytes, size_t bytes_len)
{
(void) disp_drv;
- esp_err_t err;
uint8_t *data = (uint8_t *) bytes;
- i2c_cmd_handle_t cmd = i2c_cmd_link_create();
-
- i2c_master_start(cmd);
- i2c_master_write_byte(cmd, (OLED_I2C_ADDRESS << 1) | I2C_MASTER_WRITE, true);
-
- for (size_t idx = 0; idx < bytes_len; idx++) {
- i2c_master_write_byte(cmd, data[idx], true);
- }
-
- i2c_master_stop(cmd);
-
- /* Send queued commands */
- err = i2c_master_cmd_begin(DISP_I2C_PORT, cmd, 10 / portTICK_PERIOD_MS);
- i2c_cmd_link_delete(cmd);
-
- return ESP_OK == err ? 0 : 1;
+ return lvgl_i2c_write(OLED_I2C_PORT, OLED_I2C_ADDRESS, data[0], data + 1, bytes_len - 1 );
}
static uint8_t send_pixels(lv_disp_drv_t *disp_drv, void *color_buffer, size_t buffer_len)
{
(void) disp_drv;
- esp_err_t err;
- i2c_cmd_handle_t cmd = i2c_cmd_link_create();
- i2c_master_start(cmd);
- i2c_master_write_byte(cmd, (OLED_I2C_ADDRESS << 1) | I2C_MASTER_WRITE, true);
-
- i2c_master_write_byte(cmd, OLED_CONTROL_BYTE_DATA_STREAM, true);
- i2c_master_write(cmd, (uint8_t *) color_buffer, buffer_len, true);
- i2c_master_stop(cmd);
-
- /* Send queued commands */
- err = i2c_master_cmd_begin(DISP_I2C_PORT, cmd, 10 / portTICK_PERIOD_MS);
- i2c_cmd_link_delete(cmd);
-
- return ESP_OK == err ? 0 : 1;
+ return lvgl_i2c_write(OLED_I2C_PORT, OLED_I2C_ADDRESS, OLED_CONTROL_BYTE_DATA_STREAM, color_buffer, buffer_len);
}
diff --git a/lvgl_tft/ssd1306.h b/lvgl_tft/ssd1306.h
index 2145493..62bd0e6 100644
--- a/lvgl_tft/ssd1306.h
+++ b/lvgl_tft/ssd1306.h
@@ -25,8 +25,6 @@ extern "C" {
/*********************
* DEFINES
*********************/
-#define SSD1306_SDA CONFIG_LV_DISP_PIN_SDA
-#define SSD1306_SCL CONFIG_LV_DISP_PIN_SCL
#define SSD1306_DISPLAY_ORIENTATION TFT_ORIENTATION_LANDSCAPE
/**********************
diff --git a/lvgl_tft/st7735s.c b/lvgl_tft/st7735s.c
index a459faf..112423c 100644
--- a/lvgl_tft/st7735s.c
+++ b/lvgl_tft/st7735s.c
@@ -8,12 +8,15 @@
*********************/
#include "st7735s.h"
#include "disp_spi.h"
-#include "driver/i2c.h"
#include "driver/gpio.h"
#include "esp_log.h"
#include "freertos/FreeRTOS.h"
#include "freertos/task.h"
+#ifdef CONFIG_LV_M5STICKC_HANDLE_AXP192
+ #include "lvgl_i2c/i2c_manager.h"
+#endif
+
/*********************
* DEFINES
*********************/
@@ -38,7 +41,6 @@ static void st7735s_send_cmd(uint8_t cmd);
static void st7735s_send_data(void * data, uint16_t length);
static void st7735s_send_color(void * data, uint16_t length);
static void st7735s_set_orientation(uint8_t orientation);
-static void i2c_master_init();
static void axp192_write_byte(uint8_t addr, uint8_t data);
static void axp192_init();
static void axp192_sleep_in();
@@ -60,7 +62,6 @@ uint8_t st7735s_portrait_mode = 0;
void st7735s_init(void)
{
#ifdef CONFIG_LV_M5STICKC_HANDLE_AXP192
- i2c_master_init();
axp192_init();
#endif
@@ -99,7 +100,9 @@ void st7735s_init(void)
//Initialize non-SPI GPIOs
gpio_reset_pin(ST7735S_DC);
gpio_set_direction(ST7735S_DC, GPIO_MODE_OUTPUT);
- gpio_reset_pin(ST7735S_RST);
+
+#if ST7735S_USE_RST
+ gpio_reset_pin(ST7735S_RST);
gpio_set_direction(ST7735S_RST, GPIO_MODE_OUTPUT);
//Reset the display
@@ -107,6 +110,7 @@ void st7735s_init(void)
vTaskDelay(100 / portTICK_PERIOD_MS);
gpio_set_level(ST7735S_RST, 1);
vTaskDelay(100 / portTICK_PERIOD_MS);
+#endif
ESP_LOGI(TAG, "ST7735S initialization.");
@@ -160,12 +164,16 @@ void st7735s_flush(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t * col
void st7735s_sleep_in()
{
st7735s_send_cmd(0x10);
- axp192_sleep_in();
+ #ifdef CONFIG_LV_M5STICKC_HANDLE_AXP192
+ axp192_sleep_in();
+ #endif
}
void st7735s_sleep_out()
{
- axp192_sleep_out();
+ #ifdef CONFIG_LV_M5STICKC_HANDLE_AXP192
+ axp192_sleep_out();
+ #endif
st7735s_send_cmd(0x11);
}
@@ -215,55 +223,35 @@ static void st7735s_set_orientation(uint8_t orientation)
st7735s_send_data((void *) &data[orientation], 1);
}
-static void i2c_master_init()
-{
- i2c_config_t i2c_config = {
- .mode = I2C_MODE_MASTER,
- .sda_io_num = AXP192_SDA,
- .scl_io_num = AXP192_SCL,
- .sda_pullup_en = GPIO_PULLUP_ENABLE,
- .scl_pullup_en = GPIO_PULLUP_ENABLE,
- .master.clk_speed = 400000
- };
- i2c_param_config(I2C_NUM_0, &i2c_config);
- i2c_driver_install(I2C_NUM_0, I2C_MODE_MASTER, 0, 0, 0);
-}
+#ifdef CONFIG_LV_M5STICKC_HANDLE_AXP192
-static void axp192_write_byte(uint8_t addr, uint8_t data)
-{
- esp_err_t ret;
- i2c_cmd_handle_t cmd = i2c_cmd_link_create();
+ static void axp192_write_byte(uint8_t addr, uint8_t data)
+ {
+ err = lvgl_i2c_write(CONFIG_LV_I2C_DISPLAY_PORT, AXP192_I2C_ADDRESS, addr, &data, 1);
+ if (ret != ESP_OK) {
+ ESP_LOGE(TAG, "AXP192 send failed. code: 0x%.2X", ret);
+ }
+ }
- i2c_master_start(cmd);
- i2c_master_write_byte(cmd, (AXP192_I2C_ADDRESS << 1) | I2C_MASTER_WRITE, true);
- i2c_master_write_byte(cmd, addr, true);
- i2c_master_write_byte(cmd, data, true);
- i2c_master_stop(cmd);
+ static void axp192_init()
+ {
+ // information on how to init and use AXP192 ifor M5StickC taken from
+ // https://forum.m5stack.com/topic/1025/m5stickc-turn-off-screen-completely
- ret = i2c_master_cmd_begin(I2C_NUM_0, cmd, 10/portTICK_PERIOD_MS);
- if (ret != ESP_OK) {
- ESP_LOGE(TAG, "AXP192 send failed. code: 0x%.2X", ret);
- }
- i2c_cmd_link_delete(cmd);
-}
+ axp192_write_byte(0x10, 0xFF); // OLED_VPP Enable
+ axp192_write_byte(0x28, 0xCC); // Enable LDO2&LDO3, LED&TFT 3.0V
+ axp192_sleep_out();
+ ESP_LOGI(TAG, "AXP192 initialized, power enabled for LDO2 and LDO3");
+ }
-static void axp192_init()
-{
- // information on how to init and use AXP192 ifor M5StickC taken from
- // https://forum.m5stack.com/topic/1025/m5stickc-turn-off-screen-completely
+ static void axp192_sleep_in()
+ {
+ axp192_write_byte(0x12, 0x4b);
+ }
- axp192_write_byte(0x10, 0xFF); // OLED_VPP Enable
- axp192_write_byte(0x28, 0xCC); // Enable LDO2&LDO3, LED&TFT 3.0V
- axp192_sleep_out();
- ESP_LOGI(TAG, "AXP192 initialized, power enabled for LDO2 and LDO3");
-}
+ static void axp192_sleep_out()
+ {
+ axp192_write_byte(0x12, 0x4d);
+ }
-static void axp192_sleep_in()
-{
- axp192_write_byte(0x12, 0x4b);
-}
-
-static void axp192_sleep_out()
-{
- axp192_write_byte(0x12, 0x4d);
-}
+#endif
diff --git a/lvgl_tft/st7735s.h b/lvgl_tft/st7735s.h
index de47140..2d02ed0 100644
--- a/lvgl_tft/st7735s.h
+++ b/lvgl_tft/st7735s.h
@@ -25,11 +25,9 @@ extern "C" {
*********************/
#define DISP_BUF_SIZE (LV_HOR_RES_MAX * 40)
-#define ST7735S_DC CONFIG_LV_DISP_PIN_DC
-#define ST7735S_RST CONFIG_LV_DISP_PIN_RST
-
-#define AXP192_SDA CONFIG_LV_AXP192_PIN_SDA
-#define AXP192_SCL CONFIG_LV_AXP192_PIN_SCL
+#define ST7735S_DC CONFIG_LV_DISP_PIN_DC
+#define ST7735S_RST CONFIG_LV_DISP_PIN_RST
+#define ST7735S_USE_RST CONFIG_LV_DISP_USE_RST
#define ST7735S_INVERT_COLORS CONFIG_LV_INVERT_COLORS
@@ -133,7 +131,6 @@ extern "C" {
void st7735s_init(void);
void st7735s_flush(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t * color_map);
-void st7735s_enable_backlight(bool backlight);
void st7735s_sleep_in(void);
void st7735s_sleep_out(void);
diff --git a/lvgl_tft/st7789.c b/lvgl_tft/st7789.c
index 79098c6..b99d74b 100644
--- a/lvgl_tft/st7789.c
+++ b/lvgl_tft/st7789.c
@@ -35,9 +35,7 @@ typedef struct {
**********************/
static void st7789_set_orientation(uint8_t orientation);
-static void st7789_send_cmd(uint8_t cmd);
-static void st7789_send_data(void *data, uint16_t length);
-static void st7789_send_color(void *data, uint16_t length);
+static void st7789_send_color(void *data, size_t length);
/**********************
* STATIC VARIABLES
@@ -91,7 +89,7 @@ void st7789_init(void)
gpio_reset_pin(ST7789_DC);
gpio_set_direction(ST7789_DC, GPIO_MODE_OUTPUT);
-#if !defined(CONFIG_LV_DISP_ST7789_SOFT_RESET)
+#if !defined(ST7789_SOFT_RST)
gpio_reset_pin(ST7789_RST);
gpio_set_direction(ST7789_RST, GPIO_MODE_OUTPUT);
#endif
@@ -102,7 +100,7 @@ void st7789_init(void)
#endif
//Reset the display
-#if !defined(CONFIG_LV_DISP_ST7789_SOFT_RESET)
+#if !defined(ST7789_SOFT_RST)
gpio_set_level(ST7789_RST, 0);
vTaskDelay(100 / portTICK_PERIOD_MS);
gpio_set_level(ST7789_RST, 1);
@@ -124,30 +122,12 @@ void st7789_init(void)
cmd++;
}
- st7789_enable_backlight(true);
-
st7789_set_orientation(CONFIG_LV_DISPLAY_ORIENTATION);
}
-void st7789_enable_backlight(bool backlight)
-{
-#if ST7789_ENABLE_BACKLIGHT_CONTROL
- printf("%s backlight.\n", backlight ? "Enabling" : "Disabling");
- uint32_t tmp = 0;
-
-#if (ST7789_BCKL_ACTIVE_LVL==1)
- tmp = backlight ? 1 : 0;
-#else
- tmp = backlight ? 0 : 1;
-#endif
-
- gpio_set_level(ST7789_BCKL, tmp);
-#endif
-}
-
-/* The ST7789 display controller can drive 320*240 displays, when using a 240*240
- * display there's a gap of 80px, we need to edit the coordinates to take into
- * account that gap, this is not necessary in all orientations. */
+/* The ST7789 display controller can drive up to 320*240 displays, when using a 240*240 or 240*135
+ * displays there's a gap of 80px or 40/52/53px respectively. 52px or 53x offset depends on display orientation.
+ * We need to edit the coordinates to take into account those gaps, this is not necessary in all orientations. */
void st7789_flush(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t * color_map)
{
uint8_t data[4] = {0};
@@ -164,13 +144,29 @@ void st7789_flush(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t * colo
offsety2 += CONFIG_LV_TFT_DISPLAY_Y_OFFSET;
#elif (LV_HOR_RES_MAX == 240) && (LV_VER_RES_MAX == 240)
-#if (CONFIG_LV_DISPLAY_ORIENTATION_PORTRAIT)
- offsetx1 += 80;
- offsetx2 += 80;
-#elif (CONFIG_LV_DISPLAY_ORIENTATION_LANDSCAPE_INVERTED)
- offsety1 += 80;
- offsety2 += 80;
-#endif
+ #if (CONFIG_LV_DISPLAY_ORIENTATION_PORTRAIT)
+ offsetx1 += 80;
+ offsetx2 += 80;
+ #elif (CONFIG_LV_DISPLAY_ORIENTATION_LANDSCAPE_INVERTED)
+ offsety1 += 80;
+ offsety2 += 80;
+ #endif
+#elif (LV_HOR_RES_MAX == 240) && (LV_VER_RES_MAX == 135)
+ #if (CONFIG_LV_DISPLAY_ORIENTATION_PORTRAIT) || \
+ (CONFIG_LV_DISPLAY_ORIENTATION_PORTRAIT_INVERTED)
+ offsetx1 += 40;
+ offsetx2 += 40;
+ offsety1 += 53;
+ offsety2 += 53;
+ #endif
+#elif (LV_HOR_RES_MAX == 135) && (LV_VER_RES_MAX == 240)
+ #if (CONFIG_LV_DISPLAY_ORIENTATION_LANDSCAPE) || \
+ (CONFIG_LV_DISPLAY_ORIENTATION_LANDSCAPE_INVERTED)
+ offsetx1 += 52;
+ offsetx2 += 52;
+ offsety1 += 40;
+ offsety2 += 40;
+ #endif
#endif
/*Column addresses*/
@@ -192,7 +188,7 @@ void st7789_flush(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t * colo
/*Memory write*/
st7789_send_cmd(ST7789_RAMWR);
- uint32_t size = lv_area_get_width(area) * lv_area_get_height(area);
+ size_t size = (size_t)lv_area_get_width(area) * (size_t)lv_area_get_height(area);
st7789_send_color((void*)color_map, size * 2);
@@ -201,21 +197,21 @@ void st7789_flush(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t * colo
/**********************
* STATIC FUNCTIONS
**********************/
-static void st7789_send_cmd(uint8_t cmd)
+void st7789_send_cmd(uint8_t cmd)
{
disp_wait_for_pending_transactions();
gpio_set_level(ST7789_DC, 0);
disp_spi_send_data(&cmd, 1);
}
-static void st7789_send_data(void * data, uint16_t length)
+void st7789_send_data(void * data, uint16_t length)
{
disp_wait_for_pending_transactions();
gpio_set_level(ST7789_DC, 1);
disp_spi_send_data(data, length);
}
-static void st7789_send_color(void * data, uint16_t length)
+static void st7789_send_color(void * data, size_t length)
{
disp_wait_for_pending_transactions();
gpio_set_level(ST7789_DC, 1);
diff --git a/lvgl_tft/st7789.h b/lvgl_tft/st7789.h
index 3175329..cacb31b 100644
--- a/lvgl_tft/st7789.h
+++ b/lvgl_tft/st7789.h
@@ -23,17 +23,17 @@ extern "C"
#define ST7789_DC CONFIG_LV_DISP_PIN_DC
#define ST7789_RST CONFIG_LV_DISP_PIN_RST
-#define ST7789_BCKL CONFIG_LV_DISP_PIN_BCKL
-#define ST7789_ENABLE_BACKLIGHT_CONTROL CONFIG_LV_ENABLE_BACKLIGHT_CONTROL
-#define ST7789_INVERT_COLORS CONFIG_LV_INVERT_COLORS
-
-#if CONFIG_LV_BACKLIGHT_ACTIVE_LVL
- #define ST7789_BCKL_ACTIVE_LVL 1
+#if CONFIG_LV_DISP_USE_RST
+ #if CONFIG_LV_DISP_ST7789_SOFT_RESET
+ #define ST7789_SOFT_RST
+ #endif
#else
- #define ST7789_BCKL_ACTIVE_LVL 0
+ #define ST7789_SOFT_RST
#endif
+#define ST7789_INVERT_COLORS CONFIG_LV_INVERT_COLORS
+
/* ST7789 commands */
#define ST7789_NOP 0x00
#define ST7789_SWRESET 0x01
@@ -112,7 +112,9 @@ extern "C"
void st7789_init(void);
void st7789_flush(lv_disp_drv_t *drv, const lv_area_t *area, lv_color_t *color_map);
-void st7789_enable_backlight(bool backlight);
+
+void st7789_send_cmd(uint8_t cmd);
+void st7789_send_data(void *data, uint16_t length);
#ifdef __cplusplus
} /* extern "C" */
diff --git a/lvgl_tft/st7796s.c b/lvgl_tft/st7796s.c
index fd18657..f152ef9 100644
--- a/lvgl_tft/st7796s.c
+++ b/lvgl_tft/st7796s.c
@@ -81,31 +81,25 @@ void st7796s_init(void)
{0, {0}, 0xff},
};
-#if ST7796S_BCKL == 15
- gpio_config_t io_conf;
- io_conf.intr_type = GPIO_PIN_INTR_DISABLE;
- io_conf.mode = GPIO_MODE_OUTPUT;
- io_conf.pin_bit_mask = GPIO_SEL_15;
- io_conf.pull_down_en = GPIO_PULLDOWN_DISABLE;
- io_conf.pull_up_en = GPIO_PULLUP_DISABLE;
- gpio_config(&io_conf);
-#endif
-
//Initialize non-SPI GPIOs
gpio_reset_pin(ST7796S_DC);
gpio_set_direction(ST7796S_DC, GPIO_MODE_OUTPUT);
+
+#if ST7796S_USE_RST
gpio_reset_pin(ST7796S_RST);
gpio_set_direction(ST7796S_RST, GPIO_MODE_OUTPUT);
-#if ST7796S_ENABLE_BACKLIGHT_CONTROL
- gpio_reset_pin(ST7796S_BCKL);
- gpio_set_direction(ST7796S_BCKL, GPIO_MODE_OUTPUT);
-#endif
//Reset the display
gpio_set_level(ST7796S_RST, 0);
vTaskDelay(100 / portTICK_PERIOD_MS);
gpio_set_level(ST7796S_RST, 1);
vTaskDelay(100 / portTICK_PERIOD_MS);
+#endif
+
+#if ST7796S_ENABLE_BACKLIGHT_CONTROL
+ gpio_reset_pin(ST7796S_BCKL);
+ gpio_set_direction(ST7796S_BCKL, GPIO_MODE_OUTPUT);
+#endif
ESP_LOGI(TAG, "Initialization.");
@@ -122,8 +116,6 @@ void st7796s_init(void)
cmd++;
}
- st7796s_enable_backlight(true);
-
st7796s_set_orientation(CONFIG_LV_DISPLAY_ORIENTATION);
#if ST7796S_INVERT_COLORS == 1
@@ -161,22 +153,6 @@ void st7796s_flush(lv_disp_drv_t *drv, const lv_area_t *area, lv_color_t *color_
st7796s_send_color((void *)color_map, size * 2);
}
-void st7796s_enable_backlight(bool backlight)
-{
-#if ST7796S_ENABLE_BACKLIGHT_CONTROL
- ESP_LOGI(TAG, "%s backlight.", backlight ? "Enabling" : "Disabling");
- uint32_t tmp = 0;
-
-#if (ST7796S_BCKL_ACTIVE_LVL == 1)
- tmp = backlight ? 1 : 0;
-#else
- tmp = backlight ? 0 : 1;
-#endif
-
- gpio_set_level(ST7796S_BCKL, tmp);
-#endif
-}
-
void st7796s_sleep_in()
{
uint8_t data[] = {0x08};
diff --git a/lvgl_tft/st7796s.h b/lvgl_tft/st7796s.h
index 418ec9b..95c6d4f 100644
--- a/lvgl_tft/st7796s.h
+++ b/lvgl_tft/st7796s.h
@@ -26,19 +26,12 @@ extern "C"
/*********************
* DEFINES
*********************/
-#define ST7796S_DC CONFIG_LV_DISP_PIN_DC
-#define ST7796S_RST CONFIG_LV_DISP_PIN_RST
-#define ST7796S_BCKL CONFIG_LV_DISP_PIN_BCKL
-
-#define ST7796S_ENABLE_BACKLIGHT_CONTROL CONFIG_LV_ENABLE_BACKLIGHT_CONTROL
-#define ST7796S_INVERT_COLORS CONFIG_LV_INVERT_COLORS
+#define ST7796S_DC CONFIG_LV_DISP_PIN_DC
+#define ST7796S_RST CONFIG_LV_DISP_PIN_RST
+#define ST7796S_USE_RST CONFIG_LV_DISP_USE_RST
+#define ST7796S_INVERT_COLORS CONFIG_LV_INVERT_COLORS
#define ST7796S_DISPLAY_ORIENTATION CONFIG_LV_DISPLAY_ORIENTATION
-#if CONFIG_LV_BACKLIGHT_ACTIVE_LVL
-#define ST7796S_BCKL_ACTIVE_LVL 1
-#else
-#define ST7796S_BCKL_ACTIVE_LVL 0
-#endif
/*******************
* ST7796S REGS
@@ -118,7 +111,6 @@ extern "C"
void st7796s_init(void);
void st7796s_flush(lv_disp_drv_t *drv, const lv_area_t *area, lv_color_t *color_map);
- void st7796s_enable_backlight(bool backlight);
/**********************
* MACROS
diff --git a/lvgl_touch/Kconfig b/lvgl_touch/Kconfig
index edd1dab..b793adb 100644
--- a/lvgl_touch/Kconfig
+++ b/lvgl_touch/Kconfig
@@ -1,28 +1,29 @@
menu "LVGL Touch controller"
config LV_TOUCH_CONTROLLER
- int
- default 0 if LV_TOUCH_CONTROLLER_NONE
- default 1 if LV_TOUCH_CONTROLLER_XPT2046
- default 2 if LV_TOUCH_CONTROLLER_FT6X06
- default 3 if LV_TOUCH_CONTROLLER_STMPE610
+ int
+ default 0 if LV_TOUCH_CONTROLLER_NONE
+ default 1 if LV_TOUCH_CONTROLLER_XPT2046
+ default 2 if LV_TOUCH_CONTROLLER_FT6X06
+ default 3 if LV_TOUCH_CONTROLLER_STMPE610
default 4 if LV_TOUCH_CONTROLLER_ADCRAW
default 5 if LV_TOUCH_CONTROLLER_FT81X
default 6 if LV_TOUCH_CONTROLLER_RA8875
+ default 7 if LV_TOUCH_CONTROLLER_GT911
choice
- prompt "Select a touch panel controller model."
- default LV_TOUCH_CONTROLLER_NONE
- help
- Select the controller for your touch panel.
+ prompt "Select a touch panel controller model."
+ default LV_TOUCH_CONTROLLER_NONE
+ help
+ Select the controller for your touch panel.
- config LV_TOUCH_CONTROLLER_NONE
- bool "None"
- config LV_TOUCH_CONTROLLER_XPT2046
+ config LV_TOUCH_CONTROLLER_NONE
+ bool "None"
+ config LV_TOUCH_CONTROLLER_XPT2046
select LV_TOUCH_DRIVER_PROTOCOL_SPI
bool "XPT2046"
- config LV_TOUCH_CONTROLLER_FT6X06
- select LV_TOUCH_DRIVER_PROTOCOL_I2C
+ config LV_TOUCH_CONTROLLER_FT6X06
+ select LV_I2C_TOUCH
bool "FT6X06"
config LV_TOUCH_CONTROLLER_STMPE610
select LV_TOUCH_DRIVER_PROTOCOL_SPI
@@ -36,14 +37,17 @@ menu "LVGL Touch controller"
config LV_TOUCH_CONTROLLER_RA8875
select LV_TOUCH_DRIVER_DISPLAY
bool "RA8875"
+ config LV_TOUCH_CONTROLLER_GT911
+ select LV_I2C_TOUCH
+ bool "GT911"
endchoice
-
+
config LV_TOUCH_DRIVER_PROTOCOL_SPI
bool
help
Touch controller protocol SPI
- config LV_TOUCH_DRIVER_PROTOCOL_I2C
+ config LV_I2C_TOUCH
bool
help
Touch controller protocol I2C
@@ -57,48 +61,29 @@ menu "LVGL Touch controller"
bool
help
Touch controller uses same interface/device as display
- (Note: Display must be initialized before touch)
-
- choice
- prompt "Touch I2C port"
- depends on LV_TOUCH_DRIVER_PROTOCOL_I2C
-
- default LV_TOUCH_I2C_PORT_0
- help
- Select the I2C port used by the touch controller.
+ (Note: Display must be initialized before touch)
- config LV_TOUCH_I2C_PORT_0
- bool "I2C PORT 0"
- config LV_TOUCH_I2C_PORT_1
- bool "I2C PORT 1"
- endchoice
-
choice
prompt "Touch Controller SPI Bus."
depends on LV_TOUCH_DRIVER_PROTOCOL_SPI
-
- default LV_TOUCH_CONTROLLER_SPI_VSPI if !IDF_TARGET_ESP32S2
- default LV_TOUCH_CONTROLLER_SPI_FSPI if IDF_TARGET_ESP32S2
+
+ default LV_TOUCH_CONTROLLER_SPI2_HOST
help
- Select the SPI Bus the TFT Display is attached to.
-
- config LV_TOUCH_CONTROLLER_SPI_HSPI
- bool "HSPI"
- config LV_TOUCH_CONTROLLER_SPI_VSPI
- bool "VSPI" if !IDF_TARGET_ESP32S2
- config LV_TOUCH_CONTROLLER_SPI_FSPI
- bool "FSPI" if IDF_TARGET_ESP32S2
+ Select the SPI Bus the touch controller is attached to.
+
+ config LV_TOUCH_CONTROLLER_SPI2_HOST
+ bool "SPI2_HOST"
+ config LV_TOUCH_CONTROLLER_SPI3_HOST
+ bool "SPI3_HOST"
endchoice
-
+
menu "Touchpanel (XPT2046) Pin Assignments"
depends on LV_TOUCH_CONTROLLER_XPT2046
config LV_TOUCH_SPI_MISO
int
prompt "GPIO for MISO (Master In Slave Out)"
- range 0 39 if IDF_TARGET_ESP32
- range 0 43 if IDF_TARGET_ESP32S2
-
+
default 35 if LV_PREDEFINED_PINS_38V1
default 19
help
@@ -107,8 +92,6 @@ menu "LVGL Touch controller"
config LV_TOUCH_SPI_MOSI
int
prompt "GPIO for MOSI (Master Out Slave In)"
- range 0 39 if IDF_TARGET_ESP32
- range 0 43 if IDF_TARGET_ESP32S2
default 32 if LV_PREDEFINED_PINS_38V1
default 23
@@ -117,9 +100,7 @@ menu "LVGL Touch controller"
config LV_TOUCH_SPI_CLK
int "GPIO for CLK (SCK / Serial Clock)"
- range 0 39 if IDF_TARGET_ESP32
- range 0 43 if IDF_TARGET_ESP32S2
-
+
default 26 if LV_PREDEFINED_PINS_38V1
default 18
help
@@ -127,9 +108,7 @@ menu "LVGL Touch controller"
config LV_TOUCH_SPI_CS
int "GPIO for CS (Slave Select)"
- range 0 39 if IDF_TARGET_ESP32
- range 0 43 if IDF_TARGET_ESP32S2
-
+
default 33 if LV_PREDEFINED_PINS_38V1
default 5
help
@@ -137,15 +116,13 @@ menu "LVGL Touch controller"
config LV_TOUCH_PIN_IRQ
int "GPIO for IRQ (Interrupt Request)"
- range 0 39 if IDF_TARGET_ESP32
- range 0 43 if IDF_TARGET_ESP32S2
-
+
default 27 if LV_PREDEFINED_PINS_38V4
default 25
help
Configure the touchpanel IRQ pin here.
endmenu
-
+
menu "Touchpanel Configuration (XPT2046)"
depends on LV_TOUCH_CONTROLLER_XPT2046
@@ -172,11 +149,11 @@ menu "LVGL Touch controller"
prompt "Maximum Y coordinate value."
default 4095 if LV_PREDEFINED_PINS_38V4
default 1900
-
- config LV_TOUCH_XY_SWAP
- bool
- prompt "Swap XY."
- default y
+
+ config LV_TOUCH_XY_SWAP
+ bool
+ prompt "Swap XY."
+ default y
config LV_TOUCH_INVERT_X
bool
@@ -203,36 +180,13 @@ menu "LVGL Touch controller"
endchoice
endmenu
- menu "Touchpanel (FT6X06) Pin Assignments"
- depends on LV_TOUCH_CONTROLLER_FT6X06
-
- config LV_TOUCH_I2C_SDA
- int
- prompt "GPIO for SDA (I2C)"
- range 0 39 if IDF_TARGET_ESP32
- range 0 43 if IDF_TARGET_ESP32S2
-
- default 21
- help
- Configure the I2C touchpanel SDA pin here.
-
- config LV_TOUCH_I2C_SCL
- int "GPIO for clock signal SCL (I2C)"
- range 0 39 if IDF_TARGET_ESP32
- range 0 43 if IDF_TARGET_ESP32S2
-
- default 22
- help
- Configure the I2C touchpanel SCL pin here.
- endmenu
-
menu "Touchpanel Configuration (FT6X06)"
depends on LV_TOUCH_CONTROLLER_FT6X06
- config LV_FT6X36_SWAPXY
- bool
- prompt "Swap X with Y coordinate."
- default y
+ config LV_FT6X36_SWAPXY
+ bool
+ prompt "Swap X with Y coordinate."
+ default n
config LV_FT6X36_INVERT_X
bool
@@ -242,19 +196,24 @@ menu "LVGL Touch controller"
config LV_FT6X36_INVERT_Y
bool
prompt "Invert Y coordinate value."
- default y
+ default n
+
+ config LV_FT6X36_COORDINATES_QUEUE
+ bool
+ prompt "Send coordinates to FreeRTOS queue."
+ default n
+ help
+ Receive from the FreeRTOS queue using the handle 'ft6x36_touch_queue_handle'.
endmenu
-
+
menu "Touchpanel (STMPE610) Pin Assignments"
depends on LV_TOUCH_CONTROLLER_STMPE610
config LV_TOUCH_SPI_MISO
int
prompt "GPIO for MISO (Master In Slave Out)"
- range 0 39 if IDF_TARGET_ESP32
- range 0 43 if IDF_TARGET_ESP32S2
-
+
default 35 if LV_PREDEFINED_PINS_38V1
default 19 if LV_PREDEFINED_DISPLAY_ADA_FEATHERWING
default 19
@@ -263,10 +222,9 @@ menu "LVGL Touch controller"
Configure the touchpanel MISO pin here.
config LV_TOUCH_SPI_MOSI
+ # TODO Fix default for ESP32C3
int
prompt "GPIO for MOSI (Master Out Slave In)"
- range 0 39 if IDF_TARGET_ESP32
- range 0 43 if IDF_TARGET_ESP32S2
default 32 if LV_PREDEFINED_PINS_38V1
default 18 if LV_PREDEFINED_DISPLAY_ADA_FEATHERWING
@@ -277,8 +235,6 @@ menu "LVGL Touch controller"
config LV_TOUCH_SPI_CLK
int "GPIO for CLK (SCK / Serial Clock)"
- range 0 39 if IDF_TARGET_ESP32
- range 0 43 if IDF_TARGET_ESP32S2
default 26 if LV_PREDEFINED_PINS_38V1
default 5 if LV_PREDEFINED_DISPLAY_ADA_FEATHERWING
@@ -288,9 +244,6 @@ menu "LVGL Touch controller"
config LV_TOUCH_SPI_CS
int "GPIO for CS (Slave Select)"
- range 0 39 if IDF_TARGET_ESP32
- range 0 43 if IDF_TARGET_ESP32S2
-
default 33 if LV_PREDEFINED_PINS_38V1
default 32 if LV_PREDEFINED_DISPLAY_ADA_FEATHERWING
default 5
@@ -320,11 +273,11 @@ menu "LVGL Touch controller"
int
prompt "Maximum Y coordinate value."
default 3800
-
+
config LV_TOUCH_XY_SWAP
- bool
- prompt "Swap XY."
- default n
+ bool
+ prompt "Swap XY."
+ default n
config LV_TOUCH_INVERT_X
bool
@@ -336,7 +289,7 @@ menu "LVGL Touch controller"
prompt "Invert Y coordinate value."
default y
endmenu
-
+
menu "Touchpanel (ADCRAW) Pin Assignments"
depends on LV_TOUCH_CONTROLLER_ADCRAW
@@ -357,7 +310,7 @@ menu "LVGL Touch controller"
help
Configure the touchpanel Y- pin. Must be ADC input.
-
+
config LV_TOUCHSCREEN_RESISTIVE_PIN_XL
int
prompt "GPIO X-"
@@ -423,25 +376,25 @@ menu "LVGL Touch controller"
config LV_TOUCH_X_MIN
int
prompt "Minimum X coordinate ADC value"
- range 0 1023
+ range 0 1023
default 0
config LV_TOUCH_Y_MIN
int
prompt "Minimum Y coordinate ADC value"
- range 0 1023
+ range 0 1023
default 0
config LV_TOUCH_X_MAX
int
prompt "Maximum X coordinate ADC value"
- range 0 1023
+ range 0 1023
default 1023
config LV_TOUCH_Y_MAX
int
prompt "Maximum Y coordinate ADC value"
- range 0 1023
+ range 0 1023
default 1023
config LV_TOUCH_XY_SWAP
@@ -462,13 +415,13 @@ menu "LVGL Touch controller"
config LV_TOUCH_RA8875_SAMPLE_TIME
int
prompt "TP Sample Time Adjusting"
- range 0 7
+ range 0 7
default 0
config LV_TOUCH_RA8875_ADC_CLOCK
int
prompt "ADC Clock Setting"
- range 0 7
+ range 0 7
default 0
config LV_TOUCH_RA8875_WAKEUP_ENABLE
@@ -488,4 +441,57 @@ menu "LVGL Touch controller"
endmenu
+ menu "Touchpanel Configuration (GT911)"
+ depends on LV_TOUCH_CONTROLLER_GT911
+
+ config LV_GT911_SWAPXY
+ bool
+ prompt "Swap X with Y coordinate."
+ default y
+
+ config LV_GT911_INVERT_X
+ bool
+ prompt "Invert X coordinate value."
+ default n
+
+ config LV_GT911_INVERT_Y
+ bool
+ prompt "Invert Y coordinate value."
+ default y
+
+ endmenu
+
+ choice
+ prompt "Select an I2C port for the touch panel"
+ default LV_I2C_TOUCH_PORT_0
+ depends on LV_I2C_TOUCH
+
+ config LV_I2C_TOUCH_PORT_0
+ bool
+ prompt "I2C port 0"
+ help
+ I2C is shared peripheral managed by I2C Manager. In order to configure I2C Manager (pinout, etc.) see menu
+ Component config->I2C Port Settings.
+
+ config LV_I2C_TOUCH_PORT_1
+ bool
+ prompt "I2C port 1"
+ help
+ I2C is shared peripheral managed by I2C Manager. In order to configure I2C Manager (pinout, etc.) see menu
+ Component config->I2C Port Settings.
+
+ endchoice
+
+ config LV_I2C
+ bool
+ default y if LV_I2C_TOUCH
+
+ config LV_I2C_TOUCH_PORT
+ int
+ default 1 if LV_I2C_TOUCH_PORT_1
+ default 0
+
endmenu
+
+
+
diff --git a/lvgl_touch/ft6x36.c b/lvgl_touch/ft6x36.c
index 4b8324e..78a764a 100644
--- a/lvgl_touch/ft6x36.c
+++ b/lvgl_touch/ft6x36.c
@@ -1,55 +1,45 @@
/*
* Copyright © 2020 Wolfgang Christl
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this
-* software and associated documentation files (the “Software”), to deal in the Software
-* without restriction, including without limitation the rights to use, copy, modify, merge,
-* publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+* Permission is hereby granted, free of charge, to any person obtaining a copy of this
+* software and associated documentation files (the “Software”), to deal in the Software
+* without restriction, including without limitation the rights to use, copy, modify, merge,
+* publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
* to whom the Software is furnished to do so, subject to the following conditions:
*
-* The above copyright notice and this permission notice shall be included in all copies or
+* The above copyright notice and this permission notice shall be included in all copies or
* substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-* PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
-* FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+*
+* THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+* PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+* FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
#include
-#include
#ifdef LV_LVGL_H_INCLUDE_SIMPLE
#include
#else
#include
#endif
#include "ft6x36.h"
-#include "tp_i2c.h"
-#include "../lvgl_i2c_conf.h"
+#include "lvgl_i2c/i2c_manager.h"
#define TAG "FT6X36"
+#define FT6X36_TOUCH_QUEUE_ELEMENTS 1
-ft6x36_status_t ft6x36_status;
-uint8_t current_dev_addr; // set during init
+static ft6x36_status_t ft6x36_status;
+static uint8_t current_dev_addr; // set during init
+static ft6x36_touch_t touch_inputs = { -1, -1, LV_INDEV_STATE_REL }; // -1 coordinates to designate it was never touched
+#if CONFIG_LV_FT6X36_COORDINATES_QUEUE
+QueueHandle_t ft6x36_touch_queue_handle;
+#endif
-esp_err_t ft6x06_i2c_read8(uint8_t slave_addr, uint8_t register_addr, uint8_t *data_buf) {
- i2c_cmd_handle_t i2c_cmd = i2c_cmd_link_create();
-
- i2c_master_start(i2c_cmd);
- i2c_master_write_byte(i2c_cmd, (slave_addr << 1) | I2C_MASTER_WRITE, true);
- i2c_master_write_byte(i2c_cmd, register_addr, I2C_MASTER_ACK);
-
- i2c_master_start(i2c_cmd);
- i2c_master_write_byte(i2c_cmd, (slave_addr << 1) | I2C_MASTER_READ, true);
-
- i2c_master_read_byte(i2c_cmd, data_buf, I2C_MASTER_NACK);
- i2c_master_stop(i2c_cmd);
- esp_err_t ret = i2c_master_cmd_begin(TOUCH_I2C_PORT, i2c_cmd, 1000 / portTICK_PERIOD_MS);
- i2c_cmd_link_delete(i2c_cmd);
- return ret;
+static esp_err_t ft6x06_i2c_read8(uint8_t slave_addr, uint8_t register_addr, uint8_t *data_buf) {
+ return lvgl_i2c_read(CONFIG_LV_I2C_TOUCH_PORT, slave_addr, register_addr, data_buf, 1);
}
/**
@@ -75,42 +65,38 @@ uint8_t ft6x36_get_gesture_id() {
* @retval None
*/
void ft6x06_init(uint16_t dev_addr) {
- if (!ft6x36_status.inited) {
-/* I2C master is initialized before calling this function */
-#if 0
- esp_err_t code = i2c_master_init();
-#else
- esp_err_t code = ESP_OK;
-#endif
+ ft6x36_status.inited = true;
+ current_dev_addr = dev_addr;
+ uint8_t data_buf;
+ esp_err_t ret;
+ ESP_LOGI(TAG, "Found touch panel controller");
+ if ((ret = ft6x06_i2c_read8(dev_addr, FT6X36_PANEL_ID_REG, &data_buf) != ESP_OK))
+ ESP_LOGE(TAG, "Error reading from device: %s",
+ esp_err_to_name(ret)); // Only show error the first time
+ ESP_LOGI(TAG, "\tDevice ID: 0x%02x", data_buf);
- if (code != ESP_OK) {
- ft6x36_status.inited = false;
- ESP_LOGE(TAG, "Error during I2C init %s", esp_err_to_name(code));
- } else {
- ft6x36_status.inited = true;
- current_dev_addr = dev_addr;
- uint8_t data_buf;
- esp_err_t ret;
- ESP_LOGI(TAG, "Found touch panel controller");
- if ((ret = ft6x06_i2c_read8(dev_addr, FT6X36_PANEL_ID_REG, &data_buf) != ESP_OK))
- ESP_LOGE(TAG, "Error reading from device: %s",
- esp_err_to_name(ret)); // Only show error the first time
- ESP_LOGI(TAG, "\tDevice ID: 0x%02x", data_buf);
+ ft6x06_i2c_read8(dev_addr, FT6X36_CHIPSELECT_REG, &data_buf);
+ ESP_LOGI(TAG, "\tChip ID: 0x%02x", data_buf);
- ft6x06_i2c_read8(dev_addr, FT6X36_CHIPSELECT_REG, &data_buf);
- ESP_LOGI(TAG, "\tChip ID: 0x%02x", data_buf);
+ ft6x06_i2c_read8(dev_addr, FT6X36_DEV_MODE_REG, &data_buf);
+ ESP_LOGI(TAG, "\tDevice mode: 0x%02x", data_buf);
- ft6x06_i2c_read8(dev_addr, FT6X36_DEV_MODE_REG, &data_buf);
- ESP_LOGI(TAG, "\tDevice mode: 0x%02x", data_buf);
+ ft6x06_i2c_read8(dev_addr, FT6X36_FIRMWARE_ID_REG, &data_buf);
+ ESP_LOGI(TAG, "\tFirmware ID: 0x%02x", data_buf);
- ft6x06_i2c_read8(dev_addr, FT6X36_FIRMWARE_ID_REG, &data_buf);
- ESP_LOGI(TAG, "\tFirmware ID: 0x%02x", data_buf);
+ ft6x06_i2c_read8(dev_addr, FT6X36_RELEASECODE_REG, &data_buf);
+ ESP_LOGI(TAG, "\tRelease code: 0x%02x", data_buf);
- ft6x06_i2c_read8(dev_addr, FT6X36_RELEASECODE_REG, &data_buf);
- ESP_LOGI(TAG, "\tRelease code: 0x%02x", data_buf);
- }
+#if CONFIG_LV_FT6X36_COORDINATES_QUEUE
+ ft6x36_touch_queue_handle = xQueueCreate( FT6X36_TOUCH_QUEUE_ELEMENTS, sizeof( ft6x36_touch_t ) );
+ if( ft6x36_touch_queue_handle == NULL )
+ {
+ ESP_LOGE( TAG, "\tError creating touch input FreeRTOS queue" );
+ return;
}
+ xQueueSend( ft6x36_touch_queue_handle, &touch_inputs, 0 );
+#endif
}
/**
@@ -120,82 +106,55 @@ void ft6x06_init(uint16_t dev_addr) {
* @retval Always false
*/
bool ft6x36_read(lv_indev_drv_t *drv, lv_indev_data_t *data) {
- uint8_t data_xy[4]; // 2 bytes X | 2 bytes Y
- uint8_t touch_pnt_cnt; // Number of detected touch points
- static int16_t last_x = 0; // 12bit pixel value
- static int16_t last_y = 0; // 12bit pixel value
-
- ft6x06_i2c_read8(current_dev_addr, FT6X36_TD_STAT_REG, &touch_pnt_cnt);
- if (touch_pnt_cnt != 1) { // ignore no touch & multi touch
- data->point.x = last_x;
- data->point.y = last_y;
- data->state = LV_INDEV_STATE_REL;
- return false;
+ if (!ft6x36_status.inited) {
+ ESP_LOGE(TAG, "Init first!");
+ return 0x00;
}
+ uint8_t data_buf[5]; // 1 byte status, 2 bytes X, 2 bytes Y
- // Read X value
- i2c_cmd_handle_t i2c_cmd = i2c_cmd_link_create();
-
- i2c_master_start(i2c_cmd);
- i2c_master_write_byte(i2c_cmd, (current_dev_addr << 1) | I2C_MASTER_WRITE, true);
- i2c_master_write_byte(i2c_cmd, FT6X36_P1_XH_REG, I2C_MASTER_ACK);
-
- i2c_master_start(i2c_cmd);
- i2c_master_write_byte(i2c_cmd, (current_dev_addr << 1) | I2C_MASTER_READ, true);
-
- i2c_master_read_byte(i2c_cmd, &data_xy[0], I2C_MASTER_ACK); // reads FT6X36_P1_XH_REG
- i2c_master_read_byte(i2c_cmd, &data_xy[1], I2C_MASTER_NACK); // reads FT6X36_P1_XL_REG
- i2c_master_stop(i2c_cmd);
- esp_err_t ret = i2c_master_cmd_begin(TOUCH_I2C_PORT, i2c_cmd, 1000 / portTICK_PERIOD_MS);
- i2c_cmd_link_delete(i2c_cmd);
+ esp_err_t ret = lvgl_i2c_read(CONFIG_LV_I2C_TOUCH_PORT, current_dev_addr, FT6X36_TD_STAT_REG, &data_buf[0], 5);
if (ret != ESP_OK) {
- ESP_LOGE(TAG, "Error getting X coordinates: %s", esp_err_to_name(ret));
- data->point.x = last_x;
- data->point.y = last_y;
- data->state = LV_INDEV_STATE_REL; // no touch detected
+ ESP_LOGE(TAG, "Error talking to touch IC: %s", esp_err_to_name(ret));
+ }
+ uint8_t touch_pnt_cnt = data_buf[0]; // Number of detected touch points
+
+ if (ret != ESP_OK || touch_pnt_cnt != 1) { // ignore no touch & multi touch
+ if ( touch_inputs.current_state != LV_INDEV_STATE_REL)
+ {
+ touch_inputs.current_state = LV_INDEV_STATE_REL;
+#if CONFIG_LV_FT6X36_COORDINATES_QUEUE
+ xQueueOverwrite( ft6x36_touch_queue_handle, &touch_inputs );
+#endif
+ }
+ data->point.x = touch_inputs.last_x;
+ data->point.y = touch_inputs.last_y;
+ data->state = touch_inputs.current_state;
return false;
}
- // Read Y value
- i2c_cmd = i2c_cmd_link_create();
-
- i2c_master_start(i2c_cmd);
- i2c_master_write_byte(i2c_cmd, (current_dev_addr << 1) | I2C_MASTER_WRITE, true);
- i2c_master_write_byte(i2c_cmd, FT6X36_P1_YH_REG, I2C_MASTER_ACK);
-
- i2c_master_start(i2c_cmd);
- i2c_master_write_byte(i2c_cmd, (current_dev_addr << 1) | I2C_MASTER_READ, true);
-
- i2c_master_read_byte(i2c_cmd, &data_xy[2], I2C_MASTER_ACK); // reads FT6X36_P1_YH_REG
- i2c_master_read_byte(i2c_cmd, &data_xy[3], I2C_MASTER_NACK); // reads FT6X36_P1_YL_REG
- i2c_master_stop(i2c_cmd);
- ret = i2c_master_cmd_begin(TOUCH_I2C_PORT, i2c_cmd, 1000 / portTICK_PERIOD_MS);
- i2c_cmd_link_delete(i2c_cmd);
- if (ret != ESP_OK) {
- ESP_LOGE(TAG, "Error getting Y coordinates: %s", esp_err_to_name(ret));
- data->point.x = last_x;
- data->point.y = last_y;
- data->state = LV_INDEV_STATE_REL; // no touch detected
- return false;
- }
-
- last_x = ((data_xy[0] & FT6X36_MSB_MASK) << 8) | (data_xy[1] & FT6X36_LSB_MASK);
- last_y = ((data_xy[2] & FT6X36_MSB_MASK) << 8) | (data_xy[3] & FT6X36_LSB_MASK);
+ touch_inputs.current_state = LV_INDEV_STATE_PR;
+ touch_inputs.last_x = ((data_buf[1] & FT6X36_MSB_MASK) << 8) | (data_buf[2] & FT6X36_LSB_MASK);
+ touch_inputs.last_y = ((data_buf[3] & FT6X36_MSB_MASK) << 8) | (data_buf[4] & FT6X36_LSB_MASK);
#if CONFIG_LV_FT6X36_SWAPXY
- int16_t swap_buf = last_x;
- last_x = last_y;
- last_y = swap_buf;
+ int16_t swap_buf = touch_inputs.last_x;
+ touch_inputs.last_x = touch_inputs.last_y;
+ touch_inputs.last_y = swap_buf;
#endif
#if CONFIG_LV_FT6X36_INVERT_X
- last_x = LV_HOR_RES - last_x;
+ touch_inputs.last_x = LV_HOR_RES - touch_inputs.last_x;
#endif
#if CONFIG_LV_FT6X36_INVERT_Y
- last_y = LV_VER_RES - last_y;
+ touch_inputs.last_y = LV_VER_RES - touch_inputs.last_y;
#endif
- data->point.x = last_x;
- data->point.y = last_y;
- data->state = LV_INDEV_STATE_PR;
- ESP_LOGV(TAG, "X=%u Y=%u", data->point.x, data->point.y);
+ data->point.x = touch_inputs.last_x;
+ data->point.y = touch_inputs.last_y;
+ data->state = touch_inputs.current_state;
+ ESP_LOGD(TAG, "X=%u Y=%u", data->point.x, data->point.y);
+
+#if CONFIG_LV_FT6X36_COORDINATES_QUEUE
+ xQueueOverwrite( ft6x36_touch_queue_handle, &touch_inputs );
+#endif
+
return false;
}
diff --git a/lvgl_touch/ft6x36.h b/lvgl_touch/ft6x36.h
index da466b6..c4074dc 100644
--- a/lvgl_touch/ft6x36.h
+++ b/lvgl_touch/ft6x36.h
@@ -2,20 +2,20 @@
/*
* Copyright © 2020 Wolfgang Christl
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this
-* software and associated documentation files (the “Software”), to deal in the Software
-* without restriction, including without limitation the rights to use, copy, modify, merge,
-* publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+* Permission is hereby granted, free of charge, to any person obtaining a copy of this
+* software and associated documentation files (the “Software”), to deal in the Software
+* without restriction, including without limitation the rights to use, copy, modify, merge,
+* publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
* to whom the Software is furnished to do so, subject to the following conditions:
*
-* The above copyright notice and this permission notice shall be included in all copies or
+* The above copyright notice and this permission notice shall be included in all copies or
* substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-* PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
-* FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+*
+* THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+* PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+* FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
@@ -23,6 +23,10 @@
#include
#include
+#if CONFIG_LV_FT6X36_COORDINATES_QUEUE
+#include "freertos/FreeRTOS.h"
+#include "freertos/queue.h"
+#endif
#ifdef LV_LVGL_H_INCLUDE_SIMPLE
#include "lvgl.h"
#else
@@ -145,6 +149,16 @@ typedef struct {
bool inited;
} ft6x36_status_t;
+typedef struct
+{
+ int16_t last_x;
+ int16_t last_y;
+ lv_indev_state_t current_state;
+} ft6x36_touch_t;
+
+#if CONFIG_LV_FT6X36_COORDINATES_QUEUE
+extern QueueHandle_t ft6x36_touch_queue_handle;
+#endif
/**
* @brief Initialize for FT6x36 communication via I2C
* @param dev_addr: Device address on communication Bus (I2C slave address of FT6X36).
diff --git a/lvgl_touch/gt911.c b/lvgl_touch/gt911.c
new file mode 100644
index 0000000..03c3d9d
--- /dev/null
+++ b/lvgl_touch/gt911.c
@@ -0,0 +1,144 @@
+/*
+* Copyright © 2021 Sturnus Inc.
+
+* Permission is hereby granted, free of charge, to any person obtaining a copy of this
+* software and associated documentation files (the “Software”), to deal in the Software
+* without restriction, including without limitation the rights to use, copy, modify, merge,
+* publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+* to whom the Software is furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in all copies or
+* substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+* PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+* FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+* SOFTWARE.
+*/
+
+#include
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include
+#else
+#include
+#endif
+#include "gt911.h"
+
+#include "lvgl_i2c/i2c_manager.h"
+
+#define TAG "GT911"
+
+gt911_status_t gt911_status;
+
+//TODO: handle multibyte read and refactor to just one read transaction
+esp_err_t gt911_i2c_read(uint8_t slave_addr, uint16_t register_addr, uint8_t *data_buf, uint8_t len) {
+ return lvgl_i2c_read(CONFIG_LV_I2C_TOUCH_PORT, slave_addr, register_addr | I2C_REG_16, data_buf, len);
+}
+
+esp_err_t gt911_i2c_write8(uint8_t slave_addr, uint16_t register_addr, uint8_t data) {
+ uint8_t buffer = data;
+ return lvgl_i2c_write(CONFIG_LV_I2C_TOUCH_PORT, slave_addr, register_addr | I2C_REG_16, &buffer, 1);
+}
+
+/**
+ * @brief Initialize for GT911 communication via I2C
+ * @param dev_addr: Device address on communication Bus (I2C slave address of GT911).
+ * @retval None
+ */
+void gt911_init(uint8_t dev_addr) {
+ if (!gt911_status.inited) {
+ gt911_status.i2c_dev_addr = dev_addr;
+ uint8_t data_buf;
+ esp_err_t ret;
+
+ ESP_LOGI(TAG, "Checking for GT911 Touch Controller");
+ if ((ret = gt911_i2c_read(dev_addr, GT911_PRODUCT_ID1, &data_buf, 1) != ESP_OK)) {
+ ESP_LOGE(TAG, "Error reading from device: %s",
+ esp_err_to_name(ret)); // Only show error the first time
+ return;
+ }
+
+ // Read 4 bytes for Product ID in ASCII
+ for (int i = 0; i < GT911_PRODUCT_ID_LEN; i++) {
+ gt911_i2c_read(dev_addr, (GT911_PRODUCT_ID1 + i), (uint8_t *)&(gt911_status.product_id[i]), 1);
+ }
+ ESP_LOGI(TAG, "\tProduct ID: %s", gt911_status.product_id);
+
+ gt911_i2c_read(dev_addr, GT911_VENDOR_ID, &data_buf, 1);
+ ESP_LOGI(TAG, "\tVendor ID: 0x%02x", data_buf);
+
+ gt911_i2c_read(dev_addr, GT911_X_COORD_RES_L, &data_buf, 1);
+ gt911_status.max_x_coord = data_buf;
+ gt911_i2c_read(dev_addr, GT911_X_COORD_RES_H, &data_buf, 1);
+ gt911_status.max_x_coord |= ((uint16_t)data_buf << 8);
+ ESP_LOGI(TAG, "\tX Resolution: %d", gt911_status.max_x_coord);
+
+ gt911_i2c_read(dev_addr, GT911_Y_COORD_RES_L, &data_buf, 1);
+ gt911_status.max_y_coord = data_buf;
+ gt911_i2c_read(dev_addr, GT911_Y_COORD_RES_H, &data_buf, 1);
+ gt911_status.max_y_coord |= ((uint16_t)data_buf << 8);
+ ESP_LOGI(TAG, "\tY Resolution: %d", gt911_status.max_y_coord);
+ gt911_status.inited = true;
+ }
+}
+
+/**
+ * @brief Get the touch screen X and Y positions values. Ignores multi touch
+ * @param drv:
+ * @param data: Store data here
+ * @retval Always false
+ */
+bool gt911_read(lv_indev_drv_t *drv, lv_indev_data_t *data) {
+ uint8_t touch_pnt_cnt; // Number of detected touch points
+ static int16_t last_x = 0; // 12bit pixel value
+ static int16_t last_y = 0; // 12bit pixel value
+ uint8_t data_buf;
+ uint8_t status_reg;
+
+ gt911_i2c_read(gt911_status.i2c_dev_addr, GT911_STATUS_REG, &status_reg, 1);
+// ESP_LOGI(TAG, "\tstatus: 0x%02x", status_reg);
+ touch_pnt_cnt = status_reg & 0x0F;
+ if ((status_reg & 0x80) || (touch_pnt_cnt < 6)) {
+ //Reset Status Reg Value
+ gt911_i2c_write8(gt911_status.i2c_dev_addr, GT911_STATUS_REG, 0x00);
+ }
+ if (touch_pnt_cnt != 1) { // ignore no touch & multi touch
+ data->point.x = last_x;
+ data->point.y = last_y;
+ data->state = LV_INDEV_STATE_REL;
+ return false;
+ }
+
+// gt911_i2c_read(gt911_status.i2c_dev_addr, GT911_TRACK_ID1, &data_buf, 1);
+// ESP_LOGI(TAG, "\ttrack_id: %d", data_buf);
+
+ gt911_i2c_read(gt911_status.i2c_dev_addr, GT911_PT1_X_COORD_L, &data_buf, 1);
+ last_x = data_buf;
+ gt911_i2c_read(gt911_status.i2c_dev_addr, GT911_PT1_X_COORD_H, &data_buf, 1);
+ last_x |= ((uint16_t)data_buf << 8);
+
+ gt911_i2c_read(gt911_status.i2c_dev_addr, GT911_PT1_Y_COORD_L, &data_buf, 1);
+ last_y = data_buf;
+ gt911_i2c_read(gt911_status.i2c_dev_addr, GT911_PT1_Y_COORD_H, &data_buf, 1);
+ last_y |= ((uint16_t)data_buf << 8);
+
+#if CONFIG_LV_GT911_INVERT_X
+ last_x = gt911_status.max_x_coord - last_x;
+#endif
+#if CONFIG_LV_GT911_INVERT_Y
+ last_y = gt911_status.max_y_coord - last_y;
+#endif
+#if CONFIG_LV_GT911_SWAPXY
+ int16_t swap_buf = last_x;
+ last_x = last_y;
+ last_y = swap_buf;
+#endif
+ data->point.x = last_x;
+ data->point.y = last_y;
+ data->state = LV_INDEV_STATE_PR;
+ ESP_LOGI(TAG, "X=%u Y=%u", data->point.x, data->point.y);
+ ESP_LOGV(TAG, "X=%u Y=%u", data->point.x, data->point.y);
+ return false;
+}
diff --git a/lvgl_touch/gt911.h b/lvgl_touch/gt911.h
new file mode 100644
index 0000000..6a110bd
--- /dev/null
+++ b/lvgl_touch/gt911.h
@@ -0,0 +1,94 @@
+#ifndef __GT911_H
+/*
+* Copyright © 2021 Sturnus Inc.
+
+* Permission is hereby granted, free of charge, to any person obtaining a copy of this
+* software and associated documentation files (the “Software”), to deal in the Software
+* without restriction, including without limitation the rights to use, copy, modify, merge,
+* publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+* to whom the Software is furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in all copies or
+* substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+* PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+* FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+* SOFTWARE.
+*/
+
+#define __GT911_H
+
+#include
+#include
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
+#include "lvgl/lvgl.h"
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define GT911_I2C_SLAVE_ADDR 0x5D
+
+#define GT911_PRODUCT_ID_LEN 4
+
+/* Register Map of GT911 */
+#define GT911_PRODUCT_ID1 0x8140
+#define GT911_PRODUCT_ID2 0x8141
+#define GT911_PRODUCT_ID3 0x8142
+#define GT911_PRODUCT_ID4 0x8143
+#define GT911_FIRMWARE_VER_L 0x8144
+#define GT911_FIRMWARE_VER_H 0x8145
+#define GT911_X_COORD_RES_L 0x8146
+#define GT911_X_COORD_RES_H 0x8147
+#define GT911_Y_COORD_RES_L 0x8148
+#define GT911_Y_COORD_RES_H 0x8149
+#define GT911_VENDOR_ID 0x814A
+
+#define GT911_STATUS_REG 0x814E
+#define GT911_STATUS_REG_BUF 0x80
+#define GT911_STATUS_REG_LARGE 0x40
+#define GT911_STATUS_REG_PROX_VALID 0x20
+#define GT911_STATUS_REG_HAVEKEY 0x10
+#define GT911_STATUS_REG_PT_MASK 0x0F
+
+#define GT911_TRACK_ID1 0x814F
+#define GT911_PT1_X_COORD_L 0x8150
+#define GT911_PT1_X_COORD_H 0x8151
+#define GT911_PT1_Y_COORD_L 0x8152
+#define GT911_PT1_Y_COORD_H 0x8153
+#define GT911_PT1_X_SIZE_L 0x8154
+#define GT911_PT1_X_SIZE_H 0x8155
+
+typedef struct {
+ bool inited;
+ char product_id[GT911_PRODUCT_ID_LEN];
+ uint16_t max_x_coord;
+ uint16_t max_y_coord;
+ uint8_t i2c_dev_addr;
+} gt911_status_t;
+
+/**
+ * @brief Initialize for GT911 communication via I2C
+ * @param dev_addr: Device address on communication Bus (I2C slave address of GT911).
+ * @retval None
+ */
+void gt911_init(uint8_t dev_addr);
+
+/**
+ * @brief Get the touch screen X and Y positions values. Ignores multi touch
+ * @param drv:
+ * @param data: Store data here
+ * @retval Always false
+ */
+bool gt911_read(lv_indev_drv_t *drv, lv_indev_data_t *data);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* __GT911_H */
diff --git a/lvgl_touch/touch_driver.c b/lvgl_touch/touch_driver.c
index b0aed88..35fcc6b 100644
--- a/lvgl_touch/touch_driver.c
+++ b/lvgl_touch/touch_driver.c
@@ -4,7 +4,6 @@
#include "touch_driver.h"
#include "tp_spi.h"
-#include "tp_i2c.h"
void touch_driver_init(void)
@@ -21,10 +20,16 @@ void touch_driver_init(void)
/* nothing to do */
#elif defined (CONFIG_LV_TOUCH_CONTROLLER_RA8875)
ra8875_touch_init();
+#elif defined (CONFIG_LV_TOUCH_CONTROLLER_GT911)
+ gt911_init(GT911_I2C_SLAVE_ADDR);
#endif
}
+#if LVGL_VERSION_MAJOR >= 8
+void touch_driver_read(lv_indev_drv_t *drv, lv_indev_data_t *data)
+#else
bool touch_driver_read(lv_indev_drv_t *drv, lv_indev_data_t *data)
+#endif
{
bool res = false;
@@ -40,8 +45,14 @@ bool touch_driver_read(lv_indev_drv_t *drv, lv_indev_data_t *data)
res = FT81x_read(drv, data);
#elif defined (CONFIG_LV_TOUCH_CONTROLLER_RA8875)
res = ra8875_touch_read(drv, data);
+#elif defined (CONFIG_LV_TOUCH_CONTROLLER_GT911)
+ res = gt911_read(drv, data);
#endif
+#if LVGL_VERSION_MAJOR >= 8
+ data->continue_reading = res;
+#else
return res;
+#endif
}
diff --git a/lvgl_touch/touch_driver.h b/lvgl_touch/touch_driver.h
index bc92f4f..0d014e2 100644
--- a/lvgl_touch/touch_driver.h
+++ b/lvgl_touch/touch_driver.h
@@ -32,6 +32,8 @@ extern "C" {
#include "FT81x.h"
#elif defined (CONFIG_LV_TOUCH_CONTROLLER_RA8875)
#include "ra8875_touch.h"
+#elif defined (CONFIG_LV_TOUCH_CONTROLLER_GT911)
+#include "gt911.h"
#endif
/*********************
@@ -42,7 +44,12 @@ extern "C" {
* GLOBAL PROTOTYPES
**********************/
void touch_driver_init(void);
+
+#if LVGL_VERSION_MAJOR >= 8
+void touch_driver_read(lv_indev_drv_t *drv, lv_indev_data_t *data);
+#else
bool touch_driver_read(lv_indev_drv_t *drv, lv_indev_data_t *data);
+#endif
#ifdef __cplusplus
} /* extern "C" */
diff --git a/lvgl_touch/tp_i2c.c b/lvgl_touch/tp_i2c.c
deleted file mode 100644
index dc3371c..0000000
--- a/lvgl_touch/tp_i2c.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-* Copyright © 2020 Wolfgang Christl
-
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this
-* software and associated documentation files (the “Software”), to deal in the Software
-* without restriction, including without limitation the rights to use, copy, modify, merge,
-* publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
-* to whom the Software is furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included in all copies or
-* substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-* PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
-* FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-* SOFTWARE.
-*/
-
-#include
-#include
-
-#define I2C_MASTER_FREQ_HZ 100000 /* 100kHz*/
-#define I2C_MASTER_TX_BUF_DISABLE 0 /* I2C master doesn't need buffer */
-#define I2C_MASTER_RX_BUF_DISABLE 0 /* I2C master doesn't need buffer */
-
-/**
- * @brief ESP32 I2C init as master
- * @ret ESP32 error code
- */
-esp_err_t i2c_master_init(void) {
- int i2c_master_port = I2C_NUM_0;
- i2c_config_t conf;
- conf.mode = I2C_MODE_MASTER;
- conf.sda_io_num = CONFIG_LV_TOUCH_I2C_SDA;
- conf.sda_pullup_en = GPIO_PULLUP_ENABLE;
- conf.scl_io_num = CONFIG_LV_TOUCH_I2C_SCL;
- conf.scl_pullup_en = GPIO_PULLUP_ENABLE;
- conf.master.clk_speed = I2C_MASTER_FREQ_HZ;
- i2c_param_config(i2c_master_port, &conf);
- return i2c_driver_install(i2c_master_port, conf.mode, I2C_MASTER_RX_BUF_DISABLE, I2C_MASTER_TX_BUF_DISABLE, 0);
-}
diff --git a/lvgl_touch/tp_i2c.h b/lvgl_touch/tp_i2c.h
deleted file mode 100644
index 5c1eb55..0000000
--- a/lvgl_touch/tp_i2c.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-* Copyright © 2020 Wolfgang Christl
-
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this
-* software and associated documentation files (the “Software”), to deal in the Software
-* without restriction, including without limitation the rights to use, copy, modify, merge,
-* publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
-* to whom the Software is furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included in all copies or
-* substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-* PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
-* FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-* SOFTWARE.
-*/
-
-#ifndef __TS_H
-#define __TS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include
-
-esp_err_t i2c_master_init(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __TS_H */