arduino/esp-clock
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor display methods

Browse Source
This commit is contained in:
Nicu Hodos 2021-12-08 18:08:40 +01:00
parent c676c9215d
commit 07c2e67a8f
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/display.h
View File

@ -22,7 +22,7 @@ namespace Display {
// Create display object // Create display object
Adafruit_7segment clockDisplay = Adafruit_7segment(); Adafruit_7segment clockDisplay = Adafruit_7segment();
void adjustTime() { void drawTime() {
int displayHour = hour(); int displayHour = hour();
int displayMinute = minute(); int displayMinute = minute();
int displayValue = displayHour * 100 + displayMinute; int displayValue = displayHour * 100 + displayMinute;
@ -55,7 +55,7 @@ namespace Display {
clockDisplay.setBrightness(brightness); clockDisplay.setBrightness(brightness);
} }
void displayColon(bool colonOn) { void drawColon(bool colonOn) {
if (colonOn) { if (colonOn) {
if (currentHour != hour()) { if (currentHour != hour()) {
currentHour = hour(); currentHour = hour();
@ -65,7 +65,7 @@ namespace Display {
} }
if (currentMin != minute()) { if (currentMin != minute()) {
currentMin = minute(); currentMin = minute();
adjustTime(); drawTime();
} }
} }
clockDisplay.drawColon(colonOn); clockDisplay.drawColon(colonOn);
@ -74,7 +74,7 @@ namespace Display {
void displayColon() { void displayColon() {
static bool colonOn = false; static bool colonOn = false;
displayColon(colonOn); drawColon(colonOn);
clockDisplay.writeDisplay(); clockDisplay.writeDisplay();
colonOn = !colonOn; colonOn = !colonOn;
@ -82,35 +82,35 @@ namespace Display {
void displayFloat(float value) { void displayFloat(float value) {
tDisplay.disable(); tDisplay.disable();
displayColon(false); drawColon(false);
clockDisplay.print(value); clockDisplay.print(value);
clockDisplay.writeDisplay(); clockDisplay.writeDisplay();
adjustTime(); drawTime();
tDisplay.enableDelayed(1000); tDisplay.enableDelayed(1000);
} }
void displayValue(uint8_t value) { void displayValue(uint8_t value) {
tDisplay.disable(); tDisplay.disable();
displayColon(false); drawColon(false);
clockDisplay.print(value, HEX); clockDisplay.print(value, HEX);
clockDisplay.writeDisplay(); clockDisplay.writeDisplay();
adjustTime(); drawTime();
tDisplay.enableDelayed(1000); tDisplay.enableDelayed(1000);
} }
void displayText(const char c[]) { void displayText(const char c[]) {
tDisplay.disable(); tDisplay.disable();
displayColon(false); drawColon(false);
clockDisplay.println(c); clockDisplay.println(c);
clockDisplay.writeDisplay(); clockDisplay.writeDisplay();
adjustTime(); drawTime();
tDisplay.enableDelayed(1000); tDisplay.enableDelayed(1000);
} }
void setup() { void setup() {
clockDisplay.begin(DISPLAY_ADDRESS); clockDisplay.begin(DISPLAY_ADDRESS);
clockDisplay.setBrightness(brightness); clockDisplay.setBrightness(brightness);
adjustTime(); drawTime();
displayColon(); displayColon();
} }
} }

1
src/esp_clock.cpp
View File

@ -55,6 +55,7 @@ void onWifiConnected() {
void checkWifiCallback() { void checkWifiCallback() {
if (difftime(now(), Ntp::lastConnectedTime) > STAY_CONNECTED_AFTER_BOOT) { if (difftime(now(), Ntp::lastConnectedTime) > STAY_CONNECTED_AFTER_BOOT) {
Mqtt::client.disconnect();
Wifi::disconnect(); Wifi::disconnect();
Ota::tLoop.disable(); Ota::tLoop.disable();
tCheckWifi.disable(); tCheckWifi.disable();