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

Version numbers done via tags
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Jens True
2019-11-29 10:14:03 +01:00
parent 019592f1ad
commit 0287456f1e
4 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main.cpp
View File

@ -5,7 +5,6 @@
DHTesp dht;
#define OUTPUT_SET(x) digitalWrite(CONFIG_IO_RELAY, x ? LOW : HIGH)
unsigned int timer = 0;
unsigned int next_timer_update = 0;
@ -14,10 +13,14 @@ HomieNode temperatureNode("temperature", "Temperature", "temperature");
bool powerStateHandler(const HomieRange& range, const String& value)
{
if (value != "on" && value != "off") return false;
if (value != "on" && value != "off")
{
return false;
}
powerNode.setProperty("state").send(value);
powerNode.setProperty("timer").send("0");
timer = 0;
if(value == "on")
{
OUTPUT_SET(true);
@ -50,6 +53,7 @@ bool powerTimerHandler(const HomieRange& range, const String& value)
void setupHandler()
{
pinMode(CONFIG_IO_RELAY, OUTPUT);
OUTPUT_SET(false);
powerNode.setProperty("state").send("off");
@ -58,7 +62,7 @@ void setupHandler()
dht.setup(CONFIG_IO_DHT11, DHTesp::DHT11); // Connect DHT sensor to GPIO 17
}
void loopHandler()
void loopHandleTimer()
{
if(timer)
{
@ -78,7 +82,10 @@ void loopHandler()
powerNode.setProperty("timer").send(String(min_left));
}
}
}
void loopHandleTemperature()
{
static unsigned long lastTemperatureSent = 0;
if (millis() - lastTemperatureSent >= CONFIG_TEMPERATURE_SEND_INTERVAL * 1000UL || lastTemperatureSent == 0)
{
@ -92,16 +99,25 @@ void loopHandler()
}
}
void loopHandler()
{
loopHandleTimer();
loopHandleTemperature();
}
void setup()
{
Serial.begin(CONFIG_SERIAL_BAUDRATE);
Homie_setFirmware("deskcontrol", "0.4.2");
Homie_setFirmware("deskcontrol", CONFIG_VERSION);
Homie.disableResetTrigger();
//Power
powerNode.advertise("state").settable(powerStateHandler);
powerNode.advertise("timer").settable(powerTimerHandler);
//Temperature
temperatureNode.advertise("humidity");
temperatureNode.advertise("temperature");