summaryrefslogtreecommitdiff
path: root/keyboards/cannonkeys/onyx
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/cannonkeys/onyx')
-rw-r--r--keyboards/cannonkeys/onyx/info.json166
-rw-r--r--keyboards/cannonkeys/onyx/onyx.h32
2 files changed, 87 insertions, 111 deletions
diff --git a/keyboards/cannonkeys/onyx/info.json b/keyboards/cannonkeys/onyx/info.json
index 0227024f02..3ec8f0d206 100644
--- a/keyboards/cannonkeys/onyx/info.json
+++ b/keyboards/cannonkeys/onyx/info.json
@@ -23,89 +23,97 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- {"x":0, "y":0},
- {"label":"Esc", "x":1.25, "y":0},
- {"label":"!", "x":2.25, "y":0},
- {"label":"@", "x":3.25, "y":0},
- {"label":"#", "x":4.25, "y":0},
- {"label":"$", "x":5.25, "y":0},
- {"label":"%", "x":6.25, "y":0},
- {"label":"^", "x":7.25, "y":0},
- {"label":"&", "x":8.25, "y":0},
- {"label":"*", "x":9.25, "y":0},
- {"label":"(", "x":10.25, "y":0},
- {"label":")", "x":11.25, "y":0},
- {"label":"_", "x":12.25, "y":0},
- {"label":"+", "x":13.25, "y":0},
- {"label":"~", "x":14.25, "y":0},
- {"label":"Bcksp", "x":15.25, "y":0},
- {"label":"Insert", "x":16.5, "y":0},
- {"label":"Home", "x":17.5, "y":0},
- {"label":"PgUp", "x":18.5, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
- {"x":0, "y":1},
- {"label":"Tab", "x":1.25, "y":1, "w":1.5},
- {"label":"Q", "x":2.75, "y":1},
- {"label":"W", "x":3.75, "y":1},
- {"label":"E", "x":4.75, "y":1},
- {"label":"R", "x":5.75, "y":1},
- {"label":"T", "x":6.75, "y":1},
- {"label":"Y", "x":7.75, "y":1},
- {"label":"U", "x":8.75, "y":1},
- {"label":"I", "x":9.75, "y":1},
- {"label":"O", "x":10.75, "y":1},
- {"label":"P", "x":11.75, "y":1},
- {"label":"{", "x":12.75, "y":1},
- {"label":"}", "x":13.75, "y":1},
- {"label":"|", "x":14.75, "y":1, "w":1.5},
- {"label":"Delete", "x":16.5, "y":1},
- {"label":"End", "x":17.5, "y":1},
- {"label":"PgDn", "x":18.5, "y":1},
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+ {"matrix": [0, 8], "x": 8.25, "y": 0},
+ {"matrix": [0, 9], "x": 9.25, "y": 0},
+ {"matrix": [0, 10], "x": 10.25, "y": 0},
+ {"matrix": [0, 11], "x": 11.25, "y": 0},
+ {"matrix": [0, 12], "x": 12.25, "y": 0},
+ {"matrix": [0, 13], "x": 13.25, "y": 0},
+ {"matrix": [0, 14], "x": 14.25, "y": 0},
+ {"matrix": [0, 15], "x": 15.25, "y": 0},
- {"x":0, "y":2},
- {"label":"Caps Lock", "x":1.25, "y":2, "w":1.25},
- {"label":"A", "x":3, "y":2},
- {"label":"S", "x":4, "y":2},
- {"label":"D", "x":5, "y":2},
- {"label":"F", "x":6, "y":2},
- {"label":"G", "x":7, "y":2},
- {"label":"H", "x":8, "y":2},
- {"label":"J", "x":9, "y":2},
- {"label":"K", "x":10, "y":2},
- {"label":"L", "x":11, "y":2},
- {"label":":", "x":12, "y":2},
- {"label":"\"", "x":13, "y":2},
- {"x":14, "y":2},
- {"label":"Enter", "x":15, "y":2, "w":1.25},
+ {"matrix": [0, 16], "x": 16.5, "y": 0},
+ {"matrix": [0, 17], "x": 17.5, "y": 0},
+ {"matrix": [0, 18], "x": 18.5, "y": 0},
- {"x":0, "y":3},
- {"label":"Shift", "x":1.25, "y":3, "w":1.25},
- {"label":"Shift", "x":2.5, "y":3},
- {"label":"Z", "x":3.5, "y":3},
- {"label":"X", "x":4.5, "y":3},
- {"label":"C", "x":5.5, "y":3},
- {"label":"V", "x":6.5, "y":3},
- {"label":"B", "x":7.5, "y":3},
- {"label":"N", "x":8.5, "y":3},
- {"label":"M", "x":9.5, "y":3},
- {"label":"<", "x":10.5, "y":3},
- {"label":">", "x":11.5, "y":3},
- {"label":"?", "x":12.5, "y":3},
- {"label":"Shift", "x":13.5, "y":3, "w":1.75},
- {"label":"Fn", "x":15.25, "y":3},
- {"label":"Up", "x":17.5, "y":3},
+ {"matrix": [1, 0], "x": 0, "y": 1},
- {"label":"Ctrl", "x":1.25, "y":4, "w":1.25},
- {"label":"Win", "x":2.5, "y":4, "w":1.25},
- {"label":"Alt", "x":3.75, "y":4, "w":1.25},
- {"x":5, "y":4, "w":6.25},
- {"label":"Alt", "x":11.25, "y":4, "w":1.25},
- {"label":"Alt", "x":12.5, "y":4, "w":1.25},
- {"label":"Win", "x":13.75, "y":4, "w":1.25},
- {"label":"Ctrl", "x":15, "y":4, "w":1.25},
- {"label":"Left", "x":16.5, "y":4},
- {"label":"Down", "x":17.5, "y":4},
- {"label":"Right", "x":18.5, "y":4}
+ {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 2.75, "y": 1},
+ {"matrix": [1, 3], "x": 3.75, "y": 1},
+ {"matrix": [1, 4], "x": 4.75, "y": 1},
+ {"matrix": [1, 5], "x": 5.75, "y": 1},
+ {"matrix": [1, 6], "x": 6.75, "y": 1},
+ {"matrix": [1, 7], "x": 7.75, "y": 1},
+ {"matrix": [1, 8], "x": 8.75, "y": 1},
+ {"matrix": [1, 9], "x": 9.75, "y": 1},
+ {"matrix": [1, 10], "x": 10.75, "y": 1},
+ {"matrix": [1, 11], "x": 11.75, "y": 1},
+ {"matrix": [1, 12], "x": 12.75, "y": 1},
+ {"matrix": [1, 13], "x": 13.75, "y": 1},
+ {"matrix": [1, 15], "x": 14.75, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 16], "x": 16.5, "y": 1},
+ {"matrix": [1, 17], "x": 17.5, "y": 1},
+ {"matrix": [1, 18], "x": 18.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.25},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [2, 9], "x": 10, "y": 2},
+ {"matrix": [2, 10], "x": 11, "y": 2},
+ {"matrix": [2, 11], "x": 12, "y": 2},
+ {"matrix": [2, 12], "x": 13, "y": 2},
+ {"matrix": [2, 13], "x": 14, "y": 2},
+ {"matrix": [2, 15], "x": 15, "y": 2, "w": 1.25},
+
+ {"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},
+ {"matrix": [3, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+ {"matrix": [3, 6], "x": 6.5, "y": 3},
+ {"matrix": [3, 7], "x": 7.5, "y": 3},
+ {"matrix": [3, 8], "x": 8.5, "y": 3},
+ {"matrix": [3, 9], "x": 9.5, "y": 3},
+ {"matrix": [3, 10], "x": 10.5, "y": 3},
+ {"matrix": [3, 11], "x": 11.5, "y": 3},
+ {"matrix": [3, 12], "x": 12.5, "y": 3},
+ {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75},
+ {"matrix": [3, 15], "x": 15.25, "y": 3},
+
+ {"matrix": [3, 17], "x": 17.5, "y": 3},
+
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 5, "y": 4, "w": 6.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 15], "x": 15, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 16], "x": 16.5, "y": 4},
+ {"matrix": [4, 17], "x": 17.5, "y": 4},
+ {"matrix": [4, 18], "x": 18.5, "y": 4}
]
}
}
diff --git a/keyboards/cannonkeys/onyx/onyx.h b/keyboards/cannonkeys/onyx/onyx.h
deleted file mode 100644
index 6b6e5ee6b3..0000000000
--- a/keyboards/cannonkeys/onyx/onyx.h
+++ /dev/null
@@ -1,32 +0,0 @@
- /* Copyright 2020 Andrew Kannan
- *
- * 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_all( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K115, K116, K117, K118, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K215, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K315, K317, \
- K401, K402, K403, K406, K411, K412, K413, K415, K416, K417, K418 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, KC_NO, K115, K116, K117, K118 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, KC_NO, K215, KC_NO, KC_NO, KC_NO }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, KC_NO, K315, KC_NO, K317, KC_NO }, \
- { KC_NO, K401, K402, K403, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, KC_NO, K411, K412, K413, KC_NO, K415, K416, K417, K418 } \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 15:55:37 +0000