summaryrefslogtreecommitdiffstats
path: root/keyboards/ai03
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/ai03')
-rw-r--r--keyboards/ai03/jp60/info.json399
-rw-r--r--keyboards/ai03/jp60/jp60.h42
-rw-r--r--keyboards/ai03/lunar/info.json144
-rw-r--r--keyboards/ai03/lunar/lunar.h41
-rw-r--r--keyboards/ai03/orbit/info.json138
-rw-r--r--keyboards/ai03/orbit/orbit.h29
-rw-r--r--keyboards/ai03/orbit_x/info.json103
-rw-r--r--keyboards/ai03/orbit_x/orbit_x.h44
-rw-r--r--keyboards/ai03/quasar/info.json183
-rw-r--r--keyboards/ai03/quasar/quasar.h45
-rw-r--r--keyboards/ai03/voyager60_alps/info.json73
-rw-r--r--keyboards/ai03/voyager60_alps/voyager60_alps.h32
12 files changed, 437 insertions, 836 deletions
diff --git a/keyboards/ai03/jp60/info.json b/keyboards/ai03/jp60/info.json
index c7b55c53be..922dacafa9 100644
--- a/keyboards/ai03/jp60/info.json
+++ b/keyboards/ai03/jp60/info.json
@@ -18,337 +18,74 @@
"layouts": {
"LAYOUT": {
"layout": [
- {
- "label": "Esc",
- "x": 0,
- "y": 0
- },
- {
- "label": "!",
- "x": 1,
- "y": 0
- },
- {
- "label": "\"",
- "x": 2,
- "y": 0
- },
- {
- "label": "#",
- "x": 3,
- "y": 0
- },
- {
- "label": "$",
- "x": 4,
- "y": 0
- },
- {
- "label": "%",
- "x": 5,
- "y": 0
- },
- {
- "label": "&",
- "x": 6,
- "y": 0
- },
- {
- "label": "'",
- "x": 7,
- "y": 0
- },
- {
- "label": "(",
- "x": 8,
- "y": 0
- },
- {
- "label": ")",
- "x": 9,
- "y": 0
- },
- {
- "label": "",
- "x": 10,
- "y": 0
- },
- {
- "label": "=",
- "x": 11,
- "y": 0
- },
- {
- "label": "~",
- "x": 12,
- "y": 0
- },
- {
- "label": "|",
- "x": 13,
- "y": 0
- },
- {
- "label": "Back Space",
- "x": 14,
- "y": 0
- },
- {
- "label": "Tab",
- "x": 0,
- "y": 1,
- "w": 1.5
- },
- {
- "label": "Q",
- "x": 1.5,
- "y": 1
- },
- {
- "label": "W",
- "x": 2.5,
- "y": 1
- },
- {
- "label": "E",
- "x": 3.5,
- "y": 1
- },
- {
- "label": "R",
- "x": 4.5,
- "y": 1
- },
- {
- "label": "T",
- "x": 5.5,
- "y": 1
- },
- {
- "label": "Y",
- "x": 6.5,
- "y": 1
- },
- {
- "label": "U",
- "x": 7.5,
- "y": 1
- },
- {
- "label": "I",
- "x": 8.5,
- "y": 1
- },
- {
- "label": "O",
- "x": 9.5,
- "y": 1
- },
- {
- "label": "P",
- "x": 10.5,
- "y": 1
- },
- {
- "label": "`",
- "x": 11.5,
- "y": 1
- },
- {
- "label": "{",
- "x": 12.5,
- "y": 1
- },
- {
- "label": "Enter",
- "x": 13.75,
- "y": 1,
- "w": 1.25,
- "h": 2
- },
- {
- "label": "Fn",
- "x": 0,
- "y": 2,
- "w": 1.75
- },
- {
- "label": "A",
- "x": 1.75,
- "y": 2
- },
- {
- "label": "S",
- "x": 2.75,
- "y": 2
- },
- {
- "label": "D",
- "x": 3.75,
- "y": 2
- },
- {
- "label": "F",
- "x": 4.75,
- "y": 2
- },
- {
- "label": "G",
- "x": 5.75,
- "y": 2
- },
- {
- "label": "H",
- "x": 6.75,
- "y": 2
- },
- {
- "label": "J",
- "x": 7.75,
- "y": 2
- },
- {
- "label": "K",
- "x": 8.75,
- "y": 2
- },
- {
- "label": "L",
- "x": 9.75,
- "y": 2
- },
- {
- "label": "+",
- "x": 10.75,
- "y": 2
- },
- {
- "label": "*",
- "x": 11.75,
- "y": 2
- },
- {
- "label": "}",
- "x": 12.75,
- "y": 2
- },
- {
- "label": "Shift",
- "x": 0,
- "y": 3,
- "w": 2.25
- },
- {
- "label": "Z",
- "x": 2.25,
- "y": 3
- },
- {
- "label": "X",
- "x": 3.25,
- "y": 3
- },
- {
- "label": "C",
- "x": 4.25,
- "y": 3
- },
- {
- "label": "V",
- "x": 5.25,
- "y": 3
- },
- {
- "label": "B",
- "x": 6.25,
- "y": 3
- },
- {
- "label": "N",
- "x": 7.25,
- "y": 3
- },
- {
- "label": "M",
- "x": 8.25,
- "y": 3
- },
- {
- "label": "<",
- "x": 9.25,
- "y": 3
- },
- {
- "label": ">",
- "x": 10.25,
- "y": 3
- },
- {
- "label": "?",
- "x": 11.25,
- "y": 3
- },
- {
- "label": "_",
- "x": 12.25,
- "y": 3
- },
- {
- "label": "Shift",
- "x": 13.25,
- "y": 3,
- "w": 1.75
- },
- {
- "label": "Ctrl",
- "x": 0,
- "y": 4,
- "w": 1.25
- },
- {
- "label": "Win",
- "x": 1.25,
- "y": 4
- },
- {
- "label": "Alt",
- "x": 2.25,
- "y": 4
- },
- {
- "label": "\u7121\u5909\u63db",
- "x": 3.25,
- "y": 4,
- "w": 1.25
- },
- {
- "label": "",
- "x": 4.5,
- "y": 4,
- "w": 6
- },
- {
- "label": "\u5909\u63db",
- "x": 10.5,
- "y": 4,
- "w": 1.25
- },
- {
- "label": "\u304b\u306a",
- "x": 11.75,
- "y": 4
- },
- {
- "label": "\u534a\u89d2 \u5168\u89d2 \u6f22\u5b57",
- "x": 12.75,
- "y": 4
- },
- {
- "label": "Caps Lock",
- "x": 13.75,
- "y": 4,
- "w": 1.25
- }
+ {"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},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [2, 12], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [2, 0], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2},
+ {"matrix": [1, 13], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3},
+ {"matrix": [3, 13], "x": 13.25, "y": 3, "w": 1.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 4.5, "y": 4, "w": 6},
+ {"matrix": [4, 10], "x": 10.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.75, "y": 4},
+ {"matrix": [4, 12], "x": 12.75, "y": 4},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
]
}
}
diff --git a/keyboards/ai03/jp60/jp60.h b/keyboards/ai03/jp60/jp60.h
deleted file mode 100644
index 9635e2f3ce..0000000000
--- a/keyboards/ai03/jp60/jp60.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2021 ai03
- *
- * 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 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( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K212, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K113, K213, \
- K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \
- K400, K401, K402, K403, K407, K410, K411, K412, K413 \
-) \
-{ \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \
- { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \
- { K400, K401, K402, K403, KC_NO, KC_NO, KC_NO, K407, KC_NO, KC_NO, K410, K411, K412, K413 } \
-}
diff --git a/keyboards/ai03/lunar/info.json b/keyboards/ai03/lunar/info.json
index 2b97d0042c..e2d0e78c64 100644
--- a/keyboards/ai03/lunar/info.json
+++ b/keyboards/ai03/lunar/info.json
@@ -18,76 +18,80 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"!", "x":1, "y":0},
- {"label":"@", "x":2, "y":0},
- {"label":"#", "x":3, "y":0},
- {"label":"$", "x":4, "y":0},
- {"label":"%", "x":5, "y":0},
- {"label":"^", "x":6, "y":0},
- {"label":"&", "x":7, "y":0},
- {"label":"*", "x":8, "y":0},
- {"label":"(", "x":9, "y":0},
- {"label":")", "x":10, "y":0},
- {"label":"_", "x":11, "y":0},
- {"label":"+", "x":12, "y":0},
- {"label":"BackspaceL", "x":13, "y":0},
- {"label":"BackspaceR", "x":14, "y":0},
- {"label":"Insert", "x":15, "y":0},
- {"label":"Tab", "x":0, "y":1, "w":1.5},
- {"label":"Q", "x":1.5, "y":1},
- {"label":"W", "x":2.5, "y":1},
- {"label":"E", "x":3.5, "y":1},
- {"label":"R", "x":4.5, "y":1},
- {"label":"T", "x":5.5, "y":1},
- {"label":"Y", "x":6.5, "y":1},
- {"label":"U", "x":7.5, "y":1},
- {"label":"I", "x":8.5, "y":1},
- {"label":"O", "x":9.5, "y":1},
- {"label":"P", "x":10.5, "y":1},
- {"label":"{", "x":11.5, "y":1},
- {"label":"}", "x":12.5, "y":1},
- {"label":"|", "x":13.5, "y":1, "w":1.5},
- {"label":"Delete", "x":15, "y":1},
- {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
- {"label":"A", "x":1.75, "y":2},
- {"label":"S", "x":2.75, "y":2},
- {"label":"D", "x":3.75, "y":2},
- {"label":"F", "x":4.75, "y":2},
- {"label":"G", "x":5.75, "y":2},
- {"label":"H", "x":6.75, "y":2},
- {"label":"J", "x":7.75, "y":2},
- {"label":"K", "x":8.75, "y":2},
- {"label":"L", "x":9.75, "y":2},
- {"label":":", "x":10.75, "y":2},
- {"label":"\"", "x":11.75, "y":2},
- {"label":"Enter", "x":12.75, "y":2, "w":2.25},
- {"label":"Home", "x":15, "y":2},
- {"label":"Shift", "x":0, "y":3, "w":2.25},
- {"label":"Z", "x":2.25, "y":3},
- {"label":"X", "x":3.25, "y":3},
- {"label":"C", "x":4.25, "y":3},
- {"label":"V", "x":5.25, "y":3},
- {"label":"B", "x":6.25, "y":3},
- {"label":"N", "x":7.25, "y":3},
- {"label":"M", "x":8.25, "y":3},
- {"label":"<", "x":9.25, "y":3},
- {"label":">", "x":10.25, "y":3},
- {"label":"?", "x":11.25, "y":3},
- {"label":"Shift", "x":12.25, "y":3, "w":1.75},
- {"label":"\u2191", "x":14, "y":3},
- {"label":"End", "x":15, "y":3},
- {"label":"Ctrl", "x":0, "y":4, "w":1.5},
- {"label":"Win", "x":1.5, "y":4, "w":1.25},
- {"label":"Alt", "x":2.75, "y":4, "w":1.5},
- {"x":4.25, "y":4, "w":2.25},
- {"x":6.5, "y":4, "w":1.5},
- {"x":8, "y":4, "w":2.75},
- {"label":"Alt", "x":10.75, "y":4, "w":1.25},
- {"label":"Win", "x":12, "y":4},
- {"label":"\u2190", "x":13, "y":4},
- {"label":"\u2193", "x":14, "y":4},
- {"label":"\u2192", "x":15, "y":4}
+ {"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},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [2, 12], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 10], "x": 11.25, "y": 3},
+ {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.5},
+ {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 2.25},
+ {"matrix": [4, 5], "x": 6.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 8, "y": 4, "w": 2.75},
+ {"matrix": [4, 9], "x": 10.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 12, "y": 4},
+ {"matrix": [4, 11], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
]
}
}
diff --git a/keyboards/ai03/lunar/lunar.h b/keyboards/ai03/lunar/lunar.h
deleted file mode 100644
index 2e66ecb5c5..0000000000
--- a/keyboards/ai03/lunar/lunar.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2019 Ryota Goto
- *
- * 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( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K212, K014, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, K214, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \
- K400, K401, K402, K403, K405, K407, K409, K410, K411, K413, K414 \
-) \
-{ \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314 }, \
- { K400, K401, K402, K403, KC_NO, K405, KC_NO, K407, KC_NO, K409, K410, K411, KC_NO, K413, K414 } \
-}
diff --git a/keyboards/ai03/orbit/info.json b/keyboards/ai03/orbit/info.json
index 981f3cd685..6a4ee1abf3 100644
--- a/keyboards/ai03/orbit/info.json
+++ b/keyboards/ai03/orbit/info.json
@@ -30,81 +30,83 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0.63},
- {"x":1, "y":0.38},
- {"x":2, "y":0.38},
- {"x":3, "y":0.13},
- {"x":4, "y":0},
- {"x":5, "y":0.13},
- {"x":6, "y":0.25},
- {"x":9, "y":0.25},
- {"x":10, "y":0.13},
- {"x":11, "y":0},
- {"x":12, "y":0.13},
- {"x":13, "y":0.38},
- {"x":14, "y":0.38},
- {"x":15, "y":0.63},
+ {"matrix": [0, 0], "x": 0, "y": 0.63},
+ {"matrix": [0, 1], "x": 1, "y": 0.38},
+ {"matrix": [0, 2], "x": 2, "y": 0.38},
+ {"matrix": [0, 3], "x": 3, "y": 0.13},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0.13},
+ {"matrix": [0, 6], "x": 6, "y": 0.25},
- {"x":0, "y":1.63},
- {"x":1, "y":1.38},
- {"x":2, "y":1.38},
- {"x":3, "y":1.13},
- {"x":4, "y":1},
- {"x":5, "y":1.13},
- {"x":6, "y":1.25},
- {"x":9, "y":1.25},
- {"x":10, "y":1.13},
- {"x":11, "y":1},
- {"x":12, "y":1.13},
- {"x":13, "y":1.38},
- {"x":14, "y":1.38},
- {"x":15, "y":1.63},
+ {"matrix": [5, 0], "x": 9, "y": 0.25},
+ {"matrix": [5, 1], "x": 10, "y": 0.13},
+ {"matrix": [5, 2], "x": 11, "y": 0},
+ {"matrix": [5, 3], "x": 12, "y": 0.13},
+ {"matrix": [5, 4], "x": 13, "y": 0.38},
+ {"matrix": [5, 5], "x": 14, "y": 0.38},
+ {"matrix": [5, 6], "x": 15, "y": 0.63},
- {"x":0, "y":2.63},
- {"x":1, "y":2.38},
- {"x":2, "y":2.38},
- {"x":3, "y":2.13},
- {"x":4, "y":2},
- {"x":5, "y":2.13},
- {"x":6, "y":2.25},
- {"x":9, "y":2.25},
- {"x":10, "y":2.13},
- {"x":11, "y":2},
- {"x":12, "y":2.13},
- {"x":13, "y":2.38},
- {"x":14, "y":2.38},
- {"x":15, "y":2.63},
+ {"matrix": [1, 0], "x": 0, "y": 1.63},
+ {"matrix": [1, 1], "x": 1, "y": 1.38},
+ {"matrix": [1, 2], "x": 2, "y": 1.38},
+ {"matrix": [1, 3], "x": 3, "y": 1.13},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1.13},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
- {"x":0, "y":3.63},
- {"x":1, "y":3.38},
- {"x":2, "y":3.38},
- {"x":3, "y":3.13},
- {"x":4, "y":3},
- {"x":5, "y":3.13},
- {"x":6, "y":3.25},
- {"x":9, "y":3.25},
- {"x":10, "y":3.13},
- {"x":11, "y":3},
- {"x":12, "y":3.13},
- {"x":13, "y":3.38},
- {"x":14, "y":3.38},
- {"x":15, "y":3.63},
+ {"matrix": [6, 0], "x": 9, "y": 1.25},
+ {"matrix": [6, 1], "x": 10, "y": 1.13},
+ {"matrix": [6, 2], "x": 11, "y": 1},
+ {"matrix": [6, 3], "x": 12, "y": 1.13},
+ {"matrix": [6, 4], "x": 13, "y": 1.38},
+ {"matrix": [6, 5], "x": 14, "y": 1.38},
+ {"matrix": [6, 6], "x": 15, "y": 1.63},
- {"x":1, "y":4.38},
- {"x":2, "y":4.38},
- {"x":3, "y":4.13},
- {"x":4, "y":4},
+ {"matrix": [2, 0], "x": 0, "y": 2.63},
+ {"matrix": [2, 1], "x": 1, "y": 2.38},
+ {"matrix": [2, 2], "x": 2, "y": 2.38},
+ {"matrix": [2, 3], "x": 3, "y": 2.13},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2.13},
+ {"matrix": [2, 6], "x": 6, "y": 2.25},
- {"x":5.5, "y":4.25},
- {"x":6.5, "y":4.5, "h":1.5},
+ {"matrix": [7, 0], "x": 9, "y": 2.25},
+ {"matrix": [7, 1], "x": 10, "y": 2.13},
+ {"matrix": [7, 2], "x": 11, "y": 2},
+ {"matrix": [7, 3], "x": 12, "y": 2.13},
+ {"matrix": [7, 4], "x": 13, "y": 2.38},
+ {"matrix": [7, 5], "x": 14, "y": 2.38},
+ {"matrix": [7, 6], "x": 15, "y": 2.63},
- {"x":8.5, "y":4.5, "h":1.5},
- {"x":9.5, "y":4.25},
+ {"matrix": [3, 0], "x": 0, "y": 3.63},
+ {"matrix": [3, 1], "x": 1, "y": 3.38},
+ {"matrix": [3, 2], "x": 2, "y": 3.38},
+ {"matrix": [3, 3], "x": 3, "y": 3.13},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3.13},
+ {"matrix": [3, 6], "x": 6, "y": 3.25},
- {"x":11, "y":4},
- {"x":12, "y":4.13},
- {"x":13, "y":4.38},
- {"x":14, "y":4.38}
+ {"matrix": [8, 0], "x": 9, "y": 3.25},
+ {"matrix": [8, 1], "x": 10, "y": 3.13},
+ {"matrix": [8, 2], "x": 11, "y": 3},
+ {"matrix": [8, 3], "x": 12, "y": 3.13},
+ {"matrix": [8, 4], "x": 13, "y": 3.38},
+ {"matrix": [8, 5], "x": 14, "y": 3.38},
+ {"matrix": [8, 6], "x": 15, "y": 3.63},
+
+ {"matrix": [4, 1], "x": 1, "y": 4.38},
+ {"matrix": [4, 2], "x": 2, "y": 4.38},
+ {"matrix": [4, 3], "x": 3, "y": 4.13},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5.5, "y": 4.25},
+ {"matrix": [4, 6], "x": 6.5, "y": 4.5, "h": 1.5},
+
+ {"matrix": [9, 0], "x": 8.5, "y": 4.5, "h": 1.5},
+ {"matrix": [9, 1], "x": 9.5, "y": 4.25},
+ {"matrix": [9, 2], "x": 11, "y": 4},
+ {"matrix": [9, 3], "x": 12, "y": 4.13},
+ {"matrix": [9, 4], "x": 13, "y": 4.38},
+ {"matrix": [9, 5], "x": 14, "y": 4.38}
]
}
}
diff --git a/keyboards/ai03/orbit/orbit.h b/keyboards/ai03/orbit/orbit.h
index 7f3b1aca32..7b9c238ad4 100644
--- a/keyboards/ai03/orbit/orbit.h
+++ b/keyboards/ai03/orbit/orbit.h
@@ -18,35 +18,6 @@
#include "quantum.h"
-#define XXX KC_NO
-
-/* 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( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
- L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45 \
-) { \
- { L00, L01, L02, L03, L04, L05, L06 }, \
- { L10, L11, L12, L13, L14, L15, L16 }, \
- { L20, L21, L22, L23, L24, L25, L26 }, \
- { L30, L31, L32, L33, L34, L35, L36 }, \
- { XXX, L41, L42, L43, L44, L45, L46 }, \
- { R00, R01, R02, R03, R04, R05, R06 }, \
- { R10, R11, R12, R13, R14, R15, R16 }, \
- { R20, R21, R22, R23, R24, R25, R26 }, \
- { R30, R31, R32, R33, R34, R35, R36 }, \
- { R40, R41, R42, R43, R44, R45, XXX } \
-}
-
void led_toggle(uint8_t id, bool on);
void set_all_leds(bool leds[6]);
void set_layer_indicators(uint8_t layer);
diff --git a/keyboards/ai03/orbit_x/info.json b/keyboards/ai03/orbit_x/info.json
index dbc9f40d19..dca371faf2 100644
--- a/keyboards/ai03/orbit_x/info.json
+++ b/keyboards/ai03/orbit_x/info.json
@@ -27,54 +27,61 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0.38},
- {"x":1, "y":0.38},
- {"x":2, "y":0.13},
- {"x":3, "y":0},
- {"x":4, "y":0.13},
- {"x":5, "y":0.25},
- {"x":7.5, "y":0.25},
- {"x":8.5, "y":0.13},
- {"x":9.5, "y":0},
- {"x":10.5, "y":0.13},
- {"x":11.5, "y":0.38},
- {"x":12.5, "y":0.38},
- {"x":0, "y":1.38},
- {"x":1, "y":1.38},
- {"x":2, "y":1.13},
- {"x":3, "y":1},
- {"x":4, "y":1.13},
- {"x":5, "y":1.25},
- {"x":7.5, "y":1.25},
- {"x":8.5, "y":1.13},
- {"x":9.5, "y":1},
- {"x":10.5, "y":1.13},
- {"x":11.5, "y":1.38},
- {"x":12.5, "y":1.38},
- {"x":0, "y":2.38},
- {"x":1, "y":2.38},
- {"x":2, "y":2.13},
- {"x":3, "y":2},
- {"x":4, "y":2.13},
- {"x":5, "y":2.25},
- {"x":7.5, "y":2.25},
- {"x":8.5, "y":2.13},
- {"x":9.5, "y":2},
- {"x":10.5, "y":2.13},
- {"x":11.5, "y":2.38},
- {"x":12.5, "y":2.38},
- {"x":0, "y":3.38},
-