summaryrefslogtreecommitdiff
path: root/keyboards/kagizaraya
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/kagizaraya')
-rw-r--r--keyboards/kagizaraya/chidori/chidori.h57
-rw-r--r--keyboards/kagizaraya/chidori/info.json146
2 files changed, 138 insertions, 65 deletions
diff --git a/keyboards/kagizaraya/chidori/chidori.h b/keyboards/kagizaraya/chidori/chidori.h
deleted file mode 100644
index d82b9217fb..0000000000
--- a/keyboards/kagizaraya/chidori/chidori.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright 2019 ENDO Katsuhiro <ka2hiro@kagizaraya.jp>
- *
- * 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"
-
-// clang-format off
-#define LAYOUT( \
- L01, L02, L03, L04, L05, L06, R01, R02, R03, R04, R05, R06, \
- L07, L08, L09, L10, L11, L12, R07, R08, R09, R10, R11, R12, \
- L13, L14, L15, L16, L17, L18, R13, R14, R15, R16, R17, R18, \
- L19, L20, L21, L22, L23, L24, R19, R20, R21, R22, R23, R24 \
-) { \
- { L01, L02, L03, L04, L05, L06 }, \
- { L07, L08, L09, L10, L11, L12 }, \
- { L13, L14, L15, L16, L17, L18 }, \
- { L19, L20, L21, L22, L23, L24 }, \
- { R01, R02, R03, R04, R05, R06 }, \
- { R07, R08, R09, R10, R11, R12 }, \
- { R13, R14, R15, R16, R17, R18 }, \
- { R19, R20, R21, R22, R23, R24 } \
-}
-
-#define LAYOUT_extended( \
- L01, L02, L03, L04, L05, L06, M01, M02, M03, M04, M05, M06, R01, R02, R03, R04, R05, R06, \
- L07, L08, L09, L10, L11, L12, M07, M08, M09, M10, M11, M12, R07, R08, R09, R10, R11, R12, \
- L13, L14, L15, L16, L17, L18, M13, M14, M15, M16, M17, M18, R13, R14, R15, R16, R17, R18, \
- L19, L20, L21, L22, L23, L24, M19, M20, M21, M22, M23, M24, R19, R20, R21, R22, R23, R24 \
-) { \
- { L01, L02, L03, L04, L05, L06 }, \
- { L07, L08, L09, L10, L11, L12 }, \
- { L13, L14, L15, L16, L17, L18 }, \
- { L19, L20, L21, L22, L23, L24 }, \
- { M01, M02, M03, M04, M05, M06 }, \
- { M07, M08, M09, M10, M11, M12 }, \
- { M13, M14, M15, M16, M17, M18 }, \
- { M19, M20, M21, M22, M23, M24 }, \
- { R01, R02, R03, R04, R05, R06 }, \
- { R07, R08, R09, R10, R11, R12 }, \
- { R13, R14, R15, R16, R17, R18 }, \
- { R19, R20, R21, R22, R23, R24 } \
-}
-// clang-format on
diff --git a/keyboards/kagizaraya/chidori/info.json b/keyboards/kagizaraya/chidori/info.json
index 8cafe4cc7e..16cd17f942 100644
--- a/keyboards/kagizaraya/chidori/info.json
+++ b/keyboards/kagizaraya/chidori/info.json
@@ -13,18 +13,148 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0},
- {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1},
- {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2},
- {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}
+ {"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": [4, 0], "x": 7, "y": 0},
+ {"matrix": [4, 1], "x": 8, "y": 0},
+ {"matrix": [4, 2], "x": 9, "y": 0},
+ {"matrix": [4, 3], "x": 10, "y": 0},
+ {"matrix": [4, 4], "x": 11, "y": 0},
+ {"matrix": [4, 5], "x": 12, "y": 0},
+
+ {"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": [5, 0], "x": 7, "y": 1},
+ {"matrix": [5, 1], "x": 8, "y": 1},
+ {"matrix": [5, 2], "x": 9, "y": 1},
+ {"matrix": [5, 3], "x": 10, "y": 1},
+ {"matrix": [5, 4], "x": 11, "y": 1},
+ {"matrix": [5, 5], "x": 12, "y": 1},
+
+ {"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": [6, 0], "x": 7, "y": 2},
+ {"matrix": [6, 1], "x": 8, "y": 2},
+ {"matrix": [6, 2], "x": 9, "y": 2},
+ {"matrix": [6, 3], "x": 10, "y": 2},
+ {"matrix": [6, 4], "x": 11, "y": 2},
+ {"matrix": [6, 5], "x": 12, "y": 2},
+
+ {"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": [7, 0], "x": 7, "y": 3},
+ {"matrix": [7, 1], "x": 8, "y": 3},
+ {"matrix": [7, 2], "x": 9, "y": 3},
+ {"matrix": [7, 3], "x": 10, "y": 3},
+ {"matrix": [7, 4], "x": 11, "y": 3},
+ {"matrix": [7, 5], "x": 12, "y": 3}
]
},
"LAYOUT_extended": {
"layout": [
- {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":16, "y":0}, {"x":17, "y":0}, {"x":18, "y":0}, {"x":19, "y":0},
- {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1}, {"x":17, "y":1}, {"x":18, "y":1}, {"x":19, "y":1},
- {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":17, "y":2}, {"x":18, "y":2}, {"x":19, "y":2},
- {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":16, "y":3}, {"x":17, "y":3}, {"x":18, "y":3}, {"x":19, "y":3}
+ {"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": [4, 0], "x": 7, "y": 0},
+ {"matrix": [4, 1], "x": 8, "y": 0},
+ {"matrix": [4, 2], "x": 9, "y": 0},
+ {"matrix": [4, 3], "x": 10, "y": 0},
+ {"matrix": [4, 4], "x": 11, "y": 0},
+ {"matrix": [4, 5], "x": 12, "y": 0},
+
+ {"matrix": [8, 0], "x": 14, "y": 0},
+ {"matrix": [8, 1], "x": 15, "y": 0},
+ {"matrix": [8, 2], "x": 16, "y": 0},
+ {"matrix": [8, 3], "x": 17, "y": 0},
+ {"matrix": [8, 4], "x": 18, "y": 0},
+ {"matrix": [8, 5], "x": 19, "y": 0},
+
+ {"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": [5, 0], "x": 7, "y": 1},
+ {"matrix": [5, 1], "x": 8, "y": 1},
+ {"matrix": [5, 2], "x": 9, "y": 1},
+ {"matrix": [5, 3], "x": 10, "y": 1},
+ {"matrix": [5, 4], "x": 11, "y": 1},
+ {"matrix": [5, 5], "x": 12, "y": 1},
+
+ {"matrix": [9, 0], "x": 14, "y": 1},
+ {"matrix": [9, 1], "x": 15, "y": 1},
+ {"matrix": [9, 2], "x": 16, "y": 1},
+ {"matrix": [9, 3], "x": 17, "y": 1},
+ {"matrix": [9, 4], "x": 18, "y": 1},
+ {"matrix": [9, 5], "x": 19, "y": 1},
+
+ {"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": [6, 0], "x": 7, "y": 2},
+ {"matrix": [6, 1], "x": 8, "y": 2},
+ {"matrix": [6, 2], "x": 9, "y": 2},
+ {"matrix": [6, 3], "x": 10, "y": 2},
+ {"matrix": [6, 4], "x": 11, "y": 2},
+ {"matrix": [6, 5], "x": 12, "y": 2},
+
+ {"matrix": [10, 0], "x": 14, "y": 2},
+ {"matrix": [10, 1], "x": 15, "y": 2},
+ {"matrix": [10, 2], "x": 16, "y": 2},
+ {"matrix": [10, 3], "x": 17, "y": 2},
+ {"matrix": [10, 4], "x": 18, "y": 2},
+ {"matrix": [10, 5], "x": 19, "y": 2},
+
+ {"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": [7, 0], "x": 7, "y": 3},
+ {"matrix": [7, 1], "x": 8, "y": 3},
+ {"matrix": [7, 2], "x": 9, "y": 3},
+ {"matrix": [7, 3], "x": 10, "y": 3},
+ {"matrix": [7, 4], "x": 11, "y": 3},
+ {"matrix": [7, 5], "x": 12, "y": 3},
+
+ {"matrix": [11, 0], "x": 14, "y": 3},
+ {"matrix": [11, 1], "x": 15, "y": 3},
+ {"matrix": [11, 2], "x": 16, "y": 3},
+ {"matrix": [11, 3], "x": 17, "y": 3},
+ {"matrix": [11, 4], "x": 18, "y": 3},
+ {"matrix": [11, 5], "x": 19, "y": 3}
]
}
}