summaryrefslogtreecommitdiff
path: root/keyboards/wuque/ikki68
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-04-01 13:13:18 +1100
committerGitHub <noreply@github.com>2023-04-01 13:13:18 +1100
commit9359504255236cce74c601554783ac5ce6f44fa9 (patch)
tree53b9442ed2bd096cb2db242902896f5f2354426d /keyboards/wuque/ikki68
parente40b6ca3b05e50253c3f6bbc08673e1720ddd9be (diff)
Move 66% and 68% layouts to data driven (#20293)
Diffstat (limited to 'keyboards/wuque/ikki68')
-rw-r--r--keyboards/wuque/ikki68/ikki68.c2
-rw-r--r--keyboards/wuque/ikki68/ikki68.h33
-rw-r--r--keyboards/wuque/ikki68/info.json143
3 files changed, 76 insertions, 102 deletions
diff --git a/keyboards/wuque/ikki68/ikki68.c b/keyboards/wuque/ikki68/ikki68.c
index 57aa7bf570..a61ddf3a56 100644
--- a/keyboards/wuque/ikki68/ikki68.c
+++ b/keyboards/wuque/ikki68/ikki68.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "ikki68.h"
+#include "quantum.h"
void matrix_init_kb(void) {
setPinOutput(C6);
diff --git a/keyboards/wuque/ikki68/ikki68.h b/keyboards/wuque/ikki68/ikki68.h
deleted file mode 100644
index 3210748914..0000000000
--- a/keyboards/wuque/ikki68/ikki68.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2020 wuquestudio
- *
- * 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_68_ansi( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, K0G, \
- K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \
- K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
- K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3F, \
- K40, K41, K43, K46, K4A, K4B, K4D, K4E, K4F, K4G \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E, K0F, K0G }, \
- { K10, KC_NO, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
- { K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO, KC_NO, KC_NO }, \
- { KC_NO, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, KC_NO, K3F, KC_NO }, \
- { K40, K41, KC_NO, K43, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, KC_NO, K4D, K4E, K4F, K4G }, \
-}
diff --git a/keyboards/wuque/ikki68/info.json b/keyboards/wuque/ikki68/info.json
index fd1cb7f9ba..4dd86d2a6b 100644
--- a/keyboards/wuque/ikki68/info.json
+++ b/keyboards/wuque/ikki68/info.json
@@ -19,74 +19,81 @@
"layouts": {
"LAYOUT_68_ansi": {
"layout": [
- {"label":"K00 (B0,D1)", "x":0, "y":0},
- {"label":"K01 (B0,D0)", "x":1, "y":0},
- {"label":"K02 (B0,D2)", "x":2, "y":0},
- {"label":"K03 (B0,D3)", "x":3, "y":0},
- {"label":"K04 (B0,D5)", "x":4, "y":0},
- {"label":"K05 (B0,D4)", "x":5, "y":0},
- {"label":"K06 (B0,D6)", "x":6, "y":0},
- {"label":"K07 (B0,D7)", "x":7, "y":0},
- {"label":"K08 (B0,B4)", "x":8, "y":0},
- {"label":"K09 (B0,B5)", "x":9, "y":0},
- {"label":"K0A (B0,F0)", "x":10, "y":0},
- {"label":"K0B (B0,F1)", "x":11, "y":0},
- {"label":"K0C (B0,B6)", "x":12, "y":0},
- {"label":"K0E (B0,F5)", "x":13, "y":0, "w":2},
- {"label":"K0F (B0,F6)", "x":15.5, "y":0},
- {"label":"K0G (B0,F7)", "x":16.5, "y":0},
- {"label":"K10 (B1,D1)", "x":0, "y":1, "w":1.5},
- {"label":"K12 (B1,D2)", "x":1.5, "y":1},
- {"label":"K13 (B1,D3)", "x":2.5, "y":1},
- {"label":"K14 (B1,D5)", "x":3.5, "y":1},
- {"label":"K15 (B1,D4)", "x":4.5, "y":1},
- {"label":"K16 (B1,D6)", "x":5.5, "y":1},
- {"label":"K17 (B1,D7)", "x":6.5, "y":1},
- {"label":"K18 (B1,B4)", "x":7.5, "y":1},
- {"label":"K19 (B1,B5)", "x":8.5, "y":1},
- {"label":"K1A (B1,F0)", "x":9.5, "y":1},
- {"label":"K1B (B1,F1)", "x":10.5, "y":1},
- {"label":"K1C (B1,B6)", "x":11.5, "y":1},
- {"label":"K1D (B1,F4)", "x":12.5, "y":1},
- {"label":"K1E (B1,F5)", "x":13.5, "y":1, "w":1.5},
- {"label":"K1F (B1,F6)", "x":15.5, "y":1},
- {"label":"K1G (B1,F7)", "x":16.5, "y":1},
- {"label":"K20 (B2,D1)", "x":0, "y":2, "w":1.75},
- {"label":"K22 (B2,D2)", "x":1.75, "y":2},
- {"label":"K23 (B2,D3)", "x":2.75, "y":2},
- {"label":"K24 (B2,D5)", "x":3.75, "y":2},
- {"label":"K25 (B2,D4)", "x":4.75, "y":2},
- {"label":"K26 (B2,D6)", "x":5.75, "y":2},
- {"label":"K27 (B2,D7)", "x":6.75, "y":2},
- {"label":"K28 (B2,B4)", "x":7.75, "y":2},
- {"label":"K29 (B2,B5)", "x":8.75, "y":2},
- {"label":"K2A (B2,F0)", "x":9.75, "y":2},
- {"label":"K2B (B2,F1)", "x":10.75, "y":2},
- {"label":"K2C (B2,B6)", "x":11.75, "y":2},
- {"label":"K2D (B2,F4)", "x":12.75, "y":2, "w":2.25},
- {"label":"K31 (B3,D0)", "x":0, "y":3, "w":2.25},
- {"label":"K32 (B3,D2)", "x":2.25, "y":3},
- {"label":"K33 (B3,D3)", "x":3.25, "y":3},
- {"label":"K34 (B3,D5)", "x":4.25, "y":3},
- {"label":"K35 (B3,D4)", "x":5.25, "y":3},
- {"label":"K36 (B3,D6)", "x":6.25, "y":3},
- {"label":"K37 (B3,D7)", "x":7.25, "y":3},
- {"label":"K38 (B3,B4)", "x":8.25, "y":3},
- {"label":"K39 (B3,B5)", "x":9.25, "y":3},
- {"label":"K3A (B3,F0)", "x":10.25, "y":3},
- {"label":"K3B (B3,F1)", "x":11.25, "y":3},
- {"label":"K3D (B3,F4)", "x":12.25, "y":3, "w":2.75},
- {"label":"K3F (B3,F6)", "x":15.5, "y":3},
- {"label":"K40 (E6,D1)", "x":0, "y":4, "w":1.25},
- {"label":"K41 (E6,D0)", "x":1.25, "y":4, "w":1.25},
- {"label":"K43 (E6,D3)", "x":2.5, "y":4, "w":1.25},
- {"label":"K46 (E6,D6)", "x":3.75, "y":4, "w":6.25},
- {"label":"K4A (E6,F0)", "x":10, "y":4, "w":1.25},
- {"label":"K4B (E6,F1)", "x":11.25, "y":4, "w":1.25},
- {"label":"K4D (E6,F4)", "x":12.5, "y":4, "w":1.25},
- {"label":"K4E (E6,F5)", "x":14.5, "y":4},
- {"label":"K4F (E6,F6)", "x":15.5, "y":4},
- {"label":"K4G (E6,F7)", "x":16.5, "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, 14], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [0, 15], "x": 15.5, "y": 0},
+ {"matrix": [0, 16], "x": 16.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 1},
+ {"matrix": [1, 3], "x": 2.5, "y": 1},
+ {"matrix": [1, 4], "x": 3.5, "y": 1},
+ {"matrix": [1, 5], "x": 4.5, "y": 1},
+ {"matrix": [1, 6], "x": 5.5, "y": 1},
+ {"matrix": [1, 7], "x": 6.5, "y": 1},
+ {"matrix": [1, 8], "x": 7.5, "y": 1},
+ {"matrix": [1, 9], "x": 8.5, "y": 1},
+ {"matrix": [1, 10], "x": 9.5, "y": 1},
+ {"matrix": [1, 11], "x": 10.5, "y": 1},
+ {"matrix": [1, 12], "x": 11.5, "y": 1},
+ {"matrix": [1, 13], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 15], "x": 15.5, "y": 1},
+ {"matrix": [1, 16], "x": 16.5, "y": 1},
+
+ {"matrix": [2, 0], "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": [2, 12], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 1], "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, 13], "x": 12.25, "y": 3, "w": 2.75},
+ {"matrix": [3, 15], "x": 15.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 14], "x": 14.5, "y": 4},
+ {"matrix": [4, 15], "x": 15.5, "y": 4},
+ {"matrix": [4, 16], "x": 16.5, "y": 4}
]
}
}