From 8cd600d8e8f74bcca953c84b5a1a088bbcc6ea0a Mon Sep 17 00:00:00 2001 From: C47D Date: Mon, 21 Dec 2020 11:10:35 -0600 Subject: [PATCH] Replace LV_CONF_INCLUDE_SIMPLE with LV_LVGL_H_INCLUDE_SIMPLE --- lvgl_i2c_conf.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 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lvgl_i2c_conf.h b/lvgl_i2c_conf.h index 002ca53..cf8ac45 100644 --- a/lvgl_i2c_conf.h +++ b/lvgl_i2c_conf.h @@ -12,7 +12,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#ifdef LV_CONF_INCLUDE_SIMPLE +#ifdef LV_LVGL_H_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_tft/FT81x.h b/lvgl_tft/FT81x.h index 02838d8..96366df 100644 --- a/lvgl_tft/FT81x.h +++ b/lvgl_tft/FT81x.h @@ -3,7 +3,7 @@ #include -#ifdef LV_CONF_INCLUDE_SIMPLE +#ifdef LV_LVGL_H_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_tft/GC9A01.h b/lvgl_tft/GC9A01.h index 7121512..d462c8d 100644 --- a/lvgl_tft/GC9A01.h +++ b/lvgl_tft/GC9A01.h @@ -15,7 +15,7 @@ extern "C" { *********************/ #include -#ifdef LV_CONF_INCLUDE_SIMPLE +#ifdef LV_LVGL_H_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 4e76022..1ee33c7 100644 --- a/lvgl_tft/disp_driver.h +++ b/lvgl_tft/disp_driver.h @@ -12,7 +12,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#ifdef LV_CONF_INCLUDE_SIMPLE +#ifdef LV_LVGL_H_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 77885dc..0e4e548 100644 --- a/lvgl_tft/disp_spi.c +++ b/lvgl_tft/disp_spi.c @@ -19,7 +19,7 @@ #include #include -#ifdef LV_CONF_INCLUDE_SIMPLE +#ifdef LV_LVGL_H_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_tft/hx8357.h b/lvgl_tft/hx8357.h index 09476cb..dc51532 100644 --- a/lvgl_tft/hx8357.h +++ b/lvgl_tft/hx8357.h @@ -25,7 +25,7 @@ extern "C" { #include #include -#ifdef LV_CONF_INCLUDE_SIMPLE +#ifdef LV_LVGL_H_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_tft/il3820.h b/lvgl_tft/il3820.h index fdd4bb1..15ff090 100644 --- a/lvgl_tft/il3820.h +++ b/lvgl_tft/il3820.h @@ -11,7 +11,7 @@ extern "C" { #endif -#ifdef LV_CONF_INCLUDE_SIMPLE +#ifdef LV_LVGL_H_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_tft/ili9341.h b/lvgl_tft/ili9341.h index 1cc492c..4beb4f3 100644 --- a/lvgl_tft/ili9341.h +++ b/lvgl_tft/ili9341.h @@ -15,7 +15,7 @@ extern "C" { *********************/ #include -#ifdef LV_CONF_INCLUDE_SIMPLE +#ifdef LV_LVGL_H_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_tft/ili9481.h b/lvgl_tft/ili9481.h index 6a13e01..7932190 100644 --- a/lvgl_tft/ili9481.h +++ b/lvgl_tft/ili9481.h @@ -15,7 +15,7 @@ extern "C" { #include #include -#ifdef LV_CONF_INCLUDE_SIMPLE +#ifdef LV_LVGL_H_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_tft/ili9486.h b/lvgl_tft/ili9486.h index 1544fb3..f65dd80 100644 --- a/lvgl_tft/ili9486.h +++ b/lvgl_tft/ili9486.h @@ -15,7 +15,7 @@ extern "C" { *********************/ #include -#ifdef LV_CONF_INCLUDE_SIMPLE +#ifdef LV_LVGL_H_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_tft/ili9488.h b/lvgl_tft/ili9488.h index b49e26a..45a7045 100644 --- a/lvgl_tft/ili9488.h +++ b/lvgl_tft/ili9488.h @@ -15,7 +15,7 @@ extern "C" { #include #include -#ifdef LV_CONF_INCLUDE_SIMPLE +#ifdef LV_LVGL_H_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_tft/jd79653a.h b/lvgl_tft/jd79653a.h index 1221e2c..6a2065a 100644 --- a/lvgl_tft/jd79653a.h +++ b/lvgl_tft/jd79653a.h @@ -11,7 +11,7 @@ extern "C" { #endif -#ifdef LV_CONF_INCLUDE_SIMPLE +#ifdef LV_LVGL_H_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_tft/ra8875.h b/lvgl_tft/ra8875.h index db37498..a6d1fe5 100644 --- a/lvgl_tft/ra8875.h +++ b/lvgl_tft/ra8875.h @@ -15,7 +15,7 @@ extern "C" { *********************/ #include -#ifdef LV_CONF_INCLUDE_SIMPLE +#ifdef LV_LVGL_H_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_tft/sh1107.h b/lvgl_tft/sh1107.h index 0aa6798..7a0db68 100644 --- a/lvgl_tft/sh1107.h +++ b/lvgl_tft/sh1107.h @@ -15,7 +15,7 @@ extern "C" { *********************/ #include -#ifdef LV_CONF_INCLUDE_SIMPLE +#ifdef LV_LVGL_H_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_tft/ssd1306.h b/lvgl_tft/ssd1306.h index a6724fe..f859a76 100644 --- a/lvgl_tft/ssd1306.h +++ b/lvgl_tft/ssd1306.h @@ -15,7 +15,7 @@ extern "C" { *********************/ #include -#ifdef LV_CONF_INCLUDE_SIMPLE +#ifdef LV_LVGL_H_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_tft/st7735s.h b/lvgl_tft/st7735s.h index 3796f0c..03672ee 100644 --- a/lvgl_tft/st7735s.h +++ b/lvgl_tft/st7735s.h @@ -14,7 +14,7 @@ extern "C" { * INCLUDES *********************/ #include -#ifdef LV_CONF_INCLUDE_SIMPLE +#ifdef LV_LVGL_H_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_tft/st7789.h b/lvgl_tft/st7789.h index 0cda563..1136562 100644 --- a/lvgl_tft/st7789.h +++ b/lvgl_tft/st7789.h @@ -12,7 +12,7 @@ extern "C" { #endif -#ifdef LV_CONF_INCLUDE_SIMPLE +#ifdef LV_LVGL_H_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_touch/FT81x.h b/lvgl_touch/FT81x.h index c1d6341..c788770 100644 --- a/lvgl_touch/FT81x.h +++ b/lvgl_touch/FT81x.h @@ -15,7 +15,7 @@ extern "C" { #include #include -#ifdef LV_CONF_INCLUDE_SIMPLE +#ifdef LV_LVGL_H_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_touch/adcraw.h b/lvgl_touch/adcraw.h index 6691227..5c555cc 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_CONF_INCLUDE_SIMPLE +#ifdef LV_LVGL_H_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_touch/ft6x36.c b/lvgl_touch/ft6x36.c index 3407a5d..7cbb45d 100644 --- a/lvgl_touch/ft6x36.c +++ b/lvgl_touch/ft6x36.c @@ -20,7 +20,7 @@ #include #include -#ifdef LV_CONF_INCLUDE_SIMPLE +#ifdef LV_LVGL_H_INCLUDE_SIMPLE #include #else #include diff --git a/lvgl_touch/ra8875_touch.h b/lvgl_touch/ra8875_touch.h index b896095..7d112d3 100644 --- a/lvgl_touch/ra8875_touch.h +++ b/lvgl_touch/ra8875_touch.h @@ -15,7 +15,7 @@ extern "C" { #include #include -#ifdef LV_CONF_INCLUDE_SIMPLE +#ifdef LV_LVGL_H_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_touch/stmpe610.h b/lvgl_touch/stmpe610.h index 5486d0a..153a6e7 100644 --- a/lvgl_touch/stmpe610.h +++ b/lvgl_touch/stmpe610.h @@ -15,7 +15,7 @@ extern "C" { #include #include -#ifdef LV_CONF_INCLUDE_SIMPLE +#ifdef LV_LVGL_H_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 c16901f..bc92f4f 100644 --- a/lvgl_touch/touch_driver.h +++ b/lvgl_touch/touch_driver.h @@ -14,7 +14,7 @@ extern "C" { *********************/ #include #include -#ifdef LV_CONF_INCLUDE_SIMPLE +#ifdef LV_LVGL_H_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h" diff --git a/lvgl_touch/xpt2046.h b/lvgl_touch/xpt2046.h index 9a496e3..8d61ce8 100644 --- a/lvgl_touch/xpt2046.h +++ b/lvgl_touch/xpt2046.h @@ -16,7 +16,7 @@ extern "C" { #include #include -#ifdef LV_CONF_INCLUDE_SIMPLE +#ifdef LV_LVGL_H_INCLUDE_SIMPLE #include "lvgl.h" #else #include "lvgl/lvgl.h"