Merge branch 'cleanup' of jct/deskcontrol into master

.drone.yml

@@ -6,6 +6,7 @@ steps:
   image: python:3
   commands:
   - pip install platformio
+  - pio check
   - pio run
 - name: upload
   image: python:3
@@ -16,10 +17,10 @@ steps:
 - name: release
   image: plugins/gitea-release
   settings:
-    api_key: a7f3afc9f77e721951e48b4af66d7565700b7a2e
+    api_key: 
+      from_secret: DRONE_ACCESS_TOKEN
     base_url: https://code.jcktrue.dk
     files:
       - .pio/build/nodemcu/firmware.bin
-      - .pio/build/nodemcu/firmware.elf
   when:
     event: tag

data/homie/config.example.json

@@ -0,0 +1,15 @@
+{
+  "name": "deskcontrol",
+  "wifi": {
+    "ssid": "<SSID>",
+    "password": "<PASS>"
+  },
+  "mqtt": {
+    "host": "<Domain>",
+    "port": 1883,
+    "auth": false
+  },
+  "ota": {
+    "enabled": true
+  }
+}

include/config.h

@@ -0,0 +1,11 @@
+#ifndef CONFIG_H
+
+#define CONFIG_H
+
+#define CONFIG_SERIAL_BAUDRATE  115200
+
+#define CONFIG_IO_RELAY         D1
+#define CONFIG_IO_DHT11         D2
+
+#define CONFIG_TEMPERATURE_SEND_INTERVAL 60
+#endif

platformio.ini

@@ -17,11 +17,15 @@
 # Automatic targets - enable auto-uploading
 # targets = upload
 
-[env:nodemcu]
+[env]
 platform = espressif8266
 framework = arduino
-board = nodemcu
+
 upload_speed=921600
 
 build_flags = -D PIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
-lib_deps = https://github.com/homieiot/homie-esp8266.git#develop-v3, Syslog
+lib_deps = https://github.com/homieiot/homie-esp8266.git#develop-v3, DHT sensor library for ESPx
+
+[env:nodemcu]
+board = nodemcu
+

src/main.cpp

@@ -1,24 +1,30 @@
-#include <Homie.h>
-#include <Syslog.h>
-#include <WiFiUdp.h>
-WiFiUDP udpClient;
-Syslog syslog(udpClient, SYSLOG_PROTO_IETF);
+#include "config.h"
 
-const int PIN_RELAY = D1;
-#define OUTPUT_SET(x)  digitalWrite(PIN_RELAY, x ? LOW : HIGH);
+#include <Homie.h>
+#include "DHTesp.h"
+DHTesp dht;
+
+
+
+#define OUTPUT_SET(x)  digitalWrite(CONFIG_IO_RELAY, x ? LOW : HIGH)
 unsigned int timer = 0;
 unsigned int next_timer_update = 0;
 HomieNode powerNode("power", "Power", "switch");
+HomieNode temperatureNode("temperature", "Temperature", "temperature");
 
-bool powerStateHandler(const HomieRange& range, const String& value) {
+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);
       Homie.getLogger() << "Power is on" << endl;
-    } else {
+    }
+    else
+    {
       OUTPUT_SET(false);
       Homie.getLogger() << "Power is off" << endl;
     }
@@ -26,7 +32,8 @@ bool powerStateHandler(const HomieRange& range, const String& value) {
     return 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;
@@ -41,80 +48,70 @@ bool powerTimerHandler(const HomieRange& range, const String& value) {
 }
 
 
-void setupHandler() {
-    pinMode(PIN_RELAY, OUTPUT);
+void setupHandler()
+{
+  pinMode(CONFIG_IO_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
 }
 
-void loopHandler() {
+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);
       powerNode.setProperty("timer").send(String(min_left));
-
     }
   }
+
+  static unsigned long lastTemperatureSent = 0;
+  if (millis() - lastTemperatureSent >= CONFIG_TEMPERATURE_SEND_INTERVAL * 1000UL || lastTemperatureSent == 0)
+  {
+    float humidity = dht.getHumidity();
+    float temperature = dht.getTemperature();
+
+    Homie.getLogger() << "Temperature: " << temperature << "°C " << humidity << "% Humidty" << endl;
+    temperatureNode.setProperty("temperature").send(String(temperature));
+    temperatureNode.setProperty("humidity").send(String(humidity));
+    lastTemperatureSent = millis();
+  }
 }
 
-void onHomieEvent(const HomieEvent& event) {
-  switch(event.type) {
-    case HomieEventType::OTA_FAILED:
-      syslog.log(LOG_INFO, "OTA failed");
-      // Do whatever you want when OTA is failed
-      break;
-    case HomieEventType::OTA_SUCCESSFUL:
-      syslog.log(LOG_INFO, "OTA completed");
-      break;
-    case HomieEventType::WIFI_CONNECTED:
-      // Do whatever you want when Wi-Fi is connected in normal mode
-      syslog.deviceHostname(Homie.getConfiguration().name);
-      syslog.appName("deskcontrol");
-      syslog.defaultPriority(LOG_ERR);
-      syslog.log(LOG_INFO, "WiFi Connected, software version: 1.0");
-      break;
-    case HomieEventType::MQTT_READY:
-      syslog.log(LOG_INFO, "MQTT connected");
-      break;
-    case HomieEventType::MQTT_DISCONNECTED:
-      syslog.log(LOG_INFO, "MQTT disconnected");
-      break;
-    default:
-      break;
-  }
-}
+void setup()
+{
+    Serial.begin(CONFIG_SERIAL_BAUDRATE);
 
-void setup() {
-    syslog.server("192.168.1.100", 514);
-
-    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", "0.4.2");
     
+    Homie.disableResetTrigger();
     powerNode.advertise("state").settable(powerStateHandler);
     powerNode.advertise("timer").settable(powerTimerHandler);
+
+    temperatureNode.advertise("humidity");
+    temperatureNode.advertise("temperature");
+
     Homie.setSetupFunction(setupHandler);
-    Homie.onEvent(onHomieEvent); // before Homie.setup()
     Homie.setLoopFunction(loopHandler);
+
     Homie.setup();
 }
 
-void loop() {
+void loop()
+{
     Homie.loop();
 }