summaryrefslogtreecommitdiff
path: root/keyboards/westm
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/westm')
-rw-r--r--keyboards/westm/westm68/config.h4
-rw-r--r--keyboards/westm/westm68/info.json141
-rw-r--r--keyboards/westm/westm68/rev1/config.h2
-rw-r--r--keyboards/westm/westm68/rev1/info.json3
-rw-r--r--keyboards/westm/westm68/rev1/rev1.c2
-rw-r--r--keyboards/westm/westm68/rev2/config.h2
-rw-r--r--keyboards/westm/westm68/rev2/info.json3
-rw-r--r--keyboards/westm/westm68/westm68.c17
-rw-r--r--keyboards/westm/westm68/westm68.h35
-rw-r--r--keyboards/westm/westm9/config.h4
-rw-r--r--keyboards/westm/westm9/info.json5
-rw-r--r--keyboards/westm/westm9/rev1/config.h2
-rw-r--r--keyboards/westm/westm9/rev1/info.json3
-rw-r--r--keyboards/westm/westm9/rev2/config.h2
-rw-r--r--keyboards/westm/westm9/rev2/info.json3
-rw-r--r--keyboards/westm/westm9/westm9.c17
-rw-r--r--keyboards/westm/westmergo/config.h6
-rw-r--r--keyboards/westm/westmergo/info.json145
-rw-r--r--keyboards/westm/westmergo/westmergo.c17
-rw-r--r--keyboards/westm/westmergo/westmergo.h36
20 files changed, 171 insertions, 278 deletions
diff --git a/keyboards/westm/westm68/config.h b/keyboards/westm/westm68/config.h
index 68ad770787..9a425a91a8 100644
--- a/keyboards/westm/westm68/config.h
+++ b/keyboards/westm/westm68/config.h
@@ -20,10 +20,6 @@
/* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
-#define MATRIX_ROW_PINS { A13, B9, F1, A10, A9 }
-#define MATRIX_COL_PINS { B14, B13, B12, B11, B10, B2, B1, B8, B7, B6, B5, B4, B3, A15, A14 }
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/westm/westm68/info.json b/keyboards/westm/westm68/info.json
index 8ff4f8d8ce..c71d47a41d 100644
--- a/keyboards/westm/westm68/info.json
+++ b/keyboards/westm/westm68/info.json
@@ -7,83 +7,88 @@
"vid": "0x574D",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B14", "B13", "B12", "B11", "B10", "B2", "B1", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+ "rows": ["A13", "B9", "F1", "A10", "A9"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"layouts": {
"LAYOUT_65_ansi": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
- {"x":4, "y":0},
- {"x":5, "y":0},
- {"x":6, "y":0},
- {"x":7, "y":0},
- {"x":8, "y":0},
- {"x":9, "y":0},
- {"x":10, "y":0},
- {"x":11, "y":0},
- {"x":12, "y":0},
- {"x":13, "y":0, "w":2},
- {"x":15, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 15, "y": 0},
- {"x":0, "y":1, "w":1.5},
- {"x":1.5, "y":1},
- {"x":2.5, "y":1},
- {"x":3.5, "y":1},
- {"x":4.5, "y":1},
- {"x":5.5, "y":1},
- {"x":6.5, "y":1},
- {"x":7.5, "y":1},
- {"x":8.5, "y":1},
- {"x":9.5, "y":1},
- {"x":10.5, "y":1},
- {"x":11.5, "y":1},
- {"x":12.5, "y":1},
- {"x":13.5, "y":1, "w":1.5},
- {"x":15, "y":1},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
- {"x":0, "y":2, "w":1.75},
- {"x":1.75, "y":2},
- {"x":2.75, "y":2},
- {"x":3.75, "y":2},
- {"x":4.75, "y":2},
- {"x":5.75, "y":2},
- {"x":6.75, "y":2},
- {"x":7.75, "y":2},
- {"x":8.75, "y":2},
- {"x":9.75, "y":2},
- {"x":10.75, "y":2},
- {"x":11.75, "y":2},
- {"x":12.75, "y":2, "w":2.25},
- {"x":15, "y":2},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
- {"x":0, "y":3, "w":2.25},
- {"x":2.25, "y":3},
- {"x":3.25, "y":3},
- {"x":4.25, "y":3},
- {"x":5.25, "y":3},
- {"x":6.25, "y":3},
- {"x":7.25, "y":3},
- {"x":8.25, "y":3},
- {"x":9.25, "y":3},
- {"x":10.25, "y":3},
- {"x":11.25, "y":3},
- {"x":12.25, "y":3, "w":1.75},
- {"x":14, "y":3},
- {"x":15, "y":3},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 10], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
- {"x":0, "y":4, "w":1.25},
- {"x":1.25, "y":4, "w":1.25},
- {"x":2.5, "y":4, "w":1.25},
- {"x":3.75, "y":4, "w":6.25},
- {"x":10, "y":4},
- {"x":11, "y":4},
- {"x":12, "y":4},
- {"x":13, "y":4},
- {"x":14, "y":4},
- {"x":15, "y":4}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4},
+ {"matrix": [4, 10], "x": 11, "y": 4},
+ {"matrix": [4, 11], "x": 12, "y": 4},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
]
}
}
diff --git a/keyboards/westm/westm68/rev1/config.h b/keyboards/westm/westm68/rev1/config.h
index 054b47cca2..db711fcfd9 100644
--- a/keyboards/westm/westm68/rev1/config.h
+++ b/keyboards/westm/westm68/rev1/config.h
@@ -16,8 +16,6 @@
#pragma once
-// The pin connected to the data pin of the LEDs
-#define RGB_DI_PIN A8
#define RGBLED_NUM 16
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/westm/westm68/rev1/info.json b/keyboards/westm/westm68/rev1/info.json
index a4736b30a4..70c31e162b 100644
--- a/keyboards/westm/westm68/rev1/info.json
+++ b/keyboards/westm/westm68/rev1/info.json
@@ -1,5 +1,8 @@
{
"usb": {
"pid": "0x0101"
+ },
+ "ws2812": {
+ "pin": "A8"
}
}
diff --git a/keyboards/westm/westm68/rev1/rev1.c b/keyboards/westm/westm68/rev1/rev1.c
index ea0efbee37..3b47910624 100644
--- a/keyboards/westm/westm68/rev1/rev1.c
+++ b/keyboards/westm/westm68/rev1/rev1.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "westm68.h"
+#include "quantum.h"
void board_init(void) {
rgblight_toggle(); // Fixes if LEDs were off in the first place buggy LED turns on
diff --git a/keyboards/westm/westm68/rev2/config.h b/keyboards/westm/westm68/rev2/config.h
index 054b47cca2..db711fcfd9 100644
--- a/keyboards/westm/westm68/rev2/config.h
+++ b/keyboards/westm/westm68/rev2/config.h
@@ -16,8 +16,6 @@
#pragma once
-// The pin connected to the data pin of the LEDs
-#define RGB_DI_PIN A8
#define RGBLED_NUM 16
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/westm/westm68/rev2/info.json b/keyboards/westm/westm68/rev2/info.json
index 0b36e6dd58..50711496d3 100644
--- a/keyboards/westm/westm68/rev2/info.json
+++ b/keyboards/westm/westm68/rev2/info.json
@@ -1,5 +1,8 @@
{
"usb": {
"pid": "0x0102"
+ },
+ "ws2812": {
+ "pin": "A8"
}
}
diff --git a/keyboards/westm/westm68/westm68.c b/keyboards/westm/westm68/westm68.c
deleted file mode 100644
index e30df949a9..0000000000
--- a/keyboards/westm/westm68/westm68.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 WestM
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "westm68.h" \ No newline at end of file
diff --git a/keyboards/westm/westm68/westm68.h b/keyboards/westm/westm68/westm68.h
deleted file mode 100644
index 6dda35435e..0000000000
--- a/keyboards/westm/westm68/westm68.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2021 WestM
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_65_ansi( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, \
- K40, K41, K42, K45, K49, K4A, K4B, K4C, K4D, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E}, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E}, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2C, K2E}, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, XXX, K3B, K3C, K3E}, \
- { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, K4B, K4C, K4D, K4E} \
-}
diff --git a/keyboards/westm/westm9/config.h b/keyboards/westm/westm9/config.h
index 51efda06a6..9a425a91a8 100644
--- a/keyboards/westm/westm9/config.h
+++ b/keyboards/westm/westm9/config.h
@@ -20,10 +20,6 @@
/* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
-#define MATRIX_ROW_PINS { A14, A15, B3 }
-#define MATRIX_COL_PINS { B8, B5, B4 }
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/westm/westm9/info.json b/keyboards/westm/westm9/info.json
index c9ec1e17d7..ed0b994805 100644
--- a/keyboards/westm/westm9/info.json
+++ b/keyboards/westm/westm9/info.json
@@ -7,6 +7,11 @@
"vid": "0x574D",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B8", "B5", "B4"],
+ "rows": ["A14", "A15", "B3"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"layouts": {
diff --git a/keyboards/westm/westm9/rev1/config.h b/keyboards/westm/westm9/rev1/config.h
index fcc9ddb99d..17de75167c 100644
--- a/keyboards/westm/westm9/rev1/config.h
+++ b/keyboards/westm/westm9/rev1/config.h
@@ -16,8 +16,6 @@
#pragma once
-// The pin connected to the data pin of the LEDs
-#define RGB_DI_PIN F1
#define RGBLED_NUM 14
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/westm/westm9/rev1/info.json b/keyboards/westm/westm9/rev1/info.json
index 9934337227..5986e5c1c8 100644
--- a/keyboards/westm/westm9/rev1/info.json
+++ b/keyboards/westm/westm9/rev1/info.json
@@ -1,5 +1,8 @@
{
"usb": {
"pid": "0x0301"
+ },
+ "ws2812": {
+ "pin": "F1"
}
}
diff --git a/keyboards/westm/westm9/rev2/config.h b/keyboards/westm/westm9/rev2/config.h
index fcc9ddb99d..17de75167c 100644
--- a/keyboards/westm/westm9/rev2/config.h
+++ b/keyboards/westm/westm9/rev2/config.h
@@ -16,8 +16,6 @@
#pragma once
-// The pin connected to the data pin of the LEDs
-#define RGB_DI_PIN F1
#define RGBLED_NUM 14
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/westm/westm9/rev2/info.json b/keyboards/westm/westm9/rev2/info.json
index 3b2f219948..faebf5d443 100644
--- a/keyboards/westm/westm9/rev2/info.json
+++ b/keyboards/westm/westm9/rev2/info.json
@@ -1,5 +1,8 @@
{
"usb": {
"pid": "0x0302"
+ },
+ "ws2812": {
+ "pin": "F1"
}
}
diff --git a/keyboards/westm/westm9/westm9.c b/keyboards/westm/westm9/westm9.c
deleted file mode 100644
index 45420db2e3..0000000000
--- a/keyboards/westm/westm9/westm9.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 WestM
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "westm9.h" \ No newline at end of file
diff --git a/keyboards/westm/westmergo/config.h b/keyboards/westm/westmergo/config.h
index fd10220d9f..2b64827856 100644
--- a/keyboards/westm/westmergo/config.h
+++ b/keyboards/westm/westmergo/config.h
@@ -16,10 +16,6 @@
#pragma once
-#define MATRIX_ROW_PINS { A13, B9, F1, A10, A9 }
-#define MATRIX_COL_PINS { B15, B14, B13, B12, B11, B10, B2, B1, B8, B7, B6, B5, B4, B3, A15, A14 }
-#define DIODE_DIRECTION COL2ROW
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -30,8 +26,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-// The pin connected to the data pin of the LEDs
-#define RGB_DI_PIN A8
#define RGBLED_NUM 16
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/westm/westmergo/info.json b/keyboards/westm/westmergo/info.json
index a50da579e3..e2decedf4f 100644
--- a/keyboards/westm/westmergo/info.json
+++ b/keyboards/westm/westmergo/info.json
@@ -8,80 +8,95 @@
"pid": "0x0201",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "A8"
+ },
+ "matrix_pins": {
+ "cols": ["B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+ "rows": ["A13", "B9", "F1", "A10", "A9"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"layouts": {
"LAYOUT_alice": {
"layout": [
- {"label":"K1E", "x":0, "y":0},
- {"label":"K00", "x":1.5, "y":0},
- {"label":"K01", "x":2.5, "y":0},
- {"label":"K02", "x":3.5, "y":0},
- {"label":"K03", "x":4.5, "y":0},
- {"label":"K04", "x":5.5, "y":0},
- {"label":"K05", "x":6.5, "y":0},
- {"label":"K06", "x":7.5, "y":0},
- {"label":"K07", "x":10.5, "y":0},
- {"label":"K08", "x":11.5, "y":0},
- {"label":"K09", "x":12.5, "y":0},
- {"label":"K0A", "x":13.5, "y":0},
- {"label":"K0B", "x":14.5, "y":0},
- {"label":"K0C", "x":15.5, "y":0},
- {"label":"K0D", "x":16.5, "y":0, "w":2},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.5, "y": 0},
+ {"matrix": [0, 2], "x": 2.5, "y": 0},
+ {"matrix": [0, 3], "x": 3.5, "y": 0},
+ {"matrix": [0, 4], "x": 4.5, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 8], "x": 10.5, "y": 0},
+ {"matrix": [0, 9], "x": 11.5, "y": 0},
+ {"matrix": [0, 10], "x": 12.5, "y": 0},
+ {"matrix": [0, 11], "x": 13.5, "y": 0},
+ {"matrix": [0, 13], "x": 14.5, "y": 0},
+ {"matrix": [0, 14], "x": 15.5, "y": 0},
+ {"matrix": [0, 15], "x": 16.5, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 3, "y": 1},
+ {"matrix": [1, 3], "x": 4, "y": 1},
+ {"matrix": [1, 4], "x": 5, "y": 1},
+ {"matrix": [1, 5], "x": 6, "y": 1},
+ {"matrix": [1, 6], "x": 7, "y": 1},
+
+ {"matrix": [1, 8], "x": 10, "y": 1},
+ {"matrix": [1, 9], "x": 11, "y": 1},
+ {"matrix": [1, 10], "x": 12, "y": 1},
+ {"matrix": [1, 11], "x": 13, "y": 1},
+ {"matrix": [1, 12], "x": 14, "y": 1},
+ {"matrix": [1, 13], "x": 15, "y": 1},
+ {"matrix": [1, 14], "x": 16, "y": 1},
+ {"matrix": [1, 15], "x": 17, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3.25, "y": 2},
+ {"matrix": [2, 3], "x": 4.25, "y": 2},
+ {"matrix": [2, 4], "x": 5.25, "y": 2},
+ {"matrix": [2, 5], "x": 6.25, "y": 2},
+ {"matrix": [2, 6], "x": 7.25, "y": 2},
- {"label":"K2E", "x":0, "y":1},
- {"label":"K10", "x":1.5, "y":1, "w":1.5},
- {"label":"K11", "x":3, "y":1},
- {"label":"K12", "x":4, "y":1},
- {"label":"K13", "x":5, "y":1},
- {"label":"K14", "x":6, "y":1},
- {"label":"K15", "x":7, "y":1},
- {"label":"K16", "x":10, "y":1},
- {"label":"K17", "x":11, "y":1},
- {"label":"K18", "x":12, "y":1},
- {"label":"K19", "x":13, "y":1},
- {"label":"K1A", "x":14, "y":1},
- {"label":"K1B", "x":15, "y":1},
- {"label":"K1C", "x":16, "y":1},
- {"label":"K1D", "x":17, "y":1, "w":1.5},
+ {"matrix": [2, 8], "x": 10.25, "y": 2},
+ {"matrix": [2, 9], "x": 11.25, "y": 2},
+ {"matrix": [2, 10], "x": 12.25, "y": 2},
+ {"matrix": [2, 11], "x": 13.25, "y": 2},
+ {"matrix": [2, 12], "x": 14.25, "y": 2},
+ {"matrix": [2, 13], "x": 15.25, "y": 2},
+ {"matrix": [2, 15], "x": 16.25, "y": 2, "w": 2.25},
- {"label":"K3E", "x":0, "y":2},
- {"label":"K20", "x":1.5, "y":2, "w":1.75},
- {"label":"K21", "x":3.25, "y":2},
- {"label":"K22", "x":4.25, "y":2},
- {"label":"K23", "x":5.25, "y":2},
- {"label":"K24", "x":6.25, "y":2},
- {"label":"K25", "x":7.25, "y":2},
- {"label":"K26", "x":10.25, "y":2},
- {"label":"K27", "x":11.25, "y":2},
- {"label":"K28", "x":12.25, "y":2},
- {"label":"K29", "x":13.25, "y":2},
- {"label":"K2A", "x":14.25, "y":2},
- {"label":"K2B", "x":15.25, "y":2},
- {"label":"K2D", "x":16.25, "y":2, "w":2.25},
+ {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.75, "y": 3},
+ {"matrix": [3, 3], "x": 4.75, "y": 3},
+ {"matrix": [3, 4], "x": 5.75, "y": 3},
+ {"matrix": [3, 5], "x": 6.75, "y": 3},
+ {"matrix": [3, 6], "x": 7.75, "y": 3},
- {"label":"K30", "x":1.5, "y":3, "w":2.25},
- {"label":"K32", "x":3.75, "y":3},
- {"label":"K33", "x":4.75, "y":3},
- {"label":"K34", "x":5.75, "y":3},
- {"label":"K35", "x":6.75, "y":3},
- {"label":"K36", "x":7.75, "y":3},
- {"label":"K37", "x":9.75, "y":3},
- {"label":"K38", "x":10.75, "y":3},
- {"label":"K39", "x":11.75, "y":3},
- {"label":"K3A", "x":12.75, "y":3},
- {"label":"K3B", "x":13.75, "y":3},
- {"label":"K3D", "x":14.75, "y":3},
- {"label":"K3C", "x":15.75, "y":3, "w":1.75},
- {"label":"K4D", "x":17.5, "y":3},
+ {"matrix": [3, 8], "x": 9.75, "y": 3},
+ {"matrix": [3, 9], "x": 10.75, "y": 3},
+ {"matrix": [3, 10], "x": 11.75, "y": 3},
+ {"matrix": [3, 11], "x": 12.75, "y": 3},
+ {"matrix": [3, 12], "x": 13.75, "y": 3},
+ {"matrix": [3, 13], "x": 14.75, "y": 3},
+ {"matrix": [3, 14], "x": 15.75, "y": 3, "w": 1.75},
+ {"matrix": [3, 15], "x": 17.5, "y": 3},
- {"label":"K40", "x":1.5, "y":4, "w":1.5},
- {"label":"K42", "x":4.5, "y":4, "w":1.25},
- {"label":"K44", "x":5.75, "y":4, "w":2.25},
- {"label":"K46", "x":8, "y":4, "w":1.25},
- {"label":"K48", "x":9.75, "y":4, "w":2.75},
- {"label":"K4A", "x":12.5, "y":4, "w":1.25},
- {"label":"K4E", "x":17, "y":4, "w":1.5}
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 15], "x": 17, "y": 4, "w": 1.5}
]
}
}
diff --git a/keyboards/westm/westmergo/westmergo.c b/keyboards/westm/westmergo/westmergo.c
deleted file mode 100644
index 18055d3789..0000000000
--- a/keyboards/westm/westmergo/westmergo.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 WestM
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "westmergo.h" \ No newline at end of file
diff --git a/keyboards/westm/westmergo/westmergo.h b/keyboards/westm/westmergo/westmergo.h
deleted file mode 100644
index 550773b5ac..0000000000
--- a/keyboards/westm/westmergo/westmergo.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2021 WestM
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_alice( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0d, k0e, k0f,\
- k10, k11, k12, k13, k14, k15, k16, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, \
- k20, k21, k22, k23, k24, k25, k26, k28, k29, k2a, k2b, k2c, k2d, k2f, \
- k31, k32, k33, k34, k35, k36, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, \
- k41, k43, k45, k46, k49, k4b, k4f \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, XXX, k0d, k0e, k0f },\
- { k10, k11, k12, k13, k14, k15, k16, XXX, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f }, \
- { k20, k21, k22, k23, k24, k25, k26, XXX, k28, k29, k2a, k2b, k2c, k2d, XXX, k2f }, \
- { XXX, k31, k32, k33, k34, k35, k36, XXX, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f }, \
- { XXX, k41, XXX, k43, XXX, k45, k46, XXX, XXX, k49, XXX, k4b, XXX, XXX, XXX, k4f }, \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 08:41:04 +0000