keep config checkbox to skip nvs partition (#15)

* keep config checkbox to skip nvs partition * make keep config default true * add missing type annotation * fixed * fix: update keepConfig default to false --------- Co-authored-by: WantClue <[email protected]>
bitaxeorg · Feb 1, 2025 · 92b3a75 · 92b3a75
1 parent 5168f60
commit 92b3a75
Show file tree

Hide file tree

Showing 10 changed files with 62 additions and 13 deletions.
diff --git a/src/components/LandingHero.tsx b/src/components/LandingHero.tsx
@@ -32,6 +32,7 @@ export default function LandingHero() {
   const textDecoderRef = useRef<TextDecoderStream | null>(null)
   const readableStreamClosedRef = useRef<Promise<void> | null>(null)
   const logsRef = useRef<string>('')
+  const [keepConfig, setKeepConfig] = useState(false);
 
   useEffect(() => {
     const userAgent = navigator.userAgent.toLowerCase();
@@ -116,6 +117,10 @@ export default function LandingHero() {
     }
   }
 
+  const handleKeepConfigToggle = (event: React.ChangeEvent<HTMLInputElement>) => {
+    setKeepConfig(event.target.checked);
+  };
+
   const startSerialLogging = async () => {
     if (!serialPortRef.current) {
       setStatus(t('status.connectFirst'));
@@ -256,11 +261,34 @@ export default function LandingHero() {
 
       setStatus(t('status.flashing', { percent: 0 }))
 
+      // On all Bitaxe derivatives the same
+      const nvsStart = 0x9000;
+      const nvsSize = 0x6000;
+
+      let parts;
+
+      if (keepConfig) {
+        parts = [
+          {
+            data: firmwareBinaryString.slice(0, nvsStart), // Data before NVS
+            address: 0,
+          },
+          {
+            data: firmwareBinaryString.slice(nvsStart + nvsSize), // Data after NVS
+            address: nvsStart + nvsSize,
+          },
+        ];
+      } else {
+        parts = [
+          {
+            data: firmwareBinaryString, // Entire firmware binary
+            address: 0,
+          },
+        ];
+      }
+
       await loader.writeFlash({
-        fileArray: [{
-          data: firmwareBinaryString,
-          address: 0
-        }],
+        fileArray: parts,
         flashSize: "keep",
         flashMode: "keep",
         flashFreq: "keep",
@@ -354,6 +382,18 @@ export default function LandingHero() {
                   disabled={isConnecting || isFlashing}
                 />
               )}
+              <div className="flex items-center gap-2">
+                <input
+                  type="checkbox"
+                  id="keepConfig"
+                  className="cursor-pointer"
+                  checked={keepConfig}
+                  onChange={handleKeepConfigToggle}
+                />
+                <label htmlFor="keepConfig" className="text-gray-500 dark:text-gray-400 cursor-pointer">
+                  {t('hero.keepConfig')}
+                </label>
+              </div>
               <Button
                 className="w-full"
                 onClick={handleStartFlashing}

diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
@@ -24,7 +24,8 @@
       "startLogging": "Logging starten",
       "stopLogging": "Logging stoppen",
       "downloadLogs": "Logs herunterladen",
-      "loggingDescription": "Verbinde dein Gerät, protokolliere die seriellen Daten und lade diese später herunter."
+      "loggingDescription": "Verbinde dein Gerät, protokolliere die seriellen Daten und lade diese später herunter.",
+      "keepConfig": "Konfiguration behalten"
     },
     "features": {
       "title": "Funktionen",

diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
@@ -24,7 +24,8 @@
       "startLogging": "Start Logging",
       "stopLogging": "Stop Logging",
       "downloadLogs": "Download Logs",
-      "loggingDescription": "Connect your device, log the serial data and download it later on."
+      "loggingDescription": "Connect your device, log the serial data and download it later on.",
+      "keepConfig": "Keep configuration"
     },
     "features": {
       "title": "Key Features",

diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
@@ -24,7 +24,8 @@
         "startLogging": "Avvia registrazione Log",
         "stopLogging": "Ferma registrazione Log",
         "downloadLogs": "Scarica Log",
-        "loggingDescription": "Collega il tuo dispositivo, registra i dati seriali e scaricali successivamente."
+        "loggingDescription": "Collega il tuo dispositivo, registra i dati seriali e scaricali successivamente.",
+        "keepConfig": "Mantieni configurazione"
     },
     "features": {
         "title": "Caratteristiche principali",

diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
@@ -24,7 +24,8 @@
       "startLogging": "Iniciar Log",
       "stopLogging": "Parar Log",
       "downloadLogs": "Baixar Logs",
-      "loggingDescription": "Conecte seu dispositivo, registre os dados seriais e baixe-os posteriormente."
+      "loggingDescription": "Conecte seu dispositivo, registre os dados seriais e baixe-os posteriormente.",
+      "keepConfig": "Manter configuração"
     },
     "features": {
       "title": "Principais Recursos",

diff --git a/src/i18n/locales/ro.json b/src/i18n/locales/ro.json
@@ -24,7 +24,8 @@
       "startLogging": "Pornește logarea",
       "stopLogging": "Oprește logarea",
       "downloadLogs": "Descarcă loguri",
-      "loggingDescription": "Conectează aparatul, înregistrează datele de pe comunicarea serială și descarcă mai târziu."
+      "loggingDescription": "Conectează aparatul, înregistrează datele de pe comunicarea serială și descarcă mai târziu.",
+      "keepConfig": "Păstrează configurația"
     },
     "features": {
       "title": "Funcții importante",

diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
@@ -24,7 +24,8 @@
       "startLogging": "Начать ведение журнала",
       "stopLogging": "Остановить ведение журнала",
       "downloadLogs": "Скачать логи",
-      "loggingDescription": "Подключи свое устройство, запиши в журнал последовательные данные и загрузи их позже."
+      "loggingDescription": "Подключи свое устройство, запиши в журнал последовательные данные и загрузи их позже.",
+      "keepConfig": "Сохранить конфигурацию"
     },
     "features": {
       "title": "Ключевые особенности",

diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
@@ -24,7 +24,8 @@
       "startLogging": "Spustiť Logovanie",
       "stopLogging": "Ukončiť Logovanie",
       "downloadLogs": "Stiahniť Logy",
-      "loggingDescription": "Pripojte Vaše zariadenie, uložte serialové dáta a stiahnite ich neskôr."
+      "loggingDescription": "Pripojte Vaše zariadenie, uložte serialové dáta a stiahnite ich neskôr.",
+      "keepConfig": "Zachovať konfiguráciu"
     },
     "features": {
       "title": "Kľučové Funkcie",

diff --git a/src/i18n/locales/tlh.json b/src/i18n/locales/tlh.json
@@ -24,7 +24,8 @@
         "startLogging": "De' ghItlhchoH",
         "stopLogging": "De' ghoSchoH",
         "downloadLogs": "De' nIH",
-        "loggingDescription": "chel jan, ghItlh De', nIH 'ach neH le'vaD."
+        "loggingDescription": "chel jan, ghItlh De', nIH 'ach neH le'vaD.",
+        "keepConfig": "nugh rI' choq"
     },
     "features": {
         "title": "nIvmo' chutmey",

diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
@@ -24,7 +24,8 @@
       "startLogging": "Loglamaya Başla",
       "stopLogging": "Loglamayı Durdur",
       "downloadLogs": "Logu İndir",
-      "loggingDescription": "Cihazınızı seçin, işlemi loglayın ve daha sonra indirin."
+      "loggingDescription": "Cihazınızı seçin, işlemi loglayın ve daha sonra indirin.",
+      "keepConfig": "Yapılandırmayı koru"
     },
     "features": {
       "title": "Öne Çıkan Özellikler",