Merge branch 'cleanup' of jct/deskcontrol into master

.drone.yml

@@ -3,21 +3,24 @@ name: default
 
 steps:
 - name: build
-  image: python:2
+  image: python:3
   commands:
-  - apt-get -y update && apt-get -y install git && pip install platformio
+  - pip install platformio
+  - pio check
   - pio run
 - name: upload
-  image: python:2
+  image: python:3
   commands:
   - make otaupload
+  when:
+    event: tag
 - name: release
   image: plugins/gitea-release
   settings:
-    api_key: ef6a0baa30f8994719e236370290ac9f8bbbdb1d
+    api_key: 
+      from_secret: DRONE_ACCESS_TOKEN
     base_url: https://code.jcktrue.dk
     files:
-      - .pioenvs/nodemcu/firmware.bin
-      - .pioenvs/nodemcu/firmware.elf
+      - .pio/build/nodemcu/firmware.bin
   when:
-    event: tag
+    event: tag

.gitignore

@@ -1,4 +1,5 @@
 .pioenvs
 .piolibdeps
+.pio
 data/homie/config.json
 nbproject

Jenkinsfile

@@ -1,41 +0,0 @@
-pipeline {
-    agent {
-        docker {
-            image 'debian:stretch-slim' 
-        }
-    }
-
-    stages {
-        stage('Requirements') { 
-            steps {
-                sh 'apt-get -y update && apt-get -y install git python-pip cloc && pip install platformio' 
-            }
-        }
-        stage('Build') {
-            steps {
-                sh 'pio run'
-            }
-            post {
-                always {
-                    archiveArtifacts '.pioenvs/nodemcu/firmware.bin, .pioenvs/nodemcu/firmware.elf'
-                }
-            }
-        }
-        stage('Coverage') {
-            steps {
-                sh 'cloc --by-file --xml --out=.test/cloc.xml src include'
-            }
-            post {
-                always {
-                    recordIssues(tools: [taskScanner(ignoreCase: true, includePattern: 'src/*.*', normalTags: 'TODO')])
-                    sloccountPublish encoding: '', pattern: '.test/cloc.xml'
-                }
-            }
-        }
-        stage('Upload') {
-            steps {
-                sh 'make otaupload'
-            }
-        }
-    }
-}

Makefile

@@ -2,5 +2,5 @@ build:
 	pio run
 
 otaupload: 
-	pip install -r .piolibdeps/Homie/scripts/ota_updater/requirements.txt
-	python .piolibdeps/Homie/scripts/ota_updater/ota_updater.py -l mqtt.jcktrue.dk -i 18fe34f2f987 .pioenvs/nodemcu/firmware.bin
+	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

README.md

