From 0741e4c1ab910685cf4c41f12ee600915ecc72b5 Mon Sep 17 00:00:00 2001 From: Verkehrsrot Date: Sun, 15 Dec 2019 18:21:02 +0100 Subject: [PATCH] disable ss_oled changes until lib is fixed --- platformio.ini | 8 ++++---- src/display.cpp | 7 +------ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/platformio.ini b/platformio.ini index 894149ce..e06eb55f 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 @@ -18,7 +18,7 @@ halfile = generic.h ;halfile = ttgov21old.h ;halfile = ttgov21new.h ;halfile = ttgofox.h -;halfile = ttgobeam.h +halfile = ttgobeam.h ;halfile = ttgobeam10.h ;halfile = fipy.h ;halfile = lopy.h @@ -58,8 +58,8 @@ lib_deps_lora = ;MCCI LoRaWAN LMIC library@>=3.1.0 https://github.com/mcci-catena/arduino-lmic.git#5322dd1 lib_deps_display = - ;ss_oled@>=3.1.0 - https://github.com/bitbank2/ss_oled.git#26f5d40 + ss_oled@=3.0.0 + ;https://github.com/bitbank2/ss_oled.git#26f5d40 BitBang_I2C@>=1.2.0 QRCode@>=0.0.1 lib_deps_matrix_display = diff --git a/src/display.cpp b/src/display.cpp index 94a11f96..cf9f716e 100644 --- a/src/display.cpp +++ b/src/display.cpp @@ -56,12 +56,7 @@ static const char TAG[] = __FILE__; const char *printmonth[] = {"xxx", "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; uint8_t DisplayIsOn = 0; - -#ifdef USE_BACKBUFFER static uint8_t displaybuf[DISPLAY_WIDTH * DISPLAY_HEIGHT / 8] = {0}; -#else -static uint8_t *displaybuf = NULL; -#endif QRCode qrcode; @@ -88,7 +83,7 @@ void init_display(bool verbose) { #endif // set display buffer - oledSetBackBuffer(displaybuf); + //oledSetBackBuffer(displaybuf); // clear display oledSetContrast(DISPLAYCONTRAST);