From 2d45c599bdb555fd603ea4cb933048724bd40f3f Mon Sep 17 00:00:00 2001 From: Klaus K Wilting Date: Sun, 5 Apr 2020 23:22:31 +0200 Subject: [PATCH] M5stack display support (experimental) --- platformio.ini | 6 ++---- src/display.cpp | 2 +- src/hal/m5core.h | 1 + src/hal/m5fire.h | 1 + 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/platformio.ini b/platformio.ini index 661a5c4b..306ec661 100644 --- a/platformio.ini +++ b/platformio.ini @@ -7,7 +7,7 @@ ; ---> SELECT THE TARGET PLATFORM HERE! <--- [board] -;halfile = generic.h +halfile = generic.h ;halfile = ebox.h ;halfile = eboxtube.h ;halfile = ecopower.h @@ -32,7 +32,7 @@ ;halfile = tinypico.h ;halfile = tinypicomatrix.h ;halfile = m5core.h -halfile = m5fire.h +;halfile = m5fire.h [platformio] ; upload firmware to board with usb cable @@ -97,8 +97,6 @@ build_flags_basic = '-DCORE_DEBUG_LEVEL=${common.debug_level}' '-DLOG_LOCAL_LEVEL=${common.debug_level}' '-DPROGVERSION="${common.release_version}"' - '-DUSER_SETUP_LOADED=1' ; needed for TFT_eSPI library - build_flags_sensors = -Llib/Bosch-BSEC/src/esp32/ -lalgobsec diff --git a/src/display.cpp b/src/display.cpp index 7b8ce3bc..ac482ec5 100644 --- a/src/display.cpp +++ b/src/display.cpp @@ -65,7 +65,7 @@ void dp_setup(int contrast) { // set display buffer oledSetBackBuffer(&ssoled, displaybuf); - oledSetTextWrap(&&ssoled, true); + oledSetTextWrap(&ssoled, true); #elif (HAS_DISPLAY) == 2 // SPI TFT diff --git a/src/hal/m5core.h b/src/hal/m5core.h index 10ff0ca6..0d6c4496 100644 --- a/src/hal/m5core.h +++ b/src/hal/m5core.h @@ -51,6 +51,7 @@ #define MY_DISPLAY_INVERT 1 // setting for M5 display +#define USER_SETUP_LOADED 1 #define ILI9341_DRIVER 1 #define M5STACK // needed for TFT driver diff --git a/src/hal/m5fire.h b/src/hal/m5fire.h index bb9fc848..ff4e196b 100644 --- a/src/hal/m5fire.h +++ b/src/hal/m5fire.h @@ -52,6 +52,7 @@ #define MY_DISPLAY_INVERT 1 // setting for M5 display +#define USER_SETUP_LOADED 1 #define ILI9341_DRIVER 1 #define M5STACK // needed for TFT driver