summaryrefslogtreecommitdiff
path: root/keyboards/the_royal
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/the_royal')
-rw-r--r--keyboards/the_royal/liminal/config.h7
-rw-r--r--keyboards/the_royal/liminal/info.json79
-rw-r--r--keyboards/the_royal/liminal/liminal.c1
-rw-r--r--keyboards/the_royal/schwann/config.h7
-rw-r--r--keyboards/the_royal/schwann/info.json5
-rw-r--r--keyboards/the_royal/schwann/schwann.c1
6 files changed, 47 insertions, 53 deletions
diff --git a/keyboards/the_royal/liminal/config.h b/keyboards/the_royal/liminal/config.h
index 351589a086..f752e60fcd 100644
--- a/keyboards/the_royal/liminal/config.h
+++ b/keyboards/the_royal/liminal/config.h
@@ -1,12 +1,5 @@
#pragma once
-
-#define MATRIX_ROW_PINS { C6, B6, B7, C7 }
-#define MATRIX_COL_PINS { D6, C4, D3, D2, D1, D0, C2, B0, B1, B2, B3, B4, D5, C5 }
-
-/* COL2ROW or ROW2COL */
-#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/the_royal/liminal/info.json b/keyboards/the_royal/liminal/info.json
index a1480dc5ff..45d26bf4e7 100644
--- a/keyboards/the_royal/liminal/info.json
+++ b/keyboards/the_royal/liminal/info.json
@@ -8,54 +8,59 @@
"pid": "0x0003",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D6", "C4", "D3", "D2", "D1", "D0", "C2", "B0", "B1", "B2", "B3", "B4", "D5", "C5"],
+ "rows": ["C6", "B6", "B7", "C7"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u2",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_base_kit_all": {
"layout": [
- {"label":"k01", "x":0, "y":0, "w":1},
+ {"label":"k01", "x":0, "y":0},
{"label":"k02", "x":1, "y":0, "w":1.5},
- {"label":"k03", "x":2.5, "y":0, "w":1},
- {"label":"k04", "x":3.5, "y":0, "w":1},
- {"label":"k05", "x":4.5, "y":0, "w":1},
- {"label":"k06", "x":5.5, "y":0, "w":1},
- {"label":"k07", "x":6.5, "y":0, "w":1},
- {"label":"k08", "x":7.5, "y":0, "w":1},
- {"label":"k09", "x":8.5, "y":0, "w":1},
- {"label":"k010", "x":9.5, "y":0, "w":1},
- {"label":"k011", "x":10.5, "y":0, "w":1},
- {"label":"k012", "x":11.5, "y":0, "w":1},
- {"label":"k013", "x":12.5, "y":0, "w":1},
+ {"label":"k03", "x":2.5, "y":0},
+ {"label":"k04", "x":3.5, "y":0},
+ {"label":"k05", "x":4.5, "y":0},
+ {"label":"k06", "x":5.5, "y":0},
+ {"label":"k07", "x":6.5, "y":0},
+ {"label":"k08", "x":7.5, "y":0},
+ {"label":"k09", "x":8.5, "y":0},
+ {"label":"k010", "x":9.5, "y":0},
+ {"label":"k011", "x":10.5, "y":0},
+ {"label":"k012", "x":11.5, "y":0},
+ {"label":"k013", "x":12.5, "y":0},
{"label":"k014", "x":13.5, "y":0, "w":1.5},
- {"label":"k11", "x":0, "y":1, "w":1},
+ {"label":"k11", "x":0, "y":1},
{"label":"k12", "x":1, "y":1, "w":1.75},
- {"label":"k13", "x":2.75, "y":1, "w":1},
- {"label":"k14", "x":3.75, "y":1, "w":1},
- {"label":"k15", "x":4.75, "y":1, "w":1},
- {"label":"k16", "x":5.75, "y":1, "w":1},
- {"label":"k17", "x":6.75, "y":1, "w":1},
- {"label":"k18", "x":7.75, "y":1, "w":1},
- {"label":"k19", "x":8.75, "y":1, "w":1},
- {"label":"k110", "x":9.75, "y":1, "w":1},
- {"label":"k111", "x":10.75, "y":1, "w":1},
- {"label":"k112", "x":11.75, "y":1, "w":1},
- {"label":"k113", "x":12.75, "y":1, "w":1},
+ {"label":"k13", "x":2.75, "y":1},
+ {"label":"k14", "x":3.75, "y":1},
+ {"label":"k15", "x":4.75, "y":1},
+ {"label":"k16", "x":5.75, "y":1},
+ {"label":"k17", "x":6.75, "y":1},
+ {"label":"k18", "x":7.75, "y":1},
+ {"label":"k19", "x":8.75, "y":1},
+ {"label":"k110", "x":9.75, "y":1},
+ {"label":"k111", "x":10.75, "y":1},
+ {"label":"k112", "x":11.75, "y":1},
+ {"label":"k113", "x":12.75, "y":1},
{"label":"k114", "x":13.75, "y":1, "w":1.25},
- {"label":"k21", "x":0, "y":2, "w":1},
+ {"label":"k21", "x":0, "y":2},
{"label":"k22", "x":1, "y":2, "w":1.25},
- {"label":"k23", "x":2.25, "y":2, "w":1},
- {"label":"k24", "x":3.25, "y":2, "w":1},
- {"label":"k25", "x":4.25, "y":2, "w":1},
- {"label":"k26", "x":5.25, "y":2, "w":1},
- {"label":"k27", "x":6.25, "y":2, "w":1},
- {"label":"k28", "x":7.25, "y":2, "w":1},
- {"label":"k29", "x":8.25, "y":2, "w":1},
- {"label":"k210", "x":9.25, "y":2, "w":1},
- {"label":"k211", "x":10.25, "y":2, "w":1},
- {"label":"k212", "x":11.25, "y":2, "w":1},
- {"label":"k213", "x":12.25, "y":2, "w":1},
+ {"label":"k23", "x":2.25, "y":2},
+ {"label":"k24", "x":3.25, "y":2},
+ {"label":"k25", "x":4.25, "y":2},
+ {"label":"k26", "x":5.25, "y":2},
+ {"label":"k27", "x":6.25, "y":2},
+ {"label":"k28", "x":7.25, "y":2},
+ {"label":"k29", "x":8.25, "y":2},
+ {"label":"k210", "x":9.25, "y":2},
+ {"label":"k211", "x":10.25, "y":2},
+ {"label":"k212", "x":11.25, "y":2},
+ {"label":"k213", "x":12.25, "y":2},
{"label":"k214", "x":13.25, "y":2, "w":1.75},
- {"label":"k31", "x":0, "y":3, "w":1},
+ {"label":"k31", "x":0, "y":3},
{"label":"k32", "x":1, "y":3, "w":1.5},
{"label":"k33", "x":2.5, "y":3, "w":1.25},
{"label":"k34", "x":3.75, "y":3, "w":1.5},
diff --git a/keyboards/the_royal/liminal/liminal.c b/keyboards/the_royal/liminal/liminal.c
deleted file mode 100644
index 6e1e935d44..0000000000
--- a/keyboards/the_royal/liminal/liminal.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "liminal.h" \ No newline at end of file
diff --git a/keyboards/the_royal/schwann/config.h b/keyboards/the_royal/schwann/config.h
index 0c6341af0f..600797d1ee 100644
--- a/keyboards/the_royal/schwann/config.h
+++ b/keyboards/the_royal/schwann/config.h
@@ -1,12 +1,5 @@
#pragma once
-
-#define MATRIX_ROW_PINS { F0, F1, F6, C7 }
-#define MATRIX_COL_PINS { F4, F5, D5, D3, D2, C6, B6, B5, B4, D7, D6, D1 }
-
-/* COL2ROW or ROW2COL */
-#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/the_royal/schwann/info.json b/keyboards/the_royal/schwann/info.json
index 97d10f6edc..db132721eb 100644
--- a/keyboards/the_royal/schwann/info.json
+++ b/keyboards/the_royal/schwann/info.json
@@ -8,6 +8,11 @@
"pid": "0x3521",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F4", "F5", "D5", "D3", "D2", "C6", "B6", "B5", "B4", "D7", "D6", "D1"],
+ "rows": ["F0", "F1", "F6", "C7"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/the_royal/schwann/schwann.c b/keyboards/the_royal/schwann/schwann.c
deleted file mode 100644
index 1ef8c93974..0000000000
--- a/keyboards/the_royal/schwann/schwann.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "schwann.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-28 16:11:39 +0000