Added key check to remove unneeded keys

code/espurna/alexa.ino

@@ -25,23 +25,26 @@ static std::queue<AlexaDevChange> _alexa_dev_changes;
 // ALEXA
 // -----------------------------------------------------------------------------
 
-bool _alexaWebSocketOnReceive(const char * key, JsonVariant& value) {
-    return (strncmp(key, "alx", 3) == 0);
-}
-
+#if WEB_SUPPORT
 void _alexaWebSocketOnSend(JsonObject& root) {
     root["alxVisible"] = 1;
     root["alxEnabled"] = getSetting("alxEnabled", ALEXA_ENABLED).toInt() == 1;
 }
+#endif
 
 void _alexaConfigure() {
     alexa.enable(getSetting("alxEnabled", ALEXA_ENABLED).toInt() == 1);
 }
 
+bool _alexaKeyCheck(const char * key) {
+    return (strncmp(key, "alx", 3) == 0);
+}
+
 void _alexaBackwards() {
     moveSetting("fauxmoEnabled", "alxEnabled"); // 1.9.0 - 2017-08-25
-    moveSetting("alexaEnabled", "alxEnabled"); // 1.13.1 - 2018-06-27
+    moveSetting("alexaEnabled", "alxEnabled"); // 1.14.0 - 2018-06-27
 }
