summaryrefslogtreecommitdiff
path: root/keyboards/jorne
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/jorne')
-rw-r--r--keyboards/jorne/jorne.c2
-rw-r--r--keyboards/jorne/jorne.h9
-rw-r--r--keyboards/jorne/rev1/config.h7
-rw-r--r--keyboards/jorne/rev1/info.json276
-rw-r--r--keyboards/jorne/rev1/rev1.c3
-rw-r--r--keyboards/jorne/rev1/rev1.h31
6 files changed, 54 insertions, 274 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..73e2d8219b 100644
--- a/keyboards/jorne/rev1/config.h
+++ b/keyboards/jorne/rev1/config.h
@@ -2,13 +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..c3a0ba00c6 100644
--- a/keyboards/jorne/rev1/info.json
+++ b/keyboards/jorne/rev1/info.json
@@ -8,243 +8,73 @@
"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"
},
+ "ws2812": {
+ "pin": "D3"
+ },
"processor": "atmega32u4",
"bootloader": "caterina",
"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
- },
+ {"matrix": [3, 0], "x": 0, "y": 1.125},
+ {"matrix": [0, 0], "x": 1, "y": 0.375},
+ {"matrix": [0, 1], "x": 2, "y": 0.375},
+ {"matrix": [0, 2], "x": 3, "y": 0.125},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0.125},
+ {"matrix": [0, 5], "x": 6, "y": 0.25},
+
+ {"matrix": [4, 5], "x": 10.5, "y": 0.25},
+ {"matrix": [4, 4], "x": 11.5, "y": 0.125},
+ {"matrix": [4, 3], "x": 12.5, "y": 0},
+ {"matrix": [4, 2], "x": 13.5, "y": 0.125},
+ {"matrix": [4, 1], "x": 14.5, "y": 0.375},
+ {"matrix": [4, 0], "x": 15.5, "y": 0.375},
+ {"matrix": [7, 0], "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
- },
+ {"matrix": [1, 0], "x": 1, "y": 1.375},
+ {"matrix": [1, 1], "x": 2, "y": 1.375},
+ {"matrix": [1, 2], "x": 3, "y": 1.125},
+ {"matrix": [1, 3], "x": 4, "y": 1},
+ {"matrix": [1, 4], "x": 5, "y": 1.125},
+ {"matrix": [1, 5], "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
- },
+ {"matrix": [5, 5], "x": 10.5, "y": 1.25},
+ {"matrix": [5, 4], "x": 11.5, "y": 1.125},
+ {"matrix": [5, 3], "x": 12.5, "y": 1},
+ {"matrix": [5, 2], "x": 13.5, "y": 1.125},
+ {"matrix": [5, 1], "x": 14.5, "y": 1.375},
+ {"matrix": [5, 0], "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
- },
+ {"matrix": [2, 0], "x": 1, "y": 2.375},
+ {"matrix": [2, 1], "x": 2, "y": 2.375},
+ {"matrix": [2, 2], "x": 3, "y": 2.125},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2.125},
+ {"matrix": [2, 5], "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
- },
+ {"matrix": [6, 5], "x": 10.5, "y": 2.25},
+ {"matrix": [6, 4], "x": 11.5, "y": 2.125},
+ {"matrix": [6, 3], "x": 12.5, "y": 2},
+ {"matrix": [6, 2], "x": 13.5, "y": 2.125},
+ {"matrix": [6, 1], "x": 14.5, "y": 2.375},
+ {"matrix": [6, 0], "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
- },
+ {"matrix": [3, 3], "x": 5, "y": 4},
+ {"matrix": [3, 4], "x": 6, "y": 4},
+ {"matrix": [3, 5], "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
- }
+ {"matrix": [7, 5], "x": 9.5, "y": 3.5, "h": 1.5},
+ {"matrix": [7, 4], "x": 10.5, "y": 4},
+ {"matrix": [7, 3], "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
deleted file mode 100644
index af4ef8e3b3..0000000000
--- a/keyboards/jorne/rev1/rev1.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2021 Joric (@joric)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#include "jorne.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT( \
-L33, L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R33, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, R30, R31, R32 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { L33, KC_NO, KC_NO, L30, L31, L32 }, \
- { R05, R04, R03, R02, R01, R00 }, \
- { R15, R14, R13, R12, R11, R10 }, \
- { R25, R24, R23, R22, R21, R20 }, \
- { R33, KC_NO, KC_NO, R32, R31, R30 } \
- }
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 09:16:38 +0000