Skip to content

Commit

Permalink
Merge pull request #33 from rzeldent/feature/lvgl8.3.9
Browse files Browse the repository at this point in the history
Made order BGR default
  • Loading branch information
rzeldent authored Oct 7, 2023
2 parents c6d8a53 + fa18896 commit d553206
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 18 deletions.
27 changes: 14 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,13 @@ Basically there is only **ONE** define that need to be defined: The type of boar

- Orientation of the board (optional)
- TFT_ORIENTATION_PORTRAIT (default)
- TFT_ORIENTATION_LANDSCAPE
- TFT_ORIENTATION_PORTRAIT_INV
- TFT_ORIENTATION_LANDSCAPE_INV
- TFT_ORIENTATION_LANDSCAPE (rotated 90 degrees)
- TFT_ORIENTATION_PORTRAIT_INV (rotated 180 degrees)
- TFT_ORIENTATION_LANDSCAPE_INV (rotated 270/-90 degrees)

- LCD Panel RGB order (if red and blue are swapped on the display, optional)
- TFT_PANEL_ORDER_RGB (default)
- TFT_PANEL_ORDER_BGR
- TFT_PANEL_ORDER_RGB
- TFT_PANEL_ORDER_BGR (default)

These can be defined in the ```platformio.ini``` file defining the settings:

Expand All @@ -95,8 +95,8 @@ build_flags =
# LVGL settings
-D LV_CONF_PATH=${PROJECT_INCLUDE_DIR}/lv_conf.h
# Smart display settings
#-D TFT_PANEL_ORDER_RGB
#-D TFT_PANEL_ORDER_BGR
#-D TFT_PANEL_ORDER_RGB
#-D TFT_ORIENTATION_PORTRAIT
#-D TFT_ORIENTATION_LANDSCAPE
#-D TFT_ORIENTATION_PORTRAIT_INV
Expand Down Expand Up @@ -174,26 +174,27 @@ Put the display to sleep.

Wake the display.

## Change history

- September
## Version history
- October 2023
- Cganged default RGB order to BGR
- September 2023
- Added support for ESP32_2432S024N/R/S
- Version 1.0.7
- August 2023
- Added support for esp32_8048S070N/S
- Display buffer size configurable
- Feb 2023
- February 2023
- Version 1.0.3
- Added variable for the LCD panel RGB/BGR order
- Feb 2023
- February 2023
- Version 1.0.3
- Added mutex for access to lvgl, required for multithreading
- Changed RGB led input to lv_color32_t
- Dec 2022
- December 2022
- Initial version 1.0.2.
- Drivers for ESP32_2432S028R, ESP32_3248S035R and ESP32_3248S035C displays working.
- Sound output
- RGB Led output
- CDS light sensor input
- Jul 2022
- July 2022
- Initial work started
6 changes: 3 additions & 3 deletions examples/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ build_flags =
# LVGL settings
-D LV_CONF_PATH="lv_conf.h"
# Smartdisplay settings
-D TFT_PANEL_ORDER_RGB
#-D TFT_PANEL_ORDER_BGR
#-D TFT_PANEL_ORDER_RGB
#-D TFT_ORIENTATION_PORTRAIT
-D TFT_ORIENTATION_LANDSCAPE
#-D TFT_ORIENTATION_LANDSCAPE
#-D TFT_ORIENTATION_PORTRAIT_INV
#-D TFT_ORIENTATION_LANDSCAPE_INV
#-D ESP32_2432S028R
-D ESP32_3248S035R
#-D ESP32_3248S035R
#-D ESP32_3248S035C
2 changes: 1 addition & 1 deletion include/esp32_smartdisplay.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ extern void smartdisplay_tft_wake();

// Default RGB order
#if !defined(TFT_PANEL_ORDER_RGB) && !defined(TFT_PANEL_ORDER_BGR)
#define TFT_PANEL_ORDER_RGB
#define TFT_PANEL_ORDER_BGR
#endif

// ESP32_2432S024N
Expand Down
2 changes: 1 addition & 1 deletion src/tft_ilI9341.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
#endif

#if !defined(TFT_PANEL_ORDER_RGB) && !defined(TFT_PANEL_ORDER_BGR)
#error Please define RGB order: TFT_PANEL_ORDER_BGR or
#error Please define RGB order: TFT_PANEL_ORDER_RGB or TFT_PANEL_ORDER_BGR
#endif

#ifdef TFT_PANEL_ORDER_RGB
Expand Down

0 comments on commit d553206

Please sign in to comment.