summaryrefslogtreecommitdiff
path: root/keyboards/adpenrose
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2023-04-15 10:36:11 -0700
committerGitHub <noreply@github.com>2023-04-15 10:36:11 -0700
commitd732b0b8497cb4a67dc1ce706dd26a0610e15293 (patch)
tree818fba4a4797f0fc3787186eb3add8deaea27214 /keyboards/adpenrose
parent6d965d486c08166c6d6d8d699721a02b053d35d0 (diff)
ADPenrose Obi Layout Macro Conversion and Addition (#20445)
* add matrix_diagram.md * info.json: apply friendly formatting * move matrix data to info.json * add LAYOUT_625u_space with reference keymap
Diffstat (limited to 'keyboards/adpenrose')
-rw-r--r--keyboards/adpenrose/obi/info.json163
-rw-r--r--keyboards/adpenrose/obi/keymaps/default_625u_space/keymap.c41
-rw-r--r--keyboards/adpenrose/obi/keymaps/default_625u_space/rules.mk1
-rw-r--r--keyboards/adpenrose/obi/matrix_diagram.md16
-rw-r--r--keyboards/adpenrose/obi/obi.c5
-rw-r--r--keyboards/adpenrose/obi/obi.h26
6 files changed, 168 insertions, 84 deletions
diff --git a/keyboards/adpenrose/obi/info.json b/keyboards/adpenrose/obi/info.json
index c0c1b73c64..ce4ba7b47e 100644
--- a/keyboards/adpenrose/obi/info.json
+++ b/keyboards/adpenrose/obi/info.json
@@ -17,60 +17,117 @@
17 "layouts": { 17 "layouts": {
18 "LAYOUT_all": { 18 "LAYOUT_all": {
19 "layout": [ 19 "layout": [
20 {"label":"F1", "x":0, "y":0}, 20 {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
21 {"label":"Tab", "x":1.25, "y":0, "w":1.5}, 21 {"label": "Tab", "matrix": [0, 1], "x": 1.25, "y": 0, "w": 1.5},
22 {"label":"Q", "x":2.75, "y":0}, 22 {"label": "Q", "matrix": [0, 2], "x": 2.75, "y": 0},
23 {"label":"W", "x":3.75, "y":0}, 23 {"label": "W", "matrix": [0, 3], "x": 3.75, "y": 0},
24 {"label":"E", "x":4.75, "y":0}, 24 {"label": "E", "matrix": [0, 4], "x": 4.75, "y": 0},
25 {"label":"R", "x":5.75, "y":0}, 25 {"label": "R", "matrix": [0, 5], "x": 5.75, "y": 0},
26 {"label":"T", "x":6.75, "y":0}, 26 {"label": "T", "matrix": [0, 6], "x": 6.75, "y": 0},
27 {"label":"Y", "x":7.75, "y":0}, 27 {"label": "Y", "matrix": [0, 7], "x": 7.75, "y": 0},
28 {"label":"U", "x":8.75, "y":0}, 28 {"label": "U", "matrix": [0, 8], "x": 8.75, "y": 0},
29 {"label":"I", "x":9.75, "y":0}, 29 {"label": "I", "matrix": [0, 9], "x": 9.75, "y": 0},
30 {"label":"O", "x":10.75, "y":0}, 30 {"label": "O", "matrix": [0, 10], "x": 10.75, "y": 0},
31 {"label":"P", "x":11.75, "y":0}, 31 {"label": "P", "matrix": [0, 11], "x": 11.75, "y": 0},
32 {"label":"{", "x":12.75, "y":0}, 32 {"label": "{", "matrix": [0, 12], "x": 12.75, "y": 0},
33 {"label":"Backspace", "x":13.75, "y":0, "w":1.5}, 33 {"label": "Backspace", "matrix": [0, 13], "x": 13.75, "y": 0, "w": 1.5},
34 34
35 {"label":"F2", "x":0, "y":1}, 35 {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
36 {"label":"Caps Lock", "x":1.25, "y":1, "w":1.75}, 36 {"label": "Caps Lock", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.75},
37 {"label":"A", "x":3, "y":1}, 37 {"label": "A", "matrix": [1, 2], "x": 3, "y": 1},
38 {"label":"S", "x":4, "y":1}, 38 {"label": "S", "matrix": [1, 3], "x": 4, "y": 1},
39 {"label":"D", "x":5, "y":1}, 39 {"label": "D", "matrix": [1, 4], "x": 5, "y": 1},
40 {"label":"F", "x":6, "y":1}, 40 {"label": "F", "matrix": [1, 5], "x": 6, "y": 1},
41 {"label":"G", "x":7, "y":1}, 41 {"label": "G", "matrix": [1, 6], "x": 7, "y": 1},
42 {"label":"H", "x":8, "y":1}, 42 {"label": "H", "matrix": [1, 7], "x": 8, "y": 1},
43 {"label":"J", "x":9, "y":1}, 43 {"label": "J", "matrix": [1, 8], "x": 9, "y": 1},
44 {"label":"K", "x":10, "y":1}, 44 {"label": "K", "matrix": [1, 9], "x": 10, "y": 1},
45 {"label":"L", "x":11, "y":1}, 45 {"label": "L", "matrix": [1, 10], "x": 11, "y": 1},
46 {"label":":", "x":12, "y":1}, 46 {"label": ":", "matrix": [1, 11], "x": 12, "y": 1},
47 {"label":"Enter", "x":13, "y":1, "w":2.25}, 47 {"label": "Enter", "matrix": [1, 13], "x": 13, "y": 1, "w": 2.25},
48 48
49 {"label":"F3", "x":0, "y":2}, 49 {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
50 {"label":"Shift", "x":1.25, "y":2, "w":2.25}, 50 {"label": "Shift", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 2.25},
51 {"label":"Z", "x":3.5, "y":2}, 51 {"label": "Z", "matrix": [2, 2], "x": 3.5, "y": 2},
52 {"label":"X", "x":4.5, "y":2}, 52 {"label": "X", "matrix": [2, 3], "x": 4.5, "y": 2},
53 {"label":"C", "x":5.5, "y":2}, 53 {"label": "C", "matrix": [2, 4], "x": 5.5, "y": 2},
54 {"label":"V", "x":6.5, "y":2}, 54 {"label": "V", "matrix": [2, 5], "x": 6.5, "y": 2},
55 {"label":"B", "x":7.5, "y":2}, 55 {"label": "B", "matrix": [2, 6], "x": 7.5, "y": 2},
56 {"label":"N", "x":8.5, "y":2}, 56 {"label": "N", "matrix": [2, 7], "x": 8.5, "y": 2},
57 {"label":"M", "x":9.5, "y":2}, 57 {"label": "M", "matrix": [2, 8], "x": 9.5, "y": 2},
58 {"label":"<", "x":10.5, "y":2}, 58 {"label": "<", "matrix": [2, 9], "x": 10.5, "y": 2},
59 {"label":"Shift", "x":11.5, "y":2, "w":1.75}, 59 {"label": "Shift", "matrix": [2, 10], "x": 11.5, "y": 2, "w": 1.75},
60 {"label":"Up", "x":13.25, "y":2}, 60 {"label": "Up", "matrix": [2, 12], "x": 13.25, "y": 2},
61 {"label":"?", "x":14.25, "y":2}, 61 {"label": "?", "matrix": [2, 13], "x": 14.25, "y": 2},
62 62
63 {"label":"F4", "x":0, "y":3}, 63 {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
64 {"label":"Ctrl", "x":1.25, "y":3, "w":1.25}, 64 {"label": "Ctrl", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
65 {"label":"Win", "x":2.5, "y":3}, 65 {"label": "Win", "matrix": [3, 2], "x": 2.5, "y": 3},
66 {"label":"Alt", "x":3.5, "y":3, "w":1.25}, 66 {"label": "Alt", "matrix": [3, 3], "x": 3.5, "y": 3, "w": 1.25},
67 {"label":"Spacebar", "x":4.75, "y":3, "w":2.25}, 67 {"label": "Spacebar", "matrix": [3, 5], "x": 4.75, "y": 3, "w": 2.25},
68 {"label":"Spacebar", "x":7, "y":3, "w":1.25}, 68 {"label": "Spacebar", "matrix": [3, 6], "x": 7, "y": 3, "w": 1.25},
69 {"label":"Spacebar", "x":8.25, "y":3, "w":2.75}, 69 {"label": "Spacebar", "matrix": [3, 7], "x": 8.25, "y": 3, "w": 2.75},
70 {"label":"Alt", "x":11, "y":3, "w":1.25}, 70 {"label": "Alt", "matrix": [3, 10], "x": 11, "y": 3, "w": 1.25},
71 {"label":"Left", "x":12.25, "y":3}, 71 {"label": "Left", "matrix": [3, 11], "x": 12.25, "y": 3},
72 {"label":"Down", "x":13.25, "y":3}, 72 {"label": "Down", "matrix": [3, 12], "x": 13.25, "y": 3},
73 {"label":"Right", "x":14.25, "y":3} 73 {"label": "Right", "matrix": [3, 13], "x": 14.25, "y": 3}
74 ]
75 },
76
77 "LAYOUT_625u_space": {
78 "layout": [
79 {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
80 {"label": "Tab", "matrix": [0, 1], "x": 1.25, "y": 0, "w": 1.5},
81 {"label": "Q", "matrix": [0, 2], "x": 2.75, "y": 0},
82 {"label": "W", "matrix": [0, 3], "x": 3.75, "y": 0},
83 {"label": "E", "matrix": [0, 4], "x": 4.75, "y": 0},
84 {"label": "R", "matrix": [0, 5], "x": 5.75, "y": 0},
85 {"label": "T", "matrix": [0, 6], "x": 6.75, "y": 0},
86 {"label": "Y", "matrix": [0, 7], "x": 7.75, "y": 0},
87 {"label": "U", "matrix": [0, 8], "x": 8.75, "y": 0},
88 {"label": "I", "matrix": [0, 9], "x": 9.75, "y": 0},
89 {"label": "O", "matrix": [0, 10], "x": 10.75, "y": 0},
90 {"label": "P", "matrix": [0, 11], "x": 11.75, "y": 0},
91 {"label": "{", "matrix": [0, 12], "x": 12.75, "y": 0},
92 {"label": "Backspace", "matrix": [0, 13], "x": 13.75, "y": 0, "w": 1.5},
93
94 {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1},
95 {"label": "Caps Lock", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.75},
96 {"label": "A", "matrix": [1, 2], "x": 3, "y": 1},
97 {"label": "S", "matrix": [1, 3], "x": 4, "y": 1},
98 {"label": "D", "matrix": [1, 4], "x": 5, "y": 1},
99 {"label": "F", "matrix": [1, 5], "x": 6, "y": 1},
100 {"label": "G", "matrix": [1, 6], "x": 7, "y": 1},
101 {"label": "H", "matrix": [1, 7], "x": 8, "y": 1},
102 {"label": "J", "matrix": [1, 8], "x": 9, "y": 1},
103 {"label": "K", "matrix": [1, 9], "x": 10, "y": 1},
104 {"label": "L", "matrix": [1, 10], "x": 11, "y": 1},
105 {"label": ":", "matrix": [1, 11], "x": 12, "y": 1},
106 {"label": "Enter", "matrix": [1, 13], "x": 13, "y": 1, "w": 2.25},
107
108 {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2},
109 {"label": "Shift", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 2.25},
110 {"label": "Z", "matrix": [2, 2], "x": 3.5, "y": 2},
111 {"label": "X", "matrix": [2, 3], "x": 4.5, "y": 2},
112 {"label": "C", "matrix": [2, 4], "x": 5.5, "y": 2},
113 {"label": "V", "matrix": [2, 5], "x": 6.5, "y": 2},
114 {"label": "B", "matrix": [2, 6], "x": 7.5, "y": 2},
115 {"label": "N", "matrix": [2, 7], "x": 8.5, "y": 2},
116 {"label": "M", "matrix": [2, 8], "x": 9.5, "y": 2},
117 {"label": "<", "matrix": [2, 9], "x": 10.5, "y": 2},
118 {"label": "Shift", "matrix": [2, 10], "x": 11.5, "y": 2, "w": 1.75},
119 {"label": "Up", "matrix": [2, 12], "x": 13.25, "y": 2},
120 {"label": "?", "matrix": [2, 13], "x": 14.25, "y": 2},
121
122 {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3},
123 {"label": "Ctrl", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
124 {"label": "Win", "matrix": [3, 2], "x": 2.5, "y": 3},
125 {"label": "Alt", "matrix": [3, 3], "x": 3.5, "y": 3, "w": 1.25},
126 {"label": "Spacebar", "matrix": [3, 6], "x": 4.75, "y": 3, "w": 6.25},
127 {"label": "Alt", "matrix": [3, 10], "x": 11, "y": 3, "w": 1.25},
128 {"label": "Left", "matrix": [3, 11], "x": 12.25, "y": 3},
129 {"label": "Down", "matrix": [3, 12], "x": 13.25, "y": 3},
130 {"label": "Right", "matrix": [3, 13], "x": 14.25, "y": 3}
74 ] 131 ]
75 } 132 }
76 } 133 }
diff --git a/keyboards/adpenrose/obi/keymaps/default_625u_space/keymap.c b/keyboards/adpenrose/obi/keymaps/default_625u_space/keymap.c
new file mode 100644
index 0000000000..defb516962
--- /dev/null
+++ b/keyboards/adpenrose/obi/keymaps/default_625u_space/keymap.c
@@ -0,0 +1,41 @@
1// Copyright 2022 Arturo Avila (@ADPenrose)
2// SPDX-License-Identifier: GPL-2.0-or-later
3
4#include QMK_KEYBOARD_H
5
6const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
7 /* Base */
8 [0] = LAYOUT_625u_space(
9 KC_ESC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_BSPC,
10 KC_MUTE, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
11 KC_VOLU, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_RSFT, KC_UP, KC_SLSH,
12 KC_VOLD, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_RGHT
13 ),
14 [1] = LAYOUT_625u_space(
15 KC_DEL, KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL,
16 KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_QUOT, KC_BSLS,
17 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOT, KC_TRNS, KC_TRNS,
18 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
19 ),
20 [2] = LAYOUT_625u_space(
21 KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_RBRC,
22 KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
23 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
24 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
25 ),
26 [3] = LAYOUT_625u_space(
27 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
28 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
29 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
30 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
31 )
32};
33
34#if defined(ENCODER_MAP_ENABLE)
35const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
36 [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
37 [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
38 [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
39 [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
40};
41#endif
diff --git a/keyboards/adpenrose/obi/keymaps/default_625u_space/rules.mk b/keyboards/adpenrose/obi/keymaps/default_625u_space/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/adpenrose/obi/keymaps/default_625u_space/rules.mk
@@ -0,0 +1 @@
ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/adpenrose/obi/matrix_diagram.md b/keyboards/adpenrose/obi/matrix_diagram.md
new file mode 100644
index 0000000000..b4af2f8ac8
--- /dev/null
+++ b/keyboards/adpenrose/obi/matrix_diagram.md
@@ -0,0 +1,16 @@
1# Matrix Diagram for ADPenrose Obi
2
3```
4┌───┐┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
5│00 ││01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │
6├───┤├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
7│10 ││11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1D │
8├───┤├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┬───┤
9│20 ││21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2C │2D │
10├───┤├────┬───┼───┴┬──┴───┴─┬─┴──┬┴───┴───┴─┬─┴──┬───┼───┼───┤
11│30 ││31 │32 │33 │35 │36 │37 │3A │3B │3C │3D │
12└───┘└────┴───┴────┴────────┴────┴──────────┴────┴───┴───┴───┘
13 ┌────────────────────────┐
14 │36 │ 6.25u Space
15 └────────────────────────┘
16```
diff --git a/keyboards/adpenrose/obi/obi.c b/keyboards/adpenrose/obi/obi.c
deleted file mode 100644
index 2efd4eba47..0000000000
--- a/keyboards/adpenrose/obi/obi.c
+++ /dev/null
@@ -1,5 +0,0 @@
1// Copyright 2022 Arturo Avila (@ADPenrose)
2// SPDX-License-Identifier: GPL-2.0-or-later
3
4#include "obi.h"
5
diff --git a/keyboards/adpenrose/obi/obi.h b/keyboards/adpenrose/obi/obi.h
deleted file mode 100644
index 09bf9b29fc..0000000000
--- a/keyboards/adpenrose/obi/obi.h
+++ /dev/null
@@ -1,26 +0,0 @@
1// Copyright 2022 Arturo Avila (@ADPenrose)
2// SPDX-License-Identifier: GPL-2.0-or-later
3
4#pragma once
5
6#include "quantum.h"
7
8/* This is a shortcut to help you visually see your layout.
9 *
10 * The first section contains all of the arguments representing the physical
11 * layout of the board and position of the keys.
12 *
13 * The second converts the arguments into a two-dimensional array which
14 * represents the switch matrix.
15 */
16#define LAYOUT_all( \
17 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
18 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1D, \
19 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2C, K2D, \
20 K30, K31, K32, K33, K35, K36, K37, K3A, K3B, K3C, K3D \
21) { \
22 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
23 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, KC_NO, K1D }, \
24 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, KC_NO, K2C, K2D }, \
25 { K30, K31, K32, K33, KC_NO, K35, K36, K37, KC_NO, KC_NO, K3A, K3B, K3C, K3D } \
26}
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-03 06:03:14 +0000