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

display text commands

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/display.h
View File

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

12
include/ir.h
View File

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