From a4c2d49fb0591fe30a1e7ea94e07f71d8f950acc Mon Sep 17 00:00:00 2001 From: Jens True Date: Tue, 3 Sep 2019 15:40:12 +0200 Subject: [PATCH] Sliming down and simplifying --- src/main.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 7dec079..c471c4a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2,7 +2,7 @@ #include const int PIN_RELAY = D1; -#define OUTPUT_SET(x) digitalWrite(PIN_RELAY, x ? LOW : HIGH); +#define OUTPUT_SET(x) digitalWrite(PIN_RELAY, x ? LOW : HIGH) unsigned int timer = 0; unsigned int next_timer_update = 0; HomieNode powerNode("power", "Power", "switch"); @@ -49,13 +49,14 @@ void loopHandler() { if(timer) { if(timer < millis()) - { + { //Timer has expired. (Ignore the wraparound...) timer = 0; OUTPUT_SET(false); powerNode.setProperty("timer").send("0"); powerNode.setProperty("state").send("off"); } - if(millis() > next_timer_update) { + + if(next_timer_update && millis() > next_timer_update) { next_timer_update = millis() + 60*1000; unsigned int time_remaining = timer - millis(); unsigned int min_left = time_remaining / (60*1000); @@ -69,13 +70,8 @@ void loopHandler() { void setup() { Serial.begin(115200); - Serial << endl << endl; - Serial << "Firmware 0.0.1" << endl; - Serial << endl << endl; - - Homie_setFirmware("deskcontrol", "1.0.0"); - Homie_setBrand("FuryFire"); - + Homie_setFirmware("deskcontrol", "1.1.0"); + Homie.disableResetTrigger(); powerNode.advertise("state").settable(powerStateHandler); powerNode.advertise("timer").settable(powerTimerHandler);