summaryrefslogtreecommitdiff
path: root/keyboards/handwired/ortho_brass
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/handwired/ortho_brass')
-rw-r--r--keyboards/handwired/ortho_brass/config.h27
-rw-r--r--keyboards/handwired/ortho_brass/info.json198
-rw-r--r--keyboards/handwired/ortho_brass/ortho_brass.c2
-rw-r--r--keyboards/handwired/ortho_brass/ortho_brass.h47
4 files changed, 104 insertions, 170 deletions
diff --git a/keyboards/handwired/ortho_brass/config.h b/keyboards/handwired/ortho_brass/config.h
deleted file mode 100644
index 3f8e24089b..0000000000
--- a/keyboards/handwired/ortho_brass/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2021 Christoph Jabs (BifbofII)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-/* Handwired pin-out */
-#define MATRIX_ROW_PINS \
- { D3, D2, D1, D0 }
-#define MATRIX_COL_PINS \
- { F4, F7, F5, F1, C7, F0, B1, B0, F6, B6, B2, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/ortho_brass/info.json b/keyboards/handwired/ortho_brass/info.json
index c931dc327f..b2280b6204 100644
--- a/keyboards/handwired/ortho_brass/info.json
+++ b/keyboards/handwired/ortho_brass/info.json
@@ -8,117 +8,125 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F4", "F7", "F5", "F1", "C7", "F0", "B1", "B0", "F6", "B6", "B2", "B3"],
+ "rows": ["D3", "D2", "D1", "D0"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "qmk-dfu",
"community_layouts": ["ortho_4x12"],
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_ortho_4x12"
+ },
"layouts": {
"LAYOUT_ortho_4x12": {
"layout": [
- {"label":"k00", "x":0, "y":0},
- {"label":"k01", "x":1, "y":0},
- {"label":"k02", "x":2, "y":0},
- {"label":"k03", "x":3, "y":0},
- {"label":"k04", "x":4, "y":0},
- {"label":"k05", "x":5, "y":0},
- {"label":"k06", "x":6, "y":0},
- {"label":"k07", "x":7, "y":0},
- {"label":"k08", "x":8, "y":0},
- {"label":"k09", "x":9, "y":0},
- {"label":"k0a", "x":10, "y":0},
- {"label":"k0b", "x":11, "y":0},
+ {"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},
- {"label":"k10", "x":0, "y":1},
- {"label":"k11", "x":1, "y":1},
- {"label":"k12", "x":2, "y":1},
- {"label":"k13", "x":3, "y":1},
- {"label":"k14", "x":4, "y":1},
- {"label":"k15", "x":5, "y":1},
- {"label":"k16", "x":6, "y":1},
- {"label":"k17", "x":7, "y":1},
- {"label":"k18", "x":8, "y":1},
- {"label":"k19", "x":9, "y":1},
- {"label":"k1a", "x":10, "y":1},
- {"label":"k1b", "x":11, "y":1},
+ {"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},
- {"label":"k20", "x":0, "y":2},
- {"label":"k21", "x":1, "y":2},
- {"label":"k22", "x":2, "y":2},
- {"label":"k23", "x":3, "y":2},
- {"label":"k24", "x":4, "y":2},
- {"label":"k25", "x":5, "y":2},
- {"label":"k26", "x":6, "y":2},
- {"label":"k27", "x":7, "y":2},
- {"label":"k28", "x":8, "y":2},
- {"label":"k29", "x":9, "y":2},
- {"label":"k2a", "x":10, "y":2},
- {"label":"k2b", "x":11, "y":2},
+ {"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},
- {"label":"k30", "x":0, "y":3},
- {"label":"k31", "x":1, "y":3},
- {"label":"k32", "x":2, "y":3},
- {"label":"k33", "x":3, "y":3},
- {"label":"k34", "x":4, "y":3},
- {"label":"k35", "x":5, "y":3},
- {"label":"k36", "x":6, "y":3},
- {"label":"k37", "x":7, "y":3},
- {"label":"k38", "x":8, "y":3},
- {"label":"k39", "x":9, "y":3},
- {"label":"k3a", "x":10, "y":3},
- {"label":"k3b", "x":11, "y":3}
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"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},
+ {"matrix": [3, 11], "x": 11, "y": 3}
]
},
"LAYOUT_ortho_4x12_1x2uC": {
"layout": [
- {"label":"k00", "x":0, "y":0},
- {"label":"k01", "x":1, "y":0},
- {"label":"k02", "x":2, "y":0},
- {"label":"k03", "x":3, "y":0},
- {"label":"k04", "x":4, "y":0},
- {"label":"k05", "x":5, "y":0},
- {"label":"k06", "x":6, "y":0},
- {"label":"k07", "x":7, "y":0},
- {"label":"k08", "x":8, "y":0},
- {"label":"k09", "x":9, "y":0},
- {"label":"k0a", "x":10, "y":0},
- {"label":"k0b", "x":11, "y":0},
+ {"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},
- {"label":"k10", "x":0, "y":1},
- {"label":"k11", "x":1, "y":1},
- {"label":"k12", "x":2, "y":1},
- {"label":"k13", "x":3, "y":1},
- {"label":"k14", "x":4, "y":1},
- {"label":"k15", "x":5, "y":1},
- {"label":"k16", "x":6, "y":1},
- {"label":"k17", "x":7, "y":1},
- {"label":"k18", "x":8, "y":1},
- {"label":"k19", "x":9, "y":1},
- {"label":"k1a", "x":10, "y":1},
- {"label":"k1b", "x":11, "y":1},
+ {"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},
- {"label":"k20", "x":0, "y":2},
- {"label":"k21", "x":1, "y":2},
- {"label":"k22", "x":2, "y":2},
- {"label":"k23", "x":3, "y":2},
- {"label":"k24", "x":4, "y":2},
- {"label":"k25", "x":5, "y":2},
- {"label":"k26", "x":6, "y":2},
- {"label":"k27", "x":7, "y":2},
- {"label":"k28", "x":8, "y":2},
- {"label":"k29", "x":9, "y":2},
- {"label":"k2a", "x":10, "y":2},
- {"label":"k2b", "x":11, "y":2},
+ {"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},
- {"label":"k30", "x":0, "y":3},
- {"label":"k31", "x":1, "y":3},
- {"label":"k32", "x":2, "y":3},
- {"label":"k33", "x":3, "y":3},
- {"label":"k34", "x":4, "y":3},
- {"label":"k35", "x":5, "y":3, "w":2},
- {"label":"k37", "x":7, "y":3},
- {"label":"k38", "x":8, "y":3},
- {"label":"k39", "x":9, "y":3},
- {"label":"k3a", "x":10, "y":3},
- {"label":"k3b", "x":11, "y":3}
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"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, "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},
+ {"matrix": [3, 11], "x": 11, "y": 3}
]
}
}
diff --git a/keyboards/handwired/ortho_brass/ortho_brass.c b/keyboards/handwired/ortho_brass/ortho_brass.c
index d124bbfca2..d645306afa 100644
--- a/keyboards/handwired/ortho_brass/ortho_brass.c
+++ b/keyboards/handwired/ortho_brass/ortho_brass.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "ortho_brass.h"
+#include "quantum.h"
#ifdef SWAP_HANDS_ENABLE
__attribute__((weak)) const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/handwired/ortho_brass/ortho_brass.h b/keyboards/handwired/ortho_brass/ortho_brass.h
deleted file mode 100644
index 0bcff0db51..0000000000
--- a/keyboards/handwired/ortho_brass/ortho_brass.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2021 Christoph Jabs (BifbofII)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_4x12_1x2uC( \
- 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, \
- k30, k31, k32, k33, k34, k35, k37, k38, k39, k3a, k3b \
-) \
-{ \
- { 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 }, \
- { k30, k31, k32, k33, k34, k35, k35, k37, k38, k39, k3a, k3b } \
-}
-
-#define LAYOUT_ortho_4x12( \
- 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, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
-) \
-{ \
- { 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 }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
-}
-
-#define LAYOUT LAYOUT_ortho_4x12
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 09:34:13 +0000