xoseperez · mcspr · Nov 20, 2019 · Jun 7, 2019 · Jun 7, 2019 · Jun 7, 2019
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -85,6 +85,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Restore last schedule after reboot ([#1948](https://github.com/xoseperez/espurna/issues/1948), thanks to **[@foxman69](https://github.com/foxman69)**)
 - Add `relayDelayOnN`, `relayDelayOffN`, `relayFloodTime`, `relayFloodCount` as runtime settings ([#1594](https://github.com/xoseperez/espurna/issues/1594), [#1962](https://github.com/xoseperez/espurna/pull/1962))
 - Add experimental `relayDelayInterlock` to add a pause after turning relay off in SYNC\_ONE or SYNC\_NONE\_OR\_ONE modes ([#1510](https://github.com/xoseperez/espurna/issues/1510), [#1962](https://github.com/xoseperez/espurna/pull/1962))
+- Add experimental `TUYA_SUPPORT` and `LIGHT_PROVIDER_TUYA` ([#1729](https://github.com/xoseperez/espurna/issues/1729), [#1997](https://github.com/xoseperez/espurna/issues/1997))
 #### MQTT
 - Add option to disable relay reporting ([#1645](https://github.com/xoseperez/espurna/issues/1645), thanks to **[@Niek](https://github.com/Niek)**)
 - Safer settings reload and change detection ([#1701](https://github.com/xoseperez/espurna/issues/1701))
@@ -118,6 +119,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - ESP8266 FS-UAP1 Control board ([#1925](https://github.com/xoseperez/espurna/issues/1925), thanks to **[@NemoN](https://github.com/NemoN)**)
 - Support for Teckin SP21 (Thanks to **[@xoseperez](https://github.com/xoseperez)**)
 - Support for TFlag NX-SM100 and NX-SM200 power monitoring switches (Thanks to **[@xoseperez](https://github.com/xoseperez)**)
+- Add tuya-generic-dimmer ([#1729](https://github.com/xoseperez/espurna/issues/1729), [#1997](https://github.com/xoseperez/espurna/issues/1997))
 #### WebUI
 - Configure WEB_REMOTE_DOMAIN at runtime ([#1789](https://github.com/xoseperez/espurna/issues/1789))
 #### Modules

diff --git a/code/espurna/alexa.ino b/code/espurna/alexa.ino
@@ -8,6 +8,8 @@ Copyright (C) 2016-2019 by Xose Pérez <xose dot perez at gmail dot com>
 
 #if ALEXA_SUPPORT
 
+#include "broker.h"
+
 #include <fauxmoESP.h>
 fauxmoESP alexa;
 
@@ -48,18 +50,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 +149,7 @@ void alexaSetup() {
 
     // Register main callbacks
     #if BROKER_SUPPORT
-        brokerRegister(_alexaBrokerCallback);
+        StatusBroker::Register(_alexaBrokerCallback);
     #endif
     espurnaRegisterReload(_alexaConfigure);
     espurnaRegisterLoop(alexaLoop);

diff --git a/code/espurna/broker.h b/code/espurna/broker.h
@@ -0,0 +1,56 @@
+/*
+
+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,
+    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 SensorBroker = TBroker<TBrokerType::SENSOR, 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/config/dependencies.h b/code/espurna/config/dependencies.h
@@ -106,3 +106,16 @@
 #undef SSDP_SUPPORT
 #define SSDP_SUPPORT 0
 #endif
+
+#if LIGHT_PROVIDER == LIGHT_PROVIDER_TUYA
+#undef TUYA_SUPPORT
+#define TUYA_SUPPORT                1           // Need base Tuya module for this to work
+#undef LIGHT_USE_TRANSITIONS
+#define LIGHT_USE_TRANSITIONS       0           // TODO: temporary, maybe slower step instead?
+#endif
+
+#if TUYA_SUPPORT
+#undef BROKER_SUPPORT
+#define BROKER_SUPPORT              1           // Broker is required to process relay & lights events
+#endif
+
diff --git a/code/espurna/config/general.h b/code/espurna/config/general.h
@@ -1808,3 +1808,14 @@
 #ifndef RFM69_IS_RFM69HW
 #define RFM69_IS_RFM69HW            0
 #endif
+
+//--------------------------------------------------------------------------------
+// TUYA switch & dimmer support
+//--------------------------------------------------------------------------------
+#ifndef TUYA_SUPPORT
+#define TUYA_SUPPORT                0
+#endif
+
+#ifndef TUYA_SERIAL
+#define TUYA_SERIAL                 Serial
+#endif
diff --git a/code/espurna/config/hardware.h b/code/espurna/config/hardware.h
@@ -3900,6 +3900,16 @@
     #define LED2_RELAY          1
     #define LED2_MODE           LED_MODE_FINDME_WIFI
 
+#elif defined(TUYA_GENERIC_DIMMER)
+
+    #define MANUFACTURER        "TUYA"
+    #define DEVICE              "GENERIC_DIMMER"
+
+    #define LIGHT_PROVIDER      LIGHT_PROVIDER_TUYA
+    #define LIGHT_CHANNELS      0
+    #define RELAY_PROVIDER      RELAY_PROVIDER_LIGHT
+    #define DUMMY_RELAY_COUNT   0
+
 // -----------------------------------------------------------------------------
 // Etekcity ESW01-USA 
 // https://www.amazon.com/Etekcity-Voltson-Outlet-Monitoring-Required/dp/B01M3MYIFS
@@ -4019,7 +4029,6 @@
     #define HLW8012_POWER_RATIO         3711185
     #define HLW8012_INTERRUPT_ON        FALLING
 
-
 // -----------------------------------------------------------------------------
 // MUVIT_IO_MIOBULB001
 // -----------------------------------------------------------------------------

diff --git a/code/espurna/config/prototypes.h b/code/espurna/config/prototypes.h
@@ -88,13 +88,6 @@ using api_put_callback_f = std::function<void(const char *)> ;
     void apiRegister(const char * key, api_get_callback_f getFn, api_put_callback_f putFn = NULL);
 #endif
 
-// -----------------------------------------------------------------------------
-// Broker
-// -----------------------------------------------------------------------------
-#if BROKER_SUPPORT
-    void brokerRegister(void (*)(const unsigned char, const char *, unsigned char, const char *));
-#endif
-
 // -----------------------------------------------------------------------------
 // Debug
 // -----------------------------------------------------------------------------
@@ -106,6 +99,9 @@ extern "C" {
      void custom_crash_callback(struct rst_info*, uint32_t, uint32_t);
 }
 
+class PrintRaw;
+class PrintHex;
+
 // Core version 2.4.2 and higher changed the cont_t structure to a pointer:
 // https://github.com/esp8266/Arduino/commit/5d5ea92a4d004ab009d5f642629946a0cb8893dd#diff-3fa12668b289ccb95b7ab334833a4ba8L35
 // Core version 2.5.0 introduced EspClass helper method:
@@ -282,6 +278,8 @@ const String& relayPayloadOff();
 const String& relayPayloadToggle();
 const char* relayPayload(RelayStatus status);
 
+void relaySetupDummy(unsigned char size, bool reconfigure = false);
+
 // -----------------------------------------------------------------------------
 // Settings
 // -----------------------------------------------------------------------------

diff --git a/code/espurna/config/types.h b/code/espurna/config/types.h
@@ -3,15 +3,6 @@
 // Do not touch this definitions
 //------------------------------------------------------------------------------
 
-// -----------------------------------------------------------------------------
-// BROKER
-// -----------------------------------------------------------------------------
-
-#define BROKER_MSG_TYPE_SYSTEM      0
-#define BROKER_MSG_TYPE_DATETIME    1
-#define BROKER_MSG_TYPE_STATUS      2
-#define BROKER_MSG_TYPE_SENSOR      3
-
 // -----------------------------------------------------------------------------
 // WIFI
 // -----------------------------------------------------------------------------
@@ -103,9 +94,9 @@
 #define RELAY_GROUP_SYNC_INVERSE     1
 #define RELAY_GROUP_SYNC_RECEIVEONLY 2
 
-#define RELAY_LOCK_OFF               0
-#define RELAY_LOCK_ON                1
-#define RELAY_LOCK_DISABLED          2
+#define RELAY_LOCK_DISABLED          0
+#define RELAY_LOCK_OFF               1
+#define RELAY_LOCK_ON                2
 
 //------------------------------------------------------------------------------
 // UDP SYSLOG
@@ -192,6 +183,7 @@
 #define LIGHT_PROVIDER_NONE         0
 #define LIGHT_PROVIDER_MY92XX       1       // works with MY9291 and MY9231
 #define LIGHT_PROVIDER_DIMMER       2
+#define LIGHT_PROVIDER_TUYA         3
 
 // -----------------------------------------------------------------------------
 // SCHEDULER

diff --git a/code/espurna/data/index.all.html.gz b/code/espurna/data/index.all.html.gz
diff --git a/code/espurna/data/index.light.html.gz b/code/espurna/data/index.light.html.gz
diff --git a/code/espurna/data/index.lightfox.html.gz b/code/espurna/data/index.lightfox.html.gz
diff --git a/code/espurna/data/index.rfbridge.html.gz b/code/espurna/data/index.rfbridge.html.gz
diff --git a/code/espurna/data/index.rfm69.html.gz b/code/espurna/data/index.rfm69.html.gz
diff --git a/code/espurna/data/index.sensor.html.gz b/code/espurna/data/index.sensor.html.gz
diff --git a/code/espurna/data/index.small.html.gz b/code/espurna/data/index.small.html.gz
diff --git a/code/espurna/data/index.thermostat.html.gz b/code/espurna/data/index.thermostat.html.gz
diff --git a/code/espurna/domoticz.ino b/code/espurna/domoticz.ino
@@ -8,6 +8,7 @@ Copyright (C) 2016-2019 by Xose Pérez <xose dot perez at gmail dot com>
 
 #if DOMOTICZ_SUPPORT
 
+#include "broker.h"
 #include <ArduinoJson.h>
 
 bool _dcz_enabled = false;
@@ -38,10 +39,12 @@ void _domoticzMqttSubscribe(bool value) {
 }
 
 bool _domoticzStatus(unsigned char id) {
+    if (id >= _dcz_relay_state.size()) return false;
     return _dcz_relay_state[id];
 }
 
 void _domoticzStatus(unsigned char id, bool status) {
+    if (id >= _dcz_relay_state.size()) return;
     _dcz_relay_state[id] = status;
     relayStatus(id, status);
 }
@@ -162,19 +165,27 @@ void _domoticzMqtt(unsigned int type, const char * topic, char * payload) {
 };
 
 #if BROKER_SUPPORT
-void _domoticzBrokerCallback(const unsigned char type, const char * topic, unsigned char id, const char * payload) {
 
-    // Only process status messages
-    if (BROKER_MSG_TYPE_STATUS != type) return;
+void _domoticzConfigCallback(const String& key, const String& value) {
+    if (key.equals("relayDummy")) {
+        _domoticzRelayConfigure(value.toInt());
+        return;
+    }
+}
+
+void _domoticzBrokerCallback(const String& topic, unsigned char id, unsigned int value) {
 
-    if (strcmp(MQTT_TOPIC_RELAY, topic) == 0) {
-        bool status = atoi(payload) == 1;
-        if (_domoticzStatus(id) == status) return;
-        _dcz_relay_state[id] = status;
-        domoticzSendRelay(id, status);
+    // Only process status messages for switches
+    if (!topic.equals(MQTT_TOPIC_RELAY)) {
+        return;
     }
 
+    if (_domoticzStatus(id) == value) return;
+    _dcz_relay_state[id] = value;
+    domoticzSendRelay(id, value);
+
 }
+
 #endif // BROKER_SUPPORT
 
 #if WEB_SUPPORT
@@ -206,15 +217,18 @@ void _domoticzWebSocketOnConnected(JsonObject& root) {
 
 #endif // WEB_SUPPORT
 
+void _domoticzRelayConfigure(size_t size) {
+    _dcz_relay_state.reserve(size);
+    for (size_t n = 0; n < size; ++n) {
+        _dcz_relay_state[n] = relayStatus(n);
+    }
+}
+
 void _domoticzConfigure() {
     bool enabled = getSetting("dczEnabled", DOMOTICZ_ENABLED).toInt() == 1;
     if (enabled != _dcz_enabled) _domoticzMqttSubscribe(enabled);
 
-    _dcz_relay_state.reserve(relayCount());
-    for (size_t n = 0; n < relayCount(); ++n) {
-        _dcz_relay_state[n] = relayStatus(n);
-    }
-
+    _domoticzRelayConfigure(relayCount());
     _dcz_enabled = enabled;
 }
 
@@ -267,7 +281,8 @@ void domoticzSetup() {
     #endif
 
     #if BROKER_SUPPORT
-        brokerRegister(_domoticzBrokerCallback);
+        StatusBroker::Register(_domoticzBrokerCallback);
+        ConfigBroker::Register(_domoticzConfigCallback);
     #endif
 
     // Callbacks