Compare commits
No commits in common. "master" and "v.0.5.1" have entirely different histories.
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,4 +1,6 @@
|
|||||||
|
.pioenvs
|
||||||
|
.piolibdeps
|
||||||
.pio
|
.pio
|
||||||
data/homie/config.json
|
data/homie/config.json
|
||||||
|
nbproject
|
||||||
.vscode
|
.vscode
|
||||||
output/doxygen
|
|
||||||
|
3
Makefile
3
Makefile
@ -4,6 +4,3 @@ build:
|
|||||||
otaupload:
|
otaupload:
|
||||||
pip install -r .pio/libdeps/nodemcu/Homie/scripts/ota_updater/requirements.txt
|
pip install -r .pio/libdeps/nodemcu/Homie/scripts/ota_updater/requirements.txt
|
||||||
python .pio/libdeps/nodemcu/Homie/scripts/ota_updater/ota_updater.py -l mqtt.jcktrue.dk -i 18fe34f2f987 .pio/build/nodemcu/firmware.bin
|
python .pio/libdeps/nodemcu/Homie/scripts/ota_updater/ota_updater.py -l mqtt.jcktrue.dk -i 18fe34f2f987 .pio/build/nodemcu/firmware.bin
|
||||||
|
|
||||||
docs:
|
|
||||||
doxygen .\.doxygen
|
|
||||||
|
@ -1,36 +1,15 @@
|
|||||||
/**
|
|
||||||
* \file
|
|
||||||
* \class Config
|
|
||||||
*/
|
|
||||||
#ifndef CONFIG_H
|
#ifndef CONFIG_H
|
||||||
#define CONFIG_H
|
#define CONFIG_H
|
||||||
|
|
||||||
#ifndef VERSION
|
#ifndef VERSION
|
||||||
//SEMVER style version
|
//SEMVER style version
|
||||||
/**
|
|
||||||
* \brief Version string.
|
|
||||||
* Update as needed. Formatted as SEMVER style string.
|
|
||||||
* See https://semver.org/ for more information.
|
|
||||||
*/
|
|
||||||
#define VERSION "0.4.5-Dev"
|
#define VERSION "0.4.5-Dev"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
|
||||||
* Set the default Serial baudrate in bits/seconds
|
|
||||||
*/
|
|
||||||
#define CONFIG_SERIAL_BAUDRATE 115200
|
#define CONFIG_SERIAL_BAUDRATE 115200
|
||||||
|
|
||||||
/**
|
|
||||||
* Pin ID of the output relay
|
|
||||||
*/
|
|
||||||
#define CONFIG_IO_RELAY D1
|
#define CONFIG_IO_RELAY D1
|
||||||
/**
|
|
||||||
* Pin ID of the DHT11 temperature sensor
|
|
||||||
*/
|
|
||||||
#define CONFIG_IO_DHT11 D2
|
#define CONFIG_IO_DHT11 D2
|
||||||
|
|
||||||
/**
|
|
||||||
* Interval at which the tempreature is sent in seconds
|
|
||||||
*/
|
|
||||||
#define CONFIG_TEMPERATURE_SEND_INTERVAL 60
|
#define CONFIG_TEMPERATURE_SEND_INTERVAL 60
|
||||||
#endif
|
#endif
|
58
src/main.cpp
58
src/main.cpp
@ -1,38 +1,20 @@
|
|||||||
/**
|
|
||||||
* \brief Entry point
|
|
||||||
*
|
|
||||||
* Deskcontrol is a simple on/off timer switch inteded for use with an ATX PSU.
|
|
||||||
* The theory of operation is turning on and off power by pulling the control line low/high while
|
|
||||||
* running of the 5V standby line.
|
|
||||||
*
|
|
||||||
* Additional features include support for a DHT11 to log the temperature.
|
|
||||||
* \file
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
#include <Homie.h>
|
#include <Homie.h>
|
||||||
|
|
||||||
#include <LoggerNode.h>
|
#include <LoggerNode.h>
|
||||||
LoggerNode LN; ///<Instance of the LoggerNode library
|
LoggerNode LN;
|
||||||
|
|
||||||
#include "DHTesp.h"
|
#include "DHTesp.h"
|
||||||
DHTesp dht; ///< Instance of the DHT temperature controller.
|
DHTesp dht;
|
||||||
|
|
||||||
|
|
||||||
#define OUTPUT_SET(x) digitalWrite(CONFIG_IO_RELAY, x ? LOW : HIGH) ///< Macro for controlling the output state.
|
#define OUTPUT_SET(x) digitalWrite(CONFIG_IO_RELAY, x ? LOW : HIGH)
|
||||||
unsigned int timer = 0; ///< Remaining time when counting down.
|
unsigned int timer = 0;
|
||||||
unsigned int next_timer_update = 0; ///< Timer used to control when the timer value should be pushed to the server
|
unsigned int next_timer_update = 0;
|
||||||
|
|
||||||
HomieNode powerNode("power", "Power", "switch");
|
HomieNode powerNode("power", "Power", "switch");
|
||||||
HomieNode temperatureNode("temperature", "Temperature", "temperature");
|
HomieNode temperatureNode("temperature", "Temperature", "temperature");
|
||||||
|
|
||||||
/** Power state handler
|
|
||||||
* Handles event on the power state MQTT node
|
|
||||||
* \param[in] range Currently unused
|
|
||||||
* \param[in] value New value of the power state. (Either "on" or off")
|
|
||||||
* \return False if input is invalid. Otherwise true.
|
|
||||||
*/
|
|
||||||
bool powerStateHandler(const HomieRange& range, const String& value)
|
bool powerStateHandler(const HomieRange& range, const String& value)
|
||||||
{
|
{
|
||||||
if (value != "on" && value != "off")
|
if (value != "on" && value != "off")
|
||||||
@ -56,13 +38,6 @@ bool powerStateHandler(const HomieRange& range, const String& value)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* \brief powerTimer event handler.
|
|
||||||
* Handler for events on the powerTimer node.
|
|
||||||
* \param[in] range Currently unused.
|
|
||||||
* \param[in] value New value for the timer in minutes. ASCII representation of an integer from 1 to 120.
|
|
||||||
* \return False if input is invalid. Otherwise true.
|
|
||||||
*/
|
|
||||||
bool powerTimerHandler(const HomieRange& range, const String& value)
|
bool powerTimerHandler(const HomieRange& range, const String& value)
|
||||||
{
|
{
|
||||||
int settimer = value.toInt();
|
int settimer = value.toInt();
|
||||||
@ -78,11 +53,10 @@ bool powerTimerHandler(const HomieRange& range, const String& value)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* setupHandler. Comply with Homie interface
|
|
||||||
*/
|
|
||||||
void setupHandler()
|
void setupHandler()
|
||||||
{
|
{
|
||||||
|
|
||||||
pinMode(CONFIG_IO_RELAY, OUTPUT);
|
pinMode(CONFIG_IO_RELAY, OUTPUT);
|
||||||
OUTPUT_SET(false);
|
OUTPUT_SET(false);
|
||||||
powerNode.setProperty("state").send("off");
|
powerNode.setProperty("state").send("off");
|
||||||
@ -91,9 +65,6 @@ void setupHandler()
|
|||||||
dht.setup(CONFIG_IO_DHT11, DHTesp::DHT11); // Connect DHT sensor to GPIO 17
|
dht.setup(CONFIG_IO_DHT11, DHTesp::DHT11); // Connect DHT sensor to GPIO 17
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Handle timer updates from the main event loop
|
|
||||||
*/
|
|
||||||
void loopHandleTimer()
|
void loopHandleTimer()
|
||||||
{
|
{
|
||||||
if(timer)
|
if(timer)
|
||||||
@ -116,9 +87,6 @@ void loopHandleTimer()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Handle periodic temperature measurements from the main event loop
|
|
||||||
*/
|
|
||||||
void loopHandleTemperature()
|
void loopHandleTemperature()
|
||||||
{
|
{
|
||||||
static unsigned long lastTemperatureSent = 0;
|
static unsigned long lastTemperatureSent = 0;
|
||||||
@ -133,21 +101,12 @@ void loopHandleTemperature()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Main event loop. Part of the Homie API. This runs while the device is active and connected.
|
|
||||||
*
|
|
||||||
* \callgraph
|
|
||||||
*/
|
|
||||||
void loopHandler()
|
void loopHandler()
|
||||||
{
|
{
|
||||||
loopHandleTimer();
|
loopHandleTimer();
|
||||||
loopHandleTemperature();
|
loopHandleTemperature();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Arduino style setup() routine.
|
|
||||||
* Configure the Homie framework by adding the two nodes "power" and "temperature"
|
|
||||||
*/
|
|
||||||
void setup()
|
void setup()
|
||||||
{
|
{
|
||||||
|
|
||||||
@ -171,9 +130,6 @@ void setup()
|
|||||||
Homie.setup();
|
Homie.setup();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Arduino main loop. Forwarded to Homie framework
|
|
||||||
*/
|
|
||||||
void loop()
|
void loop()
|
||||||
{
|
{
|
||||||
Homie.loop();
|
Homie.loop();
|
||||||
|
Loading…
Reference in New Issue
Block a user