diff --git a/components/lvgl_esp32_drivers/lvgl_tft/EVE_commands.c b/components/lvgl_esp32_drivers/lvgl_tft/EVE_commands.c index 67c05abd..a22f4381 100644 --- a/components/lvgl_esp32_drivers/lvgl_tft/EVE_commands.c +++ b/components/lvgl_esp32_drivers/lvgl_tft/EVE_commands.c @@ -61,6 +61,8 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR TH #include #endif +#if defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_FT81X) || defined(CONFIG_LV_TFT_TOUCH_CONTROLLER_FT81X) + #define TAG "FT81X" /* data structure for SPI reading that has (optional) space for inserted dummy byte */ @@ -2311,3 +2313,5 @@ void EVE_calibrate_manual(uint16_t height) EVE_memWrite32(REG_TOUCH_TRANSFORM_F, TransMatrix[5]); } #endif // FT81X_FULL + +#endif // defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_FT81X) || defined(CONFIG_LV_TFT_TOUCH_CONTROLLER_FT81X) diff --git a/components/lvgl_esp32_drivers/lvgl_tft/EVE_commands.h b/components/lvgl_esp32_drivers/lvgl_tft/EVE_commands.h index 3c5c1047..8a6212c1 100644 --- a/components/lvgl_esp32_drivers/lvgl_tft/EVE_commands.h +++ b/components/lvgl_esp32_drivers/lvgl_tft/EVE_commands.h @@ -31,6 +31,10 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR TH It has also been trimmed down to suit LvGL's needs. Extra features can be enabled by defining FT81X_FULL */ +#include + +#if defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_FT81X) || defined(CONFIG_LV_TFT_TOUCH_CONTROLLER_FT81X) + #include "EVE.h" #ifndef EVE_COMMANDS_H_ @@ -200,4 +204,6 @@ void EVE_calibrate_manual(uint16_t height); /* startup FT8xx: */ uint8_t EVE_init(void); +#endif // defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_FT81X) || defined(CONFIG_LV_TFT_TOUCH_CONTROLLER_FT81X) + #endif /* EVE_COMMANDS_H_ */ diff --git a/components/lvgl_esp32_drivers/lvgl_tft/FT81x.c b/components/lvgl_esp32_drivers/lvgl_tft/FT81x.c index 77ec3922..ad2346b4 100644 --- a/components/lvgl_esp32_drivers/lvgl_tft/FT81x.c +++ b/components/lvgl_esp32_drivers/lvgl_tft/FT81x.c @@ -2,12 +2,15 @@ #include #include "driver/gpio.h" +#include #include "FT81x.h" #include "EVE.h" #include "EVE_commands.h" +#if defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_FT81X) + /* some pre-definded colors */ #define RED 0xff0000UL #define ORANGE 0xffa500UL @@ -320,4 +323,6 @@ 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 +} + +#endif // defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_FT81X) diff --git a/components/lvgl_esp32_drivers/lvgl_tft/FT81x.h b/components/lvgl_esp32_drivers/lvgl_tft/FT81x.h index 96366dff..e8118a7f 100644 --- a/components/lvgl_esp32_drivers/lvgl_tft/FT81x.h +++ b/components/lvgl_esp32_drivers/lvgl_tft/FT81x.h @@ -10,8 +10,12 @@ #endif #include "../lvgl_helpers.h" +#if defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_FT81X) + void FT81x_init(void); void FT81x_flush(lv_disp_drv_t * drv, const lv_area_t * area, lv_color_t * color_map); +#endif // defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_FT81X) + #endif /* FT81X_H_ */ diff --git a/components/lvgl_esp32_drivers/lvgl_tft/GC9A01.c b/components/lvgl_esp32_drivers/lvgl_tft/GC9A01.c index 63687e3c..4df531b8 100644 --- a/components/lvgl_esp32_drivers/lvgl_tft/GC9A01.c +++ b/components/lvgl_esp32_drivers/lvgl_tft/GC9A01.c @@ -13,6 +13,8 @@ #include "freertos/FreeRTOS.h" #include "freertos/task.h" +#if defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_GC9A01) + /********************* * DEFINES *********************/ @@ -270,3 +272,5 @@ static void GC9A01_set_orientation(uint8_t orientation) GC9A01_send_cmd(0x36); GC9A01_send_data((void *) &data[orientation], 1); } + +#endif // defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_GC9A01) diff --git a/components/lvgl_esp32_drivers/lvgl_tft/GC9A01.h b/components/lvgl_esp32_drivers/lvgl_tft/GC9A01.h index d462c8d4..5c4e341b 100644 --- a/components/lvgl_esp32_drivers/lvgl_tft/GC9A01.h +++ b/components/lvgl_esp32_drivers/lvgl_tft/GC9A01.h @@ -22,6 +22,8 @@ extern "C" { #endif #include "../lvgl_helpers.h" +#if defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_GC9A01) + /********************* * DEFINES *********************/ @@ -57,6 +59,7 @@ void GC9A01_sleep_out(void); * MACROS **********************/ +#endif // defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_GC9A01) #ifdef __cplusplus } /* extern "C" */ diff --git a/components/lvgl_esp32_drivers/lvgl_tft/ili9341.c b/components/lvgl_esp32_drivers/lvgl_tft/ili9341.c index ab9480f0..3499702a 100644 --- a/components/lvgl_esp32_drivers/lvgl_tft/ili9341.c +++ b/components/lvgl_esp32_drivers/lvgl_tft/ili9341.c @@ -13,6 +13,8 @@ #include "freertos/FreeRTOS.h" #include "freertos/task.h" +#if defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9341) + /********************* * DEFINES *********************/ @@ -239,3 +241,5 @@ static void ili9341_set_orientation(uint8_t orientation) ili9341_send_cmd(0x36); ili9341_send_data((void *) &data[orientation], 1); } + +#endif // defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9341) diff --git a/components/lvgl_esp32_drivers/lvgl_tft/ili9341.h b/components/lvgl_esp32_drivers/lvgl_tft/ili9341.h index 4beb4f32..96738c3b 100644 --- a/components/lvgl_esp32_drivers/lvgl_tft/ili9341.h +++ b/components/lvgl_esp32_drivers/lvgl_tft/ili9341.h @@ -22,6 +22,8 @@ extern "C" { #endif #include "../lvgl_helpers.h" +#if defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9341) + /********************* * DEFINES *********************/ @@ -57,6 +59,7 @@ void ili9341_sleep_out(void); * MACROS **********************/ +#endif // defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9341) #ifdef __cplusplus } /* extern "C" */ diff --git a/components/lvgl_esp32_drivers/lvgl_tft/ili9481.c b/components/lvgl_esp32_drivers/lvgl_tft/ili9481.c index 6472a932..1a3f88f1 100644 --- a/components/lvgl_esp32_drivers/lvgl_tft/ili9481.c +++ b/components/lvgl_esp32_drivers/lvgl_tft/ili9481.c @@ -14,6 +14,8 @@ #include "freertos/FreeRTOS.h" #include "freertos/task.h" +#if defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9481) + /********************* * DEFINES *********************/ @@ -222,3 +224,5 @@ static void ili9481_set_orientation(uint8_t orientation) ili9481_send_cmd(ILI9481_CMD_MEMORY_ACCESS_CONTROL); ili9481_send_data((void *) &data[orientation], 1); } + +#endif // defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9481) diff --git a/components/lvgl_esp32_drivers/lvgl_tft/ili9481.h b/components/lvgl_esp32_drivers/lvgl_tft/ili9481.h index 79321908..c55c4605 100644 --- a/components/lvgl_esp32_drivers/lvgl_tft/ili9481.h +++ b/components/lvgl_esp32_drivers/lvgl_tft/ili9481.h @@ -22,6 +22,8 @@ extern "C" { #endif #include "../lvgl_helpers.h" +#if defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9481) + /********************* * DEFINES *********************/ @@ -123,6 +125,8 @@ void ili9481_enable_backlight(bool backlight); * MACROS **********************/ +#endif // defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9481) + #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/components/lvgl_esp32_drivers/lvgl_tft/jd79653a.c b/components/lvgl_esp32_drivers/lvgl_tft/jd79653a.c index e39e7471..74a6432e 100644 --- a/components/lvgl_esp32_drivers/lvgl_tft/jd79653a.c +++ b/components/lvgl_esp32_drivers/lvgl_tft/jd79653a.c @@ -34,6 +34,8 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR TH #include "disp_spi.h" #include "jd79653a.h" +#if defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_JD79653A) + #define TAG "lv_jd79653a" #define PIN_DC CONFIG_LV_DISP_PIN_DC @@ -480,3 +482,5 @@ void jd79653a_init() ESP_LOGI(TAG, "Panel is up!"); } + +#endif // defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_JD79653A) diff --git a/components/lvgl_esp32_drivers/lvgl_tft/jd79653a.h b/components/lvgl_esp32_drivers/lvgl_tft/jd79653a.h index 6a2065a8..de68aa86 100644 --- a/components/lvgl_esp32_drivers/lvgl_tft/jd79653a.h +++ b/components/lvgl_esp32_drivers/lvgl_tft/jd79653a.h @@ -17,6 +17,8 @@ extern "C" #include "lvgl/lvgl.h" #endif +#if defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_JD79653A) + void jd79653a_init(); void jd79653a_deep_sleep(); @@ -28,6 +30,7 @@ void jd79653a_lv_fb_flush(lv_disp_drv_t *drv, const lv_area_t *area, lv_color_t void jd79653a_fb_set_full_color(uint8_t color); void jd79653a_fb_full_update(uint8_t *data, size_t len); +#endif // defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_JD79653A) #ifdef __cplusplus } /* extern "C" */ diff --git a/components/lvgl_esp32_drivers/lvgl_tft/ra8875.c b/components/lvgl_esp32_drivers/lvgl_tft/ra8875.c index 04638d86..d1196ba9 100644 --- a/components/lvgl_esp32_drivers/lvgl_tft/ra8875.c +++ b/components/lvgl_esp32_drivers/lvgl_tft/ra8875.c @@ -13,6 +13,8 @@ #include "freertos/FreeRTOS.h" #include "freertos/task.h" +#if defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_RA8875) + /********************* * DEFINES *********************/ @@ -363,3 +365,5 @@ static void ra8875_send_buffer(uint8_t * data, size_t length, bool signal_flush) | (RA8875_MODE_DATA_WRITE); // Data write mode disp_spi_transaction(data, length, flags, NULL, prefix, 0); } + +#endif // defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_RA8875) diff --git a/components/lvgl_esp32_drivers/lvgl_tft/ra8875.h b/components/lvgl_esp32_drivers/lvgl_tft/ra8875.h index a6d1fe5d..c8497dc6 100644 --- a/components/lvgl_esp32_drivers/lvgl_tft/ra8875.h +++ b/components/lvgl_esp32_drivers/lvgl_tft/ra8875.h @@ -21,6 +21,8 @@ extern "C" { #include "lvgl/lvgl.h" #endif +#if defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_RA8875) + /********************* * DEFINES *********************/ @@ -110,6 +112,7 @@ void ra8875_write_cmd(uint8_t cmd, uint8_t data); * MACROS **********************/ +#endif // defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_RA8875) #ifdef __cplusplus } /* extern "C" */ diff --git a/components/lvgl_esp32_drivers/lvgl_tft/ssd1306.c b/components/lvgl_esp32_drivers/lvgl_tft/ssd1306.c index c01efcde..089a0074 100644 --- a/components/lvgl_esp32_drivers/lvgl_tft/ssd1306.c +++ b/components/lvgl_esp32_drivers/lvgl_tft/ssd1306.c @@ -14,6 +14,8 @@ #include "freertos/FreeRTOS.h" #include "freertos/task.h" +#if defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_SSD1306) + /********************* * DEFINES *********************/ @@ -238,3 +240,4 @@ void ssd1306_sleep_out() * STATIC FUNCTIONS **********************/ +#endif // defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_SSD1306) diff --git a/components/lvgl_esp32_drivers/lvgl_tft/ssd1306.h b/components/lvgl_esp32_drivers/lvgl_tft/ssd1306.h index f859a76b..8bc67b73 100644 --- a/components/lvgl_esp32_drivers/lvgl_tft/ssd1306.h +++ b/components/lvgl_esp32_drivers/lvgl_tft/ssd1306.h @@ -22,6 +22,8 @@ extern "C" { #endif #include "../lvgl_helpers.h" +#if defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_SSD1306) + /********************* * DEFINES *********************/ @@ -49,6 +51,7 @@ void ssd1306_sleep_out(void); * MACROS **********************/ +#endif // defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_SSD1306) #ifdef __cplusplus } /* extern "C" */ diff --git a/components/lvgl_esp32_drivers/lvgl_tft/st7735s.c b/components/lvgl_esp32_drivers/lvgl_tft/st7735s.c index 861904c0..706a26e5 100644 --- a/components/lvgl_esp32_drivers/lvgl_tft/st7735s.c +++ b/components/lvgl_esp32_drivers/lvgl_tft/st7735s.c @@ -14,6 +14,8 @@ #include "freertos/FreeRTOS.h" #include "freertos/task.h" +#if defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_ST7735S) + /********************* * DEFINES *********************/ @@ -267,3 +269,5 @@ static void axp192_sleep_out() { axp192_write_byte(0x12, 0x4d); } + +#endif // defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_ST7735S) diff --git a/components/lvgl_esp32_drivers/lvgl_tft/st7735s.h b/components/lvgl_esp32_drivers/lvgl_tft/st7735s.h index 03672ee5..e52ab7b4 100644 --- a/components/lvgl_esp32_drivers/lvgl_tft/st7735s.h +++ b/components/lvgl_esp32_drivers/lvgl_tft/st7735s.h @@ -20,6 +20,8 @@ extern "C" { #include "lvgl/lvgl.h" #endif +#if defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_ST7735S) + /********************* * DEFINES *********************/ @@ -142,6 +144,8 @@ void st7735s_sleep_out(void); * MACROS **********************/ +#endif // defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_ST7735S) + #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/components/lvgl_esp32_drivers/lvgl_tft/uc8151d.c b/components/lvgl_esp32_drivers/lvgl_tft/uc8151d.c index 3332120a..be5b2289 100644 --- a/components/lvgl_esp32_drivers/lvgl_tft/uc8151d.c +++ b/components/lvgl_esp32_drivers/lvgl_tft/uc8151d.c @@ -35,6 +35,8 @@ #include "disp_driver.h" #include "uc8151d.h" +#if defined(CONFIG_LV_TOUCH_CONTROLLER_UC8151D) + #define TAG "lv_uc8151d" #define PIN_DC CONFIG_LV_DISP_PIN_DC @@ -266,3 +268,5 @@ void uc8151d_init() uc8151d_panel_init(); ESP_LOGI(TAG, "Panel initialised"); } + +#endif // defined(CONFIG_LV_TOUCH_CONTROLLER_UC8151D) diff --git a/components/lvgl_esp32_drivers/lvgl_tft/uc8151d.h b/components/lvgl_esp32_drivers/lvgl_tft/uc8151d.h index e637f0e7..fb80600c 100644 --- a/components/lvgl_esp32_drivers/lvgl_tft/uc8151d.h +++ b/components/lvgl_esp32_drivers/lvgl_tft/uc8151d.h @@ -29,6 +29,8 @@ #include +#if defined(CONFIG_LV_TOUCH_CONTROLLER_UC8151D) + void uc8151d_init(); void uc8151d_lv_set_fb_cb(struct _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); @@ -36,4 +38,6 @@ void uc8151d_lv_set_fb_cb(struct _disp_drv_t *disp_drv, uint8_t *buf, lv_coord_t void uc8151d_lv_rounder_cb(struct _disp_drv_t *disp_drv, lv_area_t *area); void uc8151d_lv_fb_flush(lv_disp_drv_t *drv, const lv_area_t *area, lv_color_t *color_map); +#endif // defined(CONFIG_LV_TOUCH_CONTROLLER_UC8151D) + #endif //LVGL_DEMO_UC8151D_H diff --git a/components/lvgl_esp32_drivers/lvgl_touch/FT81x.c b/components/lvgl_esp32_drivers/lvgl_touch/FT81x.c index 266abc36..6241ad06 100644 --- a/components/lvgl_esp32_drivers/lvgl_touch/FT81x.c +++ b/components/lvgl_esp32_drivers/lvgl_touch/FT81x.c @@ -18,6 +18,8 @@ #include "../lvgl_tft/EVE.h" #include "../lvgl_tft/EVE_commands.h" +#if defined(CONFIG_LV_TOUCH_CONTROLLER_FT81X) + /********************* * DEFINES @@ -83,3 +85,5 @@ bool FT81x_read(lv_indev_drv_t * drv, lv_indev_data_t * data) /********************** * STATIC FUNCTIONS **********************/ + +#endif // defined(CONFIG_LV_TOUCH_CONTROLLER_FT81X) diff --git a/components/lvgl_esp32_drivers/lvgl_touch/FT81x.h b/components/lvgl_esp32_drivers/lvgl_touch/FT81x.h index c7887702..8b625a76 100644 --- a/components/lvgl_esp32_drivers/lvgl_touch/FT81x.h +++ b/components/lvgl_esp32_drivers/lvgl_touch/FT81x.h @@ -21,6 +21,8 @@ extern "C" { #include "lvgl/lvgl.h" #endif +#if defined(CONFIG_LV_TOUCH_CONTROLLER_FT81X) + /********************* * DEFINES *********************/ @@ -39,6 +41,8 @@ bool FT81x_read(lv_indev_drv_t * drv, lv_indev_data_t * data); * MACROS **********************/ +#endif // defined(CONFIG_LV_TOUCH_CONTROLLER_FT81X) + #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/components/lvgl_esp32_drivers/lvgl_touch/ft6x36.c b/components/lvgl_esp32_drivers/lvgl_touch/ft6x36.c index 7cbb45d1..62c93751 100644 --- a/components/lvgl_esp32_drivers/lvgl_touch/ft6x36.c +++ b/components/lvgl_esp32_drivers/lvgl_touch/ft6x36.c @@ -28,6 +28,8 @@ #include "ft6x36.h" #include "tp_i2c.h" +#if defined(CONFIG_LV_TOUCH_CONTROLLER_FT6X06) + #define TAG "FT6X36" @@ -198,3 +200,5 @@ bool ft6x36_read(lv_indev_drv_t *drv, lv_indev_data_t *data) { ESP_LOGV(TAG, "X=%u Y=%u", data->point.x, data->point.y); return false; } + +#endif // defined(CONFIG_LV_TOUCH_CONTROLLER_FT6X06) diff --git a/components/lvgl_esp32_drivers/lvgl_touch/ft6x36.h b/components/lvgl_esp32_drivers/lvgl_touch/ft6x36.h index 96746398..03e467b0 100644 --- a/components/lvgl_esp32_drivers/lvgl_touch/ft6x36.h +++ b/components/lvgl_esp32_drivers/lvgl_touch/ft6x36.h @@ -21,6 +21,10 @@ #define __FT6X06_H +#include + +#if defined(CONFIG_LV_TOUCH_CONTROLLER_FT6X06) + #include #ifdef __cplusplus @@ -159,4 +163,7 @@ bool ft6x36_read(lv_indev_drv_t *drv, lv_indev_data_t *data); #ifdef __cplusplus } #endif + +#endif // defined(CONFIG_LV_TOUCH_CONTROLLER_FT6X06) + #endif /* __FT6X06_H */ diff --git a/components/lvgl_esp32_drivers/lvgl_touch/ra8875_touch.c b/components/lvgl_esp32_drivers/lvgl_touch/ra8875_touch.c index 3340e4f3..286b8a4e 100644 --- a/components/lvgl_esp32_drivers/lvgl_touch/ra8875_touch.c +++ b/components/lvgl_esp32_drivers/lvgl_touch/ra8875_touch.c @@ -15,6 +15,8 @@ #include "../lvgl_tft/ra8875.h" +#if defined(CONFIG_LV_TOUCH_CONTROLLER_RA8875) + #ifndef CONFIG_LV_TFT_DISPLAY_CONTROLLER_RA8875 #error "Display controller must be RA8875" #endif @@ -179,3 +181,5 @@ static void ra8875_corr(int * x, int * y) (*y) = (LV_VER_RES-1) - (*y); #endif } + +#endif // defined(CONFIG_LV_TOUCH_CONTROLLER_RA8875) diff --git a/components/lvgl_esp32_drivers/lvgl_touch/ra8875_touch.h b/components/lvgl_esp32_drivers/lvgl_touch/ra8875_touch.h index 7d112d3a..f8551f2c 100644 --- a/components/lvgl_esp32_drivers/lvgl_touch/ra8875_touch.h +++ b/components/lvgl_esp32_drivers/lvgl_touch/ra8875_touch.h @@ -21,6 +21,8 @@ extern "C" { #include "lvgl/lvgl.h" #endif +#if defined(CONFIG_LV_TOUCH_CONTROLLER_RA8875) + /********************* * DEFINES *********************/ @@ -49,6 +51,8 @@ bool ra8875_touch_read(lv_indev_drv_t * drv, lv_indev_data_t * data); * MACROS **********************/ +#endif // defined(CONFIG_LV_TOUCH_CONTROLLER_RA8875) + #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/components/lvgl_esp32_drivers/lvgl_touch/stmpe610.c b/components/lvgl_esp32_drivers/lvgl_touch/stmpe610.c index 6c5ae604..fcc5a4cf 100644 --- a/components/lvgl_esp32_drivers/lvgl_touch/stmpe610.c +++ b/components/lvgl_esp32_drivers/lvgl_touch/stmpe610.c @@ -14,6 +14,8 @@ #include "tp_spi.h" #include +#if defined(CONFIG_LV_TOUCH_CONTROLLER_STMPE610) + /********************* * DEFINES *********************/ @@ -240,3 +242,4 @@ static void adjust_data(int16_t * x, int16_t * y) } +#endif // defined(CONFIG_LV_TOUCH_CONTROLLER_STMPE610) diff --git a/components/lvgl_esp32_drivers/lvgl_touch/stmpe610.h b/components/lvgl_esp32_drivers/lvgl_touch/stmpe610.h index 153a6e71..c212f411 100644 --- a/components/lvgl_esp32_drivers/lvgl_touch/stmpe610.h +++ b/components/lvgl_esp32_drivers/lvgl_touch/stmpe610.h @@ -21,6 +21,8 @@ extern "C" { #include "lvgl/lvgl.h" #endif +#if defined(CONFIG_LV_TOUCH_CONTROLLER_STMPE610) + /********************* * DEFINES *********************/ @@ -178,6 +180,8 @@ bool stmpe610_read(lv_indev_drv_t * drv, lv_indev_data_t * data); * MACROS **********************/ +#endif // defined(CONFIG_LV_TOUCH_CONTROLLER_STMPE610) + #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/components/lvgl_esp32_drivers/lvgl_touch/tp_i2c.c b/components/lvgl_esp32_drivers/lvgl_touch/tp_i2c.c index dc3371c3..a33bafe7 100644 --- a/components/lvgl_esp32_drivers/lvgl_touch/tp_i2c.c +++ b/components/lvgl_esp32_drivers/lvgl_touch/tp_i2c.c @@ -21,6 +21,8 @@ #include #include +#if defined(CONFIG_LV_TOUCH_DRIVER_PROTOCOL_I2C) + #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 */ @@ -41,3 +43,5 @@ esp_err_t i2c_master_init(void) { 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); } + +#endif // defined(CONFIG_LV_TOUCH_DRIVER_PROTOCOL_I2C) diff --git a/components/lvgl_esp32_drivers/lvgl_touch/tp_i2c.h b/components/lvgl_esp32_drivers/lvgl_touch/tp_i2c.h index 5c1eb55f..563bfbb2 100644 --- a/components/lvgl_esp32_drivers/lvgl_touch/tp_i2c.h +++ b/components/lvgl_esp32_drivers/lvgl_touch/tp_i2c.h @@ -26,9 +26,14 @@ extern "C" { #endif #include +#include + +#if defined(CONFIG_LV_TOUCH_DRIVER_PROTOCOL_I2C) esp_err_t i2c_master_init(void); +#endif // defined(CONFIG_LV_TOUCH_DRIVER_PROTOCOL_I2C) + #ifdef __cplusplus } #endif diff --git a/components/lvgl_esp32_drivers/lvgl_touch/tp_spi.c b/components/lvgl_esp32_drivers/lvgl_touch/tp_spi.c index d2b6107e..41cb9e42 100644 --- a/components/lvgl_esp32_drivers/lvgl_touch/tp_spi.c +++ b/components/lvgl_esp32_drivers/lvgl_touch/tp_spi.c @@ -16,6 +16,8 @@ #include "../lvgl_helpers.h" #include "../lvgl_spi_conf.h" +#if defined(CONFIG_LV_TOUCH_DRIVER_PROTOCOL_SPI) + /********************* * DEFINES *********************/ @@ -107,3 +109,5 @@ void tp_spi_read_reg(uint8_t reg, uint8_t* data, uint8_t byte_count) /********************** * STATIC FUNCTIONS **********************/ + +#endif // defined(CONFIG_LV_TOUCH_DRIVER_PROTOCOL_SPI) diff --git a/components/lvgl_esp32_drivers/lvgl_touch/tp_spi.h b/components/lvgl_esp32_drivers/lvgl_touch/tp_spi.h index 3fd30c5b..3dfb4b61 100644 --- a/components/lvgl_esp32_drivers/lvgl_touch/tp_spi.h +++ b/components/lvgl_esp32_drivers/lvgl_touch/tp_spi.h @@ -14,8 +14,11 @@ extern "C" { * INCLUDES *********************/ #include +#include #include +#if defined(CONFIG_LV_TOUCH_DRIVER_PROTOCOL_SPI) + /********************* * DEFINES *********************/ @@ -37,6 +40,7 @@ void tp_spi_read_reg(uint8_t reg, uint8_t* data, uint8_t byte_count); * MACROS **********************/ +#endif // defined(CONFIG_LV_TOUCH_DRIVER_PROTOCOL_SPI) #ifdef __cplusplus } /* extern "C" */ diff --git a/components/lvgl_esp32_drivers/lvgl_touch/xpt2046.c b/components/lvgl_esp32_drivers/lvgl_touch/xpt2046.c index b6fe51b7..1dae4d06 100644 --- a/components/lvgl_esp32_drivers/lvgl_touch/xpt2046.c +++ b/components/lvgl_esp32_drivers/lvgl_touch/xpt2046.c @@ -13,6 +13,8 @@ #include "tp_spi.h" #include +#if defined(CONFIG_LV_TOUCH_CONTROLLER_XPT2046) + /********************* * DEFINES *********************/ @@ -178,3 +180,5 @@ static void xpt2046_avg(int16_t * x, int16_t * y) (*x) = (int32_t)x_sum / avg_last; (*y) = (int32_t)y_sum / avg_last; } + +#endif // defined(CONFIG_LV_TOUCH_CONTROLLER_XPT2046) diff --git a/components/lvgl_esp32_drivers/lvgl_touch/xpt2046.h b/components/lvgl_esp32_drivers/lvgl_touch/xpt2046.h index 8d61ce83..3220ca5d 100644 --- a/components/lvgl_esp32_drivers/lvgl_touch/xpt2046.h +++ b/components/lvgl_esp32_drivers/lvgl_touch/xpt2046.h @@ -22,6 +22,8 @@ extern "C" { #include "lvgl/lvgl.h" #endif +#if defined(CONFIG_LV_TOUCH_CONTROLLER_XPT2046) + /********************* * DEFINES *********************/ @@ -50,6 +52,8 @@ bool xpt2046_read(lv_indev_drv_t * drv, lv_indev_data_t * data); * MACROS **********************/ +#endif // defined(CONFIG_LV_TOUCH_CONTROLLER_XPT2046) + #ifdef __cplusplus } /* extern "C" */ #endif