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

bugfix display page flip loop

Browse Source
This commit is contained in:
Verkehrsrot 2020-01-20 11:12:00 +01:00
parent e8abe8567b
commit 5cb51b2ff0
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/display.cpp
View File

@ -198,21 +198,27 @@ void shutdown_display(void) {
void draw_page(time_t t, bool nextpage, bool cyclescreen) { void draw_page(time_t t, bool nextpage, bool cyclescreen) {
// write display content to display buffer
// nextpage = true -> flip 1 page
// cyclescreen = true -> page cycling mode
static uint8_t DisplayPage = 0; static uint8_t DisplayPage = 0;
char timeState; char timeState;
#if (HAS_GPS) #if (HAS_GPS)
static bool wasnofix = true; static bool wasnofix = true;
#endif #endif
// line 1/2: pax counter
dp_printf(0, 0, FONT_STRETCHED, 0, "PAX:%-4d",
macs.size()); // display number of unique macs total Wifi + BLE
start:
if (nextpage) { if (nextpage) {
DisplayPage = (DisplayPage >= DISPLAY_PAGES - 1) ? 0 : (DisplayPage + 1); DisplayPage = (DisplayPage >= DISPLAY_PAGES - 1) ? 0 : (DisplayPage + 1);
oledFill(0, 1); oledFill(0, 1);
} }
// line 1/2: pax counter
dp_printf(0, 0, FONT_STRETCHED, 0, "PAX:%-4d",
macs.size()); // display number of unique macs total Wifi + BLE
switch (DisplayPage) { switch (DisplayPage) {
// page 0: parameters overview // page 0: parameters overview
@ -297,8 +303,7 @@ void draw_page(time_t t, bool nextpage, bool cyclescreen) {
// LORA datarate, display inverse if ADR disabled // LORA datarate, display inverse if ADR disabled
dp_printf(102, 7, FONT_SMALL, !cfg.adrmode, "%-4s", dp_printf(102, 7, FONT_SMALL, !cfg.adrmode, "%-4s",
getSfName(updr2rps(LMIC.datarate))); getSfName(updr2rps(LMIC.datarate)));
#endif // HAS_LORA #endif // HAS_LORA
break; // page0 break; // page0
// page 1: pax graph // page 1: pax graph
@ -334,7 +339,6 @@ void draw_page(time_t t, bool nextpage, bool cyclescreen) {
// page 3: BME280/680 // page 3: BME280/680
case 3: case 3:
#if (HAS_BME) #if (HAS_BME)
// line 2-3: Temp // line 2-3: Temp
dp_printf(0, 2, FONT_STRETCHED, 0, "TMP:%-2.1f", bme_status.temperature); dp_printf(0, 2, FONT_STRETCHED, 0, "TMP:%-2.1f", bme_status.temperature);
@ -356,24 +360,22 @@ void draw_page(time_t t, bool nextpage, bool cyclescreen) {
// page 4: time // page 4: time
case 4: case 4:
dp_printf(0, 4, FONT_LARGE, 0, "%02d:%02d:%02d", hour(t), minute(t), dp_printf(0, 4, FONT_LARGE, 0, "%02d:%02d:%02d", hour(t), minute(t),
second(t)); second(t));
break; break;
// page 5: blank screen // page 5: blank screen
case 5: case 5:
if (cyclescreen) if (cyclescreen)
DisplayPage++; DisplayPage++; // next page
else // show blank page only if we are not in screencycle mode else // show blank page only if we are not in screencycle mode
{ {
oledFill(0, 1); oledFill(0, 1);
break; break;
} }
default: default:
break; // default goto start; // start over
} // switch } // switch