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

new oled driver (experimental)

Browse Source
This commit is contained in:
Verkehrsrot 2019-09-27 13:03:55 +02:00
parent 0f9e2dfd63
commit 4a686bc267
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/display.cpp
View File

@ -88,13 +88,6 @@ void init_display(const char *Productname, const char *Version) {
oledFill(0, 1); oledFill(0, 1);
oledPower(cfg.screenon); // set display off if disabled oledPower(cfg.screenon); // set display off if disabled
dp_printf(0, 0, 1, 0, "PAX:0");
#if (BLECOUNTER)
dp_printf(0, 3, 0, 0, "BLTH:0");
#endif
dp_printf(0, 4, 0, 0, "WIFI:0");
dp_printf(0, 5, 0, 0, !cfg.rssilimit ? "RLIM:off " : "RLIM:%d",
cfg.rssilimit);
I2C_MUTEX_UNLOCK(); // release i2c bus access I2C_MUTEX_UNLOCK(); // release i2c bus access
} // mutex } // mutex
@ -201,16 +194,14 @@ void draw_page(time_t t, uint8_t page) {
TimePulseTick = false; TimePulseTick = false;
// display inverse timeState if clock controller is enabled // display inverse timeState if clock controller is enabled
#if (defined HAS_DCF77) || (defined HAS_IF482) #if (defined HAS_DCF77) || (defined HAS_IF482)
dp_printf(0, 6, FONT_SMALL, 0, "%02d:%02d:%02d", hour(t), minute(t), dp_printf(0, 6, 0, 0, "%02d:%02d:%02d", hour(t), minute(t), second(t));
second(t)); dp_printf(56, 6, 0, 1, "%c", timeState);
dp_printf(56, 6, FONT_SMALL, 1, "%c", timeState);
#else #else
dp_printf(0, 6, FONT_SMALL, 0, "%02d:%02d:%02d%c", hour(t), minute(t), dp_printf(0, 6, 0, 0, "%02d:%02d:%02d%c", hour(t), minute(t), second(t),
second(t), timeState); timeState);
#endif // HAS_DCF77 || HAS_IF482 #endif // HAS_DCF77 || HAS_IF482
if (timeSource != _unsynced) if (timeSource != _unsynced)
dp_printf(72, 6, FONT_SMALL, 0, " %2d.%3s%4s", day(t), dp_printf(72, 6, 0, 0, " %2d.%3s", day(t), printmonth[month(t)]);
printmonth[month(t)], year(t));
#endif // TIME_SYNC_INTERVAL #endif // TIME_SYNC_INTERVAL

1
src/ota.cpp
View File

@ -64,6 +64,7 @@ void start_ota_update() {
dp_printf(0, 3, 0, 0, "Fetching .."); dp_printf(0, 3, 0, 0, "Fetching ..");
dp_printf(0, 4, 0, 0, "Downloading .."); dp_printf(0, 4, 0, 0, "Downloading ..");
dp_printf(0, 5, 0, 0, "Rebooting .."); dp_printf(0, 5, 0, 0, "Rebooting ..");
#endif
ESP_LOGI(TAG, "Starting Wifi OTA update"); ESP_LOGI(TAG, "Starting Wifi OTA update");
ota_display(1, "**", WIFI_SSID); ota_display(1, "**", WIFI_SSID);