Compare commits
No commits in common. "master" and "v0.4.0" have entirely different histories.
11
.drone.yml
11
.drone.yml
@ -16,17 +16,10 @@ steps:
|
||||
- name: release
|
||||
image: plugins/gitea-release
|
||||
settings:
|
||||
api_key:
|
||||
from_secret: DRONE_ACCESS_TOKEN
|
||||
api_key: a7f3afc9f77e721951e48b4af66d7565700b7a2e
|
||||
base_url: https://code.jcktrue.dk
|
||||
files:
|
||||
- .pio/build/nodemcu/firmware.bin
|
||||
checksum:
|
||||
- md5
|
||||
- sha1
|
||||
- sha256
|
||||
- sha512
|
||||
- adler32
|
||||
- crc32
|
||||
- .pio/build/nodemcu/firmware.elf
|
||||
when:
|
||||
event: tag
|
||||
|
||||
5
.gitignore
vendored
5
.gitignore
vendored
@ -1,4 +1,5 @@
|
||||
.pioenvs
|
||||
.piolibdeps
|
||||
.pio
|
||||
data/homie/config.json
|
||||
.vscode
|
||||
output/doxygen
|
||||
nbproject
|
||||
|
||||
BIN
.vscode/.BROWSE.C_CPP.DB
vendored
Normal file
BIN
.vscode/.BROWSE.C_CPP.DB
vendored
Normal file
Binary file not shown.
129
.vscode/c_cpp_properties.json
vendored
Normal file
129
.vscode/c_cpp_properties.json
vendored
Normal file
@ -0,0 +1,129 @@
|
||||
{
|
||||
"configurations": [
|
||||
{
|
||||
"name": "!!! WARNING !!! AUTO-GENERATED FILE, PLEASE DO NOT MODIFY IT AND USE https://docs.platformio.org/page/projectconf/section_env_build.html#build-flags"
|
||||
},
|
||||
{
|
||||
"name": "Win32",
|
||||
"includePath": [
|
||||
"c:/Users/furyf/Dev/deskcontrol/src",
|
||||
"c:/Users/furyf/Dev/deskcontrol/.pio/libdeps/nodemcu/DHT sensor library for ESPx_ID2029",
|
||||
"c:/Users/furyf/Dev/deskcontrol/.pio/libdeps/nodemcu/Homie/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266mDNS/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266HTTPClient/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/Ticker",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/DNSServer/src",
|
||||
"c:/Users/furyf/Dev/deskcontrol/.pio/libdeps/nodemcu/ESP Async WebServer_ID306/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/Hash/src",
|
||||
"c:/Users/furyf/Dev/deskcontrol/.pio/libdeps/nodemcu/Bounce2_ID1106/src",
|
||||
"c:/Users/furyf/Dev/deskcontrol/.pio/libdeps/nodemcu/AsyncMqttClient_ID346/src",
|
||||
"c:/Users/furyf/Dev/deskcontrol/.pio/libdeps/nodemcu/ESPAsyncTCP_ID305/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266WiFi/src",
|
||||
"c:/Users/furyf/Dev/deskcontrol/.pio/libdeps/nodemcu/ArduinoJson_ID64/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/tools/sdk/include",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/tools/sdk/libc/xtensa-lx106-elf/include",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/cores/esp8266",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/tools/sdk/lwip2/include",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/variants/nodemcu",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/ArduinoOTA",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/EEPROM",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266AVRISP/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266HTTPUpdateServer/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266LLMNR",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266NetBIOS",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266SSDP",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266SdFat/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266WebServer/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266WiFiMesh/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266httpUpdate/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/Ethernet/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/GDBStub/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/SD/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/SDFS/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/SPI",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/SPISlave/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/Servo/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/SoftwareSerial/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/TFT_Touch_Shield_V2",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/Wire",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/esp8266/src",
|
||||
"C:/Users/furyf/.platformio/packages/tool-unity",
|
||||
""
|
||||
],
|
||||
"browse": {
|
||||
"limitSymbolsToIncludedHeaders": true,
|
||||
"databaseFilename": "${workspaceRoot}/.vscode/.browse.c_cpp.db",
|
||||
"path": [
|
||||
"c:/Users/furyf/Dev/deskcontrol/src",
|
||||
"c:/Users/furyf/Dev/deskcontrol/.pio/libdeps/nodemcu/DHT sensor library for ESPx_ID2029",
|
||||
"c:/Users/furyf/Dev/deskcontrol/.pio/libdeps/nodemcu/Homie/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266mDNS/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266HTTPClient/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/Ticker",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/DNSServer/src",
|
||||
"c:/Users/furyf/Dev/deskcontrol/.pio/libdeps/nodemcu/ESP Async WebServer_ID306/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/Hash/src",
|
||||
"c:/Users/furyf/Dev/deskcontrol/.pio/libdeps/nodemcu/Bounce2_ID1106/src",
|
||||
"c:/Users/furyf/Dev/deskcontrol/.pio/libdeps/nodemcu/AsyncMqttClient_ID346/src",
|
||||
"c:/Users/furyf/Dev/deskcontrol/.pio/libdeps/nodemcu/ESPAsyncTCP_ID305/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266WiFi/src",
|
||||
"c:/Users/furyf/Dev/deskcontrol/.pio/libdeps/nodemcu/ArduinoJson_ID64/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/tools/sdk/include",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/tools/sdk/libc/xtensa-lx106-elf/include",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/cores/esp8266",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/tools/sdk/lwip2/include",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/variants/nodemcu",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/ArduinoOTA",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/EEPROM",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266AVRISP/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266HTTPUpdateServer/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266LLMNR",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266NetBIOS",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266SSDP",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266SdFat/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266WebServer/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266WiFiMesh/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266httpUpdate/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/Ethernet/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/GDBStub/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/SD/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/SDFS/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/SPI",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/SPISlave/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/Servo/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/SoftwareSerial/src",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/TFT_Touch_Shield_V2",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/Wire",
|
||||
"C:/Users/furyf/.platformio/packages/framework-arduinoespressif8266/libraries/esp8266/src",
|
||||
"C:/Users/furyf/.platformio/packages/tool-unity",
|
||||
""
|
||||
]
|
||||
},
|
||||
"defines": [
|
||||
"PLATFORMIO=40000",
|
||||
"ESP8266",
|
||||
"ARDUINO_ARCH_ESP8266",
|
||||
"ARDUINO_ESP8266_NODEMCU",
|
||||
"PIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY",
|
||||
"F_CPU=80000000L",
|
||||
"__ets__",
|
||||
"ICACHE_FLASH",
|
||||
"ARDUINO=10805",
|
||||
"ARDUINO_BOARD=\"PLATFORMIO_NODEMCU\"",
|
||||
"FLASHMODE_QIO",
|
||||
"LWIP_OPEN_SRC",
|
||||
"NONOSDK221=1",
|
||||
"TCP_MSS=536",
|
||||
"LWIP_FEATURES=1",
|
||||
"LWIP_IPV6=0",
|
||||
"VTABLES_IN_FLASH",
|
||||
""
|
||||
],
|
||||
"intelliSenseMode": "clang-x64",
|
||||
"cStandard": "c99",
|
||||
"cppStandard": "c++11",
|
||||
"compilerPath": "\"C:/Users/furyf/.platformio/packages/toolchain-xtensa/bin/xtensa-lx106-elf-gcc.exe\" -mlongcalls -mtext-section-literals"
|
||||
}
|
||||
],
|
||||
"version": 4
|
||||
}
|
||||
7
.vscode/extensions.json
vendored
Normal file
7
.vscode/extensions.json
vendored
Normal file
@ -0,0 +1,7 @@
|
||||
{
|
||||
// See http://go.microsoft.com/fwlink/?LinkId=827846
|
||||
// for the documentation about the extensions.json format
|
||||
"recommendations": [
|
||||
"platformio.platformio-ide"
|
||||
]
|
||||
}
|
||||
32
.vscode/launch.json
vendored
Normal file
32
.vscode/launch.json
vendored
Normal file
@ -0,0 +1,32 @@
|
||||
// AUTOMATICALLY GENERATED FILE. PLEASE DO NOT MODIFY IT MANUALLY
|
||||
|
||||
// PIO Unified Debugger
|
||||
//
|
||||
// Documentation: https://docs.platformio.org/page/plus/debugging.html
|
||||
// Configuration: https://docs.platformio.org/page/projectconf/section_env_debug.html
|
||||
|
||||
{
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
"type": "platformio-debug",
|
||||
"request": "launch",
|
||||
"name": "PIO Debug",
|
||||
"executable": "c:/Users/furyf/Dev/deskcontrol/.pio/build/nodemcu/firmware.elf",
|
||||
"toolchainBinDir": "C:/Users/furyf/.platformio/packages/toolchain-xtensa/bin",
|
||||
"preLaunchTask": {
|
||||
"type": "PlatformIO",
|
||||
"task": "Pre-Debug"
|
||||
},
|
||||
"internalConsoleOptions": "openOnSessionStart"
|
||||
},
|
||||
{
|
||||
"type": "platformio-debug",
|
||||
"request": "launch",
|
||||
"name": "PIO Debug (skip Pre-Debug)",
|
||||
"executable": "c:/Users/furyf/Dev/deskcontrol/.pio/build/nodemcu/firmware.elf",
|
||||
"toolchainBinDir": "C:/Users/furyf/.platformio/packages/toolchain-xtensa/bin",
|
||||
"internalConsoleOptions": "openOnSessionStart"
|
||||
}
|
||||
]
|
||||
}
|
||||
6
.vscode/settings.json
vendored
Normal file
6
.vscode/settings.json
vendored
Normal file
@ -0,0 +1,6 @@
|
||||
{
|
||||
"terminal.integrated.env.windows": {
|
||||
"PATH": "C:\\Program Files (x86)\\STMicroelectronics\\st_toolset\\asm;C:\\Program Files (x86)\\Common Files\\Oracle\\Java\\javapath;C:\\WINDOWS\\system32;C:\\WINDOWS;C:\\WINDOWS\\System32\\Wbem;C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\;C:\\WINDOWS\\System32\\OpenSSH\\;C:\\Program Files (x86)\\STMicroelectronics\\STM32 ST-LINK Utility\\ST-LINK Utility;C:\\Program Files\\doxygen\\bin;C:\\Program Files (x86)\\QuickTime\\QTSystem\\;C:\\Users\\furyf\\scoop\\apps\\ruby\\current\\gems\\bin;C:\\Users\\furyf\\scoop\\apps\\ruby\\current\\bin;C:\\Users\\furyf\\scoop\\apps\\nodejs\\current\\bin;C:\\Users\\furyf\\scoop\\apps\\nodejs\\current;C:\\Users\\furyf\\go\\bin;C:\\Users\\furyf\\scoop\\apps\\composer\\current\\home\\vendor\\bin;C:\\Users\\furyf\\scoop\\apps\\python27\\current\\scripts;C:\\Users\\furyf\\scoop\\apps\\latex\\current\\texmfs\\install\\miktex\\bin;C:\\Users\\furyf\\scoop\\apps\\gcc\\current\\bin;C:\\Users\\furyf\\scoop\\apps\\nmap\\current\\bin;C:\\Users\\furyf\\AppData\\Local\\Programs\\Python\\Launcher\\;C:\\Users\\furyf\\scoop\\shims;C:\\Users\\furyf\\AppData\\Local\\Microsoft\\WindowsApps;C:\\Users\\furyf\\scoop\\apps\\msys\\current\\bin;C:\\Users\\furyf\\AppData\\Local\\Programs\\Microsoft VS Code\\bin;C:\\System\\PATH;%USERPROFILE%\\AppData\\Local\\Microsoft\\WindowsApps;C:\\Program Files (x86)\\STMicroelectronics\\st_toolset\\asm;C:\\Program Files (x86)\\Common Files\\Oracle\\Java\\javapath;C:\\WINDOWS\\system32;C:\\WINDOWS;C:\\WINDOWS\\System32\\Wbem;C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\;C:\\WINDOWS\\System32\\OpenSSH\\;C:\\Program Files (x86)\\STMicroelectronics\\STM32 ST-LINK Utility\\ST-LINK Utility;C:\\Program Files\\doxygen\\bin;C:\\Program Files (x86)\\QuickTime\\QTSystem\\;C:\\Users\\furyf\\scoop\\apps\\ruby\\current\\gems\\bin;C:\\Users\\furyf\\scoop\\apps\\ruby\\current\\bin;C:\\Users\\furyf\\scoop\\apps\\nodejs\\current\\bin;C:\\Users\\furyf\\scoop\\apps\\nodejs\\current;C:\\Users\\furyf\\go\\bin;C:\\Users\\furyf\\scoop\\apps\\composer\\current\\home\\vendor\\bin;C:\\Users\\furyf\\scoop\\apps\\python27\\current\\scripts;C:\\Users\\furyf\\scoop\\apps\\latex\\current\\texmfs\\install\\miktex\\bin;C:\\Users\\furyf\\scoop\\apps\\gcc\\current\\bin;C:\\Users\\furyf\\scoop\\apps\\nmap\\current\\bin;C:\\Users\\furyf\\AppData\\Local\\Programs\\Python\\Launcher\\;C:\\Users\\furyf\\scoop\\shims;C:\\Users\\furyf\\AppData\\Local\\Microsoft\\WindowsApps;C:\\Users\\furyf\\scoop\\apps\\msys\\current\\bin;C:\\Users\\furyf\\AppData\\Local\\Programs\\Microsoft VS Code\\bin;C:\\System\\PATH;%USERPROFILE%\\AppData\\Local\\Microsoft\\WindowsApps",
|
||||
"PLATFORMIO_CALLER": "vscode"
|
||||
}
|
||||
}
|
||||
3
Makefile
3
Makefile
@ -4,6 +4,3 @@ build:
|
||||
otaupload:
|
||||
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
|
||||
|
||||
docs:
|
||||
doxygen .\.doxygen
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
/**
|
||||
* \file
|
||||
* \class Config
|
||||
*/
|
||||
#ifndef CONFIG_H
|
||||
#define CONFIG_H
|
||||
|
||||
#ifndef 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"
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Set the default Serial baudrate in bits/seconds
|
||||
*/
|
||||
#define CONFIG_SERIAL_BAUDRATE 115200
|
||||
|
||||
/**
|
||||
* Pin ID of the output relay
|
||||
*/
|
||||
#define CONFIG_IO_RELAY D1
|
||||
/**
|
||||
* Pin ID of the DHT11 temperature sensor
|
||||
*/
|
||||
#define CONFIG_IO_DHT11 D2
|
||||
|
||||
/**
|
||||
* Interval at which the tempreature is sent in seconds
|
||||
*/
|
||||
#define CONFIG_TEMPERATURE_SEND_INTERVAL 60
|
||||
#endif
|
||||
@ -1,11 +1,30 @@
|
||||
#
|
||||
# Project Configuration File
|
||||
#
|
||||
# A detailed documentation with the EXAMPLES is located here:
|
||||
# http://docs.platformio.org/en/latest/projectconf.html
|
||||
#
|
||||
|
||||
# A sign `#` at the beginning of the line indicates a comment
|
||||
# Comment lines are ignored.
|
||||
|
||||
# Simple and base environment
|
||||
# [env:mybaseenv]
|
||||
# platform = %INSTALLED_PLATFORM_NAME_HERE%
|
||||
# framework =
|
||||
# board =
|
||||
#
|
||||
# Automatic targets - enable auto-uploading
|
||||
# targets = upload
|
||||
|
||||
[env]
|
||||
platform = espressif8266
|
||||
framework = arduino
|
||||
|
||||
upload_speed=921600
|
||||
|
||||
build_flags = -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY -DVERSION=${sysenv.DRONE_SEMVER}
|
||||
lib_deps = https://github.com/homieiot/homie-esp8266.git#develop, DHT sensor library for ESPx, HomieLoggerNode
|
||||
build_flags = -D PIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
|
||||
lib_deps = https://github.com/homieiot/homie-esp8266.git#develop-v3, DHT sensor library for ESPx
|
||||
|
||||
[env:nodemcu]
|
||||
board = nodemcu
|
||||
|
||||
134
src/main.cpp
134
src/main.cpp
@ -1,70 +1,34 @@
|
||||
/**
|
||||
* \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 <Homie.h>
|
||||
|
||||
#include <LoggerNode.h>
|
||||
LoggerNode LN; ///<Instance of the LoggerNode library
|
||||
|
||||
#include "DHTesp.h"
|
||||
DHTesp dht; ///< Instance of the DHT temperature controller.
|
||||
|
||||
|
||||
#define OUTPUT_SET(x) digitalWrite(CONFIG_IO_RELAY, x ? LOW : HIGH) ///< Macro for controlling the output state.
|
||||
unsigned int timer = 0; ///< Remaining time when counting down.
|
||||
unsigned int next_timer_update = 0; ///< Timer used to control when the timer value should be pushed to the server
|
||||
DHTesp dht;
|
||||
const int TEMPERATURE_INTERVAL = 60;
|
||||
unsigned long lastTemperatureSent = 0;
|
||||
|
||||
const int PIN_RELAY = D1;
|
||||
#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");
|
||||
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)
|
||||
{
|
||||
if (value != "on" && value != "off")
|
||||
{
|
||||
return false;
|
||||
}
|
||||
bool powerStateHandler(const HomieRange& range, const String& value) {
|
||||
if (value != "on" && value != "off") return false;
|
||||
powerNode.setProperty("state").send(value);
|
||||
powerNode.setProperty("timer").send("0");
|
||||
timer = 0;
|
||||
|
||||
if(value == "on")
|
||||
{
|
||||
if(value == "on") {
|
||||
OUTPUT_SET(true);
|
||||
LN.logf(__PRETTY_FUNCTION__, LoggerNode::INFO, "Power ON");
|
||||
}
|
||||
else
|
||||
{
|
||||
OUTPUT_SET(false); LN.logf(__PRETTY_FUNCTION__, LoggerNode::INFO, "Power OFF");
|
||||
Homie.getLogger() << "Power is on" << endl;
|
||||
} else {
|
||||
OUTPUT_SET(false);
|
||||
Homie.getLogger() << "Power is off" << endl;
|
||||
}
|
||||
|
||||
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();
|
||||
if(settimer == 0 || settimer > 120)
|
||||
return false;
|
||||
@ -73,29 +37,23 @@ bool powerTimerHandler(const HomieRange& range, const String& value)
|
||||
next_timer_update = millis() + 60*1000;
|
||||
powerNode.setProperty("timer").send(String(settimer));
|
||||
powerNode.setProperty("state").send("on");
|
||||
LN.logf(__PRETTY_FUNCTION__, LoggerNode::INFO, "Power on for %d minutes", settimer);
|
||||
Homie.getLogger() << "Power is on for " << settimer << "minutes" << endl;
|
||||
OUTPUT_SET(true);
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* setupHandler. Comply with Homie interface
|
||||
*/
|
||||
void setupHandler()
|
||||
{
|
||||
pinMode(CONFIG_IO_RELAY, OUTPUT);
|
||||
|
||||
void setupHandler() {
|
||||
pinMode(PIN_RELAY, OUTPUT);
|
||||
OUTPUT_SET(false);
|
||||
powerNode.setProperty("state").send("off");
|
||||
powerNode.setProperty("timer").send("0");
|
||||
|
||||
dht.setup(CONFIG_IO_DHT11, DHTesp::DHT11); // Connect DHT sensor to GPIO 17
|
||||
|
||||
dht.setup(D1, DHTesp::DHT11); // Connect DHT sensor to GPIO 17
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle timer updates from the main event loop
|
||||
*/
|
||||
void loopHandleTimer()
|
||||
{
|
||||
void loopHandler() {
|
||||
if(timer)
|
||||
{
|
||||
if(timer < millis())
|
||||
@ -106,62 +64,36 @@ void loopHandleTimer()
|
||||
powerNode.setProperty("state").send("off");
|
||||
}
|
||||
|
||||
if(next_timer_update && 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);
|
||||
powerNode.setProperty("timer").send(String(min_left));
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle periodic temperature measurements from the main event loop
|
||||
*/
|
||||
void loopHandleTemperature()
|
||||
{
|
||||
static unsigned long lastTemperatureSent = 0;
|
||||
if (millis() - lastTemperatureSent >= CONFIG_TEMPERATURE_SEND_INTERVAL * 1000UL || lastTemperatureSent == 0)
|
||||
if (millis() - lastTemperatureSent >= TEMPERATURE_INTERVAL * 1000UL || lastTemperatureSent == 0)
|
||||
{
|
||||
float humidity = dht.getHumidity();
|
||||
float temperature = dht.getTemperature();
|
||||
LN.logf(__PRETTY_FUNCTION__, LoggerNode::DEBUG, "Temperature: %f C Humidity: %f", temperature, humidity);
|
||||
|
||||
Homie.getLogger() << "Temperature: " << temperature << "°C " << humidity << "% Humidty" << endl;
|
||||
temperatureNode.setProperty("temperature").send(String(temperature));
|
||||
temperatureNode.setProperty("humidity").send(String(humidity));
|
||||
lastTemperatureSent = millis();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Main event loop. Part of the Homie API. This runs while the device is active and connected.
|
||||
*
|
||||
* \callgraph
|
||||
*/
|
||||
void loopHandler()
|
||||
{
|
||||
loopHandleTimer();
|
||||
loopHandleTemperature();
|
||||
}
|
||||
void setup() {
|
||||
Serial.begin(115200);
|
||||
|
||||
/**
|
||||
* Arduino style setup() routine.
|
||||
* Configure the Homie framework by adding the two nodes "power" and "temperature"
|
||||
*/
|
||||
void setup()
|
||||
{
|
||||
|
||||
Homie_setFirmware("deskcontrol", VERSION);
|
||||
Homie.setLoggingPrinter(&Serial);
|
||||
Serial.begin(CONFIG_SERIAL_BAUDRATE);
|
||||
Homie_setFirmware("deskcontrol", "1.1.0");
|
||||
|
||||
Homie.disableResetTrigger();
|
||||
|
||||
//Power
|
||||
powerNode.advertise("state").settable(powerStateHandler);
|
||||
powerNode.advertise("timer").settable(powerTimerHandler);
|
||||
|
||||
//Temperature
|
||||
temperatureNode.advertise("humidity");
|
||||
temperatureNode.advertise("temperature");
|
||||
|
||||
@ -171,10 +103,6 @@ void setup()
|
||||
Homie.setup();
|
||||
}
|
||||
|
||||
/**
|
||||
* Arduino main loop. Forwarded to Homie framework
|
||||
*/
|
||||
void loop()
|
||||
{
|
||||
void loop() {
|
||||
Homie.loop();
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user