From 7a8265247b75bf389c791738a30a01fe3dba2263 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 1 Mar 2023 02:06:11 +1100 Subject: Remove `"w":1` and `"h":1` from info.json (#19961) --- keyboards/the_royal/liminal/info.json | 74 +++++++++++++++++------------------ 1 file changed, 37 insertions(+), 37 deletions(-) (limited to 'keyboards/the_royal') diff --git a/keyboards/the_royal/liminal/info.json b/keyboards/the_royal/liminal/info.json index a1480dc5ff..d4865fa3e8 100644 --- a/keyboards/the_royal/liminal/info.json +++ b/keyboards/the_royal/liminal/info.json @@ -13,49 +13,49 @@ "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}, -- cgit v1.2.3 From ace372d90de13dafc815df5d8049497cb351b69b Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Mar 2023 00:34:34 +1100 Subject: Move matrix config to info.json, part 3 (#19991) Co-authored-by: Nick Brassel --- keyboards/the_royal/liminal/config.h | 7 ------- keyboards/the_royal/liminal/info.json | 5 +++++ keyboards/the_royal/schwann/config.h | 7 ------- keyboards/the_royal/schwann/info.json | 5 +++++ 4 files changed, 10 insertions(+), 14 deletions(-) (limited to 'keyboards/the_royal') 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 d4865fa3e8..45d26bf4e7 100644 --- a/keyboards/the_royal/liminal/info.json +++ b/keyboards/the_royal/liminal/info.json @@ -8,6 +8,11 @@ "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": { 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": { -- cgit v1.2.3 From 02ccc50e6085a9d0a4f38f252960e2d14ffe4d1f Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Mar 2023 14:02:04 +1100 Subject: Remove more empty headers (#20155) --- keyboards/the_royal/liminal/liminal.c | 1 - keyboards/the_royal/schwann/schwann.c | 1 - 2 files changed, 2 deletions(-) delete mode 100644 keyboards/the_royal/liminal/liminal.c delete mode 100644 keyboards/the_royal/schwann/schwann.c (limited to 'keyboards/the_royal') 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/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" -- cgit v1.2.3 From 47966dc2a65c88ac90fcd64d12243d72f3f6753b Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 6 Apr 2023 18:00:54 +1000 Subject: Migrate `rgblight.pin` and `RGB_DI_PIN` to `ws2812.pin` (#20303) --- keyboards/the_royal/liminal/config.h | 1 - keyboards/the_royal/liminal/info.json | 3 +++ keyboards/the_royal/schwann/config.h | 1 - keyboards/the_royal/schwann/info.json | 3 +++ 4 files changed, 6 insertions(+), 2 deletions(-) (limited to 'keyboards/the_royal') diff --git a/keyboards/the_royal/liminal/config.h b/keyboards/the_royal/liminal/config.h index f752e60fcd..02c222b2b8 100644 --- a/keyboards/the_royal/liminal/config.h +++ b/keyboards/the_royal/liminal/config.h @@ -6,7 +6,6 @@ #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN D4 #define RGBLED_NUM 1 // Number of LEDs #define RGBLIGHT_HUE_STEP 6 diff --git a/keyboards/the_royal/liminal/info.json b/keyboards/the_royal/liminal/info.json index 45d26bf4e7..eadbb7a027 100644 --- a/keyboards/the_royal/liminal/info.json +++ b/keyboards/the_royal/liminal/info.json @@ -8,6 +8,9 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D4" + }, "matrix_pins": { "cols": ["D6", "C4", "D3", "D2", "D1", "D0", "C2", "B0", "B1", "B2", "B3", "B4", "D5", "C5"], "rows": ["C6", "B6", "B7", "C7"] diff --git a/keyboards/the_royal/schwann/config.h b/keyboards/the_royal/schwann/config.h index 600797d1ee..8cfda8f8e5 100644 --- a/keyboards/the_royal/schwann/config.h +++ b/keyboards/the_royal/schwann/config.h @@ -6,7 +6,6 @@ #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN B3 #define RGBLED_NUM 8 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/the_royal/schwann/info.json b/keyboards/the_royal/schwann/info.json index db132721eb..85b6afb369 100644 --- a/keyboards/the_royal/schwann/info.json +++ b/keyboards/the_royal/schwann/info.json @@ -8,6 +8,9 @@ "pid": "0x3521", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B3" + }, "matrix_pins": { "cols": ["F4", "F5", "D5", "D3", "D2", "C6", "B6", "B5", "B4", "D7", "D6", "D1"], "rows": ["F0", "F1", "F6", "C7"] -- cgit v1.2.3 From f111bea3cda240b7c54bff2e12b5043b7b0797f7 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 25 Apr 2023 02:38:35 +1000 Subject: Move miscellaneous layouts to data driven (#20516) --- keyboards/the_royal/liminal/info.json | 107 ++++++------- keyboards/the_royal/liminal/liminal.h | 19 --- keyboards/the_royal/schwann/info.json | 277 +++++++++++++++++----------------- keyboards/the_royal/schwann/schwann.h | 44 ------ 4 files changed, 197 insertions(+), 250 deletions(-) delete mode 100644 keyboards/the_royal/liminal/liminal.h delete mode 100644 keyboards/the_royal/schwann/schwann.h (limited to 'keyboards/the_royal') diff --git a/keyboards/the_royal/liminal/info.json b/keyboards/the_royal/liminal/info.json index eadbb7a027..c62699df84 100644 --- a/keyboards/the_royal/liminal/info.json +++ b/keyboards/the_royal/liminal/info.json @@ -21,58 +21,61 @@ "layouts": { "LAYOUT_base_kit_all": { "layout": [ - {"label":"k01", "x":0, "y":0}, - {"label":"k02", "x":1, "y":0, "w":1.5}, - {"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}, - {"label":"k12", "x":1, "y":1, "w":1.75}, - {"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}, - {"label":"k22", "x":1, "y":2, "w":1.25}, - {"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}, - {"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}, - {"label":"k35", "x":5.25, "y":3, "w":2}, - {"label":"k38", "x":7.25, "y":3, "w":2.25}, - {"label":"k310", "x":9.5, "y":3, "w":1.5}, - {"label":"k311", "x":11, "y":3, "w":1.25}, - {"label":"k313", "x":12.25, "y":3, "w":1.25}, - {"label":"k314", "x":13.5, "y":3, "w":1.5} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0, "w": 1.5}, + {"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": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 10.5, "y": 0}, + {"matrix": [0, 11], "x": 11.5, "y": 0}, + {"matrix": [0, 12], "x": 12.5, "y": 0}, + {"matrix": [0, 13], "x": 13.5, "y": 0, "w": 1.5}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1, "w": 1.75}, + {"matrix": [1, 2], "x": 2.75, "y": 1}, + {"matrix": [1, 3], "x": 3.75, "y": 1}, + {"matrix": [1, 4], "x": 4.75, "y": 1}, + {"matrix": [1, 5], "x": 5.75, "y": 1}, + {"matrix": [1, 6], "x": 6.75, "y": 1}, + {"matrix": [1, 7], "x": 7.75, "y": 1}, + {"matrix": [1, 8], "x": 8.75, "y": 1}, + {"matrix": [1, 9], "x": 9.75, "y": 1}, + {"matrix": [1, 10], "x": 10.75, "y": 1}, + {"matrix": [1, 11], "x": 11.75, "y": 1}, + {"matrix": [1, 12], "x": 12.75, "y": 1}, + {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2, "w": 1.25}, + {"matrix": [2, 2], "x": 2.25, "y": 2}, + {"matrix": [2, 3], "x": 3.25, "y": 2}, + {"matrix": [2, 4], "x": 4.25, "y": 2}, + {"matrix": [2, 5], "x": 5.25, "y": 2}, + {"matrix": [2, 6], "x": 6.25, "y": 2}, + {"matrix": [2, 7], "x": 7.25, "y": 2}, + {"matrix": [2, 8], "x": 8.25, "y": 2}, + {"matrix": [2, 9], "x": 9.25, "y": 2}, + {"matrix": [2, 10], "x": 10.25, "y": 2}, + {"matrix": [2, 11], "x": 11.25, "y": 2}, + {"matrix": [2, 12], "x": 12.25, "y": 2}, + {"matrix": [2, 13], "x": 13.25, "y": 2, "w": 1.75}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3, "w": 1.5}, + {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3, "w": 1.5}, + {"matrix": [3, 5], "x": 5.25, "y": 3, "w": 2}, + {"matrix": [3, 7], "x": 7.25, "y": 3, "w": 2.25}, + {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.5}, + {"matrix": [3, 10], "x": 11, "y": 3, "w": 1.25}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.25}, + {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.5} ] } } diff --git a/keyboards/the_royal/liminal/liminal.h b/keyboards/the_royal/liminal/liminal.h deleted file mode 100644 index ba53b17011..0000000000 --- a/keyboards/the_royal/liminal/liminal.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT_base_kit_all( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ - k30, k31, k32, k33, k35, k37, k39, k3A, k3C, k3D \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \ - { k30, k31, k32, k33, XXX, k35, XXX, k37, XXX, k39, k3A, XXX, k3C, k3D } \ -} - diff --git a/keyboards/the_royal/schwann/info.json b/keyboards/the_royal/schwann/info.json index 85b6afb369..df765f747c 100644 --- a/keyboards/the_royal/schwann/info.json +++ b/keyboards/the_royal/schwann/info.json @@ -19,148 +19,155 @@ "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { - "LAYOUT_mit": { + "LAYOUT_mit": { "layout": [ - {"label":"TAB", "x":0, "y":0}, - {"label":"Q", "x":1, "y":0}, - {"label":"W", "x":2, "y":0}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0}, - {"label":"T", "x":5, "y":0}, - {"label":"Y", "x":6, "y":0}, - {"label":"U", "x":7, "y":0}, - {"label":"I", "x":8, "y":0}, - {"label":"O", "x":9, "y":0}, - {"label":"P", "x":10, "y":0}, - {"label":"BSPC", "x":11, "y":0}, - {"label":"LCtl", "x":0, "y":1}, - {"label":"A", "x":1, "y":1}, - {"label":"S", "x":2, "y":1}, - {"label":"D", "x":3, "y":1}, - {"label":"F", "x":4, "y":1}, - {"label":"G", "x":5, "y":1}, - {"label":"H", "x":6, "y":1}, - {"label":"J", "x":7, "y":1}, - {"label":"K", "x":8, "y":1}, - {"label":"L", "x":9, "y":1}, - {"label":"SCLN", "x":10, "y":1}, - {"label":"QUOT", "x":11, "y":1}, - {"label":"LSFT", "x":0, "y":2}, - {"label":"Z", "x":1, "y":2}, - {"label":"X", "x":2, "y":2}, - {"label":"C", "x":3, "y":2}, - {"label":"V", "x":4, "y":2}, - {"label":"B", "x":5, "y":2}, - {"label":"N", "x":6, "y":2}, - {"label":"M", "x":7, "y":2}, - {"label":"COMM", "x":8, "y":2}, - {"label":"DOT", "x":9, "y":2}, - {"label":"SLSH", "x":10, "y":2}, - {"label":"ENTER", "x":11, "y":2}, - {"label":"DEL", "x":1, "y":3}, - {"label":"LGUI", "x":2, "y":3}, - {"label":"LALT", "x":3, "y":3}, - {"label":"LOWER", "x":4, "y":3}, - {"label":" ", "x":5, "y":3, "w":2}, - {"label":"RAISE", "x":7, "y":3}, - {"label":"RALT", "x":8, "y":3}, - {"label":"MENU", "x":9, "y":3}, - {"label":"RCTL", "x":10, "y":3} + {"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": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 6], "x": 5, "y": 3, "w": 2}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3} ] }, - "LAYOUT_full_ortho": { - "layout": [ - {"label":"TAB", "x":0, "y":0}, - {"label":"Q", "x":1, "y":0}, - {"label":"W", "x":2, "y":0}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0}, - {"label":"T", "x":5, "y":0}, - {"label":"Y", "x":6, "y":0}, - {"label":"U", "x":7, "y":0}, - {"label":"I", "x":8, "y":0}, - {"label":"O", "x":9, "y":0}, - {"label":"P", "x":10, "y":0}, - {"label":"BSPC", "x":11, "y":0}, - {"label":"LCtl", "x":0, "y":1}, - {"label":"A", "x":1, "y":1}, - {"label":"S", "x":2, "y":1}, - {"label":"D", "x":3, "y":1}, - {"label":"F", "x":4, "y":1}, - {"label":"G", "x":5, "y":1}, - {"label":"H", "x":6, "y":1}, - {"label":"J", "x":7, "y":1}, - {"label":"K", "x":8, "y":1}, - {"label":"L", "x":9, "y":1}, - {"label":"SCLN", "x":10, "y":1}, - {"label":"QUOT", "x":11, "y":1}, - {"label":"LSFT", "x":0, "y":2}, - {"label":"Z", "x":1, "y":2}, - {"label":"X", "x":2, "y":2}, - {"label":"C", "x":3, "y":2}, - {"label":"V", "x":4, "y":2}, - {"label":"B", "x":5, "y":2}, - {"label":"N", "x":6, "y":2}, - {"label":"M", "x":7, "y":2}, - {"label":"COMM", "x":8, "y":2}, - {"label":"DOT", "x":9, "y":2}, - {"label":"SLSH", "x":10, "y":2}, - {"label":"ENTER", "x":11, "y":2}, - {"label":"DEL", "x":1, "y":3}, - {"label":"LGUI", "x":2, "y":3}, - {"label":"LALT", "x":3, "y":3}, - {"label":"LOWER", "x":4, "y":3}, - {"label":" ", "x":5, "y":3}, - {"label":" ", "x":6, "y":3}, - {"label":"RAISE", "x":7, "y":3}, - {"label":"RALT", "x":8, "y":3}, - {"label":"MENU", "x":9, "y":3}, - {"label":"RCTL", "x":10, "y":3} + "layout": [ + {"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": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3} ] }, - "LAYOUT_big_boy": { - "layout": [ - {"label":"TAB", "x":0, "y":0}, - {"label":"Q", "x":1, "y":0}, - {"label":"W", "x":2, "y":0}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0}, - {"label":"T", "x":5, "y":0}, - {"label":"Y", "x":6, "y":0}, - {"label":"U", "x":7, "y":0}, - {"label":"I", "x":8, "y":0}, - {"label":"O", "x":9, "y":0}, - {"label":"P", "x":10, "y":0}, - {"label":"BSPC", "x":11, "y":0}, - {"label":"LCtl", "x":0, "y":1}, - {"label":"A", "x":1, "y":1}, - {"label":"S", "x":2, "y":1}, - {"label":"D", "x":3, "y":1}, - {"label":"F", "x":4, "y":1}, - {"label":"G", "x":5, "y":1}, - {"label":"H", "x":6, "y":1}, - {"label":"J", "x":7, "y":1}, - {"label":"K", "x":8, "y":1}, - {"label":"L", "x":9, "y":1}, - {"label":"SCLN", "x":10, "y":1}, - {"label":"QUOT", "x":11, "y":1}, - {"label":"LSFT", "x":0, "y":2}, - {"label":"Z", "x":1, "y":2}, - {"label":"X", "x":2, "y":2}, - {"label":"C", "x":3, "y":2}, - {"label":"V", "x":4, "y":2}, - {"label":"B", "x":5, "y":2}, - {"label":"N", "x":6, "y":2}, - {"label":"M", "x":7, "y":2}, - {"label":"COMM", "x":8, "y":2}, - {"label":"DOT", "x":9, "y":2}, - {"label":"SLSH", "x":10, "y":2}, - {"label":"ENTER", "x":11, "y":2}, - {"label":"LOWER", "x":1, "y":3, "w":1.5}, - {"label":" ", "x":2.5, "y":3, "w":7}, - {"label":"RAISE", "x":9.5, "y":3, "w":1.5} + "layout": [ + {"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": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + + {"matrix": [3, 1], "x": 1, "y": 3, "w": 1.5}, + {"matrix": [3, 6], "x": 2.5, "y": 3, "w": 7}, + {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.5} ] } } diff --git a/keyboards/the_royal/schwann/schwann.h b/keyboards/the_royal/schwann/schwann.h deleted file mode 100644 index 933e903ec2..0000000000 --- a/keyboards/the_royal/schwann/schwann.h +++ /dev/null @@ -1,44 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT_mit( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \ - k31, k32, k33, k34, k36, k37, k38, k39, k3A \ -) \ -{ \ - {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B}, \ - {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B}, \ - {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B}, \ - {XXX, k31, k32, k33, k34, XXX, k36, k37, k38, k39, k3A, XXX} \ -} - -#define LAYOUT_full_ortho( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \ - k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A \ -) \ -{ \ - {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B}, \ - {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B}, \ - {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B}, \ - {XXX, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, XXX} \ -} - -#define LAYOUT_big_boy( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \ - k31, k36, k3A \ -) \ -{ \ - {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B}, \ - {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B}, \ - {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B}, \ - {XXX, k31, XXX, XXX, XXX, XXX, k36, XXX, XXX, XXX, k3A, XXX} \ -} -- cgit v1.2.3