summaryrefslogtreecommitdiff
path: root/keyboards/kiwikey
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/kiwikey')
-rw-r--r--keyboards/kiwikey/borderland/borderland.c18
-rw-r--r--keyboards/kiwikey/borderland/borderland.h29
-rw-r--r--keyboards/kiwikey/borderland/config.h20
-rw-r--r--keyboards/kiwikey/borderland/info.json152
-rw-r--r--keyboards/kiwikey/kawii9/config.h18
-rw-r--r--keyboards/kiwikey/kawii9/info.json28
-rw-r--r--keyboards/kiwikey/kawii9/kawii9.c17
-rw-r--r--keyboards/kiwikey/kawii9/kawii9.h38
-rw-r--r--keyboards/kiwikey/wanderland/config.h18
-rw-r--r--keyboards/kiwikey/wanderland/info.json298
-rw-r--r--keyboards/kiwikey/wanderland/wanderland.c17
-rw-r--r--keyboards/kiwikey/wanderland/wanderland.h77
12 files changed, 269 insertions, 461 deletions
diff --git a/keyboards/kiwikey/borderland/borderland.c b/keyboards/kiwikey/borderland/borderland.c
deleted file mode 100644
index 660e8026fc..0000000000
--- a/keyboards/kiwikey/borderland/borderland.c
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2021 KiwiKey (@KiwiKey)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "borderland.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
- if (!encoder_update_user(index, clockwise)) { return false; }
- if (index == 0) {
- if (clockwise) {
- tap_code_delay(KC_VOLU, 10);
- } else {
- tap_code_delay(KC_VOLD, 10);
- }
- }
- return true;
-}
-#endif
diff --git a/keyboards/kiwikey/borderland/borderland.h b/keyboards/kiwikey/borderland/borderland.h
deleted file mode 100644
index 85449a16b5..0000000000
--- a/keyboards/kiwikey/borderland/borderland.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2021 KiwiKey (@KiwiKey)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#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( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k1E, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k2E, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k3E, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, \
- k40, k42, k44, k45, k47, k49, k4C, k4D, k4E \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, KC_NO, k2E }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, KC_NO, k3D, k3E }, \
- { k40, KC_NO, k42, KC_NO, k44, k45, KC_NO, k47, KC_NO, k49, KC_NO, KC_NO, k4C, k4D, k4E } \
-}
diff --git a/keyboards/kiwikey/borderland/config.h b/keyboards/kiwikey/borderland/config.h
index a698476a5f..1676967490 100644
--- a/keyboards/kiwikey/borderland/config.h
+++ b/keyboards/kiwikey/borderland/config.h
@@ -3,27 +3,8 @@
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B0, B7, B5, B4, D7, D6, B3 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define TAP_CODE_DELAY 10
-#define RGB_DI_PIN B2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 18
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -40,7 +21,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kiwikey/borderland/info.json b/keyboards/kiwikey/borderland/info.json
index 84b17c4385..7ecd81e07b 100644
--- a/keyboards/kiwikey/borderland/info.json
+++ b/keyboards/kiwikey/borderland/info.json
@@ -8,87 +8,105 @@
"pid": "0x424C",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"],
+ "rows": ["D0", "D1", "D2", "D3", "D5"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "F5", "pin_b": "F6"}
]
},
+ "ws2812": {
+ "pin": "B2"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"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":6, "y":0},
- {"x":9, "y":0},
- {"x":10, "y":0},
- {"x":11, "y":0},
- {"x":12, "y":0},
- {"x":13, "y":0},
- {"x":14, "y":0},
- {"x":15, "y":0},
- {"x":16, "y":0},
- {"x":17.3, "y":0},
+ {"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": 9, "y": 0},
+ {"matrix": [0, 8], "x": 10, "y": 0},
+ {"matrix": [0, 9], "x": 11, "y": 0},
+ {"matrix": [0, 10], "x": 12, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [0, 12], "x": 14, "y": 0},
+ {"matrix": [0, 13], "x": 15, "y": 0},
+ {"matrix": [0, 14], "x": 16, "y": 0},
+
+ {"matrix": [1, 14], "x": 17.3, "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": 8.5, "y": 1},
+ {"matrix": [1, 7], "x": 9.5, "y": 1},
+ {"matrix": [1, 8], "x": 10.5, "y": 1},
+ {"matrix": [1, 9], "x": 11.5, "y": 1},
+ {"matrix": [1, 10], "x": 12.5, "y": 1},
+ {"matrix": [1, 11], "x": 13.5, "y": 1},
+ {"matrix": [1, 12], "x": 14.5, "y": 1},
+ {"matrix": [1, 13], "x": 15.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 17.3, "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": 8.75, "y": 2},
+ {"matrix": [2, 7], "x": 9.75, "y": 2},
+ {"matrix": [2, 8], "x": 10.75, "y": 2},
+ {"matrix": [2, 9], "x": 11.75, "y": 2},
+ {"matrix": [2, 10], "x": 12.75, "y": 2},
+ {"matrix": [2, 11], "x": 13.75, "y": 2},
+ {"matrix": [2, 12], "x": 14.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 14], "x": 17.3, "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": 9.25, "y": 3},
+ {"matrix": [3, 7], "x": 10.25, "y": 3},
+ {"matrix": [3, 8], "x": 11.25, "y": 3},
+ {"matrix": [3, 9], "x": 12.25, "y": 3},
+ {"matrix": [3, 10], "x": 13.25, "y": 3},
+ {"matrix": [3, 11], "x": 14.25, "y": 3, "w": 1.75},
- {"x":0, "y":1, "w":1.5},
- {"x":1.5, "y":1},
- {"x":2.5, "y":1},
- {"x":3.5, "y":1},
- {"x":4.5, "y":1},
- {"x":5.5, "y":1},
- {"x":8.5, "y":1},
- {"x":9.5, "y":1},
- {"x":10.5, "y":1},
- {"x":11.5, "y":1},
- {"x":12.5, "y":1},
- {"x":13.5, "y":1},
- {"x":14.5, "y":1},
- {"x":15.5, "y":1, "w":1.5},
- {"x":17.3, "y":1},
+ {"matrix": [3, 13], "x": 16.3, "y": 3.25},
- {"x":0, "y":2, "w":1.75},
- {"x":1.75, "y":2},
- {"x":2.75, "y":2},
- {"x":3.75, "y":2},
- {"x":4.75, "y":2},
- {"x":5.75, "y":2},
- {"x":8.75, "y":2},
- {"x":9.75, "y":2},
- {"x":10.75, "y":2},
- {"x":11.75, "y":2},
- {"x":12.75, "y":2},
- {"x":13.75, "y":2},
- {"x":14.75, "y":2, "w":2.25},
- {"x":17.3, "y":2},
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 2},
+ {"matrix": [4, 5], "x": 6.75, "y": 4, "w": 1.25},
- {"x":0, "y":3, "w":2.25},
- {"x":2.25, "y":3},
- {"x":3.25, "y":3},
- {"x":4.25, "y":3},
- {"x":5.25, "y":3},
- {"x":6.25, "y":3},
- {"x":9.25, "y":3},
- {"x":10.25, "y":3},
- {"x":11.25, "y":3},
- {"x":12.25, "y":3},
- {"x":13.25, "y":3},
- {"x":14.25, "y":3, "w":1.75},
- {"x":16.3, "y":3.25},
+ {"matrix": [4, 7], "x": 8.75, "y": 4, "w": 2.75},
+ {"matrix": [4, 9], "x": 11.5, "y": 4, "w": 1.5},
- {"x":0, "y":4, "w":1.5},
- {"x":3.25, "y":4, "w":1.5},
- {"x":4.75, "y":4, "w":2},
- {"x":6.75, "y":4, "w":1.25},
- {"x":8.75, "y":4, "w":2.75},
- {"x":11.5, "y":4, "w":1.5},
- {"x":15.3, "y":4.25},
- {"x":16.3, "y":4.25},
- {"x":17.3, "y":4.25}
+ {"matrix": [4, 12], "x": 15.3, "y": 4.25},
+ {"matrix": [4, 13], "x": 16.3, "y": 4.25},
+ {"matrix": [4, 14], "x": 17.3, "y": 4.25}
]
}
}
diff --git a/keyboards/kiwikey/kawii9/config.h b/keyboards/kiwikey/kawii9/config.h
index 086a8c839f..ee2c509f2a 100644
--- a/keyboards/kiwikey/kawii9/config.h
+++ b/keyboards/kiwikey/kawii9/config.h
@@ -17,24 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B6, B5, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3 // Ver1: F0, Ver2: D3
#define RGBLED_NUM 4
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/kiwikey/kawii9/info.json b/keyboards/kiwikey/kawii9/info.json
index e1511b544c..7537e7fe8a 100644
--- a/keyboards/kiwikey/kawii9/info.json
+++ b/keyboards/kiwikey/kawii9/info.json
@@ -8,20 +8,30 @@
"pid": "0x0303",
"device_version": "0.0.2"
},
+ "ws2812": {
+ "pin": "D3"
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6"],
+ "rows": ["B6", "B5", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_ortho_3x3": {
"layout": [
- {"label":"k00", "x":0, "y":0},
- {"label":"k01", "x":1, "y":0},
- {"label":"k02", "x":2, "y":0},
- {"label":"k10", "x":0, "y":1},
- {"label":"k11", "x":1, "y":1},
- {"label":"k12", "x":2, "y":1},
- {"label":"k20", "x":0, "y":2},
- {"label":"k21", "x":1, "y":2},
- {"label":"k22", "x":2, "y":2}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2}
]
}
}
diff --git a/keyboards/kiwikey/kawii9/kawii9.c b/keyboards/kiwikey/kawii9/kawii9.c
deleted file mode 100644
index 0e317ca726..0000000000
--- a/keyboards/kiwikey/kawii9/kawii9.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 KiwiKey
- *
- * 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 "kawii9.h"
diff --git a/keyboards/kiwikey/kawii9/kawii9.h b/keyboards/kiwikey/kawii9/kawii9.h
deleted file mode 100644
index b6fc36a575..0000000000
--- a/keyboards/kiwikey/kawii9/kawii9.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2020 KiwiKey
- *
- * 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_ortho_3x3( \
- k00, k01, k02, \
- k10, k11, k12, \
- k20, k21, k22 \
-) \
-{ \
- { k00, k01, k02 }, \
- { k10, k11, k12 }, \
- { k20, k21, k22 } \
-}
diff --git a/keyboards/kiwikey/wanderland/config.h b/keyboards/kiwikey/wanderland/config.h
index 5332a91304..dd9288a183 100644
--- a/keyboards/kiwikey/wanderland/config.h
+++ b/keyboards/kiwikey/wanderland/config.h
@@ -17,24 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, F1, E6, E2, C7, D4 }
-#define MATRIX_COL_PINS { F5, F6, B4, D7, D6, D5, D2, D3, B0, F0, B1, B2, B3 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F7
#define RGBLED_NUM 18
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/kiwikey/wanderland/info.json b/keyboards/kiwikey/wanderland/info.json
index 3bab46fb4a..eb41a349d0 100644
--- a/keyboards/kiwikey/wanderland/info.json
+++ b/keyboards/kiwikey/wanderland/info.json
@@ -8,10 +8,18 @@
"pid": "0x574C",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F5", "F6", "B4", "D7", "D6", "D5", "D2", "D3", "B0", "F0", "B1", "B2", "B3"],
+ "rows": ["F4", "F1", "E6", "E2", "C7", "D4"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B7",
"breathing": true
},
+ "ws2812": {
+ "pin": "F7"
+ },
"indicators": {
"caps_lock": "B6",
"num_lock": "C6",
@@ -22,143 +30,167 @@
"layouts": {
"LAYOUT_alice_split_bs": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"~", "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":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":"+", "x":15.25, "y":0},
- {"label":"Backspace", "x":16.25, "y":0},
- {"label":"Del", "x":17.25, "y":0},
- {"label":"Mute", "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":9.75, "y":1},
- {"label":"U", "x":10.75, "y":1},
- {"label":"I", "x":11.75, "y":1},
- {"label":"O", "x":12.75, "y":1},
- {"label":"P", "x":13.75, "y":1},
- {"label":"{", "x":14.75, "y":1},
- {"label":"}", "x":15.75, "y":1},
- {"label":"|", "x":16.75, "y":1, "w":1.5},
- {"label":"Vol-", "x":0, "y":2},
- {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75},
- {"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":10, "y":2},
- {"label":"J", "x":11, "y":2},
- {"label":"K", "x":12, "y":2},
- {"label":"L", "x":13, "y":2},
- {"label":":", "x":14, "y":2},
- {"label":"\"", "x":15, "y":2},
- {"label":"Enter", "x":16, "y":2, "w":2.25},
- {"label":"Vol+", "x":0, "y":3},
- {"label":"Shift", "x":1.25, "y":3, "w":2.25},
- {"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":"B", "x":9.5, "y":3},
- {"label":"N", "x":10.5, "y":3},
- {"label":"M", "x":11.5, "y":3},
- {"label":"<", "x":12.5, "y":3},
- {"label":">", "x":13.5, "y":3},
- {"label":"?", "x":14.5, "y":3},
- {"label":"Shift", "x":15.5, "y":3, "w":1.75},
- {"label":"Win", "x":17.25, "y":3},
- {"label":"Ctrl", "x":1.25, "y":4, "w":1.5},
- {"label":"Alt", "x":4.25, "y":4, "w":1.25},
- {"label":"Space", "x":5.5, "y":4, "w":2.25},
- {"label":"FN", "x":7.75, "y":4, "w":1.25},
- {"label":"Space", "x":9.5, "y":4, "w":2.75},
- {"label":"Alt", "x":12.25, "y":4, "w":1.5},
- {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}
+ {"matrix": [0, 2], "x": 0, "y": 0},
+
+ {"matrix": [1, 0], "x": 1.25, "y": 0},
+ {"matrix": [1, 1], "x": 2.25, "y": 0},
+ {"matrix": [1, 2], "x": 3.25, "y": 0},
+ {"matrix": [1, 3], "x": 4.25, "y": 0},
+ {"matrix": [1, 4], "x": 5.25, "y": 0},
+ {"matrix": [1, 5], "x": 6.25, "y": 0},
+ {"matrix": [0, 5], "x": 7.25, "y": 0},
+
+ {"matrix": [0, 6], "x": 10.25, "y": 0},
+ {"matrix": [1, 6], "x": 11.25, "y": 0},
+ {"matrix": [1, 7], "x": 12.25, "y": 0},
+ {"matrix": [1, 8], "x": 13.25, "y": 0},
+ {"matrix": [1, 9], "x": 14.25, "y": 0},
+ {"matrix": [1, 10], "x": 15.25, "y": 0},
+ {"matrix": [1, 11], "x": 16.25, "y": 0},
+ {"matrix": [1, 12], "x": 17.25, "y": 0},
+
+ {"matrix": [0, 1], "x": 0, "y": 1},
+
+ {"matrix": [2, 0], "x": 1.25, "y": 1, "w": 1.5},
+ {"matrix": [2, 1], "x": 2.75, "y": 1},
+ {"matrix": [2, 2], "x": 3.75, "y": 1},
+ {"matrix": [2, 3], "x": 4.75, "y": 1},
+ {"matrix": [2, 4], "x": 5.75, "y": 1},
+ {"matrix": [2, 5], "x": 6.75, "y": 1},
+ {"matrix": [0, 7], "x": 9.75, "y": 1},
+
+ {"matrix": [2, 6], "x": 10.75, "y": 1},
+ {"matrix": [2, 7], "x": 11.75, "y": 1},
+ {"matrix": [2, 8], "x": 12.75, "y": 1},
+ {"matrix": [2, 9], "x": 13.75, "y": 1},
+ {"matrix": [2, 10], "x": 14.75, "y": 1},
+ {"matrix": [2, 11], "x": 15.75, "y": 1},
+ {"matrix": [2, 12], "x": 16.75, "y": 1, "w": 1.5},
+
+ {"matrix": [0, 0], "x": 0, "y": 2},
+
+ {"matrix": [3, 0], "x": 1.25, "y": 2, "w": 1.75},
+ {"matrix": [3, 1], "x": 3, "y": 2},
+ {"matrix": [3, 2], "x": 4, "y": 2},
+ {"matrix": [3, 3], "x": 5, "y": 2},
+ {"matrix": [3, 4], "x": 6, "y": 2},
+ {"matrix": [3, 5], "x": 7, "y": 2},
+
+ {"matrix": [3, 6], "x": 10, "y": 2},
+ {"matrix": [3, 7], "x": 11, "y": 2},
+ {"matrix": [3, 8], "x": 12, "y": 2},
+ {"matrix": [3, 9], "x": 13, "y": 2},
+ {"matrix": [3, 10], "x": 14, "y": 2},
+ {"matrix": [3, 11], "x": 15, "y": 2},
+ {"matrix": [3, 12], "x": 16, "y": 2, "w": 2.25},
+
+ {"matrix": [0, 3], "x": 0, "y": 3},
+
+ {"matrix": [4, 0], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [4, 1], "x": 3.5, "y": 3},
+ {"matrix": [4, 2], "x": 4.5, "y": 3},
+ {"matrix": [4, 3], "x": 5.5, "y": 3},
+ {"matrix": [4, 4], "x": 6.5, "y": 3},
+ {"matrix": [4, 5], "x": 7.5, "y": 3},
+
+ {"matrix": [4, 6], "x": 9.5, "y": 3},
+ {"matrix": [4, 7], "x": 10.5, "y": 3},
+ {"matrix": [4, 8], "x": 11.5, "y": 3},
+ {"matrix": [4, 9], "x": 12.5, "y": 3},
+ {"matrix": [4, 10], "x": 13.5, "y": 3},
+ {"matrix": [4, 11], "x": 14.5, "y": 3},
+ {"matrix": [5, 11], "x": 15.5, "y": 3, "w": 1.75},
+ {"matrix": [4, 12], "x": 17.25, "y": 3},
+
+ {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.5},
+ {"matrix": [5, 2], "x": 4.25, "y": 4, "w": 1.25},
+ {"matrix": [5, 3], "x": 5.5, "y": 4, "w": 2.25},
+ {"matrix": [5, 5], "x": 7.75, "y": 4, "w": 1.25},
+ {"matrix": [5, 7], "x": 9.5, "y": 4, "w": 2.75},
+ {"matrix": [5, 9], "x": 12.25, "y": 4, "w": 1.5},
+ {"matrix": [5, 12], "x": 16.75, "y": 4, "w": 1.5}
]
},
"LAYOUT_alice": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"~", "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":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":"+", "x":15.25, "y":0},
- {"label":"Backspace", "x":16.25, "y":0, "w":2},
- {"label":"Mute", "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":9.75, "y":1},
- {"label":"U", "x":10.75, "y":1},
- {"label":"I", "x":11.75, "y":1},
- {"label":"O", "x":12.75, "y":1},
- {"label":"P", "x":13.75, "y":1},
- {"label":"{", "x":14.75, "y":1},
- {"label":"}", "x":15.75, "y":1},
- {"label":"|", "x":16.75, "y":1, "w":1.5},
- {"label":"Vol-", "x":0, "y":2},
- {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75},
- {"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":10, "y":2},
- {"label":"J", "x":11, "y":2},
- {"label":"K", "x":12, "y":2},
- {"label":"L", "x":13, "y":2},
- {"label":":", "x":14, "y":2},
- {"label":"\"", "x":15, "y":2},
- {"label":"Enter", "x":16, "y":2, "w":2.25},
- {"label":"Vol+", "x":0, "y":3},
- {"label":"Shift", "x":1.25, "y":3, "w":2.25},
- {"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":"B", "x":9.5, "y":3},
- {"label":"N", "x":10.5, "y":3},
- {"label":"M", "x":11.5, "y":3},
- {"label":"<", "x":12.5, "y":3},
- {"label":">", "x":13.5, "y":3},
- {"label":"?", "x":14.5, "y":3},
- {"label":"Shift", "x":15.5, "y":3, "w":1.75},
- {"label":"Win", "x":17.25, "y":3},
- {"label":"Ctrl", "x":1.25, "y":4, "w":1.5},
- {"label":"Alt", "x":4.25, "y":4, "w":1.25},
- {"label":"Space", "x":5.5, "y":4, "w":2.25},
- {"label":"FN", "x":7.75, "y":4, "w":1.25},
- {"label":"Space", "x":9.5, "y":4, "w":2.75},
- {"label":"Alt", "x":12.25, "y":4, "w":1.5},
- {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}
+ {"matrix": [0, 2], "x": 0, "y": 0},
+
+ {"matrix": [1, 0], "x": 1.25, "y": 0},
+ {"matrix": [1, 1], "x": 2.25, "y": 0},
+ {"matrix": [1, 2], "x": 3.25, "y": 0},
+ {"matrix": [1, 3], "x": 4.25, "y": 0},
+ {"matrix": [1, 4], "x": 5.25, "y": 0},
+ {"matrix": [1, 5], "x": 6.25, "y": 0},
+ {"matrix": [0, 5], "x": 7.25, "y": 0},
+
+ {"matrix": [0, 6], "x": 10.25, "y": 0},
+ {"matrix": [1, 6], "x": 11.25, "y": 0},
+ {"matrix": [1, 7], "x": 12.25, "y": 0},
+ {"matrix": [1, 8], "x": 13.25, "y": 0},
+ {"matrix": [1, 9], "x": 14.25, "y": 0},
+ {"matrix": [1, 10], "x": 15.25, "y": 0},
+ {"matrix": [1, 11], "x": 16.25, "y": 0, "w": 2},
+
+ {"matrix": [0, 1], "x": 0, "y": 1},
+
+ {"matrix": [2, 0], "x": 1.25, "y": 1, "w": 1.5},
+ {"matrix": [2, 1], "x": 2.75, "y": 1},
+ {"matrix": [2, 2], "x": 3.75, "y": 1},
+ {"matrix": [2, 3], "x": 4.75, "y": 1},
+ {"matrix": [2, 4], "x": 5.75, "y": 1},
+ {"matrix": [2, 5], "x": 6.75, "y": 1},
+
+ {"matrix": [0, 7], "x": 9.75, "y": 1},
+ {"matrix": [2, 6], "x": 10.75, "y": 1},
+ {"matrix": [2, 7], "x": 11.75, "y": 1},
+ {"matrix": [2, 8], "x": 12.75, "y": 1},
+ {"matrix": [2, 9], "x": 13.75, "y": 1},
+ {"matrix": [2, 10], "x": 14.75, "y": 1},
+ {"matrix": [2, 11], "x": 15.75, "y": 1},
+ {"matrix": [2, 12], "x": 16.75, "y": 1, "w": 1.5},
+
+ {"matrix": [0, 0], "x": 0, "y": 2},
+
+ {"matrix": [3, 0], "x": 1.25, "y": 2, "w": 1.75},
+ {"matrix": [3, 1], "x": 3, "y": 2},
+ {"matrix": [3, 2], "x": 4, "y": 2},
+ {"matrix": [3, 3], "x": 5, "y": 2},
+ {"matrix": [3, 4], "x": 6, "y": 2},
+ {"matrix": [3, 5], "x": 7, "y": 2},
+
+ {"matrix": [3, 6], "x": 10, "y": 2},
+ {"matrix": [3, 7], "x": 11, "y": 2},
+ {"matrix": [3, 8], "x": 12, "y": 2},
+ {"matrix": [3, 9], "x": 13, "y": 2},
+ {"matrix": [3, 10], "x": 14, "y": 2},
+ {"matrix": [3, 11], "x": 15, "y": 2},
+ {"matrix": [3, 12], "x": 16, "y": 2, "w": 2.25},
+
+ {"matrix": [0, 3], "x": 0, "y": 3},
+
+ {"matrix": [4, 0], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [4, 1], "x": 3.5, "y": 3},
+ {"matrix": [4, 2], "x": 4.5, "y": 3},
+ {"matrix": [4, 3], "x": 5.5, "y": 3},
+ {"matrix": [4, 4], "x": 6.5, "y": 3},
+ {"matrix": [4, 5], "x": 7.5, "y": 3},
+
+ {"matrix": [4, 6], "x": 9.5, "y": 3},
+ {"matrix": [4, 7], "x": 10.5, "y": 3},
+ {"matrix": [4, 8], "x": 11.5, "y": 3},
+ {"matrix": [4, 9], "x": 12.5, "y": 3},
+ {"matrix": [4, 10], "x": 13.5, "y": 3},
+ {"matrix": [4, 11], "x": 14.5, "y": 3},
+ {"matrix": [5, 11], "x": 15.5, "y": 3, "w": 1.75},
+ {"matrix": [4, 12], "x": 17.25, "y": 3},
+
+ {"matrix": [5, 0], "x": 1.25, "y": 4, "w": 1.5},
+ {"matrix": [5, 2], "x": 4.25, "y": 4, "w": 1.25},
+ {"matrix": [5, 3], "x": 5.5, "y": 4, "w": 2.25},
+ {"matrix": [5, 5], "x": 7.75, "y": 4, "w": 1.25},
+ {"matrix": [5, 7], "x": 9.5, "y": 4, "w": 2.75},
+ {"matrix": [5, 9], "x": 12.25, "y": 4, "w": 1.5},
+ {"matrix": [5, 12], "x": 16.75, "y": 4, "w": 1.5}
]
}
}
diff --git a/keyboards/kiwikey/wanderland/wanderland.c b/keyboards/kiwikey/wanderland/wanderland.c
deleted file mode 100644
index 33575e17a6..0000000000
--- a/keyboards/kiwikey/wanderland/wanderland.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 KiwiKey
- *
- * 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 "wanderland.h"
diff --git a/keyboards/kiwikey/wanderland/wanderland.h b/keyboards/kiwikey/wanderland/wanderland.h
deleted file mode 100644
index f207d01d6c..0000000000
--- a/keyboards/kiwikey/wanderland/wanderland.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright 2021 KiwiKey
- *
- * 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"
-
-/* Layout Alice split-backspace
- * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┐
- * │02 │ │10 │11 │12 │13 │14 │15 │05 │ │06 │16 │17 │18 │19 │1A │1B │1C │
- * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │01 │ │ 20 │21 │22 │23 │24 │25 │ │07 │26 │27 │28 │29 │2A │2B │ 2C │
- * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │00 │ │ 30 │31 │32 │33 │34 │35 │ │36 │37 │38 │39 │3A │3B │ 3C │
- * ├───┤ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
- * │03 │ │ 40 │41 │42 │43 │44 │45 │ │46 │47 │48 │49 │4A │4B │ 5B │4C │
- * └───┘ ├──────┬─┴──┬┴───┴┬──┴───┴┬──┴─┐ ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤
- * │ 50 │ │ 52 │ 53 │ 55 │ │ 57 │ 59 │ │ 5C │
- * └──────┘ └─────┴───────┴────┘ └──────────┴─────┘ └─────┘
- */
-#define LAYOUT_alice_split_bs( \
- k02, k10, k11, k12, k13, k14, k15, k05, k06, k16, k17, k18, k19, k1A, k1B, k1C, \
- k01, k20, k21, k22, k23, k24, k25, k07, k26, k27, k28, k29, k2A, k2B, k2C, \
- k00, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, \
- k03, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k5B, k4C, \
- k50, k52, k53, k55, k57, k59, k5C \
-) \
-{ \
- { k00, k01, k02, k03, KC_NO, k05, k06, k07, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C }, \
- { k50, KC_NO, k52, k53, KC_NO, k55, KC_NO, k57, KC_NO, k59, KC_NO, k5B, k5C } \
-}
-
-/* Layout Alice
- * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───────┐
- * │02 │ │10 │11 │12 │13 │14 │15 │05 │ │06 │16 │17 │18 │19 │1A │ 1B │
- * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │01 │ │ 20 │21 │22 │23 │24 │25 │ │07 │26 │27 │28 │29 │2A │2B │ 2C │
- * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │00 │ │ 30 │31 │32 │33 │34 │35 │ │36 │37 │38 │39 │3A │3B │ 3C │
- * ├───┤ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
- * │03 │ │ 40 │41 │42 │43 │44 │45 │ │46 │47 │48 │49 │4A │4B │ 5B │4C │
- * └───┘ ├──────┬─┴──┬┴───┴┬──┴───┴┬──┴─┐ ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤
- * │ 50 │ │ 52 │ 53 │ 55 │ │ 57 │ 59 │ │ 5C │
- * └──────┘ └─────┴───────┴────┘ └──────────┴─────┘ └─────┘
- */
-#define LAYOUT_alice( \
- k02, k10, k11, k12, k13, k14, k15, k05, k06, k16, k17, k18, k19, k1A, k1B, \
- k01, k20, k21, k22, k23, k24, k25, k07, k26, k27, k28, k29, k2A, k2B, k2C, \
- k00, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, \
- k03, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k5B, k4C, \
- k50, k52, k53, k55, k57, k59, k5C \
-) \
-{ \
- { k00, k01, k02, k03, KC_NO, k05, k06, k07, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, KC_NO }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C }, \
- { k50, KC_NO, k52, k53, KC_NO, k55, KC_NO, k57, KC_NO, k59, KC_NO, k5B, k5C } \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 00:14:48 +0000