Mirrors/espurna
2
0
Fork 0
mirror of https://github.com/xoseperez/espurna.git synced 2026-03-12 03:07:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

settings: simplify migrateVersion() checks in modules

Browse Source 
Just `if (version < N)` instead of `if (version && (version < N))`
Fix existing functions that were not checking for `version > 0`
This commit is contained in:
Maxim Prokhorov
2021-08-02 07:50:52 +03:00
parent dde5f374dd
commit 27f701773f
12 changed files with 101 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
code/espurna/light.cpp
View File

@@ -2502,23 +2502,21 @@ void _lightProviderDebug() {
}
void _lightSettingsMigrate(int version) {
if (!version || (version >= 5)) {
return;
if (version < 5) {
delSettingPrefix({
"chGPIO",
"chLogic",
"myChips",
"myDCKGPIO",
"myDIGPIO"
});
delSetting("lightProvider");
delSetting("useCSS");
moveSetting("lightTime", "ltTime");
moveSetting("lightColdMired", "ltColdMired");
moveSetting("lightWarmMired", "ltWarmMired");
}
delSettingPrefix({
"chGPIO",
"chLogic",
"myChips",
"myDCKGPIO",
"myDIGPIO"
});
delSetting("lightProvider");
delSetting("useCSS");
moveSetting("lightTime", "ltTime");
moveSetting("lightColdMired", "ltColdMired");
moveSetting("lightWarmMired", "ltWarmMired");
}
} // namespace
@@ -2526,7 +2524,7 @@ void _lightSettingsMigrate(int version) {
// -----------------------------------------------------------------------------
void lightSetup() {
_lightSettingsMigrate(migrateVersion());
migrateVersion(_lightSettingsMigrate);
const auto enable_pin = getSetting("ltEnableGPIO", Light::build::enablePin());
if (enable_pin != GPIO_NONE) {