Merge branch 'refactoring' of jct/deskcontrol into master

.drone.yml

@@ -14,6 +14,8 @@ steps:
   - make otaupload
   when:
     event: tag
+    branch: 
+      - master
 - name: release
   image: plugins/gitea-release
   settings:
@@ -22,5 +24,14 @@ steps:
     base_url: https://code.jcktrue.dk
     files:
       - .pio/build/nodemcu/firmware.bin
+    checksum:
+      - md5
+      - sha1
+      - sha256
+      - sha512
+      - adler32
+      - crc32
   when:
     event: tag
+    branch: 
+      - master

include/config.h

@@ -1,7 +1,11 @@
 #ifndef CONFIG_H
-
 #define CONFIG_H
 
+#ifndef VERSION
+//SEMVER style version
+#define VERSION          "0.4.5-Dev"
+#endif
+
 #define CONFIG_SERIAL_BAUDRATE  115200
 
 #define CONFIG_IO_RELAY         D1

platformio.ini

@@ -1,29 +1,10 @@
-#
-# 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 = -D PIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
+build_flags = -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY -DVERSION=${sysenv.DRONE_SEMVER}
 lib_deps = https://github.com/homieiot/homie-esp8266.git#develop-v3, DHT sensor library for ESPx
 
 [env:nodemcu]

src/main.cpp

@@ -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", VERSION);
     
     Homie.disableResetTrigger();
+
+    //Power
     powerNode.advertise("state").settable(powerStateHandler);
     powerNode.advertise("timer").settable(powerTimerHandler);
 
+    //Temperature
     temperatureNode.advertise("humidity");
     temperatureNode.advertise("temperature");