Skip to content

Commit 131cd96

Browse files
committed
2 parents d574caf + 1350201 commit 131cd96

27 files changed

+103
-3
lines changed

components/lvgl_esp32_drivers/lvgl_i2c_conf.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ extern "C" {
1212
/*********************
1313
* INCLUDES
1414
*********************/
15+
#ifdef LV_LVGL_H_INCLUDE_SIMPLE
16+
#include "lvgl.h"
17+
#else
1518
#include "lvgl/lvgl.h"
19+
#endif
1620

1721
/*********************
1822
* DEFINES

components/lvgl_esp32_drivers/lvgl_tft/EVE_config.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,11 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR TH
3535
#ifndef EVE_CONFIG_H_
3636
#define EVE_CONFIG_H_
3737

38+
#ifdef LV_LVGL_H_INCLUDE_SIMPLE
39+
#include "lvgl.h"
40+
#else
3841
#include "lvgl/lvgl.h"
42+
#endif
3943
#include "../lvgl_spi_conf.h"
4044

4145
#include "FT81x.h"

components/lvgl_esp32_drivers/lvgl_tft/FT81x.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ void TFT_bitmap_display(void)
242242

243243
// fullscreen bitmap for memory-mapped direct access
244244
EVE_cmd_dl(TAG(20));
245-
EVE_cmd_setbitmap(SCREEN_BITMAP_ADDR, EVE_RGB565, 800, 480);
245+
EVE_cmd_setbitmap(SCREEN_BITMAP_ADDR, EVE_RGB565, EVE_HSIZE, EVE_VSIZE);
246246
EVE_cmd_dl(DL_BEGIN | EVE_BITMAPS);
247247
EVE_cmd_dl(VERTEX2F(0, 0));
248248
EVE_cmd_dl(DL_END);

components/lvgl_esp32_drivers/lvgl_tft/FT81x.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33

44
#include <stdint.h>
55

6+
#ifdef LV_LVGL_H_INCLUDE_SIMPLE
7+
#include "lvgl.h"
8+
#else
69
#include "lvgl/lvgl.h"
10+
#endif
711
#include "../lvgl_helpers.h"
812

913
void FT81x_init(void);

components/lvgl_esp32_drivers/lvgl_tft/GC9A01.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@ extern "C" {
1515
*********************/
1616
#include <stdbool.h>
1717

18+
#ifdef LV_LVGL_H_INCLUDE_SIMPLE
19+
#include "lvgl.h"
20+
#else
1821
#include "lvgl/lvgl.h"
22+
#endif
1923
#include "../lvgl_helpers.h"
2024

2125
/*********************

components/lvgl_esp32_drivers/lvgl_tft/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,13 +183,13 @@ menu "LVGL TFT Display controller"
183183
depends on LV_TFT_DISPLAY_OFFSETS
184184
int
185185
default 40 if LV_PREDEFINED_DISPLAY_TTGO && (LV_DISPLAY_ORIENTATION_LANDSCAPE || LV_DISPLAY_ORIENTATION_LANDSCAPE_INVERTED)
186-
default 52 if LV_PREDEFINED_DISPLAY_TTGO && (LV_DISPLAY_ORIENTATION_PORTRAIT || LV_DISPLAY_ORIENTATION_PORTRAIT_INVERTED)
186+
default 53 if LV_PREDEFINED_DISPLAY_TTGO && (LV_DISPLAY_ORIENTATION_PORTRAIT || LV_DISPLAY_ORIENTATION_PORTRAIT_INVERTED)
187187
default 0
188188

189189
config LV_TFT_DISPLAY_Y_OFFSET
190190
depends on LV_TFT_DISPLAY_OFFSETS
191191
int
192-
default 52 if LV_PREDEFINED_DISPLAY_TTGO && (LV_DISPLAY_ORIENTATION_LANDSCAPE || LV_DISPLAY_ORIENTATION_LANDSCAPE_INVERTED)
192+
default 53 if LV_PREDEFINED_DISPLAY_TTGO && (LV_DISPLAY_ORIENTATION_LANDSCAPE || LV_DISPLAY_ORIENTATION_LANDSCAPE_INVERTED)
193193
default 40 if LV_PREDEFINED_DISPLAY_TTGO && (LV_DISPLAY_ORIENTATION_PORTRAIT || LV_DISPLAY_ORIENTATION_PORTRAIT_INVERTED)
194194
default 0
195195

components/lvgl_esp32_drivers/lvgl_tft/disp_driver.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ extern "C" {
1212
/*********************
1313
* INCLUDES
1414
*********************/
15+
#ifdef LV_LVGL_H_INCLUDE_SIMPLE
16+
#include "lvgl.h"
17+
#else
1518
#include "lvgl/lvgl.h"
19+
#endif
1620

1721
#if defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9341
1822
#include "ili9341.h"

components/lvgl_esp32_drivers/lvgl_tft/disp_spi.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@
1919
#include <freertos/semphr.h>
2020
#include <freertos/task.h>
2121

22+
#ifdef LV_LVGL_H_INCLUDE_SIMPLE
23+
#include "lvgl.h"
24+
#else
2225
#include "lvgl/lvgl.h"
26+
#endif
2327

2428
#include "disp_spi.h"
2529
#include "disp_driver.h"

components/lvgl_esp32_drivers/lvgl_tft/hx8357.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ extern "C" {
2525
#include <stdbool.h>
2626
#include <stdint.h>
2727

28+
#ifdef LV_LVGL_H_INCLUDE_SIMPLE
29+
#include "lvgl.h"
30+
#else
2831
#include "lvgl/lvgl.h"
32+
#endif
2933
#include "../lvgl_helpers.h"
3034

3135
/*********************

components/lvgl_esp32_drivers/lvgl_tft/il3820.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ extern "C"
1111
{
1212
#endif
1313

14+
#ifdef LV_LVGL_H_INCLUDE_SIMPLE
15+
#include "lvgl.h"
16+
#else
1417
#include "lvgl/lvgl.h"
18+
#endif
1519
#include "sdkconfig.h"
1620

1721
/* Values for Waveshare 2.9inch e-Paper Module, this values shouldn't be

0 commit comments

Comments
 (0)