diff options
Diffstat (limited to 'keyboards/jorne')
| -rw-r--r-- | keyboards/jorne/jorne.c | 2 | ||||
| -rw-r--r-- | keyboards/jorne/jorne.h | 9 | ||||
| -rw-r--r-- | keyboards/jorne/rev1/config.h | 6 | ||||
| -rw-r--r-- | keyboards/jorne/rev1/info.json | 273 | ||||
| -rw-r--r-- | keyboards/jorne/rev1/rev1.c | 3 | ||||
| -rw-r--r-- | keyboards/jorne/rev1/rev1.h | 2 |
6 files changed, 52 insertions, 243 deletions
diff --git a/keyboards/jorne/jorne.c b/keyboards/jorne/jorne.c index fec24d476c..d00fc2f8fc 100644 --- a/keyboards/jorne/jorne.c +++ b/keyboards/jorne/jorne.c @@ -1,6 +1,6 @@ // Copyright 2021 Joric (@joric) // SPDX-License-Identifier: GPL-2.0-or-later -#include "jorne.h" +#include "quantum.h" #ifdef OLED_ENABLE static void render_logo(void) { diff --git a/keyboards/jorne/jorne.h b/keyboards/jorne/jorne.h deleted file mode 100644 index 7c2478c563..0000000000 --- a/keyboards/jorne/jorne.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2021 Joric (@joric) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - -#ifdef KEYBOARD_jorne_rev1 -# include "rev1.h" -#endif - -#include "quantum.h" diff --git a/keyboards/jorne/rev1/config.h b/keyboards/jorne/rev1/config.h index 7e0ef17113..77316af07c 100644 --- a/keyboards/jorne/rev1/config.h +++ b/keyboards/jorne/rev1/config.h @@ -2,12 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#define MATRIX_ROW_PINS { D4, C6, D7, E6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D3 #define RGBLED_SPLIT { 28, 28 } #define RGBLED_NUM 56 diff --git a/keyboards/jorne/rev1/info.json b/keyboards/jorne/rev1/info.json index 85df8cc709..b4bbb6748a 100644 --- a/keyboards/jorne/rev1/info.json +++ b/keyboards/jorne/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], + "rows": ["D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, @@ -16,235 +21,57 @@ "layouts": { "LAYOUT": { "layout": [ - { - "label": "GUI", - "x": 0, - "y": 2.13 - }, - { - "label": "~", - "x": 1, - "y": 1.38 - }, - { - "label": "Q", - "x": 2, - "y": 1.38 - }, - { - "label": "W", - "x": 3, - "y": 1.13 - }, - { - "label": "E", - "x": 4, - "y": 1 - }, - { - "label": "R", - "x": 5, - "y": 1.13 - }, - { - "label": "T", - "x": 6, - "y": 1.25 - }, + {"x": 0, "y": 1.125}, + {"x": 1, "y": 0.375}, + {"x": 2, "y": 0.375}, + {"x": 3, "y": 0.125}, + {"x": 4, "y": 0}, + {"x": 5, "y": 0.125}, + {"x": 6, "y": 0.25}, + + {"x": 10.5, "y": 0.25}, + {"x": 11.5, "y": 0.125}, + {"x": 12.5, "y": 0}, + {"x": 13.5, "y": 0.125}, + {"x": 14.5, "y": 0.375}, + {"x": 15.5, "y": 0.375}, + {"x": 16.5, "y": 1.125}, - { - "label": "Y", - "x": 10.5, - "y": 1.25 - }, - { - "label": "U", - "x": 11.5, - "y": 1.125 - }, - { - "label": "I", - "x": 12.5, - "y": 1 - }, - { - "label": "O", - "x": 13.5, - "y": 1.125 - }, - { - "label": "P", - "x": 14.5, - "y": 1.375 - }, - { - "label": "{[", - "x": 15.5, - "y": 1.375 - }, - { - "label": "}]", - "x": 16.5, - "y": 2.13 - }, + {"x": 1, "y": 1.375}, + {"x": 2, "y": 1.375}, + {"x": 3, "y": 1.125}, + {"x": 4, "y": 1}, + {"x": 5, "y": 1.125}, + {"x": 6, "y": 1.25}, - { - "label": "Ctrl", - "x": 1, - "y": 2.38 - }, - { - "label": "A", - "x": 2, - "y": 2.38 - }, - { - "label": "S", - "x": 3, - "y": 2.13 - }, - { - "label": "D", - "x": 4, - "y": 2 - }, - { - "label": "F", - "x": 5, - "y": 2.13 - }, - { - "label": "G", - "x": 6, - "y": 2.25 - }, + {"x": 10.5, "y": 1.25}, + {"x": 11.5, "y": 1.125}, + {"x": 12.5, "y": 1}, + {"x": 13.5, "y": 1.125}, + {"x": 14.5, "y": 1.375}, + {"x": 15.5, "y": 1.375}, - { - "label": "H", - "x": 10.5, - "y": 2.25 - }, - { - "label": "J", - "x": 11.5, - "y": 2.13 - }, - { - "label": "K", - "x": 12.5, - "y": 2 - }, - { - "label": "L", - "x": 13.5, - "y": 2.125 - }, - { - "label": ":;", - "x": 14.5, - "y": 2.375 - }, - { - "label": "\"'", - "x": 15.5, - "y": 2.375 - }, - - { - "label": "Alt", - "x": 1, - "y": 3.38 - }, - { - "label": "Z", - "x": 2, - "y": 3.38 - }, - { - "label": "X", - "x": 3, - "y": 3.13 - }, - { - "label": "C", - "x": 4, - "y": 3 - }, - { - "label": "V", - "x": 5, - "y": 3.13 - }, - { - "label": "B", - "x": 6, - "y": 3.25 - }, + {"x": 1, "y": 2.375}, + {"x": 2, "y": 2.375}, + {"x": 3, "y": 2.125}, + {"x": 4, "y": 2}, + {"x": 5, "y": 2.125}, + {"x": 6, "y": 2.25}, - { - "label": "N", - "x": 10.5, - "y": 3.25 - }, - { - "label": "M", - "x": 11.5, - "y": 3.13 - }, - { - "label": "<,", - "x": 12.5, - "y": 3 - }, - { - "label": ">.", - "x": 13.5, - "y": 3.13 - }, - { - "label": "?/", - "x": 14.5, - "y": 3.38 - }, - { - "label": "|\\", - "x": 15.5, - "y": 3.38 - }, + {"x": 10.5, "y": 2.25}, + {"x": 11.5, "y": 2.125}, + {"x": 12.5, "y": 2}, + {"x": 13.5, "y": 2.125}, + {"x": 14.5, "y": 2.375}, + {"x": 15.5, "y": 2.375}, - { - "label": "Rise", - "x": 5, - "y": 5 - }, - { - "label": "Space", - "x": 6, - "y": 5 - }, - { - "label": "Lower", - "x": 7, - "y": 4.5, - "h": 1.5 - }, + {"x": 5, "y": 4}, + {"x": 6, "y": 4}, + {"x": 7, "y": 3.5, "h": 1.5}, - { - "label": "Lower", - "x": 9.5, - "y": 4.5, - "h": 1.5 - }, - { - "label": "Bcs", - "x": 10.5, - "y": 5 - }, - { - "label": "Rise", - "x": 11.5, - "y": 5 - } + {"x": 9.5, "y": 3.5, "h": 1.5}, + {"x": 10.5, "y": 4}, + {"x": 11.5, "y": 4} ] } } diff --git a/keyboards/jorne/rev1/rev1.c b/keyboards/jorne/rev1/rev1.c deleted file mode 100644 index f120ef87f8..0000000000 --- a/keyboards/jorne/rev1/rev1.c +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2021 Joric (@joric) -// SPDX-License-Identifier: GPL-2.0-or-later -#include "rev1.h" diff --git a/keyboards/jorne/rev1/rev1.h b/keyboards/jorne/rev1/rev1.h index af4ef8e3b3..0158032e5e 100644 --- a/keyboards/jorne/rev1/rev1.h +++ b/keyboards/jorne/rev1/rev1.h @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#include "jorne.h" +#include "quantum.h" /* This a shortcut to help you visually see your layout. * |