Merge 7c081f60b1 into 588719df91

.github/workflows/build.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v4
         with:
-          version: 9
+          version: 8
       - name: 🐉 Use Node.js 22.4.x
         uses: actions/setup-node@v3
         with:

package.json

@@ -1,11 +1,11 @@
 {
   "name": "charachorder-device-manager",
-  "version": "2.2.1",
+  "version": "2.1.0",
   "license": "AGPL-3.0-or-later",
   "private": true,
   "engines": {
-    "node": ">=22.4",
-    "pnpm": ">=9.4"
+    "node": ">=18.16",
+    "pnpm": ">=8.6"
   },
   "repository": {
     "type": "git",

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "app"
-version = "2.2.1"
+version = "2.1.0"
 description = "A Tauri App"
 authors = ["Thea Schöbl <dev@theaninova.de>"]
 license = "AGPL-3"

src-tauri/tauri.conf.json

@@ -6,7 +6,7 @@
     "devPath": "http://localhost:5173",
     "distDir": "../build"
   },
-  "package": { "productName": "amacc1ng", "version": "2.2.1" },
+  "package": { "productName": "amacc1ng", "version": "2.1.0" },
   "tauri": {
     "allowlist": { "all": false },
     "bundle": {

src/lib/assets/layouts/m4g.yml

@@ -5,33 +5,20 @@ col:
     row:
       - switch: { e: 26, n: 27, w: 28, s: 29 }
       - switch: { e: 21, n: 22, w: 23, s: 24 }
-      - offset: [4, 0]
-        switch: { w: 66, n: 67, e: 68, s: 69 }
-      - switch: { w: 71, n: 72, e: 73, s: 74 }
   - offset: [2, 0]
     row:
       - switch: { e: 41, n: 42, w: 43, s: 44 }
       - switch: { e: 36, n: 37, w: 38, s: 39 }
-      - offset: [4, 0]
-        switch: { w: 81, n: 82, e: 83, s: 84 }
-      - switch: { w: 86, n: 87, e: 88, s: 89 }
   # Pinkie / Index
   - offset: [0, -3]
     row:
       - switch: { e: 31, n: 32, w: 33, s: 34 }
       - offset: [4, 0]
         switch: { e: 16, n: 17, w: 18, s: 19 }
-      - switch: { w: 61, n: 62, e: 63, s: 64 }
-      - offset: [4, 0]
-        switch: { w: 76, n: 77, e: 78, s: 79 }
   # Thumbs
   - row:
       - offset: [5.5, 0.5]
         switch: { e: 11, n: 12, w: 13, s: 14 }
-      - offset: [1, 0.5]
-        switch: { w: 56, n: 57, e: 58, s: 59 }
   - row:
       - offset: [4.5, -0.25]
         switch: { e: 6, n: 7, w: 8, s: 9 }
-      - offset: [3, -0.25]
-        switch: { w: 51, n: 52, e: 53, s: 54 }

src/lib/assets/layouts/m4gr.yml

@@ -1,37 +1,24 @@
-name: M4G
+name: M4GR
 col:
   # Ring / Middle
   - offset: [2, 0]
     row:
-      - switch: { e: 26, n: 27, w: 28, s: 29 }
-      - switch: { e: 21, n: 22, w: 23, s: 24 }
-      - offset: [4, 0]
-        switch: { w: 66, n: 67, e: 68, s: 69 }
-      - switch: { w: 71, n: 72, e: 73, s: 74 }
+      - switch: { e: 23, n: 22, w: 21, s: 24 }
+      - switch: { e: 28, n: 27, w: 26, s: 29 }
   - offset: [2, 0]
     row:
-      - switch: { e: 41, n: 42, w: 43, s: 44 }
-      - switch: { e: 36, n: 37, w: 38, s: 39 }
-      - offset: [4, 0]
-        switch: { w: 81, n: 82, e: 83, s: 84 }
-      - switch: { w: 86, n: 87, e: 88, s: 89 }
+      - switch: { e: 38, n: 37, w: 36, s: 39 }
+      - switch: { e: 43, n: 42, w: 41, s: 44 }
   # Pinkie / Index
   - offset: [0, -3]
     row:
-      - switch: { e: 31, n: 32, w: 33, s: 34 }
+      - switch: { e: 18, n: 17, w: 16, s: 19 }
       - offset: [4, 0]
-        switch: { e: 16, n: 17, w: 18, s: 19 }
-      - switch: { w: 61, n: 62, e: 63, s: 64 }
-      - offset: [4, 0]
-        switch: { w: 76, n: 77, e: 78, s: 79 }
+        switch: { e: 33, n: 32, w: 31, s: 34 }
   # Thumbs
   - row:
-      - offset: [5.5, 0.5]
-        switch: { e: 11, n: 12, w: 13, s: 14 }
-      - offset: [1, 0.5]
-        switch: { w: 56, n: 57, e: 58, s: 59 }
+      - offset: [0.5, 0.5]
+        switch: { e: 13, n: 12, w: 11, s: 14 }
   - row:
-      - offset: [4.5, -0.25]
-        switch: { e: 6, n: 7, w: 8, s: 9 }
-      - offset: [3, -0.25]
-        switch: { w: 51, n: 52, e: 53, s: 54 }
+      - offset: [1.5, -0.25]
+        switch: { e: 8, n: 7, w: 6, s: 9 }

src/lib/serial/device.ts

@@ -25,8 +25,8 @@ const KEY_COUNTS = {
   TWO: 90,
   LITE: 67,
   X: 256,
-  M4G: 90,
-  M4GR: 90,
+  M4G: 64,
+  M4GR: 64,
 } as const;
 
 if (

src/routes/(app)/ccos/[device]/[version]/+page.svelte

@@ -113,9 +113,8 @@
     const { Transport, ESPLoader } = await import("esptool-js");
     const espLoader = new ESPLoader({
       transport: new Transport(port),
-      baudrate: 9600, // Number(esptool.baud),
-      romBaudrate: 9600, // Number(esptool.baud),
-      debugLogging: true,
+      baudrate: Number(esptool.baud),
+      romBaudrate: Number(esptool.baud),
       terminal: {
         clean: () => {
           terminalOutput = "";
@@ -128,10 +127,8 @@
         },
       },
     } satisfies LoaderOptions);
-    await espLoader.detectChip(esptool.before);
-    if (!espLoader.IS_STUB) {
-      await espLoader.runStub();
-    }
+    await espLoader.connect(esptool.before);
+    await espLoader.runStub();
 
     return espLoader;
   }
@@ -165,25 +162,6 @@
       port.close();
     }
   }
-
-  async function eraseSPI() {
-    const port = await navigator.serial.requestPort();
-    try {
-      console.log(data.meta);
-      const spiFlash = data.meta.spi_flash!;
-      espLoader = await connectEsp(port);
-
-      /*espLoader.flashSpiAttach(
-        (spiFlash.connection.clk << 0) |
-          (spiFlash.connection.q << 8) |
-          (spiFlash.connection.d << 16) |
-          (spiFlash.connection.cs << 24),
-      );
-      espLoader.flashId();*/
-    } finally {
-      port.close();
-    }
-  }
 </script>
 
 <div class="container">
@@ -290,7 +268,7 @@
 
   {#if data.meta.update.esptool}
     <section>
-      <h3>Factory Flash (WIP)</h3>
+      <h3>Factory Flash</h3>
       <p>
         If everything else fails, you can go through the same process that is
         being used in the factory.
@@ -310,9 +288,6 @@
         <label
           ><input type="checkbox" id="erase" bind:checked={eraseAll} />Erase All</label
         >
-        <button onclick={eraseSPI}
-          ><span class="icon">developer_board</span>Erase SPI Flash</button
-        >
       </div>
 
       <pre>{terminalOutput}</pre>

src/routes/(app)/ccos/[device]/[version]/+page.ts

@@ -44,7 +44,6 @@ export const load = (async ({ fetch, params }) => {
         (entry) =>
           entry.type === "file" && (!meta?.files || entry.name in meta.files),
       ) as FileListing[],
-      spi_flash: meta?.spi_flash ?? undefined,
     },
   };
 }) satisfies PageLoad;

src/routes/(app)/ccos/[device]/[version]/meta.ts

@@ -12,21 +12,6 @@ export interface VersionMeta {
     esptool: EspToolData | null;
   };
   files: string[];
-  spi_flash: SPIFlashInfo | null;
-}
-
-export interface SPIFlashInfo {
-  type: string;
-  size: string;
-  connection: SPIConnection;
-}
-
-export interface SPIConnection {
-  clk: number;
-  q: number;
-  d: number;
-  hd: number;
-  cs: number;
 }
 
 export interface EspToolData {