lblabr · lblabr · Dec 30, 2019 · Oct 24, 2019 · Oct 24, 2019 · Nov 1, 2019
diff --git a/.travis.yml b/.travis.yml
@@ -15,7 +15,10 @@ env:
 script:
 - ./travis_script.sh
 stages:
-- name: Test
+- name: Test WebUI
+  if: tag IS NOT present
+- name: Test PlatformIO Build
+  if: tag IS NOT present
 - name: Release
   if: tag IS present AND tag =~ ^\d+\.\d+\.\d+$
 jobs:

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/README.md b/README.md
@@ -3,11 +3,14 @@
 ESPurna ("spark" in Catalan) is a custom firmware for ESP8285/ESP8266 based smart switches, lights and sensors.
 It uses the Arduino Core for ESP8266 framework and a number of 3rd party libraries.
 
-[![version](https://img.shields.io/badge/version-1.13.6--dev-brightgreen.svg)](CHANGELOG.md)
+[![version](https://img.shields.io/badge/version-1.14.1--dev-brightgreen.svg)](CHANGELOG.md)
 [![branch](https://img.shields.io/badge/branch-dev-orange.svg)](https://github.com/xoseperez/espurna/tree/dev/)
 [![license](https://img.shields.io/github/license/xoseperez/espurna.svg)](LICENSE)
 [![travis](https://travis-ci.org/xoseperez/espurna.svg?branch=dev)](https://travis-ci.org/xoseperez/espurna)
 [![codacy](https://api.codacy.com/project/badge/Grade/c9496e25cf07434cba786b462cb15f49)](https://www.codacy.com/app/xoseperez/espurna/dashboard)
+<br />
+[![latest master build](https://img.shields.io/github/release/xoseperez/espurna/all.svg?label=latest%20master%20build)](https://github.com/xoseperez/espurna/releases/latest)
+[![latest dev build](https://img.shields.io/github/release/mcspr/espurna-nightly-builder/all.svg?label=latest%20dev%20build)](https://github.com/mcspr/espurna-nightly-builder/releases)
 [![downloads](https://img.shields.io/github/downloads/xoseperez/espurna/total.svg)](https://github.com/xoseperez/espurna/releases)
 <br />
 [![donate](https://img.shields.io/badge/donate-PayPal-blue.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=xose%2eperez%40gmail%2ecom&lc=US&no_note=0&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHostedGuest)
@@ -18,11 +21,11 @@ It uses the Arduino Core for ESP8266 framework and a number of 3rd party librari
 
 ## Collaborators
 
-Since November 2018, Max Prokhorov (@mcspr) is also actively working as a collaborator of the project. 
+Since November 2018, Max Prokhorov (**@mcspr**) is also actively working as a collaborator of the project. 
 
 ## Contributors
 
-**Without your help this project would not be possible**. I (@xoseperez) simply can't spend all the time I wish on ESPurna but luckly I recieve a lot of contributions, bug fixes, enhancement suggestions,... from people all around the world. I would like to thank each and every one of you. The [contributors](https://github.com/xoseperez/espurna/graphs/contributors) page shows the ones that have done a PR in the past, but I also get contributions in the issues, by email or via the [gitter ESPurna channel](https://gitter.im/tinkerman-cat/espurna), those I also want to thank.
+**Without your help this project would not be possible**. I (**@xoseperez**) simply can't spend all the time I wish on ESPurna but luckly I recieve a lot of contributions, bug fixes, enhancement suggestions,... from people all around the world. I would like to thank each and every one of you. The [contributors](https://github.com/xoseperez/espurna/graphs/contributors) page shows the ones that have done a PR in the past, but I also get contributions in the issues, by email or via the [gitter ESPurna channel](https://gitter.im/tinkerman-cat/espurna), those I also want to thank.
 
 **Thank you all very much**.
 
@@ -32,6 +35,13 @@ Since November 2018, Max Prokhorov (@mcspr) is also actively working as a collab
 
 > Please use the [gitter ESPurna channel](https://gitter.im/tinkerman-cat/espurna) for support and questions, you have better chances to get fast answers from me or other ESPurna users. Open an issue here only if you feel there is a bug or you want to request an enhancement. Thank you.
 
+> Process of building ESPurna from source is documented in the Wiki:  
+[Using PlatformIO IDE for VSCode](https://github.com/xoseperez/espurna/wiki/Build-and-update-from-Visual-Studio-Code-using-PlatformIO)  
+[Using PlatformIO CLI](https://github.com/xoseperez/espurna/wiki/PlatformIO)  
+[Using Arduino IDE](https://github.com/xoseperez/espurna/wiki/ArduinoIDE)  
+
+> If you want to try out latest changes from **dev** branch without building the firmware yourself or if you are having problems with the stable release, please visit [**espurna-nightly-builder** releases page](https://github.com/mcspr/espurna-nightly-builder/releases).
+
 ## Features
 
 * *KRACK* vulnerability free (when built with Arduino Core >= 2.4.0)
@@ -91,6 +101,7 @@ Since November 2018, Max Prokhorov (@mcspr) is also actively working as a collab
         * **AM2320** temperature and humidity sensor over I2C
         * **Dallas OneWire sensors** like the DS18B20
         * **MHZ19** CO2 sensor
+        * **T6613** CO2 sensor
         * **MICS2710** CO2 & NO2 sensor
         * **MICS5525** CO & CO2 sensor
         * **SenseAir S8** CO2 sensor
@@ -103,13 +114,18 @@ Since November 2018, Max Prokhorov (@mcspr) is also actively working as a collab
         * **Geiger counter** by RH Electronics
         * **HC-SR04**, **SRF05**, **SRF06**, **DYP-ME007**, **JSN-SR04T** & **Parallax PING)))™** distance sensors
         * **VL53L1X** distance sensor
+        * **MAX6675** K-thermocouple-to-digital converter
+        * **NTC** thermistor
+        * **LDR** light-dependent resistor sensor
     * Power monitoring
         * **HLW8012** using the [HLW8012 Library](https://bitbucket.org/xoseperez/hlw8012) (Sonoff POW)
         * **CSE7766** and **CSE7759B** power monitor chips
         * **HJL-01** and **BL0937** power monitor chips
-        * Non-invasive **current sensor** using **internal ADC** or **ADC712** or **ADC121** or **ADS1115**
+        * Non-invasive **current sensor** using **internal ADC** or **ADC712** or **ADC121** or **ADS1015** / **ADS1115**
         * **V9261F** power monitor chip
         * **PZEM0004T**  power monitor board
+        * **ECH1560** power monitor chip
+        * **ADE7953** power monitor chip
     * Raw **analog** and **digital** sensors
     * Simple **pulse counter** with **event triggering** option
     * Support for (almost) any UART based sensor via the **UART-to-MQTT module**
@@ -166,7 +182,7 @@ Since November 2018, Max Prokhorov (@mcspr) is also actively working as a collab
     * Long click (>1 second) to reboot device (only main button)
     * Extra long click (>10 seconds) to go back to factory settings (only main button)
     * Specific definitions for touch button devices (ESPurna Switch, Sonoff Touch & T1)
-* Configuration stored in different sectors to prevent data loosing and corruption
+* Configuration stored in different flash sectors to prevent data loss and corruption
 
 ## Notices
 
@@ -232,14 +248,14 @@ Here is the list of supported hardware. For more information please refer to the
 
 ||||
 |---|---|---|
-|![BlitzWolf BW-SHP6](images/devices/blitzwolf-bw-shp6.jpg)|![BlitzWolf BW-SHP2](images/devices/blitzwolf-bw-shp2.jpg)|![Power meters based on V9261F](images/devices/generic-v9261f.jpg)|
-|**Blitzwolf BW-SHP6**|**Blitzwolf BW-SHP2<br />(also by Coosa, Gosund, HomeCube, Teckin)**|**Power meters based on V9261F**|
-|![Itead Sonoff POW](images/devices/itead-sonoff-pow.jpg)|![Itead Sonoff POW](images/devices/itead-sonoff-pow-r2.jpg)|![Itead Sonoff S31](images/devices/itead-sonoff-s31.jpg)|
-|**Itead Sonoff POW**|**Itead Sonoff POW R2**|**Itead Sonoff S31**|
-|![Smartlife Mini Smart Socket](images/devices/smartlife-mini-smart-socket.jpg)|![Teckin SP20](images/devices/teckin-sp20.jpg)|![Digoo NX SP202](images/devices/digoo-nx-sp202.jpg)|
-|**Smartlife (NETVIP) Mini Smart Socket**|**Teckin SP20**|**Digoo NX SP202**|
-|![Vanzavanzu Smart WiFi Plug Mini](images/devices/vanzavanzu-smart-wifi-plug-mini.jpg)|||
-|**Vanzavanzu Smart WiFi Plug Mini**|||
+|![BlitzWolf BW-SHP6](images/devices/blitzwolf-bw-shp6.jpg)|![BlitzWolf BW-SHP2](images/devices/blitzwolf-bw-shp2.jpg)|![BlitzWolf BW-SHP5](images/devices/blitzwolf-bw-shp5.jpg)|
+|**Blitzwolf BW-SHP6**|**Blitzwolf BW-SHP2<br />(also by Coosa, Gosund, HomeCube, Teckin)**|**Blitzwolf BW-SHP5**|
+|![Power meters based on V9261F](images/devices/generic-v9261f.jpg)|![Itead Sonoff POW](images/devices/itead-sonoff-pow.jpg)|![Itead Sonoff POW](images/devices/itead-sonoff-pow-r2.jpg)|
+|**Power meters based on V9261F**|**Itead Sonoff POW**|**Itead Sonoff POW R2**|
+|![Itead Sonoff S31](images/devices/itead-sonoff-s31.jpg)|![Smartlife Mini Smart Socket](images/devices/smartlife-mini-smart-socket.jpg)|![Teckin SP20](images/devices/teckin-sp20.jpg)|
+|**Itead Sonoff S31**|**Smartlife (NETVIP) Mini Smart Socket**|**Teckin SP20**|
+|![Digoo NX SP202](images/devices/digoo-nx-sp202.jpg)|![Vanzavanzu Smart WiFi Plug Mini](images/devices/vanzavanzu-smart-wifi-plug-mini.jpg)|![Hykker Smart Home Power Plug](images/devices/hykker-smart-home-power-plug.jpg)|
+|**Digoo NX SP202**|**Vanzavanzu Smart WiFi Plug Mini**|**Hykker Smart Home Power Plug**|
 
 ### Embedded switches
 
@@ -251,8 +267,8 @@ Here is the list of supported hardware. For more information please refer to the
 |**Electrodragon WiFi IOT**|**OpenEnergyMonitor WiFi MQTT Relay / Thermostat**||
 |![Itead Sonoff 4CH](images/devices/itead-sonoff-4ch.jpg)|![Itead Sonoff 4CH Pro](images/devices/itead-sonoff-4ch-pro.jpg)||
 |**Itead Sonoff 4CH**|**Itead Sonoff 4CH Pro**||
-|![Allterco Shelly1](images/devices/allterco-shelly1.jpg)|![Allterco Shelly2](images/devices/allterco-shelly2.jpg)|![Jan Goedeke Wifi Relay (NO/NC)](images/devices/jangoe-wifi-relay.jpg)|
-|**Alterco Shelly1**|**Alterco Shelly2**|**Jan Goedeke Wifi Relay (NO/NC)**|
+|![Allterco Shelly 1 / 1PM](images/devices/allterco-shelly1.jpg)|![Allterco Shelly 2 / 2.5](images/devices/allterco-shelly2.jpg)|![Jan Goedeke Wifi Relay (NO/NC)](images/devices/jangoe-wifi-relay.jpg)|
+|**Alterco Shelly 1 / 1PM**|**Alterco Shelly 2 / 2.5**|**Jan Goedeke Wifi Relay (NO/NC)**|
 |![EXS Wifi Relay v3.1](images/devices/exs-wifi-relay-v31.jpg)|![EXS Wifi Relay v5.0](images/devices/exs-wifi-relay-v50.jpg)|![Jorge García Wifi + Relays Board Kit](images/devices/jorgegarcia-wifi-relays.jpg)|
 |**EXS Wifi Relay v3.1**|**EXS Wifi Relay v5.0**|**Jorge García Wifi + Relays Board Kit**|
 |![Allnet ESP8266-UP-Relay](images/devices/allnet-esp8266-up-relay.jpg)|![Bruno Horta's OnOfre](images/devices/bh-onofre.jpg)|![Luani HVIO](images/devices/luani-hvio.jpg)|
@@ -312,6 +328,8 @@ Here is the list of supported hardware. For more information please refer to the
 |**Arilux AL-LC01 (RGB)**|**Arilux AL-LC02 (RGBW)**|**Arilux AL-LC06 (RGBWWCW)**|
 |![Arilux AL-LC11 (RGBWWW) & RF](images/devices/arilux-al-lc11.jpg)|![MagicHome LED Controller (1.0 and 2.x)](images/devices/magichome-led-controller.jpg)|![Huacanxing H801/802](images/devices/huacanxing-h801.jpg)|
 |**Arilux AL-LC11 (RGBWWW) & RF**|**MagicHome LED Controller (1.0/2.x, also ZJ WFMN A/B11)**|**Huacanxing H801/802**|
+|![Muvit I/O MIOBULB001](images/devices/muvit-io-miobulb001.jpg)|
+|**Muvit I/O MIOBULB001**|
 
 ### Radio links / gateways
 

diff --git a/code/build.sh b/code/build.sh
@@ -125,8 +125,9 @@ build_environments() {
     mkdir -p $destination/espurna-$version
 
     for environment in $environments; do
-        echo -n "* espurna-$version-$environment.bin --- "
+        echo "* espurna-$version-$environment.bin"
         platformio run --silent --environment $environment || exit 1
+        echo -n "SIZE:    "
         stat_bytes .pio/build/$environment/firmware.bin
         [[ "${TRAVIS_BUILD_STAGE_NAME}" = "Test" ]] || \
             mv .pio/build/$environment/firmware.bin $destination/espurna-$version/espurna-$version-$environment.bin

diff --git a/code/espurna/alexa.ino b/code/espurna/alexa.ino
@@ -8,6 +8,9 @@ Copyright (C) 2016-2019 by Xose Pérez <xose dot perez at gmail dot com>
 
 #if ALEXA_SUPPORT
 
+#include "relay.h"
+#include "broker.h"
+
 #include <fauxmoESP.h>
 fauxmoESP alexa;
 
@@ -48,18 +51,19 @@ void _alexaConfigure() {
 #endif
 
 #if BROKER_SUPPORT
-void _alexaBrokerCallback(const unsigned char type, const char * topic, unsigned char id, const char * payload) {
+void _alexaBrokerCallback(const String& topic, unsigned char id, unsigned int value) {
 
-    // Only process status messages
-    if (BROKER_MSG_TYPE_STATUS != type) return;
-
-    unsigned char value = atoi(payload);
+    // Only process status messages for switches and channels
+    if (!topic.equals(MQTT_TOPIC_CHANNEL)
+        && !topic.equals(MQTT_TOPIC_RELAY)) {
+        return;
+    }
 
-    if (strcmp(MQTT_TOPIC_CHANNEL, topic) == 0) {
-        alexa.setState(id+1, value > 0, value);
+    if (topic.equals(MQTT_TOPIC_CHANNEL)) {
+        alexa.setState(id + 1, value > 0, value);
     }
 
-    if (strcmp(MQTT_TOPIC_RELAY, topic) == 0) {
+    if (topic.equals(MQTT_TOPIC_RELAY)) {
         #if RELAY_PROVIDER == RELAY_PROVIDER_LIGHT
             if (id > 0) return;
         #endif
@@ -146,7 +150,7 @@ void alexaSetup() {
 
     // Register main callbacks
     #if BROKER_SUPPORT
-        brokerRegister(_alexaBrokerCallback);
+        StatusBroker::Register(_alexaBrokerCallback);
     #endif
     espurnaRegisterReload(_alexaConfigure);
     espurnaRegisterLoop(alexaLoop);

diff --git a/code/espurna/api.ino b/code/espurna/api.ino
@@ -13,6 +13,8 @@ Copyright (C) 2016-2019 by Xose Pérez <xose dot perez at gmail dot com>
 #include <ArduinoJson.h>
 #include <vector>
 
+#include "system.h"
+
 typedef struct {
     char * key;
     api_get_callback_f getFn = NULL;
@@ -28,7 +30,7 @@ bool _apiWebSocketOnKeyCheck(const char * key, JsonVariant& value) {
 
 void _apiWebSocketOnConnected(JsonObject& root) {
     root["apiEnabled"] = getSetting("apiEnabled", API_ENABLED).toInt() == 1;
-    root["apiKey"] = getSetting("apiKey");
+    root["apiKey"] = getSetting("apiKey", API_KEY);
     root["apiRealTime"] = getSetting("apiRealTime", API_REAL_TIME_VALUES).toInt() == 1;
     root["apiRestFul"] = getSetting("apiRestFul", API_RESTFUL).toInt() == 1;
 }
@@ -43,21 +45,16 @@ void _apiConfigure() {
 
 bool _authAPI(AsyncWebServerRequest *request) {
 
-    if (getSetting("apiEnabled", API_ENABLED).toInt() == 0) {
+    const String key = getSetting("apiKey", API_KEY);
+    if (!key.length() || getSetting("apiEnabled", API_ENABLED).toInt() == 0) {
         DEBUG_MSG_P(PSTR("[WEBSERVER] HTTP API is not enabled\n"));
         request->send(403);
         return false;
     }
 
-    if (!request->hasParam("apikey", (request->method() == HTTP_PUT))) {
-        DEBUG_MSG_P(PSTR("[WEBSERVER] Missing apikey parameter\n"));
-        request->send(403);
-        return false;
-    }
-
     AsyncWebParameter* p = request->getParam("apikey", (request->method() == HTTP_PUT));
-    if (!p->value().equals(getSetting("apiKey"))) {
-        DEBUG_MSG_P(PSTR("[WEBSERVER] Wrong apikey parameter\n"));
+    if (!p || !p->value().equals(key)) {
+        DEBUG_MSG_P(PSTR("[WEBSERVER] Wrong / missing apikey parameter\n"));
         request->send(403);
         return false;
     }

diff --git a/code/espurna/broker.h b/code/espurna/broker.h
@@ -0,0 +1,60 @@
+/*
+
+BROKER MODULE
+
+Copyright (C) 2017-2019 by Xose Pérez <xose dot perez at gmail dot com>
+
+*/
+
+#if BROKER_SUPPORT
+
+#pragma once
+
+#include <functional>
+#include <vector>
+#include <utility>
+
+enum class TBrokerType {
+    SYSTEM,
+    STATUS,
+    SENSOR_READ,
+    SENSOR_REPORT,
+    DATETIME,
+    CONFIG
+};
+
+template <typename... TArgs>
+using TBrokerCallback = std::function<void(TArgs...)>;
+
+template <typename... TArgs>
+using TBrokerCallbacks = std::vector<TBrokerCallback<TArgs...>>;
+
+template <TBrokerType type, typename... TArgs>
+struct TBroker {
+    static TBrokerCallbacks<TArgs...> callbacks;
+
+    static void Register(TBrokerCallback<TArgs...> callback) {
+        callbacks.push_back(callback);
+    }
+    static void Publish(TArgs... args) {
+        for (auto& callback : callbacks) {
+            callback(args...);
+        }
+    }
+};
+
+template <TBrokerType type, typename... TArgs>
+TBrokerCallbacks<TArgs...> TBroker<type, TArgs...>::callbacks;
+
+
+// --- Some known types. Bind them here to avoid .ino screwing with order ---
+
+using StatusBroker = TBroker<TBrokerType::STATUS, const String&, unsigned char, unsigned int>;
+
+using SensorReadBroker = TBroker<TBrokerType::SENSOR_READ, const String&, unsigned char, double, const char*>;
+using SensorReportBroker = TBroker<TBrokerType::SENSOR_REPORT, const String&, unsigned char, double, const char*>;
+
+using TimeBroker = TBroker<TBrokerType::DATETIME, const String&, time_t, const String&>;
+using ConfigBroker = TBroker<TBrokerType::CONFIG, const String&, const String&>;
+
+#endif // BROKER_SUPPORT
diff --git a/code/espurna/broker.ino b/code/espurna/broker.ino
diff --git a/code/espurna/button.ino b/code/espurna/button.ino
@@ -15,6 +15,8 @@ Copyright (C) 2016-2019 by Xose Pérez <xose dot perez at gmail dot com>
 #include <DebounceEvent.h>
 #include <vector>
 
+#include "system.h"
+#include "relay.h"
 #include "light.h"
 
 typedef struct {