@@ -1,4 +1,5 @@
+[![Build Status](https://build.jcktrue.dk/api/badges/jct/deskcontrol/status.svg)](https://build.jcktrue.dk/jct/deskcontrol)
 # README #
-edit data/homie/config.json
-platformio run -t upload
-platformio run -t uploadfs
+* edit data/homie/config.json
+* platformio run -t upload
+* platformio run -t uploadfs

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, 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,116 +1,117 @@
+#include "config.h"
+
 #include <Homie.h>
-#include <Syslog.h>
-#include <WiFiUdp.h>
-WiFiUDP udpClient;
-Syslog syslog(udpClient, SYSLOG_PROTO_IETF);
-
-const int PIN_RELAY = D1;
-int timer = 0;
-HomieNode powerNode("power", "switch");
+#include "DHTesp.h"
+DHTesp dht;
 
 
 
-bool powerOnHandler(const HomieRange& range, const String& value) {
-    if (value != "true" && value != "false") return false;
-    bool on = (value == "true");
-    digitalWrite(PIN_RELAY, on ? LOW : HIGH);
-    powerNode.setProperty("on").send(value);
-    Homie.getLogger() << "Power is " << (on ? "on" : "off") << endl;
+#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)
+{
+    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);
+      Homie.getLogger() << "Power is on" << endl;
+    }
+    else
+    {
+      OUTPUT_SET(false);
+      Homie.getLogger() << "Power is off" << endl;
+    }
+    
     return true;
 }
 
-void setupHandler() {
-    pinMode(PIN_RELAY, OUTPUT);
-    digitalWrite(PIN_RELAY, HIGH);
+bool powerTimerHandler(const HomieRange& range, const String& value)
+{
+    int settimer = value.toInt();
+    if(settimer == 0 || settimer > 120) 
+         return false;
 
-    powerNode.setProperty("on").send("false");
+    timer = millis() + (settimer * 1000 * 60);
+    next_timer_update = millis() + 60*1000;
+    powerNode.setProperty("timer").send(String(settimer));
+    powerNode.setProperty("state").send("on");
+    Homie.getLogger() << "Power is on for " << settimer << "minutes" << endl;
+    OUTPUT_SET(true);
+    return true;
 }
 
-void onHomieEvent(const HomieEvent& event) {
-  switch(event.type) {
-    case HomieEventType::STANDALONE_MODE:
-      // Do whatever you want when standalone mode is started
-      break;
-    case HomieEventType::CONFIGURATION_MODE:
-      // Do whatever you want when configuration mode is started
-      break;
-    case HomieEventType::NORMAL_MODE:
-      // Do whatever you want when normal mode is started
-      break;
-    case HomieEventType::OTA_STARTED:
-      // Do whatever you want when OTA is started
-      break;
-    case HomieEventType::OTA_PROGRESS:
-      // Do whatever you want when OTA is in progress
 
-      // You can use event.sizeDone and event.sizeTotal
-      break;
-    case HomieEventType::OTA_FAILED:
-      // Do whatever you want when OTA is failed
-      break;
-    case HomieEventType::OTA_SUCCESSFUL:
-      // Do whatever you want when OTA is successful
-      break;
-    case HomieEventType::ABOUT_TO_RESET:
-      // Do whatever you want when the device is about to reset
-      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");
-      // You can use event.ip, event.gateway, event.mask
-      break;
-    case HomieEventType::WIFI_DISCONNECTED:
-      // Do whatever you want when Wi-Fi is disconnected in normal mode
+void setupHandler()
+{
+  pinMode(CONFIG_IO_RELAY, OUTPUT);
+  OUTPUT_SET(false);
+  powerNode.setProperty("state").send("off");
+  powerNode.setProperty("timer").send("0");
 
-      // You can use event.wifiReason
-      break;
-    case HomieEventType::MQTT_READY:
-      // Do whatever you want when MQTT is connected in normal mode
-      syslog.log(LOG_INFO, "MQTT connected");
-      break;
-    case HomieEventType::MQTT_DISCONNECTED:
-      // Do whatever you want when MQTT is disconnected in normal mode
-      syslog.log(LOG_INFO, "MQTT disconnected");
-      // You can use event.mqttReason
-      break;
-    case HomieEventType::MQTT_PACKET_ACKNOWLEDGED:
-      // Do whatever you want when an MQTT packet with QoS > 0 is acknowledged by the broker
+  dht.setup(CONFIG_IO_DHT11, DHTesp::DHT11); // Connect DHT sensor to GPIO 17
+}
 
-      // You can use event.packetId
-      break;
-    case HomieEventType::READY_TO_SLEEP:
-      // After you've called `prepareToSleep()`, the event is triggered when MQTT is disconnected
-      break;
-    case HomieEventType::SENDING_STATISTICS:
-      // Do whatever you want when statistics are sent in normal mode
-      break;
+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(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 setup() {
-    syslog.server("192.168.1.100", 514);
+void setup()
+{
+    Serial.begin(CONFIG_SERIAL_BAUDRATE);
+
+    Homie_setFirmware("deskcontrol", "0.4.2");
     
+    Homie.disableResetTrigger();
+    powerNode.advertise("state").settable(powerStateHandler);
+    powerNode.advertise("timer").settable(powerTimerHandler);
 
-    Serial.begin(115200);
-
-    Serial << endl << endl;
-    Serial << "Firmware 0.0.1" << endl;
-    Serial << endl << endl;
-
-    Homie_setFirmware("deskcontrol", "1.0.0");
-    Homie_setBrand("FuryFire");
-
-    powerNode.advertise("on").settable(powerOnHandler);
+    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();
 }