Set erase_chip as default option when not set before

betaflight · Dec 29, 2023 · b67ffa2 · b67ffa2
1 parent 6577697
commit b67ffa2
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/src/js/ConfigStorage.js b/src/js/ConfigStorage.js
@@ -3,7 +3,7 @@
  * @param {string | string[]} key string or array of strings
  * @returns {object}
  */
-export function get(key) {
+export function get(key, defaultValue = null) {
   let result = {};
   if (Array.isArray(key)) {
     key.forEach(function (element) {
@@ -24,6 +24,11 @@ export function get(key) {
     }
   }
 
+  // if default value is set and key is not found in localStorage, set default value
+  if (!result[key] && defaultValue !== null) {
+    result[key] = defaultValue;
+  }
+
   return result;
 }
 

diff --git a/src/js/main.js b/src/js/main.js
@@ -71,6 +71,7 @@ function cleanupLocalStorage() {
         'selected_board',
         'unifiedConfigLast',
         'unifiedSourceCache',
+        'erase_chip',
     ];
 
     for (const key in localStorage) {

diff --git a/src/js/tabs/firmware_flasher.js b/src/js/tabs/firmware_flasher.js
@@ -574,12 +574,8 @@ firmware_flasher.initialize = function (callback) {
             self.isFlashing = false;
         }
 
-        let result = getConfig('erase_chip');
-        if (result.erase_chip) {
-            $('input.erase_chip').prop('checked', true);
-        } else {
-            $('input.erase_chip').prop('checked', false);
-        }
+        let result = getConfig('erase_chip', true);
+        $('input.erase_chip').prop('checked', result.erase_chip);
 
         $('input.erase_chip').change(function () {
             setConfig({'erase_chip': $(this).is(':checked')});

diff --git a/src/tabs/firmware_flasher.html b/src/tabs/firmware_flasher.html
@@ -99,7 +99,7 @@
                         <td>
                         </td>
                     </tr>
-                    <tr class="expertOptions option manual_baud_rate noboarder">
+                    <tr class="expertOptions option manual_baud_rate noborder">
                         <td>
                             <label>
                                 <input class="flash_manual_baud toggle" type="checkbox" />

diff --git a/src/tabs/setup.html b/src/tabs/setup.html
@@ -175,7 +175,7 @@
                                 <td i18n="initialSetupDrawing"></td>
                                 <td class="bat-mah-drawing">0.00 A</td>
                             </tr>
-                            <tr class="noboarder">
+                            <tr class="noborder">
                                 <td i18n="initialSetupRSSI"></td>
                                 <td class="rssi">0 %</td>
                             </tr>