From a2a00bd7455dc9cedfeeafe05c4d0e9dc54b5247 Mon Sep 17 00:00:00 2001 From: C47D Date: Sun, 20 Dec 2020 17:50:53 -0600 Subject: [PATCH] Update INCLUDE_SIMPLE symbol --- lvgl_i2c_conf.h | 2 +- lvgl_tft/EVE_config.h | 2 +- lvgl_tft/FT81x.h | 2 +- lvgl_tft/GC9A01.h | 2 +- lvgl_tft/disp_driver.h | 2 +- lvgl_tft/disp_spi.c | 2 +- lvgl_tft/hx8357.h | 2 +- lvgl_tft/il3820.h | 2 +- lvgl_tft/ili9341.h | 2 +- lvgl_tft/ili9481.h | 2 +- lvgl_tft/ili9486.h | 2 +- lvgl_tft/ili9488.h | 2 +- lvgl_tft/jd79653a.h | 2 +- lvgl_tft/ra8875.h | 2 +- lvgl_tft/sh1107.h | 2 +- lvgl_tft/ssd1306.h | 2 +- lvgl_tft/st7735s.h | 2 +- lvgl_tft/st7789.h | 2 +- lvgl_touch/FT81x.h | 2 +- lvgl_touch/adcraw.h | 2 +- lvgl_touch/ft6x36.c | 2 +- lvgl_touch/ra8875_touch.h | 2 +- lvgl_touch/stmpe610.h | 2 +- lvgl_touch/touch_driver.h | 2 +- lvgl_touch/xpt2046.h | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/lvgl_i2c_conf.h b/lvgl_i2c_conf.h index cf8ac45..002ca53 100644 --- a/lvgl_i2c_conf.h +++ b/lvgl_i2c_conf.h @@ -12,7 +12,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#ifdef LV_LVGL_H_INCLUDE_SIMPLE +#ifdef LV_CONF_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_tft/EVE_config.h b/lvgl_tft/EVE_config.h index 53225a2..37d25d4 100644 --- a/lvgl_tft/EVE_config.h +++ b/lvgl_tft/EVE_config.h @@ -35,7 +35,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR TH #ifndef EVE_CONFIG_H_ #define EVE_CONFIG_H_ -#ifdef LV_LVGL_H_INCLUDE_SIMPLE +#ifdef LV_CONFIG_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_tft/FT81x.h b/lvgl_tft/FT81x.h index 96366df..02838d8 100644 --- a/lvgl_tft/FT81x.h +++ b/lvgl_tft/FT81x.h @@ -3,7 +3,7 @@ #include -#ifdef LV_LVGL_H_INCLUDE_SIMPLE +#ifdef LV_CONF_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_tft/GC9A01.h b/lvgl_tft/GC9A01.h index d462c8d..7121512 100644 --- a/lvgl_tft/GC9A01.h +++ b/lvgl_tft/GC9A01.h @@ -15,7 +15,7 @@ extern "C" { *********************/ #include -#ifdef LV_LVGL_H_INCLUDE_SIMPLE +#ifdef LV_CONF_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_tft/disp_driver.h b/lvgl_tft/disp_driver.h index 1ee33c7..4e76022 100644 --- a/lvgl_tft/disp_driver.h +++ b/lvgl_tft/disp_driver.h @@ -12,7 +12,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#ifdef LV_LVGL_H_INCLUDE_SIMPLE +#ifdef LV_CONF_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_tft/disp_spi.c b/lvgl_tft/disp_spi.c index 0e4e548..77885dc 100644 --- a/lvgl_tft/disp_spi.c +++ b/lvgl_tft/disp_spi.c @@ -19,7 +19,7 @@ #include #include -#ifdef LV_LVGL_H_INCLUDE_SIMPLE +#ifdef LV_CONF_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_tft/hx8357.h b/lvgl_tft/hx8357.h index dc51532..09476cb 100644 --- a/lvgl_tft/hx8357.h +++ b/lvgl_tft/hx8357.h @@ -25,7 +25,7 @@ extern "C" { #include #include -#ifdef LV_LVGL_H_INCLUDE_SIMPLE +#ifdef LV_CONF_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_tft/il3820.h b/lvgl_tft/il3820.h index 15ff090..fdd4bb1 100644 --- a/lvgl_tft/il3820.h +++ b/lvgl_tft/il3820.h @@ -11,7 +11,7 @@ extern "C" { #endif -#ifdef LV_LVGL_H_INCLUDE_SIMPLE +#ifdef LV_CONF_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_tft/ili9341.h b/lvgl_tft/ili9341.h index 4beb4f3..1cc492c 100644 --- a/lvgl_tft/ili9341.h +++ b/lvgl_tft/ili9341.h @@ -15,7 +15,7 @@ extern "C" { *********************/ #include -#ifdef LV_LVGL_H_INCLUDE_SIMPLE +#ifdef LV_CONF_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_tft/ili9481.h b/lvgl_tft/ili9481.h index 7932190..6a13e01 100644 --- a/lvgl_tft/ili9481.h +++ b/lvgl_tft/ili9481.h @@ -15,7 +15,7 @@ extern "C" { #include #include -#ifdef LV_LVGL_H_INCLUDE_SIMPLE +#ifdef LV_CONF_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_tft/ili9486.h b/lvgl_tft/ili9486.h index f65dd80..1544fb3 100644 --- a/lvgl_tft/ili9486.h +++ b/lvgl_tft/ili9486.h @@ -15,7 +15,7 @@ extern "C" { *********************/ #include -#ifdef LV_LVGL_H_INCLUDE_SIMPLE +#ifdef LV_CONF_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_tft/ili9488.h b/lvgl_tft/ili9488.h index 45a7045..b49e26a 100644 --- a/lvgl_tft/ili9488.h +++ b/lvgl_tft/ili9488.h @@ -15,7 +15,7 @@ extern "C" { #include #include -#ifdef LV_LVGL_H_INCLUDE_SIMPLE +#ifdef LV_CONF_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_tft/jd79653a.h b/lvgl_tft/jd79653a.h index 6a2065a..1221e2c 100644 --- a/lvgl_tft/jd79653a.h +++ b/lvgl_tft/jd79653a.h @@ -11,7 +11,7 @@ extern "C" { #endif -#ifdef LV_LVGL_H_INCLUDE_SIMPLE +#ifdef LV_CONF_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_tft/ra8875.h b/lvgl_tft/ra8875.h index a6d1fe5..db37498 100644 --- a/lvgl_tft/ra8875.h +++ b/lvgl_tft/ra8875.h @@ -15,7 +15,7 @@ extern "C" { *********************/ #include -#ifdef LV_LVGL_H_INCLUDE_SIMPLE +#ifdef LV_CONF_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_tft/sh1107.h b/lvgl_tft/sh1107.h index 7a0db68..0aa6798 100644 --- a/lvgl_tft/sh1107.h +++ b/lvgl_tft/sh1107.h @@ -15,7 +15,7 @@ extern "C" { *********************/ #include -#ifdef LV_LVGL_H_INCLUDE_SIMPLE +#ifdef LV_CONF_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_tft/ssd1306.h b/lvgl_tft/ssd1306.h index f859a76..a6724fe 100644 --- a/lvgl_tft/ssd1306.h +++ b/lvgl_tft/ssd1306.h @@ -15,7 +15,7 @@ extern "C" { *********************/ #include -#ifdef LV_LVGL_H_INCLUDE_SIMPLE +#ifdef LV_CONF_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_tft/st7735s.h b/lvgl_tft/st7735s.h index 03672ee..3796f0c 100644 --- a/lvgl_tft/st7735s.h +++ b/lvgl_tft/st7735s.h @@ -14,7 +14,7 @@ extern "C" { * INCLUDES *********************/ #include -#ifdef LV_LVGL_H_INCLUDE_SIMPLE +#ifdef LV_CONF_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_tft/st7789.h b/lvgl_tft/st7789.h index 1136562..0cda563 100644 --- a/lvgl_tft/st7789.h +++ b/lvgl_tft/st7789.h @@ -12,7 +12,7 @@ extern "C" { #endif -#ifdef LV_LVGL_H_INCLUDE_SIMPLE +#ifdef LV_CONF_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_touch/FT81x.h b/lvgl_touch/FT81x.h index c788770..c1d6341 100644 --- a/lvgl_touch/FT81x.h +++ b/lvgl_touch/FT81x.h @@ -15,7 +15,7 @@ extern "C" { #include #include -#ifdef LV_LVGL_H_INCLUDE_SIMPLE +#ifdef LV_CONF_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_touch/adcraw.h b/lvgl_touch/adcraw.h index 5c555cc..6691227 100644 --- a/lvgl_touch/adcraw.h +++ b/lvgl_touch/adcraw.h @@ -13,7 +13,7 @@ extern "C" { #include #include "driver/gpio.h" #include "driver/adc.h" -#ifdef LV_LVGL_H_INCLUDE_SIMPLE +#ifdef LV_CONF_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_touch/ft6x36.c b/lvgl_touch/ft6x36.c index 7cbb45d..3407a5d 100644 --- a/lvgl_touch/ft6x36.c +++ b/lvgl_touch/ft6x36.c @@ -20,7 +20,7 @@ #include #include -#ifdef LV_LVGL_H_INCLUDE_SIMPLE +#ifdef LV_CONF_INCLUDE_SIMPLE #include #else #include diff --git a/lvgl_touch/ra8875_touch.h b/lvgl_touch/ra8875_touch.h index 7d112d3..b896095 100644 --- a/lvgl_touch/ra8875_touch.h +++ b/lvgl_touch/ra8875_touch.h @@ -15,7 +15,7 @@ extern "C" { #include #include -#ifdef LV_LVGL_H_INCLUDE_SIMPLE +#ifdef LV_CONF_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_touch/stmpe610.h b/lvgl_touch/stmpe610.h index 153a6e7..5486d0a 100644 --- a/lvgl_touch/stmpe610.h +++ b/lvgl_touch/stmpe610.h @@ -15,7 +15,7 @@ extern "C" { #include #include -#ifdef LV_LVGL_H_INCLUDE_SIMPLE +#ifdef LV_CONF_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_touch/touch_driver.h b/lvgl_touch/touch_driver.h index bc92f4f..c16901f 100644 --- a/lvgl_touch/touch_driver.h +++ b/lvgl_touch/touch_driver.h @@ -14,7 +14,7 @@ extern "C" { *********************/ #include #include -#ifdef LV_LVGL_H_INCLUDE_SIMPLE +#ifdef LV_CONF_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_touch/xpt2046.h b/lvgl_touch/xpt2046.h index 8d61ce8..9a496e3 100644 --- a/lvgl_touch/xpt2046.h +++ b/lvgl_touch/xpt2046.h @@ -16,7 +16,7 @@ extern "C" { #include #include -#ifdef LV_LVGL_H_INCLUDE_SIMPLE +#ifdef LV_CONF_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h"