Improve settings backwards compatibility

Thanks @Willy-JL for the suggestion
RogueMaster · May 14, 2024 · a345eb1 · a345eb1
1 parent a52d025
commit a345eb1
Showing 1 changed file with 34 additions and 11 deletions.
diff --git a/mag_state.c b/mag_state.c
@@ -50,34 +50,57 @@ bool mag_state_load(MagState* out_state) {
             if(!flipper_format_file_open_existing(file, MAG_STATE_PATH)) break;
             if(!flipper_format_read_header(file, str, &tmp)) break;
             if(furi_string_cmp_str(str, MAG_STATE_HEADER)) break;
-            if(tmp != MAG_STATE_VER) break;
+            // if(tmp != MAG_STATE_VER) break;
 
-            if(!flipper_format_read_uint32(file, "pin_input", &tmp, 1)) break;
+            if(!flipper_format_read_uint32(file, "pin_input", &tmp, 1)) {
+                flipper_format_rewind(file);
+                tmp = MAG_STATE_DEFAULT_PIN_INPUT;
+            }
             state.pin_input = (MagPin)tmp;
-            if(!flipper_format_read_uint32(file, "pin_output", &tmp, 1)) break;
+
+            if(!flipper_format_read_uint32(file, "pin_output", &tmp, 1)) {
+                flipper_format_rewind(file);
+                tmp = MAG_STATE_DEFAULT_PIN_OUTPUT;
+            }
             state.pin_output = (MagPin)tmp;
-            if(!flipper_format_read_uint32(file, "pin_enable", &tmp, 1)) break;
+
+            if(!flipper_format_read_uint32(file, "pin_enable", &tmp, 1)) {
+                flipper_format_rewind(file);
+                tmp = MAG_STATE_DEFAULT_PIN_ENABLE;
+            }
             state.pin_enable = (MagPin)tmp;
-            if(!flipper_format_read_bool(file, "allow_uart", &state.allow_uart, 1)) break;
-            if(!flipper_format_read_uint32(file, "n_repeats", &tmp, 1)) break;
+
+            if(!flipper_format_read_bool(file, "allow_uart", &state.allow_uart, 1)) {
+                flipper_format_rewind(file);
+                state.allow_uart = MAG_STATE_DEFAULT_ALLOW_UART;
+            }
+
+            if(!flipper_format_read_uint32(file, "n_repeats", &tmp, 1)) {
+                flipper_format_rewind(file);
+                tmp = MAG_STATE_DEFAULT_N_REPEATS;
+            }
             state.n_repeats = (uint8_t)tmp;
-            if(!flipper_format_read_bool(file, "repeat_mode", &state.repeat_mode, 1)) break;
+
+            if(!flipper_format_read_bool(file, "repeat_mode", &state.repeat_mode, 1)) {
+                flipper_format_rewind(file);
+                state.repeat_mode = MAG_STATE_DEFAULT_REPEAT_MODE;
+            }
 
             loaded_from_file = true;
         } while(0);
         flipper_format_free(file);
     }
     furi_record_close(RECORD_STORAGE);
 
-    // If could not be read from file
-    // Or file GPIO config is invalid (pins overlap)
-    // Set defaults
+    // If file's GPIO config is invalid (pins overlap)
+    // Reset to defaults
     // Additionally raise message to user?
-    if(!loaded_from_file || !mag_state_gpio_is_valid(&state)) {
+    if(!mag_state_gpio_is_valid(&state)) {
         mag_state_gpio_reset(&state);
     }
 
     if(!loaded_from_file) {
+        mag_state_gpio_reset(&state);
         state.allow_uart = MAG_STATE_DEFAULT_ALLOW_UART;
         state.n_repeats = MAG_STATE_DEFAULT_N_REPEATS;
         state.repeat_mode = MAG_STATE_DEFAULT_REPEAT_MODE;