jct/deskcontrol
1
0
Fork 0
Code Pull Requests Releases 13 Activity

Sliming down and simplifying
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Jens True
2019-09-03 15:40:12 +02:00
parent bad20a7f58
commit a4c2d49fb0
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main.cpp
View File

@ -2,7 +2,7 @@
#include <WiFiUdp.h> #include <WiFiUdp.h>
const int PIN_RELAY = D1; 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 timer = 0;
unsigned int next_timer_update = 0; unsigned int next_timer_update = 0;
HomieNode powerNode("power", "Power", "switch"); HomieNode powerNode("power", "Power", "switch");
@ -49,13 +49,14 @@ void loopHandler() {
if(timer) if(timer)
{ {
if(timer < millis()) if(timer < millis())
{ { //Timer has expired. (Ignore the wraparound...)
timer = 0; timer = 0;
OUTPUT_SET(false); OUTPUT_SET(false);
powerNode.setProperty("timer").send("0"); powerNode.setProperty("timer").send("0");
powerNode.setProperty("state").send("off"); powerNode.setProperty("state").send("off");
} }
if(millis() > next_timer_update) {
if(next_timer_update && millis() > next_timer_update) {
next_timer_update = millis() + 60*1000; next_timer_update = millis() + 60*1000;
unsigned int time_remaining = timer - millis(); unsigned int time_remaining = timer - millis();
unsigned int min_left = time_remaining / (60*1000); unsigned int min_left = time_remaining / (60*1000);
@ -69,13 +70,8 @@ void loopHandler() {
void setup() { void setup() {
Serial.begin(115200); Serial.begin(115200);
Serial << endl << endl; Homie_setFirmware("deskcontrol", "1.1.0");
Serial << "Firmware 0.0.1" << endl;
Serial << endl << endl;
Homie_setFirmware("deskcontrol", "1.0.0");
Homie_setBrand("FuryFire");
Homie.disableResetTrigger(); Homie.disableResetTrigger();
powerNode.advertise("state").settable(powerStateHandler); powerNode.advertise("state").settable(powerStateHandler);
powerNode.advertise("timer").settable(powerTimerHandler); powerNode.advertise("timer").settable(powerTimerHandler);