settings: handle old keys in the respective modules

fixes #2419

code/espurna/button.cpp

@@ -874,9 +874,17 @@ bool _buttonSetupProvider(unsigned char index, ButtonProvider provider) {
     return result;
 }
 
-void buttonSetup() {
-    // Backwards compatibility
+void _buttonSettingsMigrate(int version) {
+    if (!version || (version >= 5)) {
+        return;
+    }
+
+    delSettingPrefix("btnGPIO");
     moveSetting("btnDelay", "btnRepDel");
+}
+
+void buttonSetup() {
+    _buttonSettingsMigrate(migrateVersion());
 
     for (unsigned char index = 0; index < ButtonsMax; ++index) {
         auto provider = getSetting({"btnProv", index}, _buttonProvider(index));

code/espurna/led.cpp

@@ -427,7 +427,19 @@ void ledLoop() {
 
 }
 
+void _ledSettingsMigrate(int version) {
+    if (!version || (version >= 5)) {
+        return;
+    }
+
+    delSettingPrefix({
+        "ledGPIO",
+        "ledLogic"
+    });
+}
+
 void ledSetup() {
+    _ledSettingsMigrate(migrateVersion());
 
     size_t leds = 0;
 

code/espurna/light.cpp

@@ -1928,8 +1928,25 @@ void _lightProviderDebug() {
     "\n"));
 }
 
-void lightSetup() {
+void _lightSettingsMigrate(int version) {
+    if (!version || (version >= 5)) {
+        return;
+    }
+
+    delSettingPrefix({
+        "chGPIO",
+        "chLogic",
+        "myChips",
+        "myDCKGPIO",
+        "myDIGPIO"
+    });
+    delSetting("lightProvider");
+
     moveSetting("lightTime", "ltTime");
+}
+
+void lightSetup() {
+    _lightSettingsMigrate(migrateVersion());
 
     const auto enable_pin = getSetting("ltEnableGPIO", _lightEnablePin());
     if (enable_pin != GPIO_NONE) {

code/espurna/migrate.cpp

@@ -12,9 +12,7 @@ Copyright (C) 2016-2019 by Xose Pérez <xose dot perez at gmail dot com>
 #include <vector>
 #include <utility>
 
-namespace {
-
-void delPrefixes(const std::initializer_list<const char*>& prefixes) {
+void delSettingPrefix(const std::initializer_list<const char*>& prefixes) {
     std::vector<String> to_purge;
 
     using namespace settings;
@@ -33,7 +31,13 @@ void delPrefixes(const std::initializer_list<const char*>& prefixes) {
     }
 }
 
-} // namespace
+void delSettingPrefix(const char* prefix) {
+    delSettingPrefix({prefix});
+}
+
+void delSettingPrefix(const String& prefix) {
+    delSettingPrefix(prefix.c_str());
+}
 
 // Configuration versions
 //
@@ -53,7 +57,6 @@ int migrateVersion() {
 }
 
 void migrate() {
-
     // We either get 0, when version did not change
     // Or, the version we migrate from
     const auto version = migrateVersion();
@@ -67,34 +70,11 @@ void migrate() {
     // and some very old keys that were forced via migrate.ino
     switch (version) {
     case 2:
-        delPrefixes({
-            "btnGPIO",
-            "ledGPIO",
-            "ledLogic",
-            "relayGPIO",
-            "relayType"
-        });
-        // fall through
     case 3:
     case 4:
-        delPrefixes({
-            "board",
-            "chGPIO",
-            "chLogic",
-            "ledGPIO",
-            "ledLogic",
-            "lightProvider",
-            "myChips",
-            "myDCKGPIO",
-            "myDIGPIO",
-            "relayGPIO",
-            "relayProvider",
-            "relayType",
-            "relays"
-        });
+        delSetting("board");
         break;
     }
 
     saveSettings();
-
 }

code/espurna/relay.cpp

@@ -1092,16 +1092,17 @@ PayloadStatus relayParsePayload(const char * payload) {
     #endif
 }
 
-// BACKWARDS COMPATIBILITY
-void _relayBackwards() {
-
-    for (unsigned char id = 0; id < _relays.size(); ++id) {
-        SettingsKey key {"mqttGroupInv", id};
-        if (!hasSetting(key)) continue;
-        setSetting({"mqttGroupSync", id}, getSetting(key));
-        delSetting(key);
+void _relaySettingsMigrate(int version) {
+    if (!version || (version >= 5)) {
+        return;
     }
 
+    delSettingPrefix({
+        "relayGPIO",
+        "relayProvider",
+        "relayType",
+    });
+    delSetting("relays");
 }
 
 void _relayBoot(unsigned char index, const RelayMaskHelper& mask) {
@@ -1793,7 +1794,7 @@ RelayProviderBasePtr _relaySetupProvider(unsigned char index) {
     return result;
 }
 
-void _relaySetupAdhoc() {
+void _relaySetup() {
     _relays.reserve(_relayAdhocPins());
 
     for (unsigned char id = 0; id < RelaysMax; ++id) {
@@ -1806,17 +1807,15 @@ void _relaySetupAdhoc() {
         }
         _relays.emplace_back(std::move(impl));
     }
+
+    relaySetupDummy(getSetting("relayDummy", DUMMY_RELAY_COUNT));
 }
 
 void relaySetup() {
+    _relaySettingsMigrate(migrateVersion());
 
-    // Ad-hoc relays
-    _relaySetupAdhoc();
-
-    // Dummy (virtual) relays
-    relaySetupDummy(getSetting("relayDummy", DUMMY_RELAY_COUNT));
+    _relaySetup();
 
-    _relayBackwards();
     _relayConfigure();
     _relayBootAll();
     _relayLoop();

code/espurna/settings.h

@@ -238,6 +238,10 @@ bool delSetting(const String& key);
 bool delSetting(const __FlashStringHelper* key);
 bool delSetting(const SettingsKey& key);
 
+void delSettingPrefix(const std::initializer_list<const char*>&);
+void delSettingPrefix(const char* prefix);
+void delSettingPrefix(const String& prefix);
+
 bool hasSetting(const char* key);
 bool hasSetting(const String& key);
 bool hasSetting(const __FlashStringHelper* key);