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

change startup order for init_display

Browse Source
This commit is contained in:
Verkehrsrot 2019-08-30 17:57:17 +02:00
parent 63ff668a96
commit 65045b3cad
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main.cpp
View File

@ -174,6 +174,13 @@ void setup() {
// read (and initialize on first run) runtime settings from NVRAM // read (and initialize on first run) runtime settings from NVRAM
loadConfig(); // includes initialize if necessary loadConfig(); // includes initialize if necessary
// initialize display
#ifdef HAS_DISPLAY
strcat_P(features, " OLED");
DisplayIsOn = cfg.screenon;
init_display(PRODUCTNAME, PROGVERSION); // note: blocking call
#endif
#ifdef BOARD_HAS_PSRAM #ifdef BOARD_HAS_PSRAM
assert(psramFound()); assert(psramFound());
ESP_LOGI(TAG, "PSRAM found and initialized"); ESP_LOGI(TAG, "PSRAM found and initialized");
@ -305,13 +312,6 @@ void setup() {
strcat_P(features, " FILTER"); strcat_P(features, " FILTER");
#endif #endif
// initialize display
#ifdef HAS_DISPLAY
strcat_P(features, " OLED");
DisplayIsOn = cfg.screenon;
init_display(PRODUCTNAME, PROGVERSION); // note: blocking call
#endif
// initialize matrix display // initialize matrix display
#ifdef HAS_MATRIX_DISPLAY #ifdef HAS_MATRIX_DISPLAY
strcat_P(features, " LED_MATRIX"); strcat_P(features, " LED_MATRIX");