DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #542 from cyberman54/development

Browse Source 
SS_OLED library update
This commit is contained in:
Verkehrsrot 2020-02-04 14:36:32 +01:00 committed by GitHub
commit 22f6ddf54b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
platformio.ini
View File

@ -44,7 +44,7 @@ description = Paxcounter is a device for metering passenger flows in realtime. I
[common] [common]
; for release_version use max. 10 chars total, use any decimal format like "a.b.c" ; for release_version use max. 10 chars total, use any decimal format like "a.b.c"
release_version = 1.9.88 release_version = 1.9.89
; DEBUG LEVEL: For production run set to 0, otherwise device will leak RAM while running! ; DEBUG LEVEL: For production run set to 0, otherwise device will leak RAM while running!
; 0=None, 1=Error, 2=Warn, 3=Info, 4=Debug, 5=Verbose ; 0=None, 1=Error, 2=Warn, 3=Info, 4=Debug, 5=Verbose
debug_level = 3 debug_level = 3
@ -59,7 +59,7 @@ lib_deps_lora =
;MCCI LoRaWAN LMIC library@>=3.1.0 ; MCCI LMIC by Terrill Moore ;MCCI LoRaWAN LMIC library@>=3.1.0 ; MCCI LMIC by Terrill Moore
https://github.com/mcci-catena/arduino-lmic.git#98a1b35 https://github.com/mcci-catena/arduino-lmic.git#98a1b35
lib_deps_display = lib_deps_display =
ss_oled@>=3.2.0 ; simple and small OLED lib by Larry Bank ss_oled@3.3.0 ; simple and small OLED lib by Larry Bank
BitBang_I2C@>=1.3.0 BitBang_I2C@>=1.3.0
QRCode@>=0.0.1 QRCode@>=0.0.1
lib_deps_matrix_display = lib_deps_matrix_display =
@ -72,7 +72,7 @@ lib_deps_sensors =
Adafruit Unified Sensor@>=1.1.1 Adafruit Unified Sensor@>=1.1.1
Adafruit BME280 Library@>=2.0.0 Adafruit BME280 Library@>=2.0.0
Adafruit BMP085 Library@>=1.0.1 Adafruit BMP085 Library@>=1.0.1
BSEC Software Library@>=1.5.1474 BSEC Software Library@1.5.1474
lib_deps_basic = lib_deps_basic =
ArduinoJson@^5.13.1 ArduinoJson@^5.13.1
76@>=1.2.4 ; #76 Timezone by Jack Christensen 76@>=1.2.4 ; #76 Timezone by Jack Christensen
@ -124,5 +124,5 @@ upload_protocol = esptool
[env:dev] [env:dev]
upload_protocol = esptool upload_protocol = esptool
build_type = debug build_type = debug
platform = https://github.com/platformio/platform-espressif32.git platform = https://github.com/platformio/platform-espressif32.git#develop
platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git

6
src/display.cpp
View File

@ -78,9 +78,11 @@ void init_display(bool verbose) {
// init display // init display
#ifndef DISPLAY_FLIP #ifndef DISPLAY_FLIP
oledInit(OLED_128x64, false, false, -1, -1, 400000L); oledInit(OLED_128x64, false, false, -1, -1,
MY_OLED_RST == NOT_A_PIN ? -1 : MY_OLED_RST, 400000L);
#else #else
oledInit(OLED_128x64, true, false, -1, -1, 400000L); oledInit(OLED_128x64, true, false, -1, -1,
MY_OLED_RST == NOT_A_PIN ? -1 : MY_OLED_RST, 400000L);
#endif #endif
// set display buffer // set display buffer

7
src/ota.cpp
View File

@ -44,10 +44,13 @@ void start_ota_update() {
// init display // init display
#ifdef HAS_DISPLAY #ifdef HAS_DISPLAY
#ifndef DISPLAY_FLIP #ifndef DISPLAY_FLIP
oledInit(OLED_128x64, ANGLE_0, false, -1, -1, 400000L); oledInit(OLED_128x64, false, false, -1, -1,
MY_OLED_RST == NOT_A_PIN ? -1 : MY_OLED_RST, 400000L);
#else #else
oledInit(OLED_128x64, ANGLE_FLIPY, false, -1, -1, 400000L); oledInit(OLED_128x64, true, false, -1, -1,
MY_OLED_RST == NOT_A_PIN ? -1 : MY_OLED_RST, 400000L);
#endif #endif
// set display buffer // set display buffer