Skip to content

ifdef'ing out contents of driver source/header files when not used. #225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions components/lvgl_esp32_drivers/lvgl_tft/EVE_commands.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR TH
#include <stdarg.h>
#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 */
Expand Down Expand Up @@ -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)
6 changes: 6 additions & 0 deletions components/lvgl_esp32_drivers/lvgl_tft/EVE_commands.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 <sdkconfig.h>

#if defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_FT81X) || defined(CONFIG_LV_TFT_TOUCH_CONTROLLER_FT81X)

#include "EVE.h"

#ifndef EVE_COMMANDS_H_
Expand Down Expand Up @@ -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_ */
7 changes: 6 additions & 1 deletion components/lvgl_esp32_drivers/lvgl_tft/FT81x.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@
#include <stdio.h>

#include "driver/gpio.h"
#include <sdkconfig.h>

#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
Expand Down Expand Up @@ -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));
}
}

#endif // defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_FT81X)
4 changes: 4 additions & 0 deletions components/lvgl_esp32_drivers/lvgl_tft/FT81x.h
Original file line number Diff line number Diff line change
Expand Up @@ -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_ */
4 changes: 4 additions & 0 deletions components/lvgl_esp32_drivers/lvgl_tft/GC9A01.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
#include "freertos/FreeRTOS.h"
#include "freertos/task.h"

#if defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_GC9A01)

/*********************
* DEFINES
*********************/
Expand Down Expand Up @@ -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)
3 changes: 3 additions & 0 deletions components/lvgl_esp32_drivers/lvgl_tft/GC9A01.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ extern "C" {
#endif
#include "../lvgl_helpers.h"

#if defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_GC9A01)

/*********************
* DEFINES
*********************/
Expand Down Expand Up @@ -57,6 +59,7 @@ void GC9A01_sleep_out(void);
* MACROS
**********************/

#endif // defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_GC9A01)

#ifdef __cplusplus
} /* extern "C" */
Expand Down
4 changes: 4 additions & 0 deletions components/lvgl_esp32_drivers/lvgl_tft/ili9341.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
#include "freertos/FreeRTOS.h"
#include "freertos/task.h"

#if defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9341)

/*********************
* DEFINES
*********************/
Expand Down Expand Up @@ -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)
3 changes: 3 additions & 0 deletions components/lvgl_esp32_drivers/lvgl_tft/ili9341.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ extern "C" {
#endif
#include "../lvgl_helpers.h"

#if defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9341)

/*********************
* DEFINES
*********************/
Expand Down Expand Up @@ -57,6 +59,7 @@ void ili9341_sleep_out(void);
* MACROS
**********************/

#endif // defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9341)

#ifdef __cplusplus
} /* extern "C" */
Expand Down
4 changes: 4 additions & 0 deletions components/lvgl_esp32_drivers/lvgl_tft/ili9481.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
#include "freertos/FreeRTOS.h"
#include "freertos/task.h"

#if defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9481)

/*********************
* DEFINES
*********************/
Expand Down Expand Up @@ -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)
4 changes: 4 additions & 0 deletions components/lvgl_esp32_drivers/lvgl_tft/ili9481.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ extern "C" {
#endif
#include "../lvgl_helpers.h"

#if defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9481)

/*********************
* DEFINES
*********************/
Expand Down Expand Up @@ -123,6 +125,8 @@ void ili9481_enable_backlight(bool backlight);
* MACROS
**********************/

#endif // defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9481)

#ifdef __cplusplus
} /* extern "C" */
#endif
Expand Down
4 changes: 4 additions & 0 deletions components/lvgl_esp32_drivers/lvgl_tft/jd79653a.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -480,3 +482,5 @@ void jd79653a_init()

ESP_LOGI(TAG, "Panel is up!");
}

#endif // defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_JD79653A)
3 changes: 3 additions & 0 deletions components/lvgl_esp32_drivers/lvgl_tft/jd79653a.h
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand All @@ -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" */
Expand Down
4 changes: 4 additions & 0 deletions components/lvgl_esp32_drivers/lvgl_tft/ra8875.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
#include "freertos/FreeRTOS.h"
#include "freertos/task.h"

#if defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_RA8875)

