diff --git a/src/lib/assets/layouts/generic/103-key.yml b/src/lib/assets/layouts/generic/103-key.yml index e30531b8..1916100c 100644 --- a/src/lib/assets/layouts/generic/103-key.yml +++ b/src/lib/assets/layouts/generic/103-key.yml @@ -1,27 +1,27 @@ name: Lite col: - row: - - key: 110 + - key: 27 - key: 112 - offset: [ 1, 0 ] + offset: [1, 0] - key: 113 - key: 114 - key: 115 - key: 116 - offset: [ 0.5, 0 ] + offset: [0.5, 0] - key: 117 - key: 118 - key: 119 - key: 120 - offset: [ 0.5, 0 ] + offset: [0.5, 0] - key: 121 - key: 122 - key: 123 - - key: 124 - offset: [ 0.25, 0 ] - - key: 125 - - key: 126 - - offset: [ 0, 0.25 ] + - key: 42 + offset: [0.25, 0] + - key: 145 + - key: 19 + - offset: [0, 0.25] row: - key: 1 - key: 2 @@ -37,19 +37,19 @@ col: - key: 12 - key: 13 - key: 15 - size: [ 2, 1 ] + size: [2, 1] - key: 75 - offset: [ 0.25, 0 ] + offset: [0.25, 0] - key: 80 - key: 85 - key: 90 - offset: [ 0.25, 0 ] + offset: [0.25, 0] - key: 95 - key: 100 - key: 105 - row: - key: 16 - size: [ 1.5, 1 ] + size: [1.5, 1] - key: 17 - key: 18 - key: 19 @@ -63,21 +63,21 @@ col: - key: 27 - key: 28 - key: 29 - size: [ 1.5, 1 ] + size: [1.5, 1] - key: 76 - offset: [ 0.25, 0 ] + offset: [0.25, 0] - key: 81 - key: 86 - key: 91 - offset: [ 0.25, 0 ] + offset: [0.25, 0] - key: 96 - key: 101 - key: 106 - size: [ 1, 2 ] - - offset: [ 0, -1 ] + size: [1, 2] + - offset: [0, -1] row: - key: 30 - size: [ 2, 1 ] + size: [2, 1] - key: 31 - key: 32 - key: 33 @@ -90,14 +90,14 @@ col: - key: 40 - key: 41 - key: 43 - size: [ 2, 1 ] + size: [2, 1] - key: 92 - offset: [ 3.5, 0 ] + offset: [3.5, 0] - key: 97 - key: 102 - row: - key: 44 - size: [ 2.5, 1 ] + size: [2.5, 1] - key: 46 - key: 47 - key: 48 @@ -109,35 +109,34 @@ col: - key: 54 - key: 55 - key: 57 - size: [ 2.5, 1 ] + size: [2.5, 1] - key: 83 - offset: [ 1.25, 0 ] + offset: [1.25, 0] - key: 93 - offset: [ 1.25, 0 ] + offset: [1.25, 0] - key: 98 - key: 103 - key: 108 - size: [ 1, 2 ] - - offset: [ 0, -1 ] + size: [1, 2] + - offset: [0, -1] row: - key: 58 - size: [ 1.5, 1 ] + size: [1.5, 1] - key: 59 - key: 60 - size: [ 1.5, 1 ] + size: [1.5, 1] - key: 61 - size: [ 7, 1 ] + size: [7, 1] - key: 62 - size: [ 1.5, 1 ] + size: [1.5, 1] - key: 63 - key: 64 - size: [ 1.5, 1 ] + size: [1.5, 1] - key: 79 - offset: [ 0.25, 0 ] + offset: [0.25, 0] - key: 84 - key: 89 - key: 99 - offset: [ 0.25, 0 ] - size: [ 2, 1 ] + offset: [0.25, 0] + size: [2, 1] - key: 104 - diff --git a/src/lib/serial/device.ts b/src/lib/serial/device.ts index eddea6e9..45ae9cd3 100644 --- a/src/lib/serial/device.ts +++ b/src/lib/serial/device.ts @@ -15,7 +15,7 @@ const PORT_FILTERS: Map = new Map([ const KEY_COUNTS = { ONE: 90, LITE: 67, - X: 255, + X: 256, } if (browser && navigator.serial === undefined && import.meta.env.TAURI_FAMILY !== undefined) { @@ -55,7 +55,7 @@ export class CharaDevice { company!: "CHARACHORDER" device!: "ONE" | "LITE" | "X" chipset!: "M0" | "S2" - keyCount!: 90 | 67 | 255 + keyCount!: 90 | 67 | 256 constructor(private readonly baudRate = 115200) {}