diff --git a/src/lib/assets/layouts/m4g_right_hand.yml b/src/lib/assets/layouts/m4g_right_hand.yml deleted file mode 100644 index 26a85e19..00000000 --- a/src/lib/assets/layouts/m4g_right_hand.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: M4G -col: - # Ring / Middle - - offset: [2, 0] - row: - - switch: { e: 21, n: 22, w: 23, s: 24 } - - switch: { e: 26, n: 27, w: 28, s: 29 } - - offset: [2, 0] - row: - - switch: { e: 36, n: 37, w: 38, s: 39 } - - switch: { e: 41, n: 42, w: 43, s: 44 } - # Pinkie / Index - - offset: [0, -3] - row: - - switch: { e: 16, n: 17, w: 18, s: 19 } - - offset: [4, 0] - switch: { e: 31, n: 32, w: 33, s: 34 } - # Thumbs - - row: - - offset: [0.5, 0.5] - switch: { e: 11, n: 12, w: 13, s: 14 } - - row: - - offset: [1.5, -0.25] - switch: { e: 6, n: 7, w: 8, s: 9 } diff --git a/src/lib/assets/layouts/m4gr.yml b/src/lib/assets/layouts/m4gr.yml new file mode 100644 index 00000000..23bf02bf --- /dev/null +++ b/src/lib/assets/layouts/m4gr.yml @@ -0,0 +1,24 @@ +name: M4GR +col: + # Ring / Middle + - offset: [2, 0] + row: + - switch: { e: 23, n: 22, w: 21, s: 24 } + - switch: { e: 28, n: 27, w: 26, s: 29 } + - offset: [2, 0] + row: + - 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: 18, n: 17, w: 16, s: 19 } + - offset: [4, 0] + switch: { e: 33, n: 32, w: 31, s: 34 } + # Thumbs + - row: + - offset: [0.5, 0.5] + switch: { e: 13, n: 12, w: 11, s: 14 } + - row: + - offset: [1.5, -0.25] + switch: { e: 8, n: 7, w: 6, s: 9 } diff --git a/src/lib/components/layout/Layout.svelte b/src/lib/components/layout/Layout.svelte index cdcc335a..9b897f48 100644 --- a/src/lib/components/layout/Layout.svelte +++ b/src/lib/components/layout/Layout.svelte @@ -37,8 +37,8 @@ import("$lib/assets/layouts/m4g.yml").then( (it) => it.default as VisualLayout, ), - M4G_RIGHT_HAND: () => - import("$lib/assets/layouts/m4g_right_hand.yml").then( + M4GR: () => + import("$lib/assets/layouts/m4gr.yml").then( (it) => it.default as VisualLayout, ), }; diff --git a/src/lib/serial/device.ts b/src/lib/serial/device.ts index adb875f0..0c5cd50a 100644 --- a/src/lib/serial/device.ts +++ b/src/lib/serial/device.ts @@ -26,7 +26,7 @@ const KEY_COUNTS = { LITE: 67, X: 256, M4G: 64, - M4G_RIGHT_HAND: 64, + M4GR: 64, } as const; if (