added flash device SM route and checks to fix flashing (#445)

Signed-off-by: Alejandro Parcet <[email protected]>
Dygmalab · Jun 21, 2023 · 043dfca · 043dfca
1 parent dd03f85
commit 043dfca
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/src/renderer/controller/FlashingSM/FlashDevice.js b/src/renderer/controller/FlashingSM/FlashDevice.js
@@ -426,6 +426,7 @@ const FlashDevice = createMachine(
         entry: [
           (context, event) => {
             console.log("Selecting upgrade path");
+            console.log("context of device", context.device);
           },
           assign({
             stateblock: (context, event) => 1
@@ -434,7 +435,8 @@ const FlashDevice = createMachine(
           raise("flashingPath")
         ],
         on: [
-          { event: "*", target: "flashDefyWired", cond: "doNotFlashSides" },
+          { event: "*", target: "flashDefyWired", cond: "doNotFlashSidesW" },
+          { event: "*", target: "resetDefyWireless", cond: "doNotFlashSidesWi" },
           { event: "*", target: "resetRaiseNeuron", cond: "flashRaise" },
           { event: "*", target: "flashRightSide", cond: "flashSides" }
         ]
@@ -862,13 +864,24 @@ const FlashDevice = createMachine(
   {
     guards: {
       flashSides: (context, event) => {
-        return !context.device.bootloader == true && context.device.info.product !== "Raise";
+        return context.device.bootloader !== true && context.device.info.product !== "Raise";
       },
       flashRaise: (context, event) => {
         return context.device.info.product === "Raise";
       },
-      doNotFlashSides: (context, event) => {
-        return context.device.bootloader == true && context.device.info.product !== "Raise";
+      doNotFlashSidesW: (context, event) => {
+        return (
+          context.device.bootloader === true &&
+          context.device.info.product !== "Raise" &&
+          context.device.info.keyboardType === "wired"
+        );
+      },
+      doNotFlashSidesWi: (context, event) => {
+        return (
+          context.device.bootloader === true &&
+          context.device.info.product !== "Raise" &&
+          context.device.info.keyboardType === "wireless"
+        );
       },
       doNotWaitForESC: (context, event) => {
         return context.device.bootloader == true || context.sideLeftBL == true;

diff --git a/src/renderer/modules/NavigationMenu/NavigationMenu.js b/src/renderer/modules/NavigationMenu/NavigationMenu.js
@@ -146,6 +146,7 @@ class NavigationMenu extends Component {
 
   contextUpdater = async () => {
     const focus = new Focus();
+    if (focus.device.bootloader) return;
     let parts = await focus.command("version");
     parts = parts.split(" ");
     let versions = {