+
 // -----------------------------------------------------------------------------
 
 void alexaSetup() {
@@ -52,13 +55,10 @@ void alexaSetup() {
     // Load & cache settings
     _alexaConfigure();
 
+    // Websockets
     #if WEB_SUPPORT
-
-        // Websockets
         wsOnSendRegister(_alexaWebSocketOnSend);
         wsOnAfterParseRegister(_alexaConfigure);
-        wsOnReceiveRegister(_alexaWebSocketOnReceive);
-
     #endif
 
     unsigned int relays = relayCount();
@@ -80,6 +80,8 @@ void alexaSetup() {
         return relayStatus(device_id);
     });
 
+    settingsRegisterKeyCheck(_alexaKeyCheck);
+
     // Register loop
     espurnaRegisterLoop(alexaLoop);
 

code/espurna/api.ino

@@ -24,7 +24,7 @@ std::vector<web_api_t> _apis;
 
 // -----------------------------------------------------------------------------
 
-bool _apiWebSocketOnReceive(const char * key, JsonVariant& value) {
+bool _apiKeyCheck(const char * key) {
     return (strncmp(key, "api", 3) == 0);
 }
 
@@ -198,7 +198,7 @@ void apiSetup() {
     webServer()->on("/apis", HTTP_GET, _onAPIs);
     webServer()->on("/rpc", HTTP_GET, _onRPC);
     wsOnSendRegister(_apiWebSocketOnSend);
-    wsOnReceiveRegister(_apiWebSocketOnReceive);
+    settingsRegisterKeyCheck(_apiKeyCheck);
 }
 
 bool apiRealTime() {

code/espurna/button.ino

@@ -36,16 +36,16 @@ void buttonMQTT(unsigned char id, uint8_t event) {
 
 #if WEB_SUPPORT
 
-bool _buttonWebSocketOnReceive(const char * key, JsonVariant& value) {
-    return (strncmp(key, "btn", 3) == 0);
-}
-
 void _buttonWebSocketOnSend(JsonObject& root) {
     root["btnDelay"] = getSetting("btnDelay", BUTTON_DBLCLICK_DELAY).toInt();
 }
 
 #endif
 
+bool _buttonKeyCheck(const char * key) {
+    return (strncmp(key, "btn", 3) == 0);
+}
+
 int buttonFromRelay(unsigned int relayID) {
     for (unsigned int i=0; i < _buttons.size(); i++) {
         if (_buttons[i].relayID == relayID) return i;
@@ -209,9 +209,10 @@ void buttonSetup() {
     // Websocket Callbacks
     #if WEB_SUPPORT
         wsOnSendRegister(_buttonWebSocketOnSend);
-        wsOnReceiveRegister(_buttonWebSocketOnReceive);
     #endif
 
+    settingsRegisterKeyCheck(_buttonKeyCheck);
+
     // Register loop
     espurnaRegisterLoop(buttonLoop);
 

code/espurna/config/prototypes.h

@@ -39,9 +39,6 @@ void wsOnActionRegister(ws_on_action_callback_f callback);
 typedef std::function<void(void)> ws_on_after_parse_callback_f;
 void wsOnAfterParseRegister(ws_on_after_parse_callback_f callback);
 
-typedef std::function<bool(const char *, JsonVariant&)> ws_on_receive_callback_f;
-void wsOnReceiveRegister(ws_on_receive_callback_f callback);
-
 // -----------------------------------------------------------------------------
 // WIFI
 // -----------------------------------------------------------------------------
@@ -74,6 +71,8 @@ bool settingsRestoreJson(JsonObject& data);
 void settingsRegisterCommand(const String& name, void (*call)(Embedis*));
 void settingsInject(void *data, size_t len);
 Stream & settingsSerial();
+typedef std::function<bool(const char *)> setting_key_check_callback_f;
+void settingsRegisterKeyCheck(setting_key_check_callback_f callback);
 
 // -----------------------------------------------------------------------------
 // I2C

code/espurna/domoticz.ino

@@ -82,12 +82,12 @@ void _domoticzMqtt(unsigned int type, const char * topic, const char * payload)
 
 };
 
-#if WEB_SUPPORT
-
-bool _domoticzWebSocketOnReceive(const char * key, JsonVariant& value) {
+bool _domoticzKeyCheck(const char * key) {
     return (strncmp(key, "dcz", 3) == 0);
 }
 
+#if WEB_SUPPORT
+
 void _domoticzWebSocketOnSend(JsonObject& root) {
 
     root["dczVisible"] = 1;
@@ -163,8 +163,8 @@ void domoticzSetup() {
     #if WEB_SUPPORT
         wsOnSendRegister(_domoticzWebSocketOnSend);
         wsOnAfterParseRegister(_domoticzConfigure);
-        wsOnReceiveRegister(_domoticzWebSocketOnReceive);
     #endif
+    settingsRegisterKeyCheck(_domoticzKeyCheck);
     mqttRegister(_domoticzMqtt);
 }
 

code/espurna/espurna.ino

@@ -34,23 +34,6 @@ void espurnaRegisterLoop(void (*callback)()) {
     _loop_callbacks.push_back(callback);
 }
 
-// -----------------------------------------------------------------------------
-// GLOBAL CONFIG KEYS
-// -----------------------------------------------------------------------------
-
-#if WEB_SUPPORT
-
-bool _espWebSocketOnReceive(const char * key, JsonVariant& value) {
-    if (strncmp(key, "admin", 5) == 0) return true;
-    if (strncmp(key, "hostname", 8) == 0) return true;
-    if (strncmp(key, "board", 5) == 0) return true;
-    if (strncmp(key, "loopDelay", 9) == 0) return true;
-    if (strncmp(key, "wtfHeap", 7) == 0) return true;
-    return false;
-}
-
-#endif
-
 // -----------------------------------------------------------------------------
 // BOOTING
 // -----------------------------------------------------------------------------
@@ -189,11 +172,6 @@ void setup() {
 
     saveSettings();
 
-    // Global configuration settings
-    #if WEB_SUPPORT
-        wsOnReceiveRegister(_espWebSocketOnReceive);
-    #endif
-
 }
 
 void loop() {

code/espurna/homeassistant.ino

@@ -229,12 +229,12 @@ void _haConfigure() {
     _haSend();
 }
 
-#if WEB_SUPPORT
-
-bool _haWebSocketOnReceive(const char * key, JsonVariant& value) {
+bool _haKeyCheck(const char * key) {
     return (strncmp(key, "ha", 2) == 0);
 }
 
+#if WEB_SUPPORT
+
 void _haWebSocketOnSend(JsonObject& root) {
     root["haVisible"] = 1;
     root["haPrefix"] = getSetting("haPrefix", HOMEASSISTANT_PREFIX);
@@ -290,7 +290,6 @@ void haSetup() {
         wsOnSendRegister(_haWebSocketOnSend);
         wsOnAfterParseRegister(_haConfigure);
         wsOnActionRegister(_haWebSocketOnAction);
-        wsOnReceiveRegister(_haWebSocketOnReceive);
     #endif
 
     // On MQTT connect check if we have something to send
@@ -302,6 +301,7 @@ void haSetup() {
         _haInitCommands();
     #endif
 
+    settingsRegisterKeyCheck(_haKeyCheck);
 
 }
 

code/espurna/i2c.ino

@@ -106,13 +106,10 @@ int _i2cClearbus(int sda, int scl) {
 
 }
 
-#if WEB_SUPPORT
-
-bool _i2cWebSocketOnReceive(const char * key, JsonVariant& value) {
+bool _i2cKeyCheck(const char * key) {
     return (strncmp(key, "i2c", 3) == 0);
 }
 
-#endif // WEB_SUPPORT
 // ---------------------------------------------------------------------
 // I2C API
 // ---------------------------------------------------------------------
@@ -373,10 +370,6 @@ void i2cSetup() {
         Wire.begin(sda, scl);
     #endif
 
-    #if WEB_SUPPORT
-        wsOnReceiveRegister(_i2cWebSocketOnReceive);
-    #endif
-
     DEBUG_MSG_P(PSTR("[I2C] Using GPIO%u for SDA and GPIO%u for SCL\n"), sda, scl);
 
     #if I2C_CLEAR_BUS
@@ -387,6 +380,8 @@ void i2cSetup() {
         i2cScan();
     #endif
 
+    settingsRegisterKeyCheck(_i2cKeyCheck);
+
 }
 
 #endif

code/espurna/influxdb.ino

@@ -20,10 +20,6 @@ SyncClient _idb_client;
 
 #if WEB_SUPPORT
 
-bool _idbWebSocketOnReceive(const char * key, JsonVariant& value) {
-    return (strncmp(key, "idb", 3) == 0);
-}
-
 void _idbWebSocketOnSend(JsonObject& root) {
     root["idbVisible"] = 1;
     root["idbEnabled"] = getSetting("idbEnabled", INFLUXDB_ENABLED).toInt() == 1;
@@ -44,10 +40,14 @@ void _idbConfigure() {
 
 #endif // WEB_SUPPORT
 
+bool _idbKeyCheck(const char * key) {
+    return (strncmp(key, "idb", 3) == 0);
+}
+
 void _idbBackwards() {
-    moveSetting("idbDatabase", "idbDB"); // 1.13.1 - 2018-06-26
-    moveSetting("idbUserName", "idbUser"); // 1.13.1 - 2018-06-26
-    moveSetting("idbPassword", "idbPass"); // 1.13.1 - 2018-06-26
+    moveSetting("idbDatabase", "idbDB"); // 1.14.0 - 2018-06-26
+    moveSetting("idbUserName", "idbUser"); // 1.14.0 - 2018-06-26
+    moveSetting("idbPassword", "idbPass"); // 1.14.0 - 2018-06-26
 }
 
 // -----------------------------------------------------------------------------
@@ -119,9 +119,10 @@ void idbSetup() {
     #if WEB_SUPPORT
         wsOnSendRegister(_idbWebSocketOnSend);
         wsOnAfterParseRegister(_idbConfigure);
-        wsOnReceiveRegister(_idbWebSocketOnReceive);
     #endif
 
+    settingsRegisterKeyCheck(_idbKeyCheck);
+
 }
 
 #endif

code/espurna/led.ino

@@ -59,21 +59,22 @@ void _ledBlink(unsigned char id, unsigned long delayOff, unsigned long delayOn)
     }
 }
 
-#if WEB_SUPPORT
-
-bool _ledWebSocketOnReceive(const char * key, JsonVariant& value) {
+bool _ledKeyCheck(const char * key) {
     return (strncmp(key, "led", 3) == 0);
 }
 
+#if WEB_SUPPORT
+
 void _ledWebSocketOnSend(JsonObject& root) {
     if (_ledCount() == 0) return;
     root["ledVisible"] = 1;
     root["ledMode0"] = _ledMode(0);
 }
 
-#endif
+#endif // WEB_SUPPORT
 
 #if MQTT_SUPPORT
+
 void _ledMQTTCallback(unsigned int type, const char * topic, const char * payload) {
 
     if (type == MQTT_CONNECT_EVENT) {
@@ -111,7 +112,8 @@ void _ledMQTTCallback(unsigned int type, const char * topic, const char * payloa
     }
 
 }
-#endif
+
+#endif // MQTT_SUPPORT
 
 unsigned char _ledCount() {
     return _leds.size();
@@ -171,13 +173,13 @@ void ledSetup() {
     #if WEB_SUPPORT
         wsOnSendRegister(_ledWebSocketOnSend);
         wsOnAfterParseRegister(_ledConfigure);
-        wsOnReceiveRegister(_ledWebSocketOnReceive);
     #endif
 
     DEBUG_MSG_P(PSTR("[LED] Number of leds: %d\n"), _leds.size());
 
-    // Register loop
+    // Registers
     espurnaRegisterLoop(ledLoop);
+    settingsRegisterKeyCheck(_ledKeyCheck);
 
 
 }

code/espurna/light.ino

@@ -761,11 +761,6 @@ void lightBrightnessStep(int steps) {
 
 #if WEB_SUPPORT
 
-bool _lightWebSocketOnReceive(const char * key, JsonVariant& value) {
-    if (strncmp(key, "lit", 3) == 0) return true;
-    return false;
-}
-
 void _lightWebSocketOnSend(JsonObject& root) {
     root["litVisible"] = 1;
     root["mqttGroupColor"] = getSetting("mqttGroupColor");
@@ -1010,18 +1005,22 @@ void _lightConfigure() {
 
 }
 
+bool _lightKeyCheck(const char * key) {
+    return (strncmp(key, "lit", 3) == 0);
+}
+
 void _lightBackwards() {
-    moveSettings("ch", "litCH"); // 1.13.1 - 2018-06-26
-    moveSetting("useCSS", "litCSS"); // 1.13.1 - 2018-06-26
-    moveSetting("useRGB", "litRGB"); // 1.13.1 - 2018-06-26
-    moveSetting("useColor", "litColor"); // 1.13.1 - 2018-06-26
-    moveSetting("useWhite", "litWhite"); // 1.13.1 - 2018-06-26
-    moveSetting("useCCT", "litCCT"); // 1.13.1 - 2018-06-26
-    moveSetting("useGamma", "litGamma"); // 1.13.1 - 2018-06-26
-    moveSetting("useTransitions", "litTrans"); // 1.13.1 - 2018-06-26
-    moveSetting("lightTime", "litTime"); // 1.13.1 - 2018-06-26
-    moveSetting("brightness", "litBright"); // 1.13.1 - 2018-06-26
-    moveSetting("mireds", "litMireds"); // 1.13.1 - 2018-06-26
+    moveSettings("ch", "litCH"); // 1.14.0 - 2018-06-26
+    moveSetting("useCSS", "litCSS"); // 1.14.0 - 2018-06-26
+    moveSetting("useRGB", "litRGB"); // 1.14.0 - 2018-06-26
+    moveSetting("useColor", "litColor"); // 1.14.0 - 2018-06-26
+    moveSetting("useWhite", "litWhite"); // 1.14.0 - 2018-06-26
+    moveSetting("useCCT", "litCCT"); // 1.14.0 - 2018-06-26
+    moveSetting("useGamma", "litGamma"); // 1.14.0 - 2018-06-26
+    moveSetting("useTransitions", "litTrans"); // 1.14.0 - 2018-06-26
+    moveSetting("lightTime", "litTime"); // 1.14.0 - 2018-06-26
+    moveSetting("brightness", "litBright"); // 1.14.0 - 2018-06-26
+    moveSetting("mireds", "litMireds"); // 1.14.0 - 2018-06-26
 }
 
 void lightSetup() {
@@ -1089,7 +1088,6 @@ void lightSetup() {
         _lightAPISetup();
         wsOnSendRegister(_lightWebSocketOnSend);
         wsOnActionRegister(_lightWebSocketOnAction);
-        wsOnReceiveRegister(_lightWebSocketOnReceive);
         wsOnAfterParseRegister([]() {
             #if LIGHT_SAVE_ENABLED == 0
                 lightSave();
@@ -1106,6 +1104,8 @@ void lightSetup() {
         _lightInitCommands();
     #endif
 
+    settingsRegisterKeyCheck(_lightKeyCheck);
+
 }
 
 #endif // LIGHT_PROVIDER != LIGHT_PROVIDER_NONE

code/espurna/mqtt.ino

@@ -121,7 +121,7 @@ void _mqttConnect() {
 
         #if ASYNC_TCP_SSL_ENABLED
 
-            bool secure = getSetting("mqttUseSSL", MQTT_SSL_ENABLED).toInt() == 1;
+            bool secure = getSetting("mqttSSL", MQTT_SSL_ENABLED).toInt() == 1;
             _mqtt.setSecure(secure);
             if (secure) {
                 DEBUG_MSG_P(PSTR("[MQTT] Using SSL\n"));
@@ -149,7 +149,7 @@ void _mqttConnect() {
 
         #if ASYNC_TCP_SSL_ENABLED
 
-            bool secure = getSetting("mqttUseSSL", MQTT_SSL_ENABLED).toInt() == 1;
+            bool secure = getSetting("mqttSSL", MQTT_SSL_ENABLED).toInt() == 1;
             if (secure) {
                 DEBUG_MSG_P(PSTR("[MQTT] Using SSL\n"));
                 if (_mqtt_client_secure.connect(host, port)) {
@@ -244,13 +244,17 @@ void _mqttConfigure() {
     } else {
         _mqtt_enabled = getSetting("mqttEnabled", MQTT_ENABLED).toInt() == 1;
     }
-    _mqtt_use_json = (getSetting("mqttUseJson", MQTT_USE_JSON).toInt() == 1);
+    _mqtt_use_json = (getSetting("mqttJson", MQTT_USE_JSON).toInt() == 1);
     mqttQueueTopic(MQTT_TOPIC_JSON);
 
     _mqtt_reconnect_delay = MQTT_RECONNECT_DELAY_MIN;
 
 }
 
+bool _mqttKeyCheck(const char * key) {
+    return (strncmp(key, "mqtt", 3) == 0);
+}
+
 void _mqttBackwards() {
 
     // 1.13.0 - 2018-05-30
@@ -260,7 +264,11 @@ void _mqttBackwards() {
         setSetting("mqttTopic", mqttTopic);
     }
 
-    moveSetting("mqttPassword", "mqttPass"); // 1.13.1 - 2018-06-26
+    moveSetting("mqttPassword", "mqttPass"); // 1.14.0 - 2018-06-26
+    moveSetting("mqttUseJson", "mqttJson"); // 1.14.0 - 2018-06-27
+    moveSetting("mqttUseSSL", "mqttSSL"); // 1.14.0 - 2018-06-27
+    delSetting("mqttOnDisc"); // 1.14.0 - 2018-06-27
+
 
 }
 
@@ -312,10 +320,6 @@ unsigned long _mqttNextMessageId() {
 
 #if WEB_SUPPORT
 
-bool _mqttWebSocketOnReceive(const char * key, JsonVariant& value) {
-    return (strncmp(key, "mqtt", 3) == 0);
-}
-
 void _mqttWebSocketOnSend(JsonObject& root) {
     root["mqttVisible"] = 1;
     root["mqttStatus"] = mqttConnected();
@@ -330,11 +334,11 @@ void _mqttWebSocketOnSend(JsonObject& root) {
     root["mqttQoS"] = _mqtt_qos;
     #if ASYNC_TCP_SSL_ENABLED
         root["mqttsslVisible"] = 1;
-        root["mqttUseSSL"] = getSetting("mqttUseSSL", MQTT_SSL_ENABLED).toInt() == 1;
+        root["mqttSSL"] = getSetting("mqttSSL", MQTT_SSL_ENABLED).toInt() == 1;
         root["mqttFP"] = getSetting("mqttFP", MQTT_SSL_FINGERPRINT);
     #endif
     root["mqttTopic"] = getSetting("mqttTopic", MQTT_TOPIC);
-    root["mqttUseJson"] = getSetting("mqttUseJson", MQTT_USE_JSON).toInt() == 1;
+    root["mqttJson"] = getSetting("mqttJson", MQTT_USE_JSON).toInt() == 1;
 }
 
 #endif
@@ -818,15 +822,15 @@ void mqttSetup() {
     #if WEB_SUPPORT
         wsOnSendRegister(_mqttWebSocketOnSend);
         wsOnAfterParseRegister(_mqttConfigure);
-        wsOnReceiveRegister(_mqttWebSocketOnReceive);
     #endif
 
     #if TERMINAL_SUPPORT
         _mqttInitCommands();
     #endif
 
-    // Register loop
+    // Register
     espurnaRegisterLoop(mqttLoop);
+    settingsRegisterKeyCheck(_mqttKeyCheck);
 
 }
 

code/espurna/nofuss.ino

@@ -22,17 +22,13 @@ bool _nofussEnabled = false;
 
 #if WEB_SUPPORT
 
-bool _nofussWebSocketOnReceive(const char * key, JsonVariant& value) {
-    return (strncmp(key, "nof", 6) == 0);
-}
-
 void _nofussWebSocketOnSend(JsonObject& root) {
     root["nofVisible"] = 1;
     root["nofEnabled"] = getSetting("nofEnabled", NOFUSS_ENABLED).toInt() == 1;
     root["nofServer"] = getSetting("nofServer", NOFUSS_SERVER);
 }
 
-#endif
+#endif // WEB_SUPPORT
 
 void _nofussConfigure() {
 
@@ -72,10 +68,14 @@ void _nofussConfigure() {
 
 }
 
+bool _nofussKeyCheck(const char * key) {
+    return (strncmp(key, "nof", 6) == 0);
+}
+
 void _nofussBackwards() {
-    moveSettings("nofussServer", "nofServer"); // 1.13.1  2018-06-26
-    moveSettings("nofussEnabled", "nofEnabled"); // 1.13.1  2018-06-26
-    moveSettings("nofussInterval", "nofInterval"); // 1.13.1  2018-06-26
+    moveSettings("nofussServer", "nofServer"); // 1.14.0  2018-06-26
+    moveSettings("nofussEnabled", "nofEnabled"); // 1.14.0  2018-06-26
+    moveSettings("nofussInterval", "nofInterval"); // 1.14.0  2018-06-26
 }
 
 #if TERMINAL_SUPPORT
@@ -164,15 +164,15 @@ void nofussSetup() {
     #if WEB_SUPPORT
         wsOnSendRegister(_nofussWebSocketOnSend);
         wsOnAfterParseRegister(_nofussConfigure);
-        wsOnReceiveRegister(_nofussWebSocketOnReceive);
     #endif
 
     #if TERMINAL_SUPPORT
         _nofussInitCommands();
     #endif
 
-    // Register loop
+    // Register
     espurnaRegisterLoop(nofussLoop);
+    settingsRegisterKeyCheck(_nofussKeyCheck);
 
 }
 

code/espurna/ntp.ino

@@ -25,10 +25,6 @@ bool _ntp_configure = false;
 
 #if WEB_SUPPORT
 
-bool _ntpWebSocketOnReceive(const char * key, JsonVariant& value) {
-    return (strncmp(key, "ntp", 3) == 0);
-}
-
 void _ntpWebSocketOnSend(JsonObject& root) {
     root["ntpVisible"] = 1;
     root["ntpStatus"] = (timeStatus() == timeSet);
@@ -116,6 +112,10 @@ void _ntpLoop() {
 
 }
 
+bool _ntpKeyCheck(const char * key) {
+    return (strncmp(key, "ntp", 3) == 0);
+}
+
 void _ntpBackwards() {
 
     // 1.12.0 - 2018-01-21
@@ -186,12 +186,12 @@ void ntpSetup() {
 
     #if WEB_SUPPORT
         wsOnSendRegister(_ntpWebSocketOnSend);
-        wsOnReceiveRegister(_ntpWebSocketOnReceive);
         wsOnAfterParseRegister([]() { _ntp_configure = true; });
     #endif
 
-    // Register loop
+    // Register
     espurnaRegisterLoop(_ntpLoop);
+    settingsRegisterKeyCheck(_ntpKeyCheck);
 
 }
 

code/espurna/ota.ino

@@ -199,14 +199,10 @@ void _otaInitCommands() {
 
 #endif // TERMINAL_SUPPORT
 
-#if WEB_SUPPORT
-
-bool _otaWebSocketOnReceive(const char * key, JsonVariant& value) {
+bool _otaKeyCheck(const char * key) {
     return (strncmp(key, "ota", 3) == 0);
 }
 
-#endif // WEB_SUPPORT
-
 void _otaBackwards() {
     moveSetting("otafs", "otaFS");
 }
@@ -220,13 +216,15 @@ void otaSetup() {
 
     #if WEB_SUPPORT
         wsOnAfterParseRegister(_otaConfigure);
-        wsOnReceiveRegister(_otaWebSocketOnReceive);
     #endif
 
     #if TERMINAL_SUPPORT
         _otaInitCommands();
     #endif
 
+    // Register settings key check
+    settingsRegisterKeyCheck(_otaKeyCheck);
+
     // Register loop
     espurnaRegisterLoop(_otaLoop);
 

code/espurna/relay.ino

@@ -414,7 +414,10 @@ unsigned char relayParsePayload(const char * payload) {
 
 }
 
-// BACKWARDS COMPATIBILITY
+bool _relayKeyCheck(const char * key) {
+    return (strncmp(key, "rly", 3) == 0);
+}
+
 void _relayBackwards() {
 
     // 1.11.0 - 2017-12-26
@@ -431,7 +434,7 @@ void _relayBackwards() {
     delSetting("relayPulseMode");
     delSetting("relayPulseTime");
 
-    // 1.13.1 - 2018-06-26
+    // 1.14.0 - 2018-06-26
     moveSettings("relayBoot", "rlyBoot");
     moveSettings("relayPulse", "rlyPulse");
     moveSettings("relayTime", "rlyTime");
@@ -510,10 +513,6 @@ void _relayConfigure() {
 
 #if WEB_SUPPORT
 
-bool _relayWebSocketOnReceive(const char * key, JsonVariant& value) {
-    return (strncmp(key, "rly", 3) == 0);
-}
-
 void _relayWebSocketUpdate(JsonObject& root) {
     JsonArray& relay = root.createNestedArray("relayStatus");
     for (unsigned char i=0; i<relayCount(); i++) {
@@ -593,7 +592,6 @@ void relaySetupWS() {
     wsOnSendRegister(_relayWebSocketOnStart);
     wsOnActionRegister(_relayWebSocketOnAction);
     wsOnAfterParseRegister(_relayConfigure);
-    wsOnReceiveRegister(_relayWebSocketOnReceive);
 }
 
 #endif // WEB_SUPPORT
@@ -948,6 +946,7 @@ void relaySetup() {
     _relayBoot();
     _relayLoop();
 
+    settingsRegisterKeyCheck(_relayKeyCheck);
     espurnaRegisterLoop(_relayLoop);
 
     #if WEB_SUPPORT

code/espurna/scheduler.ino

@@ -17,10 +17,6 @@ Module key prefix: sch
 
 #if WEB_SUPPORT
 
-bool _schWebSocketOnReceive(const char * key, JsonVariant& value) {
-    return (strncmp(key, "sch", 3) == 0);
-}
-
 void _schWebSocketOnSend(JsonObject &root){
 
     if (relayCount() > 0) {
@@ -49,6 +45,10 @@ void _schWebSocketOnSend(JsonObject &root){
 
 // -----------------------------------------------------------------------------
 
+bool _schKeyCheck(const char * key) {
+    return (strncmp(key, "sch", 3) == 0);
+}
+
 void _schConfigure() {
 
     bool delete_flag = false;
@@ -217,10 +217,11 @@ void schSetup() {
     // Update websocket clients
     #if WEB_SUPPORT
         wsOnSendRegister(_schWebSocketOnSend);
-        wsOnReceiveRegister(_schWebSocketOnReceive);
         wsOnAfterParseRegister(_schConfigure);
     #endif
 
+    settingsRegisterKeyCheck(_schKeyCheck);
+    
     // Register loop
     espurnaRegisterLoop(_schLoop);
 

code/espurna/sensor.ino

@@ -97,17 +97,6 @@ double _magnitudeProcess(unsigned char type, double value) {
 
 #if WEB_SUPPORT
 
-bool _sensorWebSocketOnReceive(const char * key, JsonVariant& value) {
-    if (strncmp(key, "sns", 3) == 0) return true;
-    if (strncmp(key, "pwr", 3) == 0) return true;
-    if (strncmp(key, "ene", 3) == 0) return true;
-    if (strncmp(key, "cur", 3) == 0) return true;
-    if (strncmp(key, "vol", 3) == 0) return true;
-    if (strncmp(key, "tmp", 3) == 0) return true;
-    if (strncmp(key, "hum", 3) == 0) return true;
-    return false;
-}
-
 void _sensorWebSocketSendData(JsonObject& root) {
 
     char buffer[10];
@@ -842,20 +831,36 @@ void _sensorConfigure() {
 
 }
 
+bool _sensorKeyCheck(const char * key) {
+
+    if (strncmp(key, "sns", 3) == 0) return true;
+
+    if (strncmp(key, "pwr", 3) == 0) return true;
+    if (strncmp(key, "ene", 3) == 0) return true;
+    if (strncmp(key, "cur", 3) == 0) return true;
+    if (strncmp(key, "vol", 3) == 0) return true;
+    if (strncmp(key, "tmp", 3) == 0) return true;
+    if (strncmp(key, "hum", 3) == 0) return true;
+
+    if (strncmp(key, "hlw", 3) == 0) return true;
+
+    return false;
+}
+
 void _sensorBackwards() {
     moveSetting("powerUnits", "pwrUnits"); // 1.12.5 - 2018-04-03
-    moveSetting("tmpCorrection", "tmpOffset"); // 1.13.1 - 2018-06-26
-    moveSetting("humCorrection", "humOffset"); // 1.13.1 - 2018-06-26
-    moveSetting("energyUnits", "eneUnits"); // 1.13.1 - 2018-06-26
-    moveSetting("pwrRatioC", "curRatio"); // 1.13.1 - 2018-06-26
-    moveSetting("pwrRatioP", "pwrRatio"); // 1.13.1 - 2018-06-26
-    moveSetting("pwrRatioV", "volRatio"); // 1.13.1 - 2018-06-26
-    moveSetting("pwrVoltage", "volNominal"); // 1.13.1 - 2018-06-26
-    moveSetting("pwrExpectedP", "pwrExpected"); // 1.13.1 - 2018-06-26
-    moveSetting("pwrExpectedC", "curExpected"); // 1.13.1 - 2018-06-26
-    moveSetting("pwrExpectedV", "volExpected"); // 1.13.1 - 2018-06-26
-    moveSetting("pwrResetCalibration", "snsResetCalibration"); // 1.13.1 - 2018-06-26
-    moveSetting("pwrResetE", "eneReset"); // 1.13.1 - 2018-06-26
+    moveSetting("tmpCorrection", "tmpOffset"); // 1.14.0 - 2018-06-26
+    moveSetting("humCorrection", "humOffset"); // 1.14.0 - 2018-06-26
+    moveSetting("energyUnits", "eneUnits"); // 1.14.0 - 2018-06-26
+    moveSetting("pwrRatioC", "curRatio"); // 1.14.0 - 2018-06-26
+    moveSetting("pwrRatioP", "pwrRatio"); // 1.14.0 - 2018-06-26
+    moveSetting("pwrRatioV", "volRatio"); // 1.14.0 - 2018-06-26
+    moveSetting("pwrVoltage", "volNominal"); // 1.14.0 - 2018-06-26
+    moveSetting("pwrExpectedP", "pwrExpected"); // 1.14.0 - 2018-06-26
+    moveSetting("pwrExpectedC", "curExpected"); // 1.14.0 - 2018-06-26
+    moveSetting("pwrExpectedV", "volExpected"); // 1.14.0 - 2018-06-26
+    moveSetting("pwrResetCalibration", "snsResetCalibration"); // 1.14.0 - 2018-06-26
+    moveSetting("pwrResetE", "eneReset"); // 1.14.0 - 2018-06-26
 }
 
 // -----------------------------------------------------------------------------
@@ -950,7 +955,6 @@ void sensorSetup() {
 
         // Websockets
         wsOnSendRegister(_sensorWebSocketStart);
-        wsOnReceiveRegister(_sensorWebSocketOnReceive);
         wsOnSendRegister(_sensorWebSocketSendData);
         wsOnAfterParseRegister(_sensorConfigure);
 
@@ -963,6 +967,8 @@ void sensorSetup() {
         _sensorInitCommands();
     #endif
 
+    settingsRegisterKeyCheck(_sensorKeyCheck);
+
     // Register loop
     espurnaRegisterLoop(sensorLoop);
 

code/espurna/settings.ino

@@ -26,6 +26,8 @@ EmbedisWrap embedis(_serial, TERMINAL_BUFFER_SIZE);
 
 bool _settings_save = false;
 
+std::vector<setting_key_check_callback_f> _setting_key_check_callbacks;
+
 // -----------------------------------------------------------------------------
 // Reverse engineering EEPROM storage format
 // -----------------------------------------------------------------------------
@@ -40,6 +42,13 @@ unsigned long settingsSize() {
 
 // -----------------------------------------------------------------------------
 
+bool settingsKeyExists(const char * key) {
+    for (unsigned char i = 0; i < _setting_key_check_callbacks.size(); i++) {
+        if ((_setting_key_check_callbacks[i])(key)) return true;
+    }
+    return false;
+}
+
 unsigned int settingsKeyCount() {
     unsigned count = 0;
     unsigned pos = SPI_FLASH_SEC_SIZE - 1;
@@ -107,6 +116,16 @@ std::vector<String> _settingsKeys() {
     return keys;
 }
 
+bool _settingsKeyCheck(const char * key) {
+    if (strncmp(key, "admin", 5) == 0) return true;
+    if (strncmp(key, "hostname", 8) == 0) return true;
+    if (strncmp(key, "board", 5) == 0) return true;
+    if (strncmp(key, "loopDelay", 9) == 0) return true;
+    if (strncmp(key, "wtfHeap", 7) == 0) return true;
+    if (strncmp(key, "cfg", 3) == 0) return true;
+    return false;
+}
+
 // -----------------------------------------------------------------------------
 // Commands
 // -----------------------------------------------------------------------------
@@ -163,6 +182,28 @@ void _settingsKeysCommand() {
 
 }
 
+void _settingsCleanCommand(bool do_delete) {
+
+    // Get sorted list of keys
+    std::vector<String> keys = _settingsKeys();
+
+    unsigned int count = 0;
+    for (unsigned int i=0; i<keys.size(); i++) {
+        if (!settingsKeyExists((keys[i]).c_str())) {
+            if (do_delete) {
+                delSetting(keys[i]);
+                DEBUG_MSG_P(PSTR("> %s deleted\n"), (keys[i]).c_str());
+            } else {
+                DEBUG_MSG_P(PSTR("> %s is safe to delete\n"), (keys[i]).c_str());
+            }
+            ++count;
+        }
+    }
+
+    DEBUG_MSG_P(PSTR("%u unknown key(s) found\n"), count);
+
+}
+
 void _settingsFactoryResetCommand() {
     for (unsigned int i = 0; i < SPI_FLASH_SEC_SIZE; i++) {
         EEPROMr.write(i, 0xFF);
@@ -180,6 +221,15 @@ void _settingsInitCommands() {
         });
     #endif
 
+    settingsRegisterCommand(F("CLEAN"), [](Embedis* e) {
+        bool do_delete = false;
+        if (e->argc > 1) {
+            do_delete = String(e->argv[1]).toInt() == 1;
+        }
+        _settingsCleanCommand(do_delete);
+        DEBUG_MSG_P(PSTR("+OK\n"));
+    });
+
     settingsRegisterCommand(F("COMMANDS"), [](Embedis* e) {
         _settingsHelpCommand();
         DEBUG_MSG_P(PSTR("+OK\n"));
@@ -443,6 +493,10 @@ void settingsRegisterCommand(const String& name, void (*call)(Embedis*)) {
     Embedis::command(name, call);
 };
 
+void settingsRegisterKeyCheck(setting_key_check_callback_f callback) {
+    _setting_key_check_callbacks.push_back(callback);
+}
+
 // -----------------------------------------------------------------------------
 // Initialization
 // -----------------------------------------------------------------------------
@@ -479,6 +533,9 @@ void settingsSetup() {
     #endif // SERIAL_RX_ENABLED
     #endif // TERMINAL_SUPPORT
 
+    // Register key check
+    settingsRegisterKeyCheck(_settingsKeyCheck);
+
     // Register loop
     espurnaRegisterLoop(settingsLoop);
 

code/espurna/telnet.ino

@@ -24,10 +24,6 @@ bool _telnetFirst = true;
 
 #if WEB_SUPPORT
 
-bool _telnetWebSocketOnReceive(const char * key, JsonVariant& value) {
-    return (strncmp(key, "telt", 3) == 0);
-}
-
 void _telnetWebSocketOnSend(JsonObject& root) {
     root["telVisible"] = 1;
     root["telSTA"] = getSetting("telSTA", TELNET_STA).toInt() == 1;
@@ -162,8 +158,12 @@ void _telnetNewClient(AsyncClient *client) {
 
 }
 
+bool _telnetKeyCheck(const char * key) {
+    return (strncmp(key, "telt", 3) == 0);
+}
+
 void _telnetBackwards() {
-    moveSetting("telnetSTA", "telSTA"); // 1.13.1 -- 2018-06-26
+    moveSetting("telnetSTA", "telSTA"); // 1.14.0 -- 2018-06-26
 }
 
 // -----------------------------------------------------------------------------
@@ -195,9 +195,10 @@ void telnetSetup() {
 
     #if WEB_SUPPORT
         wsOnSendRegister(_telnetWebSocketOnSend);
-        wsOnReceiveRegister(_telnetWebSocketOnReceive);
     #endif
 
+    settingsRegisterKeyCheck(_telnetKeyCheck);
+    
     DEBUG_MSG_P(PSTR("[TELNET] Listening on port %d\n"), TELNET_PORT);
 
 }

code/espurna/thinkspeak.ino

@@ -34,12 +34,12 @@ unsigned long _tspk_last_flush = 0;
 
 // -----------------------------------------------------------------------------
 
-#if WEB_SUPPORT
-
-bool _tspkWebSocketOnReceive(const char * key, JsonVariant& value) {
+bool _tspkKeyCheck(const char * key) {
     return (strncmp(key, "tspk", 4) == 0);
 }
 
+#if WEB_SUPPORT
+
 void _tspkWebSocketOnSend(JsonObject& root) {
 
     unsigned char visible = 0;
@@ -262,7 +262,6 @@ void tspkSetup() {
     #if WEB_SUPPORT
         wsOnSendRegister(_tspkWebSocketOnSend);
         wsOnAfterParseRegister(_tspkConfigure);
-        wsOnReceiveRegister(_tspkWebSocketOnReceive);
     #endif
 
     DEBUG_MSG_P(PSTR("[THINGSPEAK] Async %s, SSL %s\n"),
@@ -270,6 +269,8 @@ void tspkSetup() {
         THINGSPEAK_USE_SSL ? "ENABLED" : "DISABLED"
     );
 
+    settingsRegisterKeyCheck(_tspkKeyCheck);
+
     // Register loop
     espurnaRegisterLoop(tspkLoop);
 

code/espurna/web.ino

@@ -367,9 +367,8 @@ void _webWebSocketOnSend(JsonObject& root) {
     root["webPort"] = webPort();
 }
 
-bool _webWebSocketOnReceive(const char * key, JsonVariant& value) {
-    if (strncmp(key, "web", 3) == 0) return true;
-    return false;
+bool _webKeyCheck(const char * key) {
+    return (strncmp(key, "web", 3) == 0);
 }
 
 // -----------------------------------------------------------------------------
@@ -459,7 +458,9 @@ void webSetup() {
 
     // Websocket Callbacks
     wsOnSendRegister(_webWebSocketOnSend);
-    wsOnReceiveRegister(_webWebSocketOnReceive);
+
+    // Settings key check register
+    settingsRegisterKeyCheck(_webKeyCheck);
 
 }
 

code/espurna/wifi.ino

@@ -425,11 +425,6 @@ void _wifiInitCommands() {
 
 #if WEB_SUPPORT
 
-bool _wifiWebSocketOnReceive(const char * key, JsonVariant& value) {
-    if (strncmp(key, "wifi", 4) == 0) return true;
-    return false;
-}
-
 void _wifiWebSocketOnSend(JsonObject& root) {
     root["maxNetworks"] = WIFI_MAX_NETWORKS;
     root["wifiScan"] = getSetting("wifiScan", WIFI_SCAN_NETWORKS).toInt() == 1;
@@ -452,7 +447,13 @@ void _wifiWebSocketOnAction(uint32_t client_id, const char * action, JsonObject&
 
 #endif
 
+bool _wifiKeyCheck(const char * key) {
+    return (strncmp(key, "wifi", 4) == 0);
+}
+
 void _wifiBackwards() {
+
+    // 1.14.0 - 2018-06-27
     moveSettings("ssid", "wifiName");
     moveSettings("pass", "wifiPass");
     moveSettings("ip", "wifiIP");
@@ -460,6 +461,7 @@ void _wifiBackwards() {
     moveSettings("mask", "wifiMask");
     moveSettings("dns", "wifiDNS");
     moveSetting("apmode", "wifiMode");
+    delSetting("wifiGain");
 }
 
 // -----------------------------------------------------------------------------
@@ -613,7 +615,6 @@ void wifiSetup() {
 
     #if WEB_SUPPORT
         wsOnSendRegister(_wifiWebSocketOnSend);
-        wsOnReceiveRegister(_wifiWebSocketOnReceive);
         wsOnAfterParseRegister(_wifiConfigure);
         wsOnActionRegister(_wifiWebSocketOnAction);
     #endif
@@ -622,6 +623,8 @@ void wifiSetup() {
         _wifiInitCommands();
     #endif
 
+    settingsRegisterKeyCheck(_wifiKeyCheck);
+
     // Register loop
     espurnaRegisterLoop(wifiLoop);
 

code/espurna/ws.ino

@@ -23,7 +23,6 @@ Ticker _web_defer;
 std::vector<ws_on_send_callback_f> _ws_on_send_callbacks;
 std::vector<ws_on_action_callback_f> _ws_on_action_callbacks;
 std::vector<ws_on_after_parse_callback_f> _ws_on_after_parse_callbacks;
-std::vector<ws_on_receive_callback_f> _ws_on_receive_callbacks;
 
 // -----------------------------------------------------------------------------
 // Private methods
@@ -225,14 +224,7 @@ void _wsParse(AsyncWebSocketClient *client, uint8_t * payload, size_t length) {
             }
 
             // Check if key has to be processed
-            bool found = false;
-            for (unsigned char i = 0; i < _ws_on_receive_callbacks.size(); i++) {
-                found |= (_ws_on_receive_callbacks[i])(key.c_str(), value);
-                // TODO: remove this to call all OnReceiveCallbacks with the
-                // current key/value
-                if (found) break;
-            }
-            if (!found) {
+            if (!settingsKeyExists(key.c_str())) {
                 delSetting(key);
                 continue;
             }
@@ -294,11 +286,8 @@ void _wsUpdate(JsonObject& root) {
     #endif
 }
 
-bool _wsOnReceive(const char * key, JsonVariant& value) {
-    if (strncmp(key, "ws", 2) == 0) return true;
-    if (strncmp(key, "admin", 5) == 0) return true;
-    if (strncmp(key, "hostname", 8) == 0) return true;
-    return false;
+bool _wsKeyCheck(const char * key) {
+    return (strncmp(key, "ws", 2) == 0);
 }
 
 void _wsOnStart(JsonObject& root) {
@@ -412,10 +401,6 @@ void wsOnSendRegister(ws_on_send_callback_f callback) {
     _ws_on_send_callbacks.push_back(callback);
 }
 
-void wsOnReceiveRegister(ws_on_receive_callback_f callback) {
-    _ws_on_receive_callbacks.push_back(callback);
-}
-
 void wsOnActionRegister(ws_on_action_callback_f callback) {
     _ws_on_action_callbacks.push_back(callback);
 }
@@ -497,8 +482,11 @@ void wsSetup() {
     #endif
 
     wsOnSendRegister(_wsOnStart);
-    wsOnReceiveRegister(_wsOnReceive);
+
+    settingsRegisterKeyCheck(_wsKeyCheck);
+
     espurnaRegisterLoop(_wsLoop);
+
 }
 
 #endif // WEB_SUPPORT

code/html/custom.js

@@ -199,12 +199,12 @@ function addValue(data, name, value) {
 
     // These fields will always be a list of values
     var is_group = [
-        "wifiName", "wifiPass", "wifiGW", "wifiMask", "wifiIP", "wifiDNS",
-        "schEnabled", "schSwitch","schAction","schType","schHour","schMinute","schWDs","schUTC",
-        "rlyBoot", "rlyPulse", "rlyTime",
-        "mqttGroup", "mqttGroupInv", "rlyOnDisc",
-        "dczRelayIdx", "dczMagnitude",
-        "tspkRelay", "tspkMagnitude",
+        "wifiName","wifiPass","wifiGW","wifiMask","wifiIP","wifiDNS",
+        "schEnabled","schSwitch","schAction","schType","schHour","schMinute","schWDs","schUTC",
+        "rlyBoot","rlyPulse","rlyTime","rlyOnDisc",
+        "mqttGroup","mqttGroupInv",
+        "dczRelayIdx","dczMagnitude",
+        "tspkRelay","tspkMagnitude",
         "ledMode",
         "adminPass"
     ];

code/html/index.html

@@ -721,7 +721,7 @@
 
                                 <div class="pure-g module module-mqttssl">
                                     <label class="pure-u-1 pure-u-lg-1-4">Use secure connection (SSL)</label>
-                                    <div class="pure-u-1 pure-u-lg-1-4"><input type="checkbox" name="mqttUseSSL" tabindex="29" /></div>
+                                    <div class="pure-u-1 pure-u-lg-1-4"><input type="checkbox" name="mqttSSL" tabindex="29" /></div>
                                 </div>
 
                                 <div class="pure-g module module-mqttssl">
@@ -757,7 +757,7 @@
 
                                 <div class="pure-g">
                                     <label class="pure-u-1 pure-u-lg-1-4">Use JSON payload</label>
-                                    <div class="pure-u-1 pure-u-lg-3-4"><input type="checkbox" name="mqttUseJson" tabindex="32" /></div>
+                                    <div class="pure-u-1 pure-u-lg-3-4"><input type="checkbox" name="mqttJson" tabindex="32" /></div>
                                     <div class="pure-u-1 pure-u-lg-1-4"></div>
                                     <div class="pure-u-1 pure-u-lg-3-4 hint">
                                         All messages (except the device status) will be included in a JSON payload along with the timestamp and hostname