Refactor ConfigInserter to class

betaflight · Jan 6, 2023 · 35115e7 · 35115e7
1 parent 82092f5
commit 35115e7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 18 deletions.
diff --git a/src/js/ConfigInserter.js b/src/js/ConfigInserter.js
@@ -1,7 +1,3 @@
-'use strict';
-
-const ConfigInserter = function () {
-};
 
 const CUSTOM_DEFAULTS_POINTER_ADDRESS = 0x08002800;
 const BLOCK_SIZE = 16384;
@@ -87,21 +83,24 @@ function generateData(firmware, input, startAddress) {
 
 const CONFIG_LABEL = `Custom defaults inserted in`;
 
-ConfigInserter.prototype.insertConfig = function (firmware, config) {
-    console.time(CONFIG_LABEL);
+export default class ConfigInserter {
 
-    const input = `# Betaflight\n${config}\0`;
-    const customDefaultsArea = getCustomDefaultsArea(firmware);
+    insertConfig(firmware, config) {
+        console.time(CONFIG_LABEL);
 
-    if (!customDefaultsArea || customDefaultsArea.endAddress - customDefaultsArea.startAddress === 0) {
-        return false;
-    } else if (input.length >= customDefaultsArea.endAddress - customDefaultsArea.startAddress) {
-        throw new Error(`Custom defaults area too small (${customDefaultsArea.endAddress - customDefaultsArea.startAddress} bytes), ${input.length + 1} bytes needed.`);
-    }
+        const input = `# Betaflight\n${config}\0`;
+        const customDefaultsArea = getCustomDefaultsArea(firmware);
+
+        if (!customDefaultsArea || customDefaultsArea.endAddress - customDefaultsArea.startAddress === 0) {
+            return false;
+        } else if (input.length >= customDefaultsArea.endAddress - customDefaultsArea.startAddress) {
+            throw new Error(`Custom defaults area too small (${customDefaultsArea.endAddress - customDefaultsArea.startAddress} bytes), ${input.length + 1} bytes needed.`);
+        }
 
-    generateData(firmware, input, customDefaultsArea.startAddress);
+        generateData(firmware, input, customDefaultsArea.startAddress);
 
-    console.timeEnd(CONFIG_LABEL);
+        console.timeEnd(CONFIG_LABEL);
 
-    return true;
-};
+        return true;
+    }
+}
diff --git a/src/js/tabs/firmware_flasher.js b/src/js/tabs/firmware_flasher.js
@@ -3,6 +3,7 @@ import GUI from '../gui';
 import { get as getConfig, set as setConfig } from '../ConfigStorage';
 import { get as getStorage, set as setStorage } from '../SessionStorage';
 import BuildApi from '../BuildApi';
+import ConfigInserter from "../ConfigInserter.js";
 
 const firmware_flasher = {
     targets: null,

diff --git a/src/main.html b/src/main.html
@@ -105,7 +105,6 @@
     <script type="text/javascript" src="./js/RateCurve.js"></script>
     <script type="text/javascript" src="./js/Features.js"></script>
     <script type="text/javascript" src="./js/Beepers.js"></script>
-    <script type="text/javascript" src="./js/ConfigInserter.js"></script>
     <script type="text/javascript" src="./js/GitHubApi.js"></script>
     <script type="module" src="./js/main.js"></script>
     <script type="text/javascript" src="./js/LogoManager.js"></script>