settings: simplify migrateVersion() checks in modules

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

View File

@@ -796,12 +796,10 @@ bool _buttonSetupProvider(size_t index, ButtonProvider provider) {
}
void _buttonSettingsMigrate(int version) {
if (!version || (version >= 5)) {
return;
if (version < 5) {
delSettingPrefix("btnGPIO");
moveSetting("btnDelay", "btnRepDel");
}
delSettingPrefix("btnGPIO");
moveSetting("btnDelay", "btnRepDel");
}
bool buttonAdd() {
@@ -817,7 +815,7 @@ bool buttonAdd() {
}
void buttonSetup() {
_buttonSettingsMigrate(migrateVersion());
migrateVersion(_buttonSettingsMigrate);
for (size_t index = 0; index < ButtonsMax; ++index) {
auto provider = getSetting({"btnProv", index}, button::build::provider(index));