summaryrefslogtreecommitdiff
path: root/keyboards/ortho5by12
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/ortho5by12')
-rw-r--r--keyboards/ortho5by12/config.h17
-rw-r--r--keyboards/ortho5by12/info.json253
-rw-r--r--keyboards/ortho5by12/ortho5by12.c2
-rw-r--r--keyboards/ortho5by12/ortho5by12.h57
4 files changed, 135 insertions, 194 deletions
diff --git a/keyboards/ortho5by12/config.h b/keyboards/ortho5by12/config.h
index b11ecb7733..2e97980987 100644
--- a/keyboards/ortho5by12/config.h
+++ b/keyboards/ortho5by12/config.h
@@ -14,23 +14,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- 0 1 2 3 4 5 6 7 8 9 */
-#define MATRIX_ROW_PINS { B5, B1, B2, B3, B4, C0, D5, D6, D7, B0 }
-#define MATRIX_COL_PINS { C2, D0, D1, D4, C3, C1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/ortho5by12/info.json b/keyboards/ortho5by12/info.json
index cf87e52e48..fda913aa32 100644
--- a/keyboards/ortho5by12/info.json
+++ b/keyboards/ortho5by12/info.json
@@ -8,6 +8,11 @@
"pid": "0x27DB",
"device_version": "0.0.2"
},
+ "matrix_pins": {
+ "cols": ["C2", "D0", "D1", "D4", "C3", "C1"],
+ "rows": ["B5", "B1", "B2", "B3", "B4", "C0", "D5", "D6", "D7", "B0"]
+ },
+ "diode_direction": "ROW2COL",
"bootmagic": {
"matrix": [7, 2]
},
@@ -16,128 +21,138 @@
"layouts": {
"LAYOUT_ortho_5x12_1x2uC": {
"layout": [
- { "w": 1, "x": 0, "y": 0 },
- { "w": 1, "x": 1, "y": 0 },
- { "w": 1, "x": 2, "y": 0 },
- { "w": 1, "x": 3, "y": 0 },
- { "w": 1, "x": 4, "y": 0 },
- { "w": 1, "x": 5, "y": 0 },
- { "w": 1, "x": 6, "y": 0 },
- { "w": 1, "x": 7, "y": 0 },
- { "w": 1, "x": 8, "y": 0 },
- { "w": 1, "x": 9, "y": 0 },
- { "w": 1, "x": 10, "y": 0 },
- { "w": 1, "x": 11, "y": 0 },
- { "w": 1, "x": 0, "y": 1 },
- { "w": 1, "x": 1, "y": 1 },
- { "w": 1, "x": 2, "y": 1 },
- { "w": 1, "x": 3, "y": 1 },
- { "w": 1, "x": 4, "y": 1 },
- { "w": 1, "x": 5, "y": 1 },
- { "w": 1, "x": 6, "y": 1 },
- { "w": 1, "x": 7, "y": 1 },
- { "w": 1, "x": 8, "y": 1 },
- { "w": 1, "x": 9, "y": 1 },
- { "w": 1, "x": 10, "y": 1 },
- { "w": 1, "x": 11, "y": 1 },
- { "w": 1, "x": 0, "y": 2 },
- { "w": 1, "x": 1, "y": 2 },
- { "w": 1, "x": 2, "y": 2 },
- { "w": 1, "x": 3, "y": 2 },
- { "w": 1, "x": 4, "y": 2 },
- { "w": 1, "x": 5, "y": 2 },
- { "w": 1, "x": 6, "y": 2 },
- { "w": 1, "x": 7, "y": 2 },
- { "w": 1, "x": 8, "y": 2 },
- { "w": 1, "x": 9, "y": 2 },
- { "w": 1, "x": 10, "y": 2 },
- { "w": 1, "x": 11, "y": 2 },
- { "w": 1, "x": 0, "y": 3 },
- { "w": 1, "x": 1, "y": 3 },
- { "w": 1, "x": 2, "y": 3 },
- { "w": 1, "x": 3, "y": 3 },
- { "w": 1, "x": 4, "y": 3 },
- { "w": 1, "x": 5, "y": 3 },
- { "w": 1, "x": 6, "y": 3 },
- { "w": 1, "x": 7, "y": 3 },
- { "w": 1, "x": 8, "y": 3 },
- { "w": 1, "x": 9, "y": 3 },
- { "w": 1, "x": 10, "y": 3 },
- { "w": 1, "x": 11, "y": 3 },
- { "w": 1, "x": 0, "y": 4 },
- { "w": 1, "x": 1, "y": 4 },
- { "w": 1, "x": 2, "y": 4 },
- { "w": 1, "x": 3, "y": 4 },
- { "w": 1, "x": 4, "y": 4 },
- { "w": 2, "x": 5, "y": 4 },
- { "w": 1, "x": 7, "y": 4 },
- { "w": 1, "x": 8, "y": 4 },
- { "w": 1, "x": 9, "y": 4 },
- { "w": 1, "x": 10, "y": 4 },
- { "w": 1, "x": 11, "y": 4 } ]
+ {"matrix": [1, 0], "x": 0, "y": 0},
+ {"matrix": [0, 0], "x": 1, "y": 0},
+ {"matrix": [1, 1], "x": 2, "y": 0},
+ {"matrix": [0, 1], "x": 3, "y": 0},
+ {"matrix": [1, 2], "x": 4, "y": 0},
+ {"matrix": [0, 2], "x": 5, "y": 0},
+ {"matrix": [1, 3], "x": 6, "y": 0},
+ {"matrix": [0, 3], "x": 7, "y": 0},
+ {"matrix": [1, 4], "x": 8, "y": 0},
+ {"matrix": [0, 4], "x": 9, "y": 0},
+ {"matrix": [1, 5], "x": 10, "y": 0},
+ {"matrix": [0, 5], "x": 11, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1},
+ {"matrix": [3, 0], "x": 1, "y": 1},
+ {"matrix": [2, 1], "x": 2, "y": 1},
+ {"matrix": [3, 1], "x": 3, "y": 1},
+ {"matrix": [2, 2], "x": 4, "y": 1},
+ {"matrix": [3, 2], "x": 5, "y": 1},
+ {"matrix": [2, 3], "x": 6, "y": 1},
+ {"matrix": [3, 3], "x": 7, "y": 1},
+ {"matrix": [2, 4], "x": 8, "y": 1},
+ {"matrix": [3, 4], "x": 9, "y": 1},
+ {"matrix": [2, 5], "x": 10, "y": 1},
+ {"matrix": [3, 5], "x": 11, "y": 1},
+
+ {"matrix": [5, 0], "x": 0, "y": 2},
+ {"matrix": [4, 0], "x": 1, "y": 2},
+ {"matrix": [5, 1], "x": 2, "y": 2},
+ {"matrix": [4, 1], "x": 3, "y": 2},
+ {"matrix": [5, 2], "x": 4, "y": 2},
+ {"matrix": [4, 2], "x": 5, "y": 2},
+ {"matrix": [5, 3], "x": 6, "y": 2},
+ {"matrix": [4, 3], "x": 7, "y": 2},
+ {"matrix": [5, 4], "x": 8, "y": 2},
+ {"matrix": [4, 4], "x": 9, "y": 2},
+ {"matrix": [5, 5], "x": 10, "y": 2},
+ {"matrix": [4, 5], "x": 11, "y": 2},
+
+ {"matrix": [6, 0], "x": 0, "y": 3},
+ {"matrix": [7, 0], "x": 1, "y": 3},
+ {"matrix": [6, 1], "x": 2, "y": 3},
+ {"matrix": [7, 1], "x": 3, "y": 3},
+ {"matrix": [6, 2], "x": 4, "y": 3},
+ {"matrix": [7, 2], "x": 5, "y": 3},
+ {"matrix": [6, 3], "x": 6, "y": 3},
+ {"matrix": [7, 3], "x": 7, "y": 3},
+ {"matrix": [6, 4], "x": 8, "y": 3},
+ {"matrix": [7, 4], "x": 9, "y": 3},
+ {"matrix": [6, 5], "x": 10, "y": 3},
+ {"matrix": [7, 5], "x": 11, "y": 3},
+
+ {"matrix": [9, 0], "x": 0, "y": 4},
+ {"matrix": [8, 0], "x": 1, "y": 4},
+ {"matrix": [9, 1], "x": 2, "y": 4},
+ {"matrix": [8, 1], "x": 3, "y": 4},
+ {"matrix": [9, 2], "x": 4, "y": 4},
+ {"matrix": [8, 2], "x": 5, "y": 4, "w": 2},
+ {"matrix": [8, 3], "x": 7, "y": 4},
+ {"matrix": [9, 4], "x": 8, "y": 4},
+ {"matrix": [8, 4], "x": 9, "y": 4},
+ {"matrix": [9, 5], "x": 10, "y": 4},
+ {"matrix": [8, 5], "x": 11, "y": 4}
+ ]
},
"LAYOUT_ortho_5x12": {
"layout": [
- { "w": 1, "x": 0, "y": 0 },
- { "w": 1, "x": 1, "y": 0 },
- { "w": 1, "x": 2, "y": 0 },
- { "w": 1, "x": 3, "y": 0 },
- { "w": 1, "x": 4, "y": 0 },
- { "w": 1, "x": 5, "y": 0 },
- { "w": 1, "x": 6, "y": 0 },
- { "w": 1, "x": 7, "y": 0 },
- { "w": 1, "x": 8, "y": 0 },
- { "w": 1, "x": 9, "y": 0 },
- { "w": 1, "x": 10, "y": 0 },
- { "w": 1, "x": 11, "y": 0 },
- { "w": 1, "x": 0, "y": 1 },
- { "w": 1, "x": 1, "y": 1 },
- { "w": 1, "x": 2, "y": 1 },
- { "w": 1, "x": 3, "y": 1 },
- { "w": 1, "x": 4, "y": 1 },
- { "w": 1, "x": 5, "y": 1 },
- { "w": 1, "x": 6, "y": 1 },
- { "w": 1, "x": 7, "y": 1 },
- { "w": 1, "x": 8, "y": 1 },
- { "w": 1, "x": 9, "y": 1 },
- { "w": 1, "x": 10, "y": 1 },
- { "w": 1, "x": 11, "y": 1 },
- { "w": 1, "x": 0, "y": 2 },
- { "w": 1, "x": 1, "y": 2 },
- { "w": 1, "x": 2, "y": 2 },
- { "w": 1, "x": 3, "y": 2 },
- { "w": 1, "x": 4, "y": 2 },
- { "w": 1, "x": 5, "y": 2 },
- { "w": 1, "x": 6, "y": 2 },
- { "w": 1, "x": 7, "y": 2 },
- { "w": 1, "x": 8, "y": 2 },
- { "w": 1, "x": 9, "y": 2 },
- { "w": 1, "x": 10, "y": 2 },
- { "w": 1, "x": 11, "y": 2 },
- { "w": 1, "x": 0, "y": 3 },
- { "w": 1, "x": 1, "y": 3 },
- { "w": 1, "x": 2, "y": 3 },
- { "w": 1, "x": 3, "y": 3 },
- { "w": 1, "x": 4, "y": 3 },
- { "w": 1, "x": 5, "y": 3 },
- { "w": 1, "x": 6, "y": 3 },
- { "w": 1, "x": 7, "y": 3 },
- { "w": 1, "x": 8, "y": 3 },
- { "w": 1, "x": 9, "y": 3 },
- { "w": 1, "x": 10, "y": 3 },
- { "w": 1, "x": 11, "y": 3 },
- { "w": 1, "x": 0, "y": 4 },
- { "w": 1, "x": 1, "y": 4 },
- { "w": 1, "x": 2, "y": 4 },
- { "w": 1, "x": 3, "y": 4 },
- { "w": 1, "x": 4, "y": 4 },
- { "w": 1, "x": 5, "y": 4 },
- { "w": 1, "x": 6, "y": 4 },
- { "w": 1, "x": 7, "y": 4 },
- { "w": 1, "x": 8, "y": 4 },
- { "w": 1, "x": 9, "y": 4 },
- { "w": 1, "x": 10, "y": 4 },
- { "w": 1, "x": 11, "y": 4 } ]
+ {"matrix": [1, 0], "x": 0, "y": 0},
+ {"matrix": [0, 0], "x": 1, "y": 0},
+ {"matrix": [1, 1], "x": 2, "y": 0},
+ {"matrix": [0, 1], "x": 3, "y": 0},
+ {"matrix": [1, 2], "x": 4, "y": 0},
+ {"matrix": [0, 2], "x": 5, "y": 0},
+ {"matrix": [1, 3], "x": 6, "y": 0},
+ {"matrix": [0, 3], "x": 7, "y": 0},
+ {"matrix": [1, 4], "x": 8, "y": 0},
+ {"matrix": [0, 4], "x": 9, "y": 0},
+ {"matrix": [1, 5], "x": 10, "y": 0},
+ {"matrix": [0, 5], "x": 11, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1},
+ {"matrix": [3, 0], "x": 1, "y": 1},
+ {"matrix": [2, 1], "x": 2, "y": 1},
+ {"matrix": [3, 1], "x": 3, "y": 1},
+ {"matrix": [2, 2], "x": 4, "y": 1},
+ {"matrix": [3, 2], "x": 5, "y": 1},
+ {"matrix": [2, 3], "x": 6, "y": 1},
+ {"matrix": [3, 3], "x": 7, "y": 1},
+ {"matrix": [2, 4], "x": 8, "y": 1},
+ {"matrix": [3, 4], "x": 9, "y": 1},
+ {"matrix": [2, 5], "x": 10, "y": 1},
+ {"matrix": [3, 5], "x": 11, "y": 1},
+
+ {"matrix": [5, 0], "x": 0, "y": 2},
+ {"matrix": [4, 0], "x": 1, "y": 2},
+ {"matrix": [5, 1], "x": 2, "y": 2},
+ {"matrix": [4, 1], "x": 3, "y": 2},
+ {"matrix": [5, 2], "x": 4, "y": 2},
+ {"matrix": [4, 2], "x": 5, "y": 2},
+ {"matrix": [5, 3], "x": 6, "y": 2},
+ {"matrix": [4, 3], "x": 7, "y": 2},
+ {"matrix": [5, 4], "x": 8, "y": 2},
+ {"matrix": [4, 4], "x": 9, "y": 2},
+ {"matrix": [5, 5], "x": 10, "y": 2},
+ {"matrix": [4, 5], "x": 11, "y": 2},
+
+ {"matrix": [6, 0], "x": 0, "y": 3},
+ {"matrix": [7, 0], "x": 1, "y": 3},
+ {"matrix": [6, 1], "x": 2, "y": 3},
+ {"matrix": [7, 1], "x": 3, "y": 3},
+ {"matrix": [6, 2], "x": 4, "y": 3},
+ {"matrix": [7, 2], "x": 5, "y": 3},
+ {"matrix": [6, 3], "x": 6, "y": 3},
+ {"matrix": [7, 3], "x": 7, "y": 3},
+ {"matrix": [6, 4], "x": 8, "y": 3},
+ {"matrix": [7, 4], "x": 9, "y": 3},
+ {"matrix": [6, 5], "x": 10, "y": 3},
+ {"matrix": [7, 5], "x": 11, "y": 3},
+
+ {"matrix": [9, 0], "x": 0, "y": 4},
+ {"matrix": [8, 0], "x": 1, "y": 4},
+ {"matrix": [9, 1], "x": 2, "y": 4},
+ {"matrix": [8, 1], "x": 3, "y": 4},
+ {"matrix": [9, 2], "x": 4, "y": 4},
+ {"matrix": [8, 2], "x": 5, "y": 4},
+ {"matrix": [9, 3], "x": 6, "y": 4},
+ {"matrix": [8, 3], "x": 7, "y": 4},
+ {"matrix": [9, 4], "x": 8, "y": 4},
+ {"matrix": [8, 4], "x": 9, "y": 4},
+ {"matrix": [9, 5], "x": 10, "y": 4},
+ {"matrix": [8, 5], "x": 11, "y": 4}
+ ]
}
}
}
diff --git a/keyboards/ortho5by12/ortho5by12.c b/keyboards/ortho5by12/ortho5by12.c
index 615ab9d04e..29173749ae 100644
--- a/keyboards/ortho5by12/ortho5by12.c
+++ b/keyboards/ortho5by12/ortho5by12.c
@@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "ortho5by12.h"
+#include "quantum.h"
void matrix_init_kb(void) {
setPinOutput(C4);
diff --git a/keyboards/ortho5by12/ortho5by12.h b/keyboards/ortho5by12/ortho5by12.h
deleted file mode 100644
index 84f59859d8..0000000000
--- a/keyboards/ortho5by12/ortho5by12.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright 2019 Yiancar
- *
- * 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
-#define XXX KC_NO
-#include "quantum.h"
-
-#define LAYOUT_ortho_5x12( \
- K00, K01, K02, K03, K04, K05, K10, K11, K12, K13, K14, K15, \
- K20, K21, K22, K23, K24, K25, K30, K31, K32, K33, K34, K35, \
- K40, K41, K42, K43, K44, K45, K50, K51, K52, K53, K54, K55, \
- K60, K61, K62, K63, K64, K65, K70, K71, K72, K73, K74, K75, \
- K80, K81, K82, K83, K84, K85, K90, K91, K92, K93, K94, K95 \
-) { \
- { K01, K03, K05, K11, K13, K15 }, \
- { K00, K02, K04, K10, K12, K14 }, \
- { K20, K22, K24, K30, K32, K34 }, \
- { K21, K23, K25, K31, K33, K35 }, \
- { K41, K43, K45, K51, K53, K55 }, \
- { K40, K42, K44, K50, K52, K54 }, \
- { K60, K62, K64, K70, K72, K74 }, \
- { K61, K63, K65, K71, K73, K75 }, \
- { K81, K83, K85, K91, K93, K95 }, \
- { K80, K82, K84, K90, K92, K94 } \
-}
-
-#define LAYOUT_ortho_5x12_1x2uC( \
- K00, K01, K02, K03, K04, K05, K10, K11, K12, K13, K14, K15, \
- K20, K21, K22, K23, K24, K25, K30, K31, K32, K33, K34, K35, \
- K40, K41, K42, K43, K44, K45, K50, K51, K52, K53, K54, K55, \
- K60, K61, K62, K63, K64, K65, K70, K71, K72, K73, K74, K75, \
- K80, K81, K82, K83, K84, K85, K91, K92, K93, K94, K95 \
-) { \
- { K01, K03, K05, K11, K13, K15 }, \
- { K00, K02, K04, K10, K12, K14 }, \
- { K20, K22, K24, K30, K32, K34 }, \
- { K21, K23, K25, K31, K33, K35 }, \
- { K41, K43, K45, K51, K53, K55 }, \
- { K40, K42, K44, K50, K52, K54 }, \
- { K60, K62, K64, K70, K72, K74 }, \
- { K61, K63, K65, K71, K73, K75 }, \
- { K81, K83, K85, K91, K93, K95 }, \
- { K80, K82, K84, XXX, K92, K94 } \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 15:51:13 +0000