summaryrefslogtreecommitdiff
path: root/keyboards/keyhive/opus
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/keyhive/opus')
-rw-r--r--keyboards/keyhive/opus/config.h7
-rw-r--r--keyboards/keyhive/opus/info.json89
-rw-r--r--keyboards/keyhive/opus/opus.c17
-rw-r--r--keyboards/keyhive/opus/opus.h39
4 files changed, 47 insertions, 105 deletions
diff --git a/keyboards/keyhive/opus/config.h b/keyboards/keyhive/opus/config.h
index 42cc507df9..ae2fa676f6 100644
--- a/keyboards/keyhive/opus/config.h
+++ b/keyboards/keyhive/opus/config.h
@@ -16,13 +16,6 @@
#pragma once
-
-/* PCB pin-out */
-#define MATRIX_ROW_PINS {B1, B3, B2, B6}
-#define MATRIX_COL_PINS {D1, D0, D4, C6, D7, E6, B4, B5, F4, F5, F6, F7}
-
-#define DIODE_DIRECTION COL2ROW
-
/* 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/keyhive/opus/info.json b/keyboards/keyhive/opus/info.json
index f3ce5cec58..5bef38ca0a 100644
--- a/keyboards/keyhive/opus/info.json
+++ b/keyboards/keyhive/opus/info.json
@@ -7,60 +7,65 @@
"pid": "0x4F50",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5", "F6", "F7"],
+ "rows": ["B1", "B3", "B2", "B6"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
- { "label": "Tab", "x": 0, "y": 0.4 },
- { "label": "Q", "x": 1, "y": 0.4 },
- { "label": "W", "x": 2, "y": 0.2 },
- { "label": "E", "x": 3, "y": 0 },
- { "label": "R", "x": 4, "y": 0.4 },
- { "label": "T", "x": 5, "y": 0.5 },
+ {"matrix": [0, 0], "x": 0, "y": 0.4},
+ {"matrix": [0, 1], "x": 1, "y": 0.4},
+ {"matrix": [0, 2], "x": 2, "y": 0.2},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.4},
+ {"matrix": [0, 5], "x": 5, "y": 0.5},
- { "label": "Y", "x": 10, "y": 0.5 },
- { "label": "U", "x": 11, "y": 0.4 },
- { "label": "I", "x": 12, "y": 0 },
- { "label": "O", "x": 13, "y": 0.2 },
- { "label": "P", "x": 14, "y": 0.4 },
- { "label": "Back Space", "x": 15, "y": 0.4 },
+ {"matrix": [0, 6], "x": 10, "y": 0.5},
+ {"matrix": [0, 7], "x": 11, "y": 0.4},
+ {"matrix": [0, 8], "x": 12, "y": 0},
+ {"matrix": [0, 9], "x": 13, "y": 0.2},
+ {"matrix": [0, 10], "x": 14, "y": 0.4},
+ {"matrix": [0, 11], "x": 15, "y": 0.4},
- { "label": "Ctrl / Esc", "x": 0, "y": 1.4 },
- { "label": "A", "x": 1, "y": 1.4 },
- { "label": "S", "x": 2, "y": 1.2 },
- { "label": "D", "x": 3, "y": 1 },
- { "label": "F", "x": 4, "y": 1.4 },
- { "label": "G", "x": 5, "y": 1.5 },
+ {"matrix": [1, 0], "x": 0, "y": 1.4},
+ {"matrix": [1, 1], "x": 1, "y": 1.4},
+ {"matrix": [1, 2], "x": 2, "y": 1.2},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.4},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
- { "label": "H", "x": 10, "y": 1.5 },
- { "label": "J", "x": 11, "y": 1.4 },
- { "label": "K", "x": 12, "y": 1 },
- { "label": "L", "x": 13, "y": 1.2 },
- { "label": ";", "x": 14, "y": 1.4 },
- { "label": "'", "x": 15, "y": 1.4 },
+ {"matrix": [1, 6], "x": 10, "y": 1.5},
+ {"matrix": [1, 7], "x": 11, "y": 1.4},
+ {"matrix": [1, 8], "x": 12, "y": 1},
+ {"matrix": [1, 9], "x": 13, "y": 1.2},
+ {"matrix": [1, 10], "x": 14, "y": 1.4},
+ {"matrix": [1, 11], "x": 15, "y": 1.4},
- { "label": "GUI", "x": 0, "y": 2.4 },
- { "label": "Z", "x": 1, "y": 2.4 },
- { "label": "X", "x": 2, "y": 2.2 },
- { "label": "C", "x": 3, "y": 2 },
- { "label": "V", "x": 4, "y": 2.4 },
- { "label": "B", "x": 5, "y": 2.5 },
+ {"matrix": [2, 0], "x": 0, "y": 2.4},
+ {"matrix": [2, 1], "x": 1, "y": 2.4},
+ {"matrix": [2, 2], "x": 2, "y": 2.2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.4},
+ {"matrix": [2, 5], "x": 5, "y": 2.5},
- { "label": "N", "x": 10, "y": 2.5 },
- { "label": "M", "x": 11, "y": 2.4 },
- { "label": ",", "x": 12, "y": 2 },
- { "label": ".", "x": 13, "y": 2.2 },
- { "label": "/", "x": 14, "y": 2.4 },
- { "label": "Enter", "x": 15, "y": 2.4 },
+ {"matrix": [2, 6], "x": 10, "y": 2.5},
+ {"matrix": [2, 7], "x": 11, "y": 2.4},
+ {"matrix": [2, 8], "x": 12, "y": 2},
+ {"matrix": [2, 9], "x": 13, "y": 2.2},
+ {"matrix": [2, 10], "x": 14, "y": 2.4},
+ {"matrix": [2, 11], "x": 15, "y": 2.4},
- { "label": "Lower", "x": 4.8, "y": 3.7 },
- { "label": "Shift", "x": 5.8, "y": 3.5 },
- { "label": "Tab", "x": 6.8, "y": 3.6 },
+ {"matrix": [3, 3], "x": 4.8, "y": 3.7},
+ {"matrix": [3, 4], "x": 5.8, "y": 3.5},
+ {"matrix": [3, 5], "x": 6.8, "y": 3.6},
- { "label": "Enter", "x": 8.2, "y": 3.6 },
- { "label": "Space", "x": 9.2, "y": 3.5 },
- { "label": "Raise", "x": 10.2, "y": 3.7 }
+ {"matrix": [3, 6], "x": 8.2, "y": 3.6},
+ {"matrix": [3, 7], "x": 9.2, "y": 3.5},
+ {"matrix": [3, 8], "x": 10.2, "y": 3.7}
]
}
}
diff --git a/keyboards/keyhive/opus/opus.c b/keyboards/keyhive/opus/opus.c
deleted file mode 100644
index 5a188cf8a0..0000000000
--- a/keyboards/keyhive/opus/opus.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 rtwayland
- *
- * 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/>.
- */
-
-#include "opus.h"
diff --git a/keyboards/keyhive/opus/opus.h b/keyboards/keyhive/opus/opus.h
deleted file mode 100644
index ec82c5bc9a..0000000000
--- a/keyboards/keyhive/opus/opus.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2020 rtwayland
- *
- * 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"
-
-/* 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( \
- 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, \
- k33, k34, k35, k36, k37, k38 \
-) \
-{ \
- { 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 }, \
- { KC_NO, KC_NO, KC_NO, k33, k34, k35, k36, k37, k38, KC_NO, KC_NO, KC_NO } \
-}