summaryrefslogtreecommitdiffstats
path: root/keyboards/adpenrose/obi
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/adpenrose/obi')
-rw-r--r--keyboards/adpenrose/obi/info.json110
-rw-r--r--keyboards/adpenrose/obi/obi.h26
2 files changed, 57 insertions, 79 deletions
diff --git a/keyboards/adpenrose/obi/info.json b/keyboards/adpenrose/obi/info.json
index c3e8d7b43b..3f16b579df 100644
--- a/keyboards/adpenrose/obi/info.json
+++ b/keyboards/adpenrose/obi/info.json
@@ -25,60 +25,64 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- {"label":"F1", "x":0, "y":0},
- {"label":"Tab", "x":1.25, "y":0, "w":1.5},
- {"label":"Q", "x":2.75, "y":0},
- {"label":"W", "x":3.75, "y":0},
- {"label":"E", "x":4.75, "y":0},
- {"label":"R", "x":5.75, "y":0},
- {"label":"T", "x":6.75, "y":0},
- {"label":"Y", "x":7.75, "y":0},
- {"label":"U", "x":8.75, "y":0},
- {"label":"I", "x":9.75, "y":0},
- {"label":"O", "x":10.75, "y":0},
- {"label":"P", "x":11.75, "y":0},
- {"label":"{", "x":12.75, "y":0},
- {"label":"Backspace", "x":13.75, "y":0, "w":1.5},
+ {"matrix": [0, 0], "x": 0, "y": 0},
- {"label":"F2", "x":0, "y":1},
- {"label":"Caps Lock", "x":1.25, "y":1, "w":1.75},
- {"label":"A", "x":3, "y":1},
- {"label":"S", "x":4, "y":1},
- {"label":"D", "x":5, "y":1},
- {"label":"F", "x":6, "y":1},
- {"label":"G", "x":7, "y":1},
- {"label":"H", "x":8, "y":1},
- {"label":"J", "x":9, "y":1},
- {"label":"K", "x":10, "y":1},
- {"label":"L", "x":11, "y":1},
- {"label":":", "x":12, "y":1},
- {"label":"Enter", "x":13, "y":1, "w":2.25},
-
- {"label":"F3", "x":0, "y":2},
- {"label":"Shift", "x":1.25, "y":2, "w":2.25},
- {"label":"Z", "x":3.5, "y":2},
- {"label":"X", "x":4.5, "y":2},
- {"label":"C", "x":5.5, "y":2},
- {"label":"V", "x":6.5, "y":2},
- {"label":"B", "x":7.5, "y":2},
- {"label":"N", "x":8.5, "y":2},
- {"label":"M", "x":9.5, "y":2},
- {"label":"<", "x":10.5, "y":2},
- {"label":"Shift", "x":11.5, "y":2, "w":1.75},
- {"label":"Up", "x":13.25, "y":2},
- {"label":"?", "x":14.25, "y":2},
-
- {"label":"F4", "x":0, "y":3},
- {"label":"Ctrl", "x":1.25, "y":3, "w":1.25},
- {"label":"Win", "x":2.5, "y":3},
- {"label":"Alt", "x":3.5, "y":3, "w":1.25},
- {"label":"Spacebar", "x":4.75, "y":3, "w":2.25},
- {"label":"Spacebar", "x":7, "y":3, "w":1.25},
- {"label":"Spacebar", "x":8.25, "y":3, "w":2.75},
- {"label":"Alt", "x":11, "y":3, "w":1.25},
- {"label":"Left", "x":12.25, "y":3},
- {"label":"Down", "x":13.25, "y":3},
- {"label":"Right", "x":14.25, "y":3}
+ {"matrix": [0, 1], "x": 1.25, "y": 0, "w": 1.5},
+ {"matrix": [0, 2], "x": 2.75, "y": 0},
+ {"matrix": [0, 3], "x": 3.75, "y": 0},
+ {"matrix": [0, 4], "x": 4.75, "y": 0},
+ {"matrix": [0, 5], "x": 5.75, "y": 0},
+ {"matrix": [0, 6], "x": 6.75, "y": 0},
+ {"matrix": [0, 7], "x": 7.75, "y": 0},
+ {"matrix": [0, 8], "x": 8.75, "y": 0},
+ {"matrix": [0, 9], "x": 9.75, "y": 0},
+ {"matrix": [0, 10], "x": 10.75, "y": 0},
+ {"matrix": [0, 11], "x": 11.75, "y": 0},
+ {"matrix": [0, 12], "x": 12.75, "y": 0},
+ {"matrix": [0, 13], "x": 13.75, "y": 0, "w": 1.5},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.75},
+ {"matrix": [1, 2], "x": 3, "y": 1},
+ {"matrix": [1, 3], "x": 4, "y": 1},
+ {"matrix": [1, 4], "x": 5, "y": 1},
+ {"matrix": [1, 5], "x": 6, "y": 1},
+ {"matrix": [1, 6], "x": 7, "y": 1},
+ {"matrix": [1, 7], "x": 8, "y": 1},
+ {"matrix": [1, 8], "x": 9, "y": 1},
+ {"matrix": [1, 9], "x": 10, "y": 1},
+ {"matrix": [1, 10], "x": 11, "y": 1},
+ {"matrix": [1, 11], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "y": 1, "w": 2.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 2.25},
+ {"matrix": [2, 2], "x": 3.5, "y": 2},
+ {"matrix": [2, 3], "x": 4.5, "y": 2},
+ {"matrix": [2, 4], "x": 5.5, "y": 2},
+ {"matrix": [2, 5], "x": 6.5, "y": 2},
+ {"matrix": [2, 6], "x": 7.5, "y": 2},
+ {"matrix": [2, 7], "x": 8.5, "y": 2},
+ {"matrix": [2, 8], "x": 9.5, "y": 2},
+ {"matrix": [2, 9], "x": 10.5, "y": 2},
+ {"matrix": [2, 10], "x": 11.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 12], "x": 13.25, "y": 2},
+ {"matrix": [2, 13], "x": 14.25, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 2], "x": 2.5, "y": 3},
+ {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 5], "x": 4.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 6], "x": 7, "y": 3, "w": 1.25},
+ {"matrix": [3, 7], "x": 8.25, "y": 3, "w": 2.75},
+ {"matrix": [3, 10], "x": 11, "y": 3, "w": 1.25},
+ {"matrix": [3, 11], "x": 12.25, "y": 3},
+ {"matrix": [3, 12], "x": 13.25, "y": 3},
+ {"matrix": [3, 13], "x": 14.25, "y": 3}
]
}
}
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 @@
-// Copyright 2022 Arturo Avila (@ADPenrose)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is 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_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, K1D, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2C, K2D, \
- K30, K31, K32, K33, K35, K36, K37, K3A, K3B, 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, KC_NO, K1D }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, KC_NO, K2C, K2D }, \
- { K30, K31, K32, K33, KC_NO, K35, K36, K37, KC_NO, KC_NO, K3A, K3B, K3C, K3D } \
-}