/*********************
* DEFINES
*********************/
Expand Down Expand Up @@ -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)
3 changes: 3 additions & 0 deletions components/lvgl_esp32_drivers/lvgl_tft/ra8875.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ extern "C" {
#include "lvgl/lvgl.h"
#endif

#if defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_RA8875)

/*********************
* DEFINES
*********************/
Expand Down Expand Up @@ -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" */
Expand Down
3 changes: 3 additions & 0 deletions components/lvgl_esp32_drivers/lvgl_tft/ssd1306.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
#include "freertos/FreeRTOS.h"
#include "freertos/task.h"

#if defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_SSD1306)

/*********************
* DEFINES
*********************/
Expand Down Expand Up @@ -238,3 +240,4 @@ void ssd1306_sleep_out()
* STATIC FUNCTIONS
**********************/

#endif // defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_SSD1306)
3 changes: 3 additions & 0 deletions components/lvgl_esp32_drivers/lvgl_tft/ssd1306.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ extern "C" {
#endif
#include "../lvgl_helpers.h"

#if defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_SSD1306)

/*********************
* DEFINES
*********************/
Expand Down Expand Up @@ -49,6 +51,7 @@ void ssd1306_sleep_out(void);
* MACROS
**********************/

#endif // defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_SSD1306)

#ifdef __cplusplus
} /* extern "C" */
Expand Down
4 changes: 4 additions & 0 deletions components/lvgl_esp32_drivers/lvgl_tft/st7735s.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
#include "freertos/FreeRTOS.h"
#include "freertos/task.h"

#if defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_ST7735S)

/*********************
* DEFINES
*********************/
Expand Down Expand Up @@ -267,3 +269,5 @@ static void axp192_sleep_out()
{
axp192_write_byte(0x12, 0x4d);
}

#endif // defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_ST7735S)
4 changes: 4 additions & 0 deletions components/lvgl_esp32_drivers/lvgl_tft/st7735s.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ extern "C" {
#include "lvgl/lvgl.h"
#endif

#if defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_ST7735S)

/*********************
* DEFINES
*********************/
Expand Down Expand Up @@ -142,6 +144,8 @@ void st7735s_sleep_out(void);
* MACROS
**********************/

#endif // defined(CONFIG_LV_TFT_DISPLAY_CONTROLLER_ST7735S)

#ifdef __cplusplus
} /* extern "C" */
#endif
Expand Down
4 changes: 4 additions & 0 deletions components/lvgl_esp32_drivers/lvgl_tft/uc8151d.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -266,3 +268,5 @@ void uc8151d_init()
uc8151d_panel_init();
ESP_LOGI(TAG, "Panel initialised");
}

#endif // defined(CONFIG_LV_TOUCH_CONTROLLER_UC8151D)
4 changes: 4 additions & 0 deletions components/lvgl_esp32_drivers/lvgl_tft/uc8151d.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,15 @@

#include <lvgl.h>

#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);

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
4 changes: 4 additions & 0 deletions components/lvgl_esp32_drivers/lvgl_touch/FT81x.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
#include "../lvgl_tft/EVE.h"
#include "../lvgl_tft/EVE_commands.h"

#if defined(CONFIG_LV_TOUCH_CONTROLLER_FT81X)


/*********************
* DEFINES
Expand Down Expand Up @@ -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)
4 changes: 4 additions & 0 deletions components/lvgl_esp32_drivers/lvgl_touch/FT81x.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ extern "C" {
#include "lvgl/lvgl.h"
#endif

#if defined(CONFIG_LV_TOUCH_CONTROLLER_FT81X)

/*********************
* DEFINES
*********************/
Expand All @@ -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
Expand Down
4 changes: 4 additions & 0 deletions components/lvgl_esp32_drivers/lvgl_touch/ft6x36.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
#include "ft6x36.h"
#include "tp_i2c.h"

#if defined(CONFIG_LV_TOUCH_CONTROLLER_FT6X06)

#define TAG "FT6X36"


Expand Down Expand Up @@ -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)
7 changes: 7 additions & 0 deletions components/lvgl_esp32_drivers/lvgl_touch/ft6x36.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@

#define __FT6X06_H

#include <sdkconfig.h>

#if defined(CONFIG_LV_TOUCH_CONTROLLER_FT6X06)

#include <lvgl/src/lv_hal/lv_hal.h>

#ifdef __cplusplus
Expand Down Expand Up @@ -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 */
Loading