Merge pull request #984 from Dygmalab/fixRaise2BLFlash

fix: removed validation step from raise2 neuron
Dygmalab · Jan 23, 2025 · 8b00115 · 8b00115
2 parents 66061a9 + 373b1e9
commit 8b00115
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "Bazecor",
   "productName": "Bazecor",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "description": "Bazecor desktop app",
   "private": true,
   "repository": {

diff --git a/src/api/flash/raise2Flasher/Raise2-flasher.ts b/src/api/flash/raise2Flasher/Raise2-flasher.ts
@@ -211,9 +211,9 @@ const Raise2Flash = {
       address += bufferSize;
     }
 
-    log.info("Validating...");
-    ans = await rawCommand("V#", serialPort, 1000);
-    if (ans[0] !== 65) throw Error("error when Validating");
+    // log.info("Validating...");
+    // ans = await rawCommand("V#", serialPort, 1000);
+    // if (ans[0] !== 65) throw Error("error when Validating");
 
     // START APPLICATION
     ans = await rawCommand("F#", serialPort, 1000);

diff --git a/src/renderer/controller/FlashingProcedure/machine.ts b/src/renderer/controller/FlashingProcedure/machine.ts
@@ -48,6 +48,10 @@ const FlashDevice = setup({
       context.device.info.product !== "Raise" &&
       context.device.info.keyboardType === "wired",
     doNotFlashSidesWi: ({ context }) =>
+      context.device?.bootloader === true &&
+      context.device.info.product !== "Raise" &&
+      (context.device.info.keyboardType === "wireless" || context.device.info.product !== "Raise2"),
+    doNotFlashSidesR2: ({ context }) =>
       context.device?.bootloader === true &&
       context.device.info.product !== "Raise" &&
       (context.device.info.keyboardType === "wireless" || context.device.info.product === "Raise2"),
@@ -124,6 +128,7 @@ const FlashDevice = setup({
         "*": [
           { target: "flashDefyWired", guard: "doNotFlashSidesW" },
           { target: "resetDefyWireless", guard: "doNotFlashSidesWi" },
+          { target: "resetRaise2", guard: "doNotFlashSidesR2" },
           { target: "resetRaiseNeuron", guard: "flashRaise" },
           { target: "flashRightSide", guard: "flashSides" },
         ],