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

Merge branch 'mqtt' into bmp

Browse Source
This commit is contained in:
Nicu Hodos 2021-12-07 23:29:46 +01:00
commit b4c7661c3a
2 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/display.h
View File

@ -13,7 +13,7 @@
namespace Display { namespace Display {
void displayColon(); void displayColon();
Task tDisplay(500, TASK_FOREVER, Display::displayColon, &ts, true); Task tDisplay(500, TASK_FOREVER, displayColon, &ts, true);
uint8_t brightness = BRIGHTNESS; uint8_t brightness = BRIGHTNESS;
int currentHour = -1; int currentHour = -1;
@ -85,14 +85,20 @@ namespace Display {
clockDisplay.writeDisplay(); clockDisplay.writeDisplay();
} }
void displayValue(int value) { void displayValue(uint8_t value) {
tDisplay.disable();
displayColon(false);
clockDisplay.print(value, HEX); clockDisplay.print(value, HEX);
clockDisplay.writeDisplay(); clockDisplay.writeDisplay();
adjustTime();
tDisplay.enableDelayed(1000);
} }
void displayText(const char c[]) { void displayText(const char c[]) {
clockDisplay.println(c); clockDisplay.println(c);
clockDisplay.writeDisplay(); clockDisplay.writeDisplay();
adjustTime();
tDisplay.enableDelayed(1000);
} }
void setup() { void setup() {

46
include/ir.h
View File

@ -37,20 +37,10 @@ namespace Ir {
return newCommand; return newCommand;
} }
void displayValue() { void command(const char c[]) {
Display::tDisplay.disable(); avrOn = true;
Display::displayColon(false); Wifi::reconnect();
Display::displayValue(lastCommand);
Display::adjustTime();
Display::tDisplay.enableDelayed(1000);
}
void displayText(const char c[]) {
Display::tDisplay.disable();
Display::displayColon(false);
Display::displayText(c); Display::displayText(c);
Display::adjustTime();
Display::tDisplay.enableDelayed(1000);
} }
void loop() { void loop() {
@ -60,27 +50,41 @@ namespace Ir {
case 0x9F: case 0x9F:
avrOn = false; avrOn = false;
tCheckWifi.enable(); tCheckWifi.enable();
displayText("Off"); Display::displayText("Off");
break;
case 0x12:
command("Slp");
break; break;
case 0xC4: case 0xC4:
command("Play");
break;
case 0xD0: case 0xD0:
command("Fire");
break;
case 0xC0: case 0xC0:
avrOn = true; command("On");
Wifi::reconnect();
break; break;
default: default:
displayValue(); Display::displayValue(lastCommand);
break; break;
} }
} }
if (!avrOn && Mqtt::commands.getCurrent() == 0xC7) { if (Mqtt::commands.getCurrent() == 0xC7) {
displayText("Up"); if (!avrOn) {
Display::displayText("B Up");
Display::changeBrightness(true); Display::changeBrightness(true);
} else {
Display::displayText(" Up");
}
Mqtt::commands.pop(); Mqtt::commands.pop();
} }
if (!avrOn && Mqtt::commands.getCurrent() == 0xC8) { if (Mqtt::commands.getCurrent() == 0xC8) {
displayText("Down"); if (!avrOn) {
Display::displayText("B Dn");
Display::changeBrightness(false); Display::changeBrightness(false);
} else {
Display::displayText(" Dn");
}
Mqtt::commands.pop(); Mqtt::commands.pop();
} }
} }