display text commands

This commit is contained in:
Nicu Hodos 2021-12-07 20:20:03 +01:00
parent 50b2a11ec1
commit 5346e3f5a6
2 changed files with 16 additions and 8 deletions

View File

@ -55,9 +55,7 @@ namespace Display {
clockDisplay.setBrightness(brightness);
}
void displayColon() {
static bool colonOn = false;
void displayColon(bool colonOn) {
if (colonOn) {
if (currentHour != hour()) {
currentHour = hour();
@ -71,6 +69,12 @@ namespace Display {
}
}
clockDisplay.drawColon(colonOn);
}
void displayColon() {
static bool colonOn = false;
displayColon(colonOn);
clockDisplay.writeDisplay();
colonOn = !colonOn;
@ -82,7 +86,7 @@ namespace Display {
}
void displayText(const char c[]) {
clockDisplay.print(c);
clockDisplay.println(c);
clockDisplay.writeDisplay();
}

View File

@ -38,13 +38,16 @@ namespace Ir {
}
void displayValue() {
Display::tDisplay.disable();
Display::displayColon(false);
Display::displayValue(lastCommand);
Display::tDisplay.setCallback(Display::displayColon);
Display::adjustTime();
Display::tDisplay.enableDelayed(1000);
}
void displayText(const char c[]) {
Display::tDisplay.disable();
Display::displayColon(false);
Display::displayText(c);
Display::adjustTime();
Display::tDisplay.enableDelayed(1000);
@ -57,7 +60,7 @@ namespace Ir {
case 0x9F:
avrOn = false;
tCheckWifi.enable();
displayText("off");
displayText("Off");
break;
case 0xC4:
case 0xD0:
@ -66,16 +69,17 @@ namespace Ir {
Wifi::reconnect();
break;
default:
Display::tDisplay.setCallback(displayValue);
Display::tDisplay.forceNextIteration();
displayValue();
break;
}
}
if (!avrOn && Mqtt::commands.getCurrent() == 0xC7) {
displayText("Up");
Display::changeBrightness(true);
Mqtt::commands.pop();
}
if (!avrOn && Mqtt::commands.getCurrent() == 0xC8) {
displayText("Down");
Display::changeBrightness(false);
Mqtt::commands.pop();
}