summaryrefslogtreecommitdiff
path: root/keyboards/4pplet
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/4pplet')
-rw-r--r--keyboards/4pplet/aekiso60/rev_a/config.h9
-rw-r--r--keyboards/4pplet/aekiso60/rev_a/info.json8
-rw-r--r--keyboards/4pplet/aekiso60/rev_b/config.h10
-rw-r--r--keyboards/4pplet/aekiso60/rev_b/info.json8
-rw-r--r--keyboards/4pplet/bootleg/rev_a/config.h25
-rw-r--r--keyboards/4pplet/bootleg/rev_a/info.json5
-rw-r--r--keyboards/4pplet/eagle_viper_rep/rev_a/config.h5
-rw-r--r--keyboards/4pplet/eagle_viper_rep/rev_a/info.json9
-rw-r--r--keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk1
-rw-r--r--keyboards/4pplet/eagle_viper_rep/rev_b/config.h5
-rw-r--r--keyboards/4pplet/eagle_viper_rep/rev_b/info.json82
-rw-r--r--keyboards/4pplet/eagle_viper_rep/rev_b/rev_b.h20
-rw-r--r--keyboards/4pplet/perk60_iso/rev_a/config.h4
-rw-r--r--keyboards/4pplet/perk60_iso/rev_a/info.json77
-rw-r--r--keyboards/4pplet/perk60_iso/rev_a/rev_a.h20
-rw-r--r--keyboards/4pplet/perk60_iso/rev_a/rules.mk1
-rw-r--r--keyboards/4pplet/steezy60/rev_a/info.json8
-rw-r--r--keyboards/4pplet/steezy60/rev_b/info.json4
-rw-r--r--keyboards/4pplet/unextended_std/rev_a/info.json4
-rw-r--r--keyboards/4pplet/waffling60/rev_a/config.h26
-rw-r--r--keyboards/4pplet/waffling60/rev_a/info.json78
-rw-r--r--keyboards/4pplet/waffling60/rev_a/rev_a.c17
-rw-r--r--keyboards/4pplet/waffling60/rev_a/rev_a.h36
-rw-r--r--keyboards/4pplet/waffling60/rev_b/config.h10
-rw-r--r--keyboards/4pplet/waffling60/rev_b/info.json81
-rw-r--r--keyboards/4pplet/waffling60/rev_b/rev_b.h15
-rw-r--r--keyboards/4pplet/waffling60/rev_c/config.h10
-rw-r--r--keyboards/4pplet/waffling60/rev_c/info.json81
-rw-r--r--keyboards/4pplet/waffling60/rev_c/rev_c.h15
-rw-r--r--keyboards/4pplet/waffling60/rev_d/config.h10
-rw-r--r--keyboards/4pplet/waffling60/rev_d/info.json82
-rw-r--r--keyboards/4pplet/waffling60/rev_d/rev_d.h15
-rw-r--r--keyboards/4pplet/waffling60/rev_d_ansi/config.h26
-rw-r--r--keyboards/4pplet/waffling60/rev_d_ansi/info.json76
-rw-r--r--keyboards/4pplet/waffling60/rev_d_ansi/rev_d_ansi.c17
-rw-r--r--keyboards/4pplet/waffling60/rev_d_ansi/rev_d_ansi.h35
-rw-r--r--keyboards/4pplet/waffling60/rev_d_iso/config.h26
-rw-r--r--keyboards/4pplet/waffling60/rev_d_iso/info.json77
-rw-r--r--keyboards/4pplet/waffling60/rev_d_iso/rev_d_iso.c17
-rw-r--r--keyboards/4pplet/waffling60/rev_d_iso/rev_d_iso.h35
-rw-r--r--keyboards/4pplet/waffling80/rev_a/config.h9
-rw-r--r--keyboards/4pplet/waffling80/rev_a/info.json123
-rw-r--r--keyboards/4pplet/waffling80/rev_a/rev_a.h24
-rw-r--r--keyboards/4pplet/waffling80/rev_b/config.h9
-rw-r--r--keyboards/4pplet/waffling80/rev_b/info.json123
-rw-r--r--keyboards/4pplet/waffling80/rev_b/rev_b.h24
-rw-r--r--keyboards/4pplet/yakiimo/rev_a/config.h4
-rw-r--r--keyboards/4pplet/yakiimo/rev_a/info.json541
-rw-r--r--keyboards/4pplet/yakiimo/rev_a/matrix_diagram.md27
-rw-r--r--keyboards/4pplet/yakiimo/rev_a/rev_a.c17
-rw-r--r--keyboards/4pplet/yakiimo/rev_a/rev_a.h42
51 files changed, 1480 insertions, 553 deletions
diff --git a/keyboards/4pplet/aekiso60/rev_a/config.h b/keyboards/4pplet/aekiso60/rev_a/config.h
index f7ef22d986..4ec3391a61 100644
--- a/keyboards/4pplet/aekiso60/rev_a/config.h
+++ b/keyboards/4pplet/aekiso60/rev_a/config.h
@@ -1,14 +1,5 @@
#pragma once
-
-// ROWS: Top to bottom, COLS: Left to right
-#define MATRIX_ROW_PINS {C2,D0,B0,C7,C5}
-#define MATRIX_COL_PINS {C4,C6,B7,B6,B5,B4,B3,B2,B1,D6,D5,D4,D2,D1}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
#define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/4pplet/aekiso60/rev_a/info.json b/keyboards/4pplet/aekiso60/rev_a/info.json
index 18d86678d0..cbcf0f5997 100644
--- a/keyboards/4pplet/aekiso60/rev_a/info.json
+++ b/keyboards/4pplet/aekiso60/rev_a/info.json
@@ -4,6 +4,14 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "D3"
+ },
+ "matrix_pins": {
+ "cols": ["C4", "C6", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D6", "D5", "D4", "D2", "D1"],
+ "rows": ["C2", "D0", "B0", "C7", "C5"]
+ },
+ "diode_direction": "COL2ROW",
"qmk_lufa_bootloader": {
"esc_input": "C2",
"esc_output": "C4"
diff --git a/keyboards/4pplet/aekiso60/rev_b/config.h b/keyboards/4pplet/aekiso60/rev_b/config.h
index b5602b1cc0..e6f7c748a5 100644
--- a/keyboards/4pplet/aekiso60/rev_b/config.h
+++ b/keyboards/4pplet/aekiso60/rev_b/config.h
@@ -16,18 +16,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS {B15,A9,B7,A1,A2}
-#define MATRIX_COL_PINS {A3,A4,F1,F0,C15,C14,C13,B9,B8,B6,B5,B4,B3,A15}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define RGBLED_NUM 12
#define WS2812_EXTERNAL_PULLUP
-#define RGB_DI_PIN A8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/4pplet/aekiso60/rev_b/info.json b/keyboards/4pplet/aekiso60/rev_b/info.json
index 9f9f8bba8e..4e218f9365 100644
--- a/keyboards/4pplet/aekiso60/rev_b/info.json
+++ b/keyboards/4pplet/aekiso60/rev_b/info.json
@@ -4,6 +4,14 @@
"pid": "0x0011",
"device_version": "0.0.2"
},
+ "ws2812": {
+ "pin": "A8"
+ },
+ "matrix_pins": {
+ "cols": ["A3", "A4", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B6", "B5", "B4", "B3", "A15"],
+ "rows": ["B15", "A9", "B7", "A1", "A2"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "A10"
},
diff --git a/keyboards/4pplet/bootleg/rev_a/config.h b/keyboards/4pplet/bootleg/rev_a/config.h
deleted file mode 100644
index b1743d0982..0000000000
--- a/keyboards/4pplet/bootleg/rev_a/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-Copyright 2020 Stefan Sundin "4pplet" <4pplet@protonmail.com>
-
-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
-
-
-// ROWS: Top to bottom, COLS: Left to right
-#define MATRIX_ROW_PINS {D0,C2,C4,D4,D2}
-#define MATRIX_COL_PINS {C5,C6,C7,B7,B6,B5,B4,B3,B2,B1,B0,D6,D5,D3,D1}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/4pplet/bootleg/rev_a/info.json b/keyboards/4pplet/bootleg/rev_a/info.json
index 4f38932290..f149126a17 100644
--- a/keyboards/4pplet/bootleg/rev_a/info.json
+++ b/keyboards/4pplet/bootleg/rev_a/info.json
@@ -8,6 +8,11 @@
"pid": "0x0004",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["C5", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "D6", "D5", "D3", "D1"],
+ "rows": ["D0", "C2", "C4", "D4", "D2"]
+ },
+ "diode_direction": "COL2ROW",
"qmk_lufa_bootloader": {
"esc_input": "D0",
"esc_output": "C4"
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h
index 3d480a1e93..6114950220 100644
--- a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h
+++ b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h
@@ -16,16 +16,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-#define MATRIX_COL_PINS { A0, B1, B0, A4, B5, B4, B3 }
-#define MATRIX_ROW_PINS { A2, A1, B8, A10, C15, A15, B7, B6, C14, C13}
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD2
#define BACKLIGHT_PWM_CHANNEL 4
#define BACKLIGHT_PAL_MODE 2
/* Underglow */
-#define RGB_DI_PIN A7
#define WS2812_SPI SPID1
#define WS2812_SPI_MOSI_PAL_MODE 0
#define WS2812_SPI_SCK_PIN A5
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/info.json b/keyboards/4pplet/eagle_viper_rep/rev_a/info.json
index 57f7e3469e..f0023534ad 100644
--- a/keyboards/4pplet/eagle_viper_rep/rev_a/info.json
+++ b/keyboards/4pplet/eagle_viper_rep/rev_a/info.json
@@ -8,11 +8,20 @@
"pid": "0x0007",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["A0", "B1", "B0", "A4", "B5", "B4", "B3"],
+ "rows": ["A2", "A1", "B8", "A10", "C15", "A15", "B7", "B6", "C14", "C13"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "A3",
"levels": 10,
"breathing": true
},
+ "ws2812": {
+ "pin": "A7",
+ "driver": "spi"
+ },
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"layouts": {
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk b/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk
index 8b5bef208b..4e3e37ff3d 100644
--- a/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk
+++ b/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk
@@ -9,7 +9,6 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = yes
RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = spi
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -p FFFF -v FFFF
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h
index eed3b708c4..7c8c8a8cf2 100644
--- a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h
+++ b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h
@@ -16,10 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-#define MATRIX_COL_PINS { A0, A3, A4, A7, B5, B4, B3 }
-#define MATRIX_ROW_PINS { A2, A1, B8, A10, C15, A15, B7, B6, C14, C13}
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1
@@ -27,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Underglow */
#define RGBLED_NUM 16
#define WS2812_EXTERNAL_PULLUP
-#define RGB_DI_PIN A8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/info.json b/keyboards/4pplet/eagle_viper_rep/rev_b/info.json
index 7ced2cf40c..9fa3ab5d41 100644
--- a/keyboards/4pplet/eagle_viper_rep/rev_b/info.json
+++ b/keyboards/4pplet/eagle_viper_rep/rev_b/info.json
@@ -8,6 +8,11 @@
"pid": "0x0010",
"device_version": "0.0.2"
},
+ "matrix_pins": {
+ "cols": ["A0", "A3", "A4", "A7", "B5", "B4", "B3"],
+ "rows": ["A2", "A1", "B8", "A10", "C15", "A15", "B7", "B6", "C14", "C13"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "A6",
"levels": 6,
@@ -18,11 +23,86 @@
"num_lock": "B12",
"scroll_lock": "B13"
},
+ "ws2812": {
+ "pin": "A8"
+ },
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"layouts": {
"LAYOUT": {
- "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"1,0", "x":1, "y":0}, {"label":"0,1", "x":2, "y":0}, {"label":"1,1", "x":3, "y":0}, {"label":"0,2", "x":4, "y":0}, {"label":"1,2", "x":5, "y":0}, {"label":"0,3", "x":6, "y":0}, {"label":"1,3", "x":7, "y":0}, {"label":"0,4", "x":8, "y":0}, {"label":"1,4", "x":9, "y":0}, {"label":"0,5", "x":10, "y":0}, {"label":"1,5", "x":11, "y":0}, {"label":"0,6", "x":12, "y":0}, {"label":"1,6", "x":13, "y":0}, {"label":"3,6", "x":14, "y":0}, {"label":"2,0", "x":0, "y":1, "w":1.5}, {"label":"3,0", "x":1.5, "y":1}, {"label":"2,1", "x":2.5, "y":1}, {"label":"3,1", "x":3.5, "y":1}, {"label":"2,2", "x":4.5, "y":1}, {"label":"3,2", "x":5.5, "y":1}, {"label":"2,3", "x":6.5, "y":1}, {"label":"3,3", "x":7.5, "y":1}, {"label":"2,4", "x":8.5, "y":1}, {"label":"3,4", "x":9.5, "y":1}, {"label":"2,5", "x":10.5, "y":1}, {"label":"3,5", "x":11.5, "y":1}, {"label":"2,6", "x":12.5, "y":1}, {"label":"5,6", "x":13.5, "y":1, "w":1.5}, {"label":"4,0", "x":0, "y":2, "w":1.75}, {"label":"5,0", "x":1.75, "y":2}, {"label":"4,1", "x":2.75, "y":2}, {"label":"5,1", "x":3.75, "y":2}, {"label":"4,2", "x":4.75, "y":2}, {"label":"5,2", "x":5.75, "y":2}, {"label":"4,3", "x":6.75, "y":2}, {"label":"5,3", "x":7.75, "y":2}, {"label":"4,4", "x":8.75, "y":2}, {"label":"5,4", "x":9.75, "y":2}, {"label":"4,5", "x":10.75, "y":2}, {"label":"5,5", "x":11.75, "y":2}, {"label":"4,6", "x":12.75, "y":2}, {"label":"7,6", "x":13.75, "y":2, "w":1.25}, {"label":"6,0", "x":0, "y":3, "w":1.25}, {"label":"7,0", "x":1.25, "y":3}, {"label":"6,1", "x":2.25, "y":3}, {"label":"7,1", "x":3.25, "y":3}, {"label":"6,2", "x":4.25, "y":3}, {"label":"7,2", "x":5.25, "y":3}, {"label":"6,3", "x":6.25, "y":3}, {"label":"7,3", "x":7.25, "y":3}, {"label":"6,4", "x":8.25, "y":3}, {"label":"7,4", "x":9.25, "y":3}, {"label":"6,5", "x":10.25, "y":3}, {"label":"7,5", "x":11.25, "y":3}, {"label":"6,6", "x":12.25, "y":3, "w":1.75}, {"label":"9,6", "x":14, "y":3}, {"label":"8,0", "x":0, "y":4, "w":1.25}, {"label":"9,0", "x":1.25, "y":4, "w":1.25}, {"label":"9,1", "x":2.5, "y":4, "w":1.25}, {"label":"9,2", "x":3.75, "y":4, "w":2.25}, {"label":"9,3", "x":6, "y":4, "w":1.25}, {"label":"9,4", "x":10, "y":4, "w":1.25}, {"label":"8,5", "x":11.25, "y":4, "w":1.25}, {"label":"9,5", "x":12.5, "y":4, "w":1.25}, {"label":"8,6", "x":13.75, "y":4, "w":1.25}, {"label":"8,4", "x":7, "y":9, "w":2.75}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+ {"matrix": [0, 3], "x": 6, "y": 0},
+ {"matrix": [1, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [1, 4], "x": 9, "y": 0},
+ {"matrix": [0, 5], "x": 10, "y": 0},
+ {"matrix": [1, 5], "x": 11, "y": 0},
+ {"matrix": [0, 6], "x": 12, "y": 0},
+ {"matrix": [1, 6], "x": 13, "y": 0},
+ {"matrix": [3, 6], "x": 14, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [3, 0], "x": 1.5, "y": 1},
+ {"matrix": [2, 1], "x": 2.5, "y": 1},
+ {"matrix": [3, 1], "x": 3.5, "y": 1},
+ {"matrix": [2, 2], "x": 4.5, "y": 1},
+ {"matrix": [3, 2], "x": 5.5, "y": 1},
+ {"matrix": [2, 3], "x": 6.5, "y": 1},
+ {"matrix": [3, 3], "x": 7.5, "y": 1},
+ {"matrix": [2, 4], "x": 8.5, "y": 1},
+ {"matrix": [3, 4], "x": 9.5, "y": 1},
+ {"matrix": [2, 5], "x": 10.5, "y": 1},
+ {"matrix": [3, 5], "x": 11.5, "y": 1},
+ {"matrix": [2, 6], "x": 12.5, "y": 1},
+ {"matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [5, 0], "x": 1.75, "y": 2},
+ {"matrix": [4, 1], "x": 2.75, "y": 2},
+ {"matrix": [5, 1], "x": 3.75, "y": 2},
+ {"matrix": [4, 2], "x": 4.75, "y": 2},
+ {"matrix": [5, 2], "x": 5.75, "y": 2},
+ {"matrix": [4, 3], "x": 6.75, "y": 2},
+ {"matrix": [5, 3], "x": 7.75, "y": 2},
+ {"matrix": [4, 4], "x": 8.75, "y": 2},
+ {"matrix": [5, 4], "x": 9.75, "y": 2},
+ {"matrix": [4, 5], "x": 10.75, "y": 2},
+ {"matrix": [5, 5], "x": 11.75, "y": 2},
+ {"matrix": [4, 6], "x": 12.75, "y": 2},
+ {"matrix": [7, 6], "x": 13.75, "y": 2, "w": 1.25},
+
+ {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [7, 0], "x": 1.25, "y": 3},
+ {"matrix": [6, 1], "x": 2.25, "y": 3},
+ {"matrix": [7, 1], "x": 3.25, "y": 3},
+ {"matrix": [6, 2], "x": 4.25, "y": 3},
+ {"matrix": [7, 2], "x": 5.25, "y": 3},
+ {"matrix": [6, 3], "x": 6.25, "y": 3},
+ {"matrix": [7, 3], "x": 7.25, "y": 3},
+ {"matrix": [6, 4], "x": 8.25, "y": 3},
+ {"matrix": [7, 4], "x": 9.25, "y": 3},
+ {"matrix": [6, 5], "x": 10.25, "y": 3},
+ {"matrix": [7, 5], "x": 11.25, "y": 3},
+ {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [9, 6], "x": 14, "y": 3},
+
+ {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [9, 2], "x": 3.75, "y": 4, "w": 2.25},
+ {"matrix": [9, 3], "x": 6, "y": 4, "w": 1.25},
+ {"matrix": [8, 4], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [8, 5], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [9, 5], "x": 13.75, "y": 4, "w": 1.25},
+ {"matrix": [8, 6], "x": 7, "y": 9, "w": 2.75}
+ ]
}
}
}
diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/rev_b.h b/keyboards/4pplet/eagle_viper_rep/rev_b/rev_b.h
index 02dea9d1ca..7cfb11b3f3 100644
--- a/keyboards/4pplet/eagle_viper_rep/rev_b/rev_b.h
+++ b/keyboards/4pplet/eagle_viper_rep/rev_b/rev_b.h
@@ -19,23 +19,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "quantum.h"
void setLayerLed(layer_state_t state);
-
-#define LAYOUT( \
- k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k36, \
- k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k56,\
- k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k76,\
- k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k96,\
- k80, k90, k91, k92, k93, k84 ,k94, k85, k95, k86 \
-) \
-{ \
- {k00, k01, k02, k03, k04, k05, k06}, \
- {k10, k11, k12, k13, k14, k15, k16}, \
- {k20, k21, k22, k23, k24, k25, k26}, \
- {k30, k31, k32, k33, k34, k35, k36}, \
- {k40, k41, k42, k43, k44, k45, k46}, \
- {k50, k51, k52, k53, k54, k55, k56}, \
- {k60, k61, k62, k63, k64, k65, k66}, \
- {k70, k71, k72, k73, k74, k75, k76}, \
- {k80, KC_NO, KC_NO, KC_NO, k84, k85, k86}, \
- {k90, k91, k92, k93, k94, k95, k96} \
-}
diff --git a/keyboards/4pplet/perk60_iso/rev_a/config.h b/keyboards/4pplet/perk60_iso/rev_a/config.h
index 2764861e97..e033b16259 100644
--- a/keyboards/4pplet/perk60_iso/rev_a/config.h
+++ b/keyboards/4pplet/perk60_iso/rev_a/config.h
@@ -16,10 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-#define MATRIX_COL_PINS { A1, B12, B14, A2, A0, A3, A4}
-#define MATRIX_ROW_PINS { C14, C13, B5, B4, B8, A15, B3, B9, A5, A7}
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/4pplet/perk60_iso/rev_a/info.json b/keyboards/4pplet/perk60_iso/rev_a/info.json
index 07bd69f22e..e961253a23 100644
--- a/keyboards/4pplet/perk60_iso/rev_a/info.json
+++ b/keyboards/4pplet/perk60_iso/rev_a/info.json
@@ -8,12 +8,87 @@
"pid": "0x0009",
"device_version": "0.0.1"
},
+ "rgb_matrix": {
+ "driver": "IS31FL3733"
+ },
+ "matrix_pins": {
+ "cols": ["A1", "B12", "B14", "A2", "A0", "A3", "A4"],
+ "rows": ["C14", "C13", "B5", "B4", "B8", "A15", "B3", "B9", "A5", "A7"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32F411",
"bootloader": "stm32-dfu",
"community_layouts": ["60_iso"],
"layouts": {
"LAYOUT_60_iso": {
- "layout": [{"label":"\u00ac", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"\u00a3", "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":"Backspace", "x":13, "y":0, "w":2}, {"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":"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":"~", "x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"|", "x":1.25, "y":3}, {"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":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"AltGr", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+ {"matrix": [0, 3], "x": 6, "y": 0},
+ {"matrix": [1, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [1, 4], "x": 9, "y": 0},
+ {"matrix": [0, 5], "x": 10, "y": 0},
+ {"matrix": [1, 5], "x": 11, "y": 0},
+ {"matrix": [0, 6], "x": 12, "y": 0},
+ {"matrix": [3, 6], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [3, 0], "x": 1.5, "y": 1},
+ {"matrix": [2, 1], "x": 2.5, "y": 1},
+ {"matrix": [3, 1], "x": 3.5, "y": 1},
+ {"matrix": [2, 2], "x": 4.5, "y": 1},
+ {"matrix": [3, 2], "x": 5.5, "y": 1},
+ {"matrix": [2, 3], "x": 6.5, "y": 1},
+ {"matrix": [3, 3], "x": 7.5, "y": 1},
+ {"matrix": [2, 4], "x": 8.5, "y": 1},
+ {"matrix": [3, 4], "x": 9.5, "y": 1},
+ {"matrix": [2, 5], "x": 10.5, "y": 1},
+ {"matrix": [3, 5], "x": 11.5, "y": 1},
+ {"matrix": [2, 6], "x": 12.5, "y": 1},
+
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [5, 0], "x": 1.75, "y": 2},
+ {"matrix": [4, 1], "x": 2.75, "y": 2},
+ {"matrix": [5, 1], "x": 3.75, "y": 2},
+ {"matrix": [4, 2], "x": 4.75, "y": 2},
+ {"matrix": [5, 2], "x": 5.75, "y": 2},
+ {"matrix": [4, 3], "x": 6.75, "y": 2},
+ {"matrix": [5, 3], "x": 7.75, "y": 2},
+ {"matrix": [4, 4], "x": 8.75, "y": 2},
+ {"matrix": [5, 4], "x": 9.75, "y": 2},
+ {"matrix": [4, 5], "x": 10.75, "y": 2},
+ {"matrix": [5, 5], "x": 11.75, "y": 2},
+ {"matrix": [4, 6], "x": 12.75, "y": 2},
+ {"matrix": [7, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [7, 0], "x": 1.25, "y": 3},
+ {"matrix": [6, 1], "x": 2.25, "y": 3},
+ {"matrix": [7, 1], "x": 3.25, "y": 3},
+ {"matrix": [6, 2], "x": 4.25, "y": 3},
+ {"matrix": [7, 2], "x": 5.25, "y": 3},
+ {"matrix": [6, 3], "x": 6.25, "y": 3},
+ {"matrix": [7, 3], "x": 7.25, "y": 3},
+ {"matrix": [6, 4], "x": 8.25, "y": 3},
+ {"matrix": [7, 4], "x": 9.25, "y": 3},
+ {"matrix": [6, 5], "x": 10.25, "y": 3},
+ {"matrix": [7, 5], "x": 11.25, "y": 3},
+ {"matrix": [8, 6], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [9, 3], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [9, 4], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [8, 5], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [9, 5], "x": 13.75, "y": 4, "w": 1.25}
+ ]
}
}
}
diff --git a/keyboards/4pplet/perk60_iso/rev_a/rev_a.h b/keyboards/4pplet/perk60_iso/rev_a/rev_a.h
index d1cd6a35d4..2f4fa7531a 100644
--- a/keyboards/4pplet/perk60_iso/rev_a/rev_a.h
+++ b/keyboards/4pplet/perk60_iso/rev_a/rev_a.h
@@ -21,23 +21,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define CAPS_LED_GROUP LED_FLAG_INDICATOR // change what leds to target, for example LED_FLAG_KEYLIGHT for alpas or LED_FLAG_MODIFIER for modifiers
#include "quantum.h"
-
-#define LAYOUT_60_iso( \
- k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k36, \
- k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, \
- k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k76, \
- k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k86,\
- k80, k90, k81, k83, k93, k94, k85, k95 \
-) \
-{ \
- {k00, k01, k02, k03, k04, k05, k06}, \
- {k10, k11, k12, k13, k14, k15, KC_NO}, \
- {k20, k21, k22, k23, k24, k25, k26}, \
- {k30, k31, k32, k33, k34, k35, k36}, \
- {k40, k41, k42, k43, k44, k45, k46}, \
- {k50, k51, k52, k53, k54, k55, KC_NO}, \
- {k60, k61, k62, k63, k64, k65, KC_NO}, \
- {k70, k71, k72, k73, k74, k75, k76}, \
- {k80, k81, KC_NO, k83, KC_NO, k85, k86}, \
- {k90, KC_NO, KC_NO, k93, k94, k95, KC_NO} \
-}
diff --git a/keyboards/4pplet/perk60_iso/rev_a/rules.mk b/keyboards/4pplet/perk60_iso/rev_a/rules.mk
index dbdd70b907..d89fef7194 100644
--- a/keyboards/4pplet/perk60_iso/rev_a/rules.mk
+++ b/keyboards/4pplet/perk60_iso/rev_a/rules.mk
@@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3733
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/4pplet/steezy60/rev_a/info.json b/keyboards/4pplet/steezy60/rev_a/info.json
index 2125a491ca..40223b44e2 100644
--- a/keyboards/4pplet/steezy60/rev_a/info.json
+++ b/keyboards/4pplet/steezy60/rev_a/info.json
@@ -8,6 +8,10 @@
"pid": "0x0002",
"device_version": "0.0.1"
},
+ "qmk_lufa_bootloader": {
+ "esc_input": "C2",
+ "esc_output": "C4"
+ },
"processor": "atmega32u2",
"bootloader": "atmel-dfu",
"community_layouts": [
@@ -38,7 +42,6 @@
},
"rgblight": {
"led_count": 12,
- "pin": "D3",
"animations": {
"alternating": true,
"breathing": true,
@@ -52,6 +55,9 @@
"twinkle": true
}
},
+ "ws2812": {
+ "pin": "D3"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/4pplet/steezy60/rev_b/info.json b/keyboards/4pplet/steezy60/rev_b/info.json
index 6ffe02e506..6896b37844 100644
--- a/keyboards/4pplet/steezy60/rev_b/info.json
+++ b/keyboards/4pplet/steezy60/rev_b/info.json
@@ -38,7 +38,6 @@
},
"rgblight": {
"led_count": 12,
- "pin": "A8",
"animations": {
"alternating": true,
"breathing": true,
@@ -52,6 +51,9 @@
"twinkle": true
}
},
+ "ws2812": {
+ "pin": "A8"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/4pplet/unextended_std/rev_a/info.json b/keyboards/4pplet/unextended_std/rev_a/info.json
index 458439e7b7..1e88400947 100644
--- a/keyboards/4pplet/unextended_std/rev_a/info.json
+++ b/keyboards/4pplet/unextended_std/rev_a/info.json
@@ -32,8 +32,10 @@
"audio": false
},
+ "ws2812": {
+ "pin": "A8"
+ },
"rgblight": {
- "pin": "A8",
"led_count": 16,
"animations": {
"alternating": true,
diff --git a/keyboards/4pplet/waffling60/rev_a/config.h b/keyboards/4pplet/waffling60/rev_a/config.h
deleted file mode 100644
index 670c8132a1..0000000000
--- a/keyboards/4pplet/waffling60/rev_a/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
-
-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
-
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS {D4,D1,C2,C4,C7,B2}
-#define MATRIX_COL_PINS {D3,D0,D2,B6,B5,B4,B3,D6,D5,B0,B1}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/4pplet/waffling60/rev_a/info.json b/keyboards/4pplet/waffling60/rev_a/info.json
index 0b98be4876..fbd30bdd29 100644
--- a/keyboards/4pplet/waffling60/rev_a/info.json
+++ b/keyboards/4pplet/waffling60/rev_a/info.json
@@ -8,6 +8,11 @@
"pid": "0x0003",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D3", "D0", "D2", "B6", "B5", "B4", "B3", "D6", "D5", "B0", "B1"],
+ "rows": ["D4", "D1", "C2", "C4", "C7", "B2"]
+ },
+ "diode_direction": "COL2ROW",
"qmk_lufa_bootloader": {
"esc_input": "D4",
"esc_output": "D3"
@@ -16,7 +21,78 @@
"bootloader": "atmel-dfu",
"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":"~", "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":"|", "x":13.5, "y":1, "w":1.5}, {"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":"Shift", "x":0, "y":3, "w":1.25}, {"label":"ISO", "x":1.25, "y":3}, {"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":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.25}, {"x":6, "y":4, "w":1.25}, {"x":7.25, "y":4, "w":2.75}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [1, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+ {"matrix": [0, 5], "x": 6, "y": 0},
+ {"matrix": [1, 5], "x": 7, "y": 0},
+ {"matrix": [0, 6], "x": 8, "y": 0},
+ {"matrix": [0, 7], "x": 9, "y": 0},
+ {"matrix": [0, 8], "x": 10, "y": 0},
+ {"matrix": [1, 8], "x": 11, "y": 0},
+ {"matrix": [0, 9], "x": 12, "y": 0},
+ {"matrix": [0, 10], "x": 13, "y": 0},
+ {"matrix": [1, 10], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [2, 2], "x": 3.5, "y": 1},
+ {"matrix": [1, 3], "x": 4.5, "y": 1},
+ {"matrix": [1, 4], "x": 5.5, "y": 1},
+ {"matrix": [2, 5], "x": 6.5, "y": 1},
+ {"matrix": [3, 5], "x": 7.5, "y": 1},
+ {"matrix": [1, 6], "x": 8.5, "y": 1},
+ {"matrix": [1, 7], "x": 9.5, "y": 1},
+ {"matrix": [2, 8], "x": 10.5, "y": 1},
+ {"matrix": [1, 9], "x": 11.5, "y": 1},
+ {"matrix": [2, 9], "x": 12.5, "y": 1},
+ {"matrix": [2, 10], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 2},
+ {"matrix": [3, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [3, 3], "x": 4.75, "y": 2},
+ {"matrix": [2, 4], "x": 5.75, "y": 2},
+ {"matrix": [4, 5], "x": 6.75, "y": 2},
+ {"matrix": [2, 6], "x": 7.75, "y": 2},
+ {"matrix": [3, 6], "x": 8.75, "y": 2},
+ {"matrix": [2, 7], "x": 9.75, "y": 2},
+ {"matrix": [3, 8], "x": 10.75, "y": 2},
+ {"matrix": [3, 9], "x": 11.75, "y": 2},
+ {"matrix": [3, 10], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [4, 0], "x": 1.25, "y": 3},
+ {"matrix": [4, 1], "x": 2.25, "y": 3},
+ {"matrix": [4, 2], "x": 3.25, "y": 3},
+ {"matrix": [4, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [4, 4], "x": 6.25, "y": 3},
+ {"matrix": [5, 5], "x": 7.25, "y": 3},
+ {"matrix": [4, 6], "x": 8.25, "y": 3},
+ {"matrix": [3, 7], "x": 9.25, "y": 3},
+ {"matrix": [4, 7], "x": 10.25, "y": 3},
+ {"matrix": [4, 8], "x": 11.25, "y": 3},
+ {"matrix": [4, 9], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [4, 10], "x": 14, "y": 3},
+
+ {"matrix": [5, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [5, 3], "x": 3.75, "y": 4, "w": 2.25},
+ {"matrix": [5, 4], "x": 6, "y": 4, "w": 1.25},
+ {"matrix": [5, 6], "x": 7.25, "y": 4, "w": 2.75},
+ {"matrix": [5, 7], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [5, 8], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [5, 9], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [5, 10], "x": 13.75, "y": 4, "w": 1.25}
+ ]
}
}
}
diff --git a/keyboards/4pplet/waffling60/rev_a/rev_a.c b/keyboards/4pplet/waffling60/rev_a/rev_a.c
deleted file mode 100644
index dc6c727fb7..0000000000
--- a/keyboards/4pplet/waffling60/rev_a/rev_a.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
-
-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 "rev_a.h"
diff --git a/keyboards/4pplet/waffling60/rev_a/rev_a.h b/keyboards/4pplet/waffling60/rev_a/rev_a.h
deleted file mode 100644
index 92384b4840..0000000000
--- a/keyboards/4pplet/waffling60/rev_a/rev_a.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
-
-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"
-
-// k<row><col>
-#define LAYOUT( \
- k00, k01, k11, k02, k03, k04, k05, k15, k06, k07, k08, k18, k09, k0a, k1a, \
- k10, k21, k12, k22, k13, k14, k25, k35, k16, k17, k28, k19, k29, k2a, \
- k20, k31, k32, k23, k33, k24, k45, k26, k36, k27, k38, k39, k3a, \
- k30, k40, k41, k42, k43, k34, k44, k55, k46, k37, k47, k48, k49, k4a, \
- k50, k51, k52, k53, k54, k56, k57, k58, k59, k5a \
-) \
-{ \
- {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a}, \
- {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a}, \
- {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a}, \
- {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a}, \
- {k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a}, \
- {k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a} \
-}
diff --git a/keyboards/4pplet/waffling60/rev_b/config.h b/keyboards/4pplet/waffling60/rev_b/config.h
index 7c1e13ce84..2552b1e451 100644
--- a/keyboards/4pplet/waffling60/rev_b/config.h
+++ b/keyboards/4pplet/waffling60/rev_b/config.h
@@ -16,16 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS {C2,D0,B0,D6,D5}
-#define MATRIX_COL_PINS {C4,C5,D2,C6,C7,B7,B6,B5,B4,B3,B2,B1,D1,D4}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
#define RGBLED_NUM 1
#define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/4pplet/waffling60/rev_b/info.json b/keyboards/4pplet/waffling60/rev_b/info.json
index 866ae5c1ac..90fe5d02a2 100644
--- a/keyboards/4pplet/waffling60/rev_b/info.json
+++ b/keyboards/4pplet/waffling60/rev_b/info.json
@@ -8,6 +8,14 @@
"pid": "0x0005",
"device_version": "0.0.2"
},
+ "ws2812": {
+ "pin": "D3"
+ },
+ "matrix_pins": {
+ "cols": ["C4", "C5", "D2", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D1", "D4"],
+ "rows": ["C2", "D0", "B0", "D6", "D5"]
+ },
+ "diode_direction": "COL2ROW",
"qmk_lufa_bootloader": {
"esc_input": "C4",
"esc_output": "C2"
@@ -16,7 +24,78 @@
"bootloader": "atmel-dfu",
"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":"~", "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":"|", "x":13.5, "y":1, "w":1.5}, {"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":"Shift", "x":0, "y":3, "w":1.25}, {"label":"ISO", "x":1.25, "y":3}, {"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":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.25}, {"x":6, "y":4, "w":1.25}, {"x":7.25, "y":4, "w":2.75}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
+ "layout": [
+ {"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": [1, 13], "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, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"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": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"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, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "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, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.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}
+ ]
}
}
}
diff --git a/keyboards/4pplet/waffling60/rev_b/rev_b.h b/keyboards/4pplet/waffling60/rev_b/rev_b.h
index b3949012e9..57a4964202 100644
--- a/keyboards/4pplet/waffling60/rev_b/rev_b.h
+++ b/keyboards/4pplet/waffling60/rev_b/rev_b.h
@@ -20,18 +20,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define CAPS_LOCK_COLOR HSV_ORANGE
#include "quantum.h"
-
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k1d, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k2c, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
- k40, k41, k42, k44, k46, k48, k4a, k4b, k4c, k4d \
-) \
-{ \
- {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d}, \
- {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d}, \
- {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d}, \
- {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d}, \
- {k40, k41, k42, KC_NO, k44, KC_NO, k46, KC_NO, k48, KC_NO, k4a, k4b, k4c, k4d}, \
-}
diff --git a/keyboards/4pplet/waffling60/rev_c/config.h b/keyboards/4pplet/waffling60/rev_c/config.h
index 689a515013..06e5db9090 100644
--- a/keyboards/4pplet/waffling60/rev_c/config.h
+++ b/keyboards/4pplet/waffling60/rev_c/config.h
@@ -16,16 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS {C2,D0,B0,D6,D5}
-#define MATRIX_COL_PINS {C4,C5,D2,C6,C7,B7,B6,B5,B4,B3,B2,B1,D1,D4}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
#define RGBLED_NUM 1
#define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/4pplet/waffling60/rev_c/info.json b/keyboards/4pplet/waffling60/rev_c/info.json
index 1a6937b096..c33d2b0616 100644
--- a/keyboards/4pplet/waffling60/rev_c/info.json
+++ b/keyboards/4pplet/waffling60/rev_c/info.json
@@ -8,6 +8,14 @@
"pid": "0x0008",
"device_version": "0.0.3"
},
+ "matrix_pins": {
+ "cols": ["C4", "C5", "D2", "C6", "C7", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "D1", "D4"],
+ "rows": ["C2", "D0", "B0", "D6", "D5"]
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "diode_direction": "COL2ROW",
"qmk_lufa_bootloader": {
"esc_input": "C4",
"esc_output": "C2"
@@ -16,7 +24,78 @@
"bootloader": "atmel-dfu",
"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":"~", "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":"|", "x":13.5, "y":1, "w":1.5}, {"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":"Shift", "x":0, "y":3, "w":1.25}, {"label":"ISO", "x":1.25, "y":3}, {"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":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.25}, {"x":6, "y":4, "w":1.25}, {"x":7.25, "y":4, "w":2.75}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
+ "layout": [
+ {"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": [1, 13], "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, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"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": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"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, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "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, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.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}
+ ]
}
}
}
diff --git a/keyboards/4pplet/waffling60/rev_c/rev_c.h b/keyboards/4pplet/waffling60/rev_c/rev_c.h
index c57c0f29c2..641b663336 100644
--- a/keyboards/4pplet/waffling60/rev_c/rev_c.h
+++ b/keyboards/4pplet/waffling60/rev_c/rev_c.h
@@ -20,18 +20,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define CAPS_LOCK_COLOR HSV_ORANGE
#include "quantum.h"
-
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k1d, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k2c, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
- k40, k41, k42, k44, k46, k48, k4a, k4b, k4c, k4d \
-) \
-{ \
- {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d}, \
- {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d}, \
- {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d}, \
- {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d}, \
- {k40, k41, k42, KC_NO, k44, KC_NO, k46, KC_NO, k48, KC_NO, k4a, k4b, k4c, k4d}, \
-}
diff --git a/keyboards/4pplet/waffling60/rev_d/config.h b/keyboards/4pplet/waffling60/rev_d/config.h
index 05e66f6a79..2ba774712a 100644
--- a/keyboards/4pplet/waffling60/rev_d/config.h
+++ b/keyboards/4pplet/waffling60/rev_d/config.h
@@ -16,18 +16,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS {B14,A9,B6,B5,B4}
-#define MATRIX_COL_PINS {B2,A4,A3,A2,F1,F0,C15,C14,C13,B9,B8,B7,A15,B3}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define RGBLED_NUM 1
#define WS2812_EXTERNAL_PULLUP
-#define RGB_DI_PIN A8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/4pplet/waffling60/rev_d/info.json b/keyboards/4pplet/waffling60/rev_d/info.json
index 7b09f0a0d3..01aba22863 100644
--- a/keyboards/4pplet/waffling60/rev_d/info.json
+++ b/keyboards/4pplet/waffling60/rev_d/info.json
@@ -8,11 +8,91 @@
"pid": "0x000E",
"device_version": "0.0.4"
},
+ "ws2812": {
+ "pin": "A8"
+ },
+ "matrix_pins": {
+ "cols": ["B2", "A4", "A3", "A2", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "A15", "B3"],
+ "rows": ["B14", "A9", "B6", "B5", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"layouts": {
"LAYOUT": {
- "layout": [{"label":"~", "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}, {"x":13, "y":0}, {"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":"|", "x":13.5, "y":1, "w":1.5}, {"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":"ISO", "x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"ISO", "x":1.25, "y":3}, {"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":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.25}, {"x":6, "y":4, "w":1.25}, {"x":7.25, "y":4, "w":2.75}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
+ "layout": [
+ {"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, 13], "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": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"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, 12], "x": 12.75, "y": 2},
+ {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"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, "w": 1.75},
+ {"matrix": [4, 13], "x": 14, "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, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25}
+ ]
}
}
}
diff --git a/keyboards/4pplet/waffling60/rev_d/rev_d.h b/keyboards/4pplet/waffling60/rev_d/rev_d.h
index a3b75c63b6..641b663336 100644
--- a/keyboards/4pplet/waffling60/rev_d/rev_d.h
+++ b/keyboards/4pplet/waffling60/rev_d/rev_d.h
@@ -20,18 +20,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define CAPS_LOCK_COLOR HSV_ORANGE
#include "quantum.h"
-
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k2d, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k3d, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k4d, \
- k40, k41, k42, k44, k46, k48, k49, k4a, k4b, k4c \
-) \
-{ \
- {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d}, \
- {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d}, \
- {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d}, \
- {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d}, \
- {k40, k41, k42, KC_NO, k44, KC_NO, k46, KC_NO, k48, k49, k4a, k4b, k4c, k4d}, \
-}
diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/config.h b/keyboards/4pplet/waffling60/rev_d_ansi/config.h
deleted file mode 100644
index beb204bb2d..0000000000
--- a/keyboards/4pplet/waffling60/rev_d_ansi/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2022 Stefan Sundin "4pplet" <4pplet@protonmail.com>
-
-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
-
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS {B14,A9,B6,B5,B4}
-#define MATRIX_COL_PINS {B2,A4,A3,A2,F1,F0,C15,C14,C13,B9,B8,B7,A15,B3}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/info.json b/keyboards/4pplet/waffling60/rev_d_ansi/info.json
index dc3ea424bb..3969d98c42 100644
--- a/keyboards/4pplet/waffling60/rev_d_ansi/info.json
+++ b/keyboards/4pplet/waffling60/rev_d_ansi/info.json
@@ -8,11 +8,85 @@
"pid": "0x000D",
"device_version": "0.0.4"
},
+ "matrix_pins": {
+ "cols": ["B2", "A4", "A3", "A2", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "A15", "B3"],
+ "rows": ["B14", "A9", "B6", "B5", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"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":"~", "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":"|", "x":13.5, "y":1, "w":1.5}, {"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":"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":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"label":"3U", "x":4, "y":4, "w":3}, {"label":"1U", "x":7, "y":4}, {"label":"3U", "x":8, "y":4, "w":3}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Win", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}]
+ "layout": [
+ {"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": [1, 13], "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, 12], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"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": [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, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 4], "x": 4, "y": 4, "w": 3},
+ {"matrix": [4, 6], "x": 7, "y": 4},
+ {"matrix": [4, 8], "x": 8, "y": 4, "w": 3},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
}
}
}
diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/rev_d_ansi.c b/keyboards/4pplet/waffling60/rev_d_ansi/rev_d_ansi.c
deleted file mode 100644
index 2568bd5650..0000000000
--- a/keyboards/4pplet/waffling60/rev_d_ansi/rev_d_ansi.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2022 Stefan Sundin "4pplet" <4pplet@protonmail.com>
-
-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 "rev_d_ansi.h"
diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/rev_d_ansi.h b/keyboards/4pplet/waffling60/rev_d_ansi/rev_d_ansi.h
deleted file mode 100644
index aaa60a1f33..0000000000
--- a/keyboards/4pplet/waffling60/rev_d_ansi/rev_d_ansi.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2022 Stefan Sundin "4pplet" <4pplet@protonmail.com>
-
-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"
-
-// k<row><col>
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k1d, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k2c, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
- k40, k41, k42, k44, k46, k48, k4b, k4c, k4d \
-) \
-{ \
- {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d}, \
- {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d}, \
- {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d}, \
- {k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d}, \
- {k40, k41, k42, KC_NO, k44, KC_NO, k46, KC_NO, k48, KC_NO, KC_NO, k4b, k4c, k4d} \
-}
diff --git a/keyboards/4pplet/waffling60/rev_d_iso/config.h b/keyboards/4pplet/waffling60/rev_d_iso/config.h
deleted file mode 100644
index cb2e06921a..0000000000
--- a/keyboards/4pplet/waffling60/rev_d_iso/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
-
-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
-
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS {B14,A9,B6,B5,B4}
-#define MATRIX_COL_PINS {B2,A4,A3,A2,F1,F0,C15,C14,C13,B9,B8,B7,A15,B3}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/4pplet/waffling60/rev_d_iso/info.json b/keyboards/4pplet/waffling60/rev_d_iso/info.json
index 8f9c34b563..cab2fa1c07 100644
--- a/keyboards/4pplet/waffling60/rev_d_iso/info.json
+++ b/keyboards/4pplet/waffling60/rev_d_iso/info.json
@@ -8,11 +8,86 @@
"pid": "0x000C",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B2", "A4", "A3", "A2", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "A15", "B3"],
+ "rows": ["B14", "A9", "B6", "B5", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"layouts": {
"LAYOUT": {
- "layout": [{"label":"\u00ac", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"\u00a3", "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":"Backspace", "x":13, "y":0}, {"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":"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":"~", "x":12.75, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"|", "x":1.25, "y":3}, {"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}, {"x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":3}, {"x":7, "y":4}, {"x":8, "y":4, "w":3}, {"label":"Win", "x":11, "y":4, "w":1.5}, {"label":"Menu", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}]
+ "layout": [
+ {"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": [1, 13], "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": [2, 12], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"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, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 4], "x": 4, "y": 4, "w": 3},
+ {"matrix": [4, 6], "x": 7, "y": 4},
+ {"matrix": [4, 8], "x": 8, "y": 4, "w": 3},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 12], "x": 12.5, "y": 4},
+ {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5}
+ ]
}
}
}
diff --git a/keyboards/4pplet/waffling60/rev_d_iso/rev_d_iso.c b/keyboards/4pplet/waffling60/rev_d_iso/rev_d_iso.c
deleted file mode 100644
index 8efa86152e..0000000000
--- a/keyboards/4pplet/waffling60/rev_d_iso/rev_d_iso.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
-
-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 "rev_d_iso.h"
diff --git a/keyboards/4pplet/waffling60/rev_d_iso/rev_d_iso.h b/keyboards/4pplet/waffling60/rev_d_iso/rev_d_iso.h
deleted file mode 100644
index 46f0ec65ff..0000000000
--- a/keyboards/4pplet/waffling60/rev_d_iso/rev_d_iso.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
-
-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"
-
-// k<row><col>
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k1d, \
- 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, k2d, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
- k40, k41, k42, k44, k46, k48, k4b, k4c, k4d \
-) \
-{ \
- {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d}, \
- {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d}, \
- {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d}, \
- {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d}, \
- {k40, k41, k42, KC_NO, k44, KC_NO, k46, KC_NO, k48, KC_NO, KC_NO, k4b, k4c, k4d} \
-}
diff --git a/keyboards/4pplet/waffling80/rev_a/config.h b/keyboards/4pplet/waffling80/rev_a/config.h
index 8b3dc47247..e42bb68b37 100644
--- a/keyboards/4pplet/waffling80/rev_a/config.h
+++ b/keyboards/4pplet/waffling80/rev_a/config.h
@@ -16,15 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-
-// ROWS: Top to bottom, COLS: Left to right
-#define MATRIX_ROW_PINS {C4,C5,B4,B3,B1,B0,D6,D5,D3,D4,D1,D2}
-#define MATRIX_COL_PINS {C6,C7,B7,B6,B5,B2,D0,C2}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D7
#define RGBLED_NUM 2
#define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/4pplet/waffling80/rev_a/info.json b/keyboards/4pplet/waffling80/rev_a/info.json
index 13bffb7384..953b1a6ffc 100644
--- a/keyboards/4pplet/waffling80/rev_a/info.json
+++ b/keyboards/4pplet/waffling80/rev_a/info.json
@@ -8,6 +8,14 @@
"pid": "0x0006",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "D7"
+ },
+ "matrix_pins": {
+ "cols": ["C6", "C7", "B7", "B6", "B5", "B2", "D0", "C2"],
+ "rows": ["C4", "C5", "B4", "B3", "B1", "B0", "D6", "D5", "D3", "D4", "D1", "D2"]
+ },
+ "diode_direction": "COL2ROW",
"qmk_lufa_bootloader": {
"esc_input": "C4",
"esc_output": "C6"
@@ -16,7 +24,120 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_all": {
- "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"F13", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"|", "x":13, "y":1.5}, {"label":"~", "x":14, "y":1.5}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"~", "x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":3.5, "w":1.25}, {"x":15.25, "y":3.5}, {"x":17.25, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"|", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, {"label":"Fn", "x":14, "y":4.5}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":2.25}, {"x":6, "y":5.5, "w":1.25}, {"x":7.25, "y":5.5, "w":2.75}, {"label":"AltGr", "x":10, "y":5.5, "w":1.25}, {"label":"Menu", "x":11.25, "y":5.5, "w":1.25}, {"label":"Win", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [1, 0], "x": 1.25, "y": 0},
+ {"matrix": [0, 1], "x": 2.25, "y": 0},
+ {"matrix": [1, 1], "x": 3.25, "y": 0},
+ {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+ {"matrix": [1, 2], "x": 5.5, "y": 0},
+ {"matrix": [0, 3], "x": 6.5, "y": 0},
+ {"matrix": [1, 3], "x": 7.5, "y": 0},
+ {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+ {"matrix": [1, 4], "x": 9.75, "y": 0},
+ {"matrix": [0, 5], "x": 10.75, "y": 0},
+ {"matrix": [1, 5], "x": 11.75, "y": 0},
+ {"matrix": [0, 6], "x": 12.75, "y": 0},
+
+ {"matrix": [1, 6], "x": 14, "y": 0},
+
+ {"matrix": [0, 7], "x": 15.25, "y": 0},
+ {"matrix": [1, 7], "x": 16.25, "y": 0},
+ {"matrix": [3, 7], "x": 17.25, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1.5},
+ {"matrix": [3, 0], "x": 1, "y": 1.5},
+ {"matrix": [2, 1], "x": 2, "y": 1.5},
+ {"matrix": [3, 1], "x": 3, "y": 1.5},
+ {"matrix": [2, 2], "x": 4, "y": 1.5},
+ {"matrix": [3, 2], "x": 5, "y": 1.5},
+ {"matrix": [2, 3], "x": 6, "y": 1.5},
+ {"matrix": [3, 3], "x": 7, "y": 1.5},
+ {"matrix": [2, 4], "x": 8, "y": 1.5},
+ {"matrix": [3, 4], "x": 9, "y": 1.5},
+ {"matrix": [2, 5], "x": 10, "y": 1.5},
+ {"matrix": [3, 5], "x": 11, "y": 1.5},
+ {"matrix": [2, 6], "x": 12, "y": 1.5},
+ {"matrix": [3, 6], "x": 13, "y": 1.5},
+ {"matrix": [6, 7], "x": 14, "y": 1.5},
+
+ {"matrix": [2, 7], "x": 15.25, "y": 1.5},
+ {"matrix": [5, 7], "x": 16.25, "y": 1.5},
+ {"matrix": [9, 7], "x": 17.25, "y": 1.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [5, 0], "x": 1.5, "y": 2.5},
+ {"matrix": [4, 1], "x": 2.5, "y": 2.5},
+ {"matrix": [5, 1], "x": 3.5, "y": 2.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 2.5},
+ {"matrix": [5, 2], "x": 5.5, "y": 2.5},
+ {"matrix": [4, 3], "x": 6.5, "y": 2.5},
+ {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+ {"matrix": [4, 4], "x": 8.5, "y": 2.5},
+ {"matrix": [5, 4], "x": 9.5, "y": 2.5},
+ {"matrix": [4, 5], "x": 10.5, "y": 2.5},
+ {"matrix": [5, 5], "x": 11.5, "y": 2.5},
+ {"matrix": [4, 6], "x": 12.5, "y": 2.5},
+ {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"matrix": [4, 7], "x": 15.25, "y": 2.5},
+ {"matrix": [7, 7], "x": 16.25, "y": 2.5},
+ {"matrix": [11, 7], "x": 17.25, "y": 2.5},
+
+ {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [7, 0], "x": 1.75, "y": 3.5},
+ {"matrix": [6, 1], "x": 2.75, "y": 3.5},
+ {"matrix": [7, 1], "x": 3.75, "y": 3.5},
+ {"matrix": [6, 2], "x": 4.75, "y": 3.5},
+ {"matrix": [7, 2], "x": 5.75, "y": 3.5},
+ {"matrix": [6, 3], "x": 6.75, "y": 3.5},
+ {"matrix": [7, 3], "x": 7.75, "y": 3.5},
+ {"matrix": [6, 4], "x": 8.75, "y": 3.5},
+ {"matrix": [7, 4], "x": 9.75, "y": 3.5},
+ {"matrix": [6, 5], "x": 10.75, "y": 3.5},
+ {"matrix": [7, 5], "x": 11.75, "y": 3.5},
+ {"matrix": [6, 6], "x": 12.75, "y": 3.5},
+ {"matrix": [7, 6], "x": 13.75, "y": 3.5, "w": 1.25},
+
+ {"matrix": [8, 0], "x": 15.25, "y": 3.5},
+
+ {"matrix": [9, 0], "x": 17.25, "y": 3.5},
+
+ {"matrix": [8, 1], "x": 0, "y": 4.5, "w": 1.25},
+ {"matrix": [9, 1], "x": 1.25, "y": 4.5},
+ {"matrix": [8, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [9, 2], "x": 3.25, "y": 4.5},
+ {"matrix": [8, 3], "x": 4.25, "y": 4.5},
+ {"matrix": [9, 3], "x": 5.25, "y": 4.5},
+ {"matrix": [8, 4], "x": 6.25, "y": 4.5},
+ {"matrix": [9, 4], "x": 7.25, "y": 4.5},
+ {"matrix": [8, 5], "x": 8.25, "y": 4.5},
+ {"matrix": [9, 5], "x": 9.25, "y": 4.5},
+ {"matrix": [8, 6], "x": 10.25, "y": 4.5},
+ {"matrix": [9, 6], "x": 11.25, "y": 4.5},
+ {"matrix": [8, 7], "x": 12.25, "y": 4.5, "w": 1.75},
+ {"matrix": [10, 0], "x": 14, "y": 4.5},
+
+ {"matrix": [11, 1], "x": 16.25, "y": 4.5},
+
+ {"matrix": [10, 1], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [11, 2], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [10, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [11, 3], "x": 3.75, "y": 5.5, "w": 2.25},
+ {"matrix": [10, 4], "x": 6, "y": 5.5, "w": 1.25},
+ {"matrix": [11, 4], "x": 7.25, "y": 5.5, "w": 2.75},
+ {"matrix": [10, 5], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [11, 5], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [10, 6], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [11, 6], "x": 13.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [10, 7], "x": 15.25, "y": 5.5},
+ {"matrix": [11, 0], "x": 16.25, "y": 5.5},
+ {"matrix": [10, 2], "x": 17.25, "y": 5.5}
+ ]
}
}
}
diff --git a/keyboards/4pplet/waffling80/rev_a/rev_a.h b/keyboards/4pplet/waffling80/rev_a/rev_a.h
index 298a1b5a9f..c8d4c8b971 100644
--- a/keyboards/4pplet/waffling80/rev_a/rev_a.h
+++ b/keyboards/4pplet/waffling80/rev_a/rev_a.h
@@ -24,27 +24,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define SCROLL_LOCK_COLOR HSV_GREEN
#include "quantum.h"
-
-#define LAYOUT_all( \
- k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, k37, \
- k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k67, k27, k57, k97, \
- k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k77, kb7, \
- k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, \
- k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86, k96, k87, \
- ka0, kb1, ka1, kb2, ka3, kb3, ka4, kb4, ka5, kb5, ka6, kb6, ka7, \
- kb0, ka2 \
-) \
-{ \
- {k00, k01, k02, k03, k04, k05, k06, k07}, \
- {k10, k11, k12, k13, k14, k15, k16, k17}, \
- {k20, k21, k22, k23, k24, k25, k26, k27}, \
- {k30, k31, k32, k33, k34, k35, k36, k37}, \
- {k40, k41, k42, k43, k44, k45, k46, k47}, \
- {k50, k51, k52, k53, k54, k55, k56, k57}, \
- {k60, k61, k62, k63, k64, k65, k66, k67}, \
- {k70, k71, k72, k73, k74, k75, k76, k77}, \
- {k80, k81, k82, k83, k84, k85, k86, k87}, \
- {k90, k91, k92, k93, k94, k95, k96, k97}, \
- {ka0, ka1, ka2, ka3, ka4, ka5, ka6, ka7}, \
- {kb0, kb1, kb2, kb3, kb4, kb5, kb6, kb7} \
-}
diff --git a/keyboards/4pplet/waffling80/rev_b/config.h b/keyboards/4pplet/waffling80/rev_b/config.h
index c863208012..1bf561d74a 100644
--- a/keyboards/4pplet/waffling80/rev_b/config.h
+++ b/keyboards/4pplet/waffling80/rev_b/config.h
@@ -16,17 +16,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-
-// ROWS: Top to bottom, COLS: Left to right
-#define MATRIX_ROW_PINS {B13,B12,A5,A4,A2,A1,F0,C15,C13,C14,F1,A0}
-#define MATRIX_COL_PINS {B2,B1,B0,A7,A6,A3,B9,B8}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define RGBLED_NUM 2
#define WS2812_EXTERNAL_PULLUP
-#define RGB_DI_PIN A8
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/4pplet/waffling80/rev_b/info.json b/keyboards/4pplet/waffling80/rev_b/info.json
index f6a835652f..eeef974249 100644
--- a/keyboards/4pplet/waffling80/rev_b/info.json
+++ b/keyboards/4pplet/waffling80/rev_b/info.json
@@ -8,11 +8,132 @@
"pid": "0x000F",
"device_version": "0.0.2"
},
+ "ws2812": {
+ "pin": "A8"
+ },
+ "matrix_pins": {
+ "cols": ["B2", "B1", "B0", "A7", "A6", "A3", "B9", "B8"],
+ "rows": ["B13", "B12", "A5", "A4", "A2", "A1", "F0", "C15", "C13", "C14", "F1", "A0"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"layouts": {
"LAYOUT_all": {
- "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"F13", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"|", "x":13, "y":1.5}, {"label":"~", "x":14, "y":1.5}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"~", "x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":3.5, "w":1.25}, {"x":15.25, "y":3.5}, {"x":17.25, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"|", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, {"label":"Fn", "x":14, "y":4.5}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":2.25}, {"x":6, "y":5.5, "w":1.25}, {"x":7.25, "y":5.5, "w":2.75}, {"label":"AltGr", "x":10, "y":5.5, "w":1.25}, {"label":"Menu", "x":11.25, "y":5.5, "w":1.25}, {"label":"Win", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [1, 0], "x": 1.25, "y": 0},
+ {"matrix": [0, 1], "x": 2.25, "y": 0},
+ {"matrix": [1, 1], "x": 3.25, "y": 0},
+ {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+ {"matrix": [1, 2], "x": 5.5, "y": 0},
+ {"matrix": [0, 3], "x": 6.5, "y": 0},
+ {"matrix": [1, 3], "x": 7.5, "y": 0},
+ {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+ {"matrix": [1, 4], "x": 9.75, "y": 0},
+ {"matrix": [0, 5], "x": 10.75, "y": 0},
+ {"matrix": [1, 5], "x": 11.75, "y": 0},
+ {"matrix": [0, 6], "x": 12.75, "y": 0},
+
+ {"matrix": [1, 6], "x": 14, "y": 0},
+
+ {"matrix": [0, 7], "x": 15.25, "y": 0},
+ {"matrix": [1, 7], "x": 16.25, "y": 0},
+ {"matrix": [3, 7], "x": 17.25, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1.5},
+ {"matrix": [3, 0], "x": 1, "y": 1.5},
+ {"matrix": [2, 1], "x": 2, "y": 1.5},
+ {"matrix": [3, 1], "x": 3, "y": 1.5},
+ {"matrix": [2, 2], "x": 4, "y": 1.5},
+ {"matrix": [3, 2], "x": 5, "y": 1.5},
+ {"matrix": [2, 3], "x": 6, "y": 1.5},
+ {"matrix": [3, 3], "x": 7, "y": 1.5},
+ {"matrix": [2, 4], "x": 8, "y": 1.5},
+ {"matrix": [3, 4], "x": 9, "y": 1.5},
+ {"matrix": [2, 5], "x": 10, "y": 1.5},
+ {"matrix": [3, 5], "x": 11, "y": 1.5},
+ {"matrix": [2, 6], "x": 12, "y": 1.5},
+ {"matrix": [3, 6], "x": 13, "y": 1.5},
+ {"matrix": [6, 7], "x": 14, "y": 1.5},
+
+ {"matrix": [2, 7], "x": 15.25, "y": 1.5},
+ {"matrix": [5, 7], "x": 16.25, "y": 1.5},
+ {"matrix": [9, 7], "x": 17.25, "y": 1.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [5, 0], "x": 1.5, "y": 2.5},
+ {"matrix": [4, 1], "x": 2.5, "y": 2.5},
+ {"matrix": [5, 1], "x": 3.5, "y": 2.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 2.5},
+ {"matrix": [5, 2], "x": 5.5, "y": 2.5},
+ {"matrix": [4, 3], "x": 6.5, "y": 2.5},
+ {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+ {"matrix": [4, 4], "x": 8.5, "y": 2.5},
+ {"matrix": [5, 4], "x": 9.5, "y": 2.5},
+ {"matrix": [4, 5], "x": 10.5, "y": 2.5},
+ {"matrix": [5, 5], "x": 11.5, "y": 2.5},
+ {"matrix": [4, 6], "x": 12.5, "y": 2.5},
+ {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"matrix": [4, 7], "x": 15.25, "y": 2.5},
+ {"matrix": [7, 7], "x": 16.25, "y": 2.5},
+ {"matrix": [11, 7], "x": 17.25, "y": 2.5},
+
+ {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [7, 0], "x": 1.75, "y": 3.5},
+ {"matrix": [6, 1], "x": 2.75, "y": 3.5},
+ {"matrix": [7, 1], "x": 3.75, "y": 3.5},
+ {"matrix": [6, 2], "x": 4.75, "y": 3.5},
+ {"matrix": [7, 2], "x": 5.75, "y": 3.5},
+ {"matrix": [6, 3], "x": 6.75, "y": 3.5},
+ {"matrix": [7, 3], "x": 7.75, "y": 3.5},
+ {"matrix": [6, 4], "x": 8.75, "y": 3.5},
+ {"matrix": [7, 4], "x": 9.75, "y": 3.5},
+ {"matrix": [6, 5], "x": 10.75, "y": 3.5},
+ {"matrix": [7, 5], "x": 11.75, "y": 3.5},
+ {"matrix": [6, 6], "x": 12.75, "y": 3.5},
+ {"matrix": [7, 6], "x": 13.75, "y": 3.5, "w": 1.25},
+
+ {"matrix": [8, 0], "x": 15.25, "y": 3.5},
+
+ {"matrix": [9, 0], "x": 17.25, "y": 3.5},
+
+ {"matrix": [8, 1], "x": 0, "y": 4.5, "w": 1.25},
+ {"matrix": [9, 1], "x": 1.25, "y": 4.5},
+ {"matrix": [8, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [9, 2], "x": 3.25, "y": 4.5},
+ {"matrix": [8, 3], "x": 4.25, "y": 4.5},
+ {"matrix": [9, 3], "x": 5.25, "y": 4.5},
+ {"matrix": [8, 4], "x": 6.25, "y": 4.5},
+ {"matrix": [9, 4], "x": 7.25, "y": 4.5},
+ {"matrix": [8, 5], "x": 8.25, "y": 4.5},
+ {"matrix": [9, 5], "x": 9.25, "y": 4.5},
+ {"matrix": [8, 6], "x": 10.25, "y": 4.5},
+ {"matrix": [9, 6], "x": 11.25, "y": 4.5},
+ {"matrix": [8, 7], "x": 12.25, "y": 4.5, "w": 1.75},
+ {"matrix": [10, 0], "x": 14, "y": 4.5},
+
+ {"matrix": [11, 1], "x": 16.25, "y": 4.5},
+
+ {"matrix": [10, 1], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [11, 2], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"matrix": [10, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"matrix": [11, 3], "x": 3.75, "y": 5.5, "w": 2.25},
+ {"matrix": [10, 4], "x": 6, "y": 5.5, "w": 1.25},
+ {"matrix": [11, 4], "x": 7.25, "y": 5.5, "w": 2.75},
+ {"matrix": [10, 5], "x": 10, "y": 5.5, "w": 1.25},
+ {"matrix": [11, 5], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"matrix": [10, 6], "x": 12.5, "y": 5.5, "w": 1.25},
+ {"matrix": [11, 6], "x": 13.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [10, 7], "x": 15.25, "y": 5.5},
+ {"matrix": [11, 0], "x": 16.25, "y": 5.5},
+ {"matrix": [10, 2], "x": 17.25, "y": 5.5}
+ ]
}
}
}
diff --git a/keyboards/4pplet/waffling80/rev_b/rev_b.h b/keyboards/4pplet/waffling80/rev_b/rev_b.h
index 42a550f192..c8d4c8b971 100644
--- a/keyboards/4pplet/waffling80/rev_b/rev_b.h
+++ b/keyboards/4pplet/waffling80/rev_b/rev_b.h
@@ -24,27 +24,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define SCROLL_LOCK_COLOR HSV_GREEN
#include "quantum.h"
-
-#define LAYOUT_all( \
- k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, k37, \
- k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k67, k27, k57, k97, \
- k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k77, kb7, \
- k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, \
- k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86, k96, k87, \
- ka0, kb1, ka1, kb2, ka3, kb3, ka4, kb4, ka5, kb5, ka6, kb6, ka7, \
- kb0, ka2 \
-) \
-{ \
- {k00, k01, k02, k03, k04, k05, k06, k07}, \
- {k10, k11, k12, k13, k14, k15, k16, k17}, \
- {k20, k21, k22, k23, k24, k25, k26, k27}, \
- {k30, k31, k32, k33, k34, k35, k36, k37}, \
- {k40, k41, k42, k43, k44, k45, k46, k47}, \
- {k50, k51, k52, k53, k54, k55, k56, k57}, \
- {k60, k61, k62, k63, k64, k65, k66, k67}, \
- {k70, k71, k72, k73, k74, k75, k76, k77}, \
- {k80, k81, k82, k83, k84, k85, k86, k87}, \
- {k90, k91, k92, k93, k94, k95, k96, k97}, \
- {ka0, ka1, ka2, ka3, ka4, ka5, ka6, ka7}, \
- {kb0, kb1, kb2, kb3, kb4, kb5, kb6, kb7} \
-}
diff --git a/keyboards/4pplet/yakiimo/rev_a/config.h b/keyboards/4pplet/yakiimo/rev_a/config.h
index 959bd92622..b9a17d4128 100644
--- a/keyboards/4pplet/yakiimo/rev_a/config.h
+++ b/keyboards/4pplet/yakiimo/rev_a/config.h
@@ -16,10 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-#define MATRIX_COL_PINS { B0, A5, A4, A3, A2, A1, A0, C15, A8 }
-#define MATRIX_ROW_PINS { B10, B1, C13, C14, B14, B12, B9, B8, B5, B4, A15, B3 }
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/4pplet/yakiimo/rev_a/info.json b/keyboards/4pplet/yakiimo/rev_a/info.json
index b902a0d6cf..d71b9d787a 100644
--- a/keyboards/4pplet/yakiimo/rev_a/info.json
+++ b/keyboards/4pplet/yakiimo/rev_a/info.json
@@ -8,15 +8,554 @@
"pid": "0x000A",
"device_version": "0.0.2"
},
+ "matrix_pins": {
+ "cols": ["B0", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "A8"],
+ "rows": ["B10", "B1", "C13", "C14", "B14", "B12", "B9", "B8", "B5", "B4", "A15", "B3"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "A6",
"scroll_lock": "A7"
},
"processor": "STM32F411",
"bootloader": "stm32-dfu",
+ "community_layouts": [
+ "tkl_ansi_tsangan",
+ "tkl_ansi_tsangan_split_bs_rshift",
+ "tkl_iso_tsangan",
+ "tkl_iso_tsangan_split_bs_rshift"
+ ],
"layouts": {
"LAYOUT_all": {
- "layout": [{"label":"Esc", "x":2.75, "y":0}, {"label":"F1", "x":4.75, "y":0}, {"label":"F2", "x":5.75, "y":0}, {"label":"F3", "x":6.75, "y":0}, {"label":"F4", "x":7.75, "y":0}, {"label":"F5", "x":9.25, "y":0}, {"label":"F6", "x":10.25, "y":0}, {"label":"F7", "x":11.25, "y":0}, {"label":"F8", "x":12.25, "y":0}, {"label":"F9", "x":13.75, "y":0}, {"label":"F10", "x":14.75, "y":0}, {"label":"F11", "x":15.75, "y":0}, {"label":"F12", "x":16.75, "y":0}, {"label":"PrtSc", "x":18, "y":0}, {"label":"Scroll Lock", "x":19, "y":0}, {"label":"Pause", "x":20, "y":0}, {"label":"~", "x":2.75, "y":1.5}, {"label":"!", "x":3.75, "y":1.5}, {"label":"@", "x":4.75, "y":1.5}, {"label":"#", "x":5.75, "y":1.5}, {"label":"$", "x":6.75, "y":1.5}, {"label":"%", "x":7.75, "y":1.5}, {"label":"^", "x":8.75, "y":1.5}, {"label":"&", "x":9.75, "y":1.5}, {"label":"*", "x":10.75, "y":1.5}, {"label":"(", "x":11.75, "y":1.5}, {"label":")", "x":12.75, "y":1.5}, {"label":"_", "x":13.75, "y":1.5}, {"label":"+", "x":14.75, "y":1.5}, {"label":"|", "x":15.75, "y":1.5}, {"label":"~", "x":16.75, "y":1.5}, {"label":"Insert", "x":18, "y":1.5}, {"label":"Home", "x":19, "y":1.5}, {"label":"PgUp", "x":20, "y":1.5}, {"label":"Tab", "x":2.75, "y":2.5, "w":1.5}, {"label":"Q", "x":4.25, "y":2.5}, {"label":"W", "x":5.25, "y":2.5}, {"label":"E", "x":6.25, "y":2.5}, {"label":"R", "x":7.25, "y":2.5}, {"label":"T", "x":8.25, "y":2.5}, {"label":"Y", "x":9.25, "y":2.5}, {"label":"U", "x":10.25, "y":2.5}, {"label":"I", "x":11.25, "y":2.5}, {"label":"O", "x":12.25, "y":2.5}, {"label":"P", "x":13.25, "y":2.5}, {"label":"{", "x":14.25, "y":2.5}, {"label":"}", "x":15.25, "y":2.5}, {"label":"|", "x":16.25, "y":2.5, "w":1.5}, {"label":"Delete", "x":18, "y":2.5}, {"label":"End", "x":19, "y":2.5}, {"label":"PgDn", "x":20, "y":2.5}, {"label":"Caps Lock", "x":2.75, "y":3.5, "w":1.75}, {"label":"A", "x":4.5, "y":3.5}, {"label":"S", "x":5.5, "y":3.5}, {"label":"D", "x":6.5, "y":3.5}, {"label":"F", "x":7.5, "y":3.5}, {"label":"G", "x":8.5, "y":3.5}, {"label":"H", "x":9.5, "y":3.5}, {"label":"J", "x":10.5, "y":3.5}, {"label":"K", "x":11.5, "y":3.5}, {"label":"L", "x":12.5, "y":3.5}, {"label":":", "x":13.5, "y":3.5}, {"label":"\"", "x":14.5, "y":3.5}, {"label":"~", "x":15.5, "y":3.5}, {"label":"Enter", "x":16.5, "y":3.5, "w":1.25}, {"label":"Shift", "x":2.75, "y":4.5, "w":1.25}, {"label":"|", "x":4, "y":4.5}, {"label":"Z", "x":5, "y":4.5}, {"label":"X", "x":6, "y":4.5}, {"label":"C", "x":7, "y":4.5}, {"label":"V", "x":8, "y":4.5}, {"label":"B", "x":9, "y":4.5}, {"label":"N", "x":10, "y":4.5}, {"label":"M", "x":11, "y":4.5}, {"label":"<", "x":12, "y":4.5}, {"label":">", "x":13, "y":4.5}, {"label":"?", "x":14, "y":4.5}, {"label":"Shift", "x":15, "y":4.5, "w":1.75}, {"label":"Fn", "x":16.75, "y":4.5}, {"label":"\u2191", "x":19, "y":4.5}, {"label":"Ctrl", "x":2.75, "y":5.5, "w":1.5}, {"label":"Win", "x":4.25, "y":5.5}, {"label":"Alt", "x":5.25, "y":5.5, "w":1.5}, {"x":6.75, "y":5.5, "w":3}, {"x":9.75, "y":5.5}, {"x":10.75, "y":5.5, "w":3}, {"label":"AltGr", "x":13.75, "y":5.5, "w":1.5}, {"label":"Win", "x":15.25, "y":5.5}, {"label":"Ctrl", "x":16.25, "y":5.5, "w":1.5}, {"label":"\u2190", "x":18, "y":5.5}, {"label":"\u2193", "x":19, "y":5.5}, {"label":"\u2192", "x":20, "y":5.5}]
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+ {"label": "F2", "matrix": [1, 1], "x": 3, "y": 0},
+ {"label": "F3", "matrix": [0, 2], "x": 4, "y": 0},
+ {"label": "F4", "matrix": [1, 2], "x": 5, "y": 0},
+
+ {"label": "F5", "matrix": [0, 3], "x": 6.5, "y": 0},
+ {"label": "F6", "matrix": [1, 3], "x": 7.5, "y": 0},
+ {"label": "F7", "matrix": [0, 4], "x": 8.5, "y": 0},
+ {"label": "F8", "matrix": [1, 4], "x": 9.5, "y": 0},
+
+ {"label": "F9", "matrix": [0, 5], "x": 11, "y": 0},
+ {"label": "F10", "matrix": [1, 5], "x": 12, "y": 0},
+ {"label": "F11", "matrix": [0, 6], "x": 13, "y": 0},
+ {"label": "F12", "matrix": [1, 6], "x": 14, "y": 0},
+
+ {"label": "Print Screen", "matrix": [0, 7], "x": 15.25, "y": 0},
+ {"label": "Scroll Lock", "matrix": [1, 8], "x": 16.25, "y": 0},
+ {"label": "Pause", "matrix": [0, 8], "x": 17.25, "y": 0},
+
+ {"label": "`", "matrix": [2, 0], "x": 0, "y": 1.5},
+ {"label": "1", "matrix": [3, 0], "x": 1, "y": 1.5},
+ {"label": "2", "matrix": [2, 1], "x": 2, "y": 1.5},
+ {"label": "3", "matrix": [3, 1], "x": 3, "y": 1.5},
+ {"label": "4", "matrix": [2, 2], "x": 4, "y": 1.5},
+ {"label": "5", "matrix": [3, 2], "x": 5, "y": 1.5},
+ {"label": "6", "matrix": [2, 3], "x": 6, "y": 1.5},
+ {"label": "7", "matrix": [3, 3], "x": 7, "y": 1.5},
+ {"label": "8", "matrix": [2, 4], "x": 8, "y": 1.5},
+ {"label": "9", "matrix": [3, 4], "x": 9, "y": 1.5},
+ {"label": "0", "matrix": [2, 5], "x": 10, "y": 1.5},
+ {"label": "-", "matrix": [3, 5], "x": 11, "y": 1.5},
+ {"label": "=", "matrix": [2, 6], "x": 12, "y": 1.5},
+ {"label": "\\", "matrix": [3, 6], "x": 13, "y": 1.5},
+ {"label": "Backspace", "matrix": [2, 7], "x": 14, "y": 1.5},
+
+ {"label": "Insert", "matrix": [3, 7], "x": 15.25, "y": 1.5},
+ {"label": "Home", "matrix": [2, 8], "x": 16.25, "y": 1.5},
+ {"label": "Page Up", "matrix": [3, 8], "x": 17.25, "y": 1.5},
+
+ {"label": "Tab", "matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"label": "Q", "matrix": [5, 0], "x": 1.5, "y": 2.5},
+ {"label": "W", "matrix": [4, 1], "x": 2.5, "y": 2.5},
+ {"label": "E", "matrix": [5, 1], "x": 3.5, "y": 2.5},
+ {"label": "R", "matrix": [4, 2], "x": 4.5, "y": 2.5},
+ {"label": "T", "matrix": [5, 2], "x": 5.5, "y": 2.5},
+ {"label": "Y", "matrix": [4, 3], "x": 6.5, "y": 2.5},
+ {"label": "U", "matrix": [5, 3], "x": 7.5, "y": 2.5},
+ {"label": "I", "matrix": [4, 4], "x": 8.5, "y": 2.5},
+ {"label": "O", "matrix": [5, 4], "x": 9.5, "y": 2.5},
+ {"label": "P", "matrix": [4, 5], "x": 10.5, "y": 2.5},
+ {"label": "[", "matrix": [5, 5], "x": 11.5, "y": 2.5},
+ {"label": "]", "matrix": [4, 6], "x": 12.5, "y": 2.5},
+ {"label": "\\", "matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"label": "Delete", "matrix": [4, 7], "x": 15.25, "y": 2.5},
+ {"label": "End", "matrix": [4, 8], "x": 16.25, "y": 2.5},
+ {"label": "Page Down", "matrix": [5, 8], "x": 17.25, "y": 2.5},
+
+ {"label": "Caps Lock", "matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"label": "A", "matrix": [7, 0], "x": 1.75, "y": 3.5},
+ {"label": "S", "matrix": [6, 1], "x": 2.75, "y": 3.5},
+ {"label": "D", "matrix": [7, 1], "x": 3.75, "y": 3.5},
+ {"label": "F", "matrix": [6, 2], "x": 4.75, "y": 3.5},
+ {"label": "G", "matrix": [7, 2], "x": 5.75, "y": 3.5},
+ {"label": "H", "matrix": [6, 3], "x": 6.75, "y": 3.5},
+ {"label": "J", "matrix": [7, 3], "x": 7.75, "y": 3.5},
+ {"label": "K", "matrix": [6, 4], "x": 8.75, "y": 3.5},
+ {"label": "L", "matrix": [7, 4], "x": 9.75, "y": 3.5},
+ {"label": ";", "matrix": [6, 5], "x": 10.75, "y": 3.5},
+ {"label": "'", "matrix": [7, 5], "x": 11.75, "y": 3.5},
+ {"label": "#", "matrix": [6, 6], "x": 12.75, "y": 3.5},
+ {"label": "Enter", "matrix": [7, 6], "x": 13.75, "y": 3.5, "w": 1.25},
+
+ {"label": "Shift", "matrix": [8, 0], "x": 0, "y": 4.5, "w": 1.25},
+ {"label": "\\", "matrix": [9, 0], "x": 1.25, "y": 4.5},
+ {"label": "Z", "matrix": [8, 1], "x": 2.25, "y": 4.5},
+ {"label": "X", "matrix": [9, 1], "x": 3.25, "y": 4.5},
+ {"label": "C", "matrix": [8, 2], "x": 4.25, "y": 4.5},
+ {"label": "V", "matrix": [9, 2], "x": 5.25, "y": 4.5},
+ {"label": "B", "matrix": [8, 3], "x": 6.25, "y": 4.5},
+ {"label": "N", "matrix": [9, 3], "x": 7.25, "y": 4.5},
+ {"label": "M", "matrix": [8, 4], "x": 8.25, "y": 4.5},
+ {"label": ",", "matrix": [9, 4], "x": 9.25, "y": 4.5},
+ {"label": ".", "matrix": [8, 5], "x": 10.25, "y": 4.5},
+ {"label": "/", "matrix": [9, 5], "x": 11.25, "y": 4.5},
+ {"label": "Shift", "matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 1.75},
+ {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 4.5},
+
+ {"label": "\u2191", "matrix": [9, 8], "x": 16.25, "y": 4.5},
+
+ {"label": "Ctrl", "matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5},
+ {"label": "GUI", "matrix": [10, 1], "x": 1.5, "y": 5.5},
+ {"label": "Alt", "matrix": [11, 1], "x": 2.5, "y": 5.5, "w": 1.5},
+ {"label": "Space", "matrix": [11, 2], "x": 4, "y": 5.5, "w": 3},
+ {"label": "Space", "matrix": [11, 3], "x": 7, "y": 5.5},
+ {"label": "Space", "matrix": [11, 4], "x": 8, "y": 5.5, "w": 3},
+ {"label": "Alt", "matrix": [11, 5], "x": 11, "y": 5.5, "w": 1.5},
+ {"label": "GUI", "matrix": [10, 6], "x": 12.5, "y": 5.5},
+ {"label": "Ctrl", "matrix": [11, 6], "x": 13.5, "y": 5.5, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [10, 7], "x": 15.25, "y": 5.5},
+ {"label": "\u2193", "matrix": [11, 8], "x": 16.25, "y": 5.5},
+ {"label": "\u2192", "matrix": [10, 8], "x": 17.25, "y": 5.5}
+ ]
+ },
+
+ "LAYOUT_tkl_ansi_tsangan": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+ {"label": "F2", "matrix": [1, 1], "x": 3, "y": 0},
+ {"label": "F3", "matrix": [0, 2], "x": 4, "y": 0},
+ {"label": "F4", "matrix": [1, 2], "x": 5, "y": 0},
+
+ {"label": "F5", "matrix": [0, 3], "x": 6.5, "y": 0},
+ {"label": "F6", "matrix": [1, 3], "x": 7.5, "y": 0},
+ {"label": "F7", "matrix": [0, 4], "x": 8.5, "y": 0},
+ {"label": "F8", "matrix": [1, 4], "x": 9.5, "y": 0},
+
+ {"label": "F9", "matrix": [0, 5], "x": 11, "y": 0},
+ {"label": "F10", "matrix": [1, 5], "x": 12, "y": 0},
+ {"label": "F11", "matrix": [0, 6], "x": 13, "y": 0},
+ {"label": "F12", "matrix": [1, 6], "x": 14, "y": 0},
+
+ {"label": "Print Screen", "matrix": [0, 7], "x": 15.25, "y": 0},
+ {"label": "Scroll Lock", "matrix": [1, 8], "x": 16.25, "y": 0},
+ {"label": "Pause", "matrix": [0, 8], "x": 17.25, "y": 0},
+
+ {"label": "`", "matrix": [2, 0], "x": 0, "y": 1.5},
+ {"label": "1", "matrix": [3, 0], "x": 1, "y": 1.5},
+ {"label": "2", "matrix": [2, 1], "x": 2, "y": 1.5},
+ {"label": "3", "matrix": [3, 1], "x": 3, "y": 1.5},
+ {"label": "4", "matrix": [2, 2], "x": 4, "y": 1.5},
+ {"label": "5", "matrix": [3, 2], "x": 5, "y": 1.5},
+ {"label": "6", "matrix": [2, 3], "x": 6, "y": 1.5},
+ {"label": "7", "matrix": [3, 3], "x": 7, "y": 1.5},
+ {"label": "8", "matrix": [2, 4], "x": 8, "y": 1.5},
+ {"label": "9", "matrix": [3, 4], "x": 9, "y": 1.5},
+ {"label": "0", "matrix": [2, 5], "x": 10, "y": 1.5},
+ {"label": "-", "matrix": [3, 5], "x": 11, "y": 1.5},
+ {"label": "=", "matrix": [2, 6], "x": 12, "y": 1.5},
+ {"label": "Backspace", "matrix": [2, 7], "x": 13, "y": 1.5, "w": 2},
+
+ {"label": "Insert", "matrix": [3, 7], "x": 15.25, "y": 1.5},
+ {"label": "Home", "matrix": [2, 8], "x": 16.25, "y": 1.5},
+ {"label": "Page Up", "matrix": [3, 8], "x": 17.25, "y": 1.5},
+
+ {"label": "Tab", "matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"label": "Q", "matrix": [5, 0], "x": 1.5, "y": 2.5},
+ {"label": "W", "matrix": [4, 1], "x": 2.5, "y": 2.5},
+ {"label": "E", "matrix": [5, 1], "x": 3.5, "y": 2.5},
+ {"label": "R", "matrix": [4, 2], "x": 4.5, "y": 2.5},
+ {"label": "T", "matrix": [5, 2], "x": 5.5, "y": 2.5},
+ {"label": "Y", "matrix": [4, 3], "x": 6.5, "y": 2.5},
+ {"label": "U", "matrix": [5, 3], "x": 7.5, "y": 2.5},
+ {"label": "I", "matrix": [4, 4], "x": 8.5, "y": 2.5},
+ {"label": "O", "matrix": [5, 4], "x": 9.5, "y": 2.5},
+ {"label": "P", "matrix": [4, 5], "x": 10.5, "y": 2.5},
+ {"label": "[", "matrix": [5, 5], "x": 11.5, "y": 2.5},
+ {"label": "]", "matrix": [4, 6], "x": 12.5, "y": 2.5},
+ {"label": "\\", "matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"label": "Delete", "matrix": [4, 7], "x": 15.25, "y": 2.5},
+ {"label": "End", "matrix": [4, 8], "x": 16.25, "y": 2.5},
+ {"label": "Page Down", "matrix": [5, 8], "x": 17.25, "y": 2.5},
+
+ {"label": "Caps Lock", "matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"label": "A", "matrix": [7, 0], "x": 1.75, "y": 3.5},
+ {"label": "S", "matrix": [6, 1], "x": 2.75, "y": 3.5},
+ {"label": "D", "matrix": [7, 1], "x": 3.75, "y": 3.5},
+ {"label": "F", "matrix": [6, 2], "x": 4.75, "y": 3.5},
+ {"label": "G", "matrix": [7, 2], "x": 5.75, "y": 3.5},
+ {"label": "H", "matrix": [6, 3], "x": 6.75, "y": 3.5},
+ {"label": "J", "matrix": [7, 3], "x": 7.75, "y": 3.5},
+ {"label": "K", "matrix": [6, 4], "x": 8.75, "y": 3.5},
+ {"label": "L", "matrix": [7, 4], "x": 9.75, "y": 3.5},
+ {"label": ";", "matrix": [6, 5], "x": 10.75, "y": 3.5},
+ {"label": "'", "matrix": [7, 5], "x": 11.75, "y": 3.5},
+ {"label": "Enter", "matrix": [7, 6], "x": 12.75, "y": 3.5, "w": 2.25},
+
+ {"label": "Shift", "matrix": [8, 0], "x": 0, "y": 4.5, "w": 2.25},
+ {"label": "Z", "matrix": [8, 1], "x": 2.25, "y": 4.5},
+ {"label": "X", "matrix": [9, 1], "x": 3.25, "y": 4.5},
+ {"label": "C", "matrix": [8, 2], "x": 4.25, "y": 4.5},
+ {"label": "V", "matrix": [9, 2], "x": 5.25, "y": 4.5},
+ {"label": "B", "matrix": [8, 3], "x": 6.25, "y": 4.5},
+ {"label": "N", "matrix": [9, 3], "x": 7.25, "y": 4.5},
+ {"label": "M", "matrix": [8, 4], "x": 8.25, "y": 4.5},
+ {"label": ",", "matrix": [9, 4], "x": 9.25, "y": 4.5},
+ {"label": ".", "matrix": [8, 5], "x": 10.25, "y": 4.5},
+ {"label": "/", "matrix": [9, 5], "x": 11.25, "y": 4.5},
+ {"label": "Shift", "matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 2.75},
+
+ {"label": "\u2191", "matrix": [9, 8], "x": 16.25, "y": 4.5},
+
+ {"label": "Ctrl", "matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5},
+ {"label": "GUI", "matrix": [10, 1], "x": 1.5, "y": 5.5},
+ {"label": "Alt", "matrix": [11, 1], "x": 2.5, "y": 5.5, "w": 1.5},
+ {"label": "Space", "matrix": [11, 3], "x": 4, "y": 5.5, "w": 7},
+ {"label": "Alt", "matrix": [11, 5], "x": 11, "y": 5.5, "w": 1.5},
+ {"label": "GUI", "matrix": [10, 6], "x": 12.5, "y": 5.5},
+ {"label": "Ctrl", "matrix": [11, 6], "x": 13.5, "y": 5.5, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [10, 7], "x": 15.25, "y": 5.5},
+ {"label": "\u2193", "matrix": [11, 8], "x": 16.25, "y": 5.5},
+ {"label": "\u2192", "matrix": [10, 8], "x": 17.25, "y": 5.5}
+ ]
+ },
+
+ "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+ {"label": "F2", "matrix": [1, 1], "x": 3, "y": 0},
+ {"label": "F3", "matrix": [0, 2], "x": 4, "y": 0},
+ {"label": "F4", "matrix": [1, 2], "x": 5, "y": 0},
+
+ {"label": "F5", "matrix": [0, 3], "x": 6.5, "y": 0},
+ {"label": "F6", "matrix": [1, 3], "x": 7.5, "y": 0},
+ {"label": "F7", "matrix": [0, 4], "x": 8.5, "y": 0},
+ {"label": "F8", "matrix": [1, 4], "x": 9.5, "y": 0},
+
+ {"label": "F9", "matrix": [0, 5], "x": 11, "y": 0},
+ {"label": "F10", "matrix": [1, 5], "x": 12, "y": 0},
+ {"label": "F11", "matrix": [0, 6], "x": 13, "y": 0},
+ {"label": "F12", "matrix": [1, 6], "x": 14, "y": 0},
+
+ {"label": "Print Screen", "matrix": [0, 7], "x": 15.25, "y": 0},
+ {"label": "Scroll Lock", "matrix": [1, 8], "x": 16.25, "y": 0},
+ {"label": "Pause", "matrix": [0, 8], "x": 17.25, "y": 0},
+
+ {"label": "`", "matrix": [2, 0], "x": 0, "y": 1.5},
+ {"label": "1", "matrix": [3, 0], "x": 1, "y": 1.5},
+ {"label": "2", "matrix": [2, 1], "x": 2, "y": 1.5},
+ {"label": "3", "matrix": [3, 1], "x": 3, "y": 1.5},
+ {"label": "4", "matrix": [2, 2], "x": 4, "y": 1.5},
+ {"label": "5", "matrix": [3, 2], "x": 5, "y": 1.5},
+ {"label": "6", "matrix": [2, 3], "x": 6, "y": 1.5},
+ {"label": "7", "matrix": [3, 3], "x": 7, "y": 1.5},
+ {"label": "8", "matrix": [2, 4], "x": 8, "y": 1.5},
+ {"label": "9", "matrix": [3, 4], "x": 9, "y": 1.5},
+ {"label": "0", "matrix": [2, 5], "x": 10, "y": 1.5},
+ {"label": "-", "matrix": [3, 5], "x": 11, "y": 1.5},
+ {"label": "=", "matrix": [2, 6], "x": 12, "y": 1.5},
+ {"label": "\\", "matrix": [3, 6], "x": 13, "y": 1.5},
+ {"label": "Backspace", "matrix": [2, 7], "x": 14, "y": 1.5},
+
+ {"label": "Insert", "matrix": [3, 7], "x": 15.25, "y": 1.5},
+ {"label": "Home", "matrix": [2, 8], "x": 16.25, "y": 1.5},
+ {"label": "Page Up", "matrix": [3, 8], "x": 17.25, "y": 1.5},
+
+ {"label": "Tab", "matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"label": "Q", "matrix": [5, 0], "x": 1.5, "y": 2.5},
+ {"label": "W", "matrix": [4, 1], "x": 2.5, "y": 2.5},
+ {"label": "E", "matrix": [5, 1], "x": 3.5, "y": 2.5},
+ {"label": "R", "matrix": [4, 2], "x": 4.5, "y": 2.5},
+ {"label": "T", "matrix": [5, 2], "x": 5.5, "y": 2.5},
+ {"label": "Y", "matrix": [4, 3], "x": 6.5, "y": 2.5},
+ {"label": "U", "matrix": [5, 3], "x": 7.5, "y": 2.5},
+ {"label": "I", "matrix": [4, 4], "x": 8.5, "y": 2.5},
+ {"label": "O", "matrix": [5, 4], "x": 9.5, "y": 2.5},
+ {"label": "P", "matrix": [4, 5], "x": 10.5, "y": 2.5},
+ {"label": "[", "matrix": [5, 5], "x": 11.5, "y": 2.5},
+ {"label": "]", "matrix": [4, 6], "x": 12.5, "y": 2.5},
+ {"label": "\\", "matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"label": "Delete", "matrix": [4, 7], "x": 15.25, "y": 2.5},
+ {"label": "End", "matrix": [4, 8], "x": 16.25, "y": 2.5},
+ {"label": "Page Down", "matrix": [5, 8], "x": 17.25, "y": 2.5},
+
+ {"label": "Caps Lock", "matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"label": "A", "matrix": [7, 0], "x": 1.75, "y": 3.5},
+ {"label": "S", "matrix": [6, 1], "x": 2.75, "y": 3.5},
+ {"label": "D", "matrix": [7, 1], "x": 3.75, "y": 3.5},
+ {"label": "F", "matrix": [6, 2], "x": 4.75, "y": 3.5},
+ {"label": "G", "matrix": [7, 2], "x": 5.75, "y": 3.5},
+ {"label": "H", "matrix": [6, 3], "x": 6.75, "y": 3.5},
+ {"label": "J", "matrix": [7, 3], "x": 7.75, "y": 3.5},
+ {"label": "K", "matrix": [6, 4], "x": 8.75, "y": 3.5},
+ {"label": "L", "matrix": [7, 4], "x": 9.75, "y": 3.5},
+ {"label": ";", "matrix": [6, 5], "x": 10.75, "y": 3.5},
+ {"label": "'", "matrix": [7, 5], "x": 11.75, "y": 3.5},
+ {"label": "Enter", "matrix": [7, 6], "x": 12.75, "y": 3.5, "w": 2.25},
+
+ {"label": "Shift", "matrix": [8, 0], "x": 0, "y": 4.5, "w": 2.25},
+ {"label": "Z", "matrix": [8, 1], "x": 2.25, "y": 4.5},
+ {"label": "X", "matrix": [9, 1], "x": 3.25, "y": 4.5},
+ {"label": "C", "matrix": [8, 2], "x": 4.25, "y": 4.5},
+ {"label": "V", "matrix": [9, 2], "x": 5.25, "y": 4.5},
+ {"label": "B", "matrix": [8, 3], "x": 6.25, "y": 4.5},
+ {"label": "N", "matrix": [9, 3], "x": 7.25, "y": 4.5},
+ {"label": "M", "matrix": [8, 4], "x": 8.25, "y": 4.5},
+ {"label": ",", "matrix": [9, 4], "x": 9.25, "y": 4.5},
+ {"label": ".", "matrix": [8, 5], "x": 10.25, "y": 4.5},
+ {"label": "/", "matrix": [9, 5], "x": 11.25, "y": 4.5},
+ {"label": "Shift", "matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 1.75},
+ {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 4.5},
+
+ {"label": "\u2191", "matrix": [9, 8], "x": 16.25, "y": 4.5},
+
+ {"label": "Ctrl", "matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5},
+ {"label": "GUI", "matrix": [10, 1], "x": 1.5, "y": 5.5},
+ {"label": "Alt", "matrix": [11, 1], "x": 2.5, "y": 5.5, "w": 1.5},
+ {"label": "Space", "matrix": [11, 3], "x": 4, "y": 5.5, "w": 7},
+ {"label": "Alt", "matrix": [11, 5], "x": 11, "y": 5.5, "w": 1.5},
+ {"label": "GUI", "matrix": [10, 6], "x": 12.5, "y": 5.5},
+ {"label": "Ctrl", "matrix": [11, 6], "x": 13.5, "y": 5.5, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [10, 7], "x": 15.25, "y": 5.5},
+ {"label": "\u2193", "matrix": [11, 8], "x": 16.25, "y": 5.5},
+ {"label": "\u2192", "matrix": [10, 8], "x": 17.25, "y": 5.5}
+ ]
+ },
+
+ "LAYOUT_tkl_iso_tsangan": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+ {"label": "F2", "matrix": [1, 1], "x": 3, "y": 0},
+ {"label": "F3", "matrix": [0, 2], "x": 4, "y": 0},
+ {"label": "F4", "matrix": [1, 2], "x": 5, "y": 0},
+
+ {"label": "F5", "matrix": [0, 3], "x": 6.5, "y": 0},
+ {"label": "F6", "matrix": [1, 3], "x": 7.5, "y": 0},
+ {"label": "F7", "matrix": [0, 4], "x": 8.5, "y": 0},
+ {"label": "F8", "matrix": [1, 4], "x": 9.5, "y": 0},
+
+ {"label": "F9", "matrix": [0, 5], "x": 11, "y": 0},
+ {"label": "F10", "matrix": [1, 5], "x": 12, "y": 0},
+ {"label": "F11", "matrix": [0, 6], "x": 13, "y": 0},
+ {"label": "F12", "matrix": [1, 6], "x": 14, "y": 0},
+
+ {"label": "Print Screen", "matrix": [0, 7], "x": 15.25, "y": 0},
+ {"label": "Scroll Lock", "matrix": [1, 8], "x": 16.25, "y": 0},
+ {"label": "Pause", "matrix": [0, 8], "x": 17.25, "y": 0},
+
+ {"label": "`", "matrix": [2, 0], "x": 0, "y": 1.5},
+ {"label": "1", "matrix": [3, 0], "x": 1, "y": 1.5},
+ {"label": "2", "matrix": [2, 1], "x": 2, "y": 1.5},
+ {"label": "3", "matrix": [3, 1], "x": 3, "y": 1.5},
+ {"label": "4", "matrix": [2, 2], "x": 4, "y": 1.5},
+ {"label": "5", "matrix": [3, 2], "x": 5, "y": 1.5},
+ {"label": "6", "matrix": [2, 3], "x": 6, "y": 1.5},
+ {"label": "7", "matrix": [3, 3], "x": 7, "y": 1.5},
+ {"label": "8", "matrix": [2, 4], "x": 8, "y": 1.5},
+ {"label": "9", "matrix": [3, 4], "x": 9, "y": 1.5},
+ {"label": "0", "matrix": [2, 5], "x": 10, "y": 1.5},
+ {"label": "-", "matrix": [3, 5], "x": 11, "y": 1.5},
+ {"label": "=", "matrix": [2, 6], "x": 12, "y": 1.5},
+ {"label": "Backspace", "matrix": [2, 7], "x": 13, "y": 1.5, "w": 2},
+
+ {"label": "Insert", "matrix": [3, 7], "x": 15.25, "y": 1.5},
+ {"label": "Home", "matrix": [2, 8], "x": 16.25, "y": 1.5},
+ {"label": "Page Up", "matrix": [3, 8], "x": 17.25, "y": 1.5},
+
+ {"label": "Tab", "matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"label": "Q", "matrix": [5, 0], "x": 1.5, "y": 2.5},
+ {"label": "W", "matrix": [4, 1], "x": 2.5, "y": 2.5},
+ {"label": "E", "matrix": [5, 1], "x": 3.5, "y": 2.5},
+ {"label": "R", "matrix": [4, 2], "x": 4.5, "y": 2.5},
+ {"label": "T", "matrix": [5, 2], "x": 5.5, "y": 2.5},
+ {"label": "Y", "matrix": [4, 3], "x": 6.5, "y": 2.5},
+ {"label": "U", "matrix": [5, 3], "x": 7.5, "y": 2.5},
+ {"label": "I", "matrix": [4, 4], "x": 8.5, "y": 2.5},
+ {"label": "O", "matrix": [5, 4], "x": 9.5, "y": 2.5},
+ {"label": "P", "matrix": [4, 5], "x": 10.5, "y": 2.5},
+ {"label": "[", "matrix": [5, 5], "x": 11.5, "y": 2.5},
+ {"label": "]", "matrix": [4, 6], "x": 12.5, "y": 2.5},
+
+ {"label": "Delete", "matrix": [4, 7], "x": 15.25, "y": 2.5},
+ {"label": "End", "matrix": [4, 8], "x": 16.25, "y": 2.5},
+ {"label": "Page Down", "matrix": [5, 8], "x": 17.25, "y": 2.5},
+
+ {"label": "Caps Lock", "matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"label": "A", "matrix": [7, 0], "x": 1.75, "y": 3.5},
+ {"label": "S", "matrix": [6, 1], "x": 2.75, "y": 3.5},
+ {"label": "D", "matrix": [7, 1], "x": 3.75, "y": 3.5},
+ {"label": "F", "matrix": [6, 2], "x": 4.75, "y": 3.5},
+ {"label": "G", "matrix": [7, 2], "x": 5.75, "y": 3.5},
+ {"label": "H", "matrix": [6, 3], "x": 6.75, "y": 3.5},
+ {"label": "J", "matrix": [7, 3], "x": 7.75, "y": 3.5},
+ {"label": "K", "matrix": [6, 4], "x": 8.75, "y": 3.5},
+ {"label": "L", "matrix": [7, 4], "x": 9.75, "y": 3.5},
+ {"label": ";", "matrix": [6, 5], "x": 10.75, "y": 3.5},
+ {"label": "'", "matrix": [7, 5], "x": 11.75, "y": 3.5},
+ {"label": "#", "matrix": [6, 6], "x": 12.75, "y": 3.5},
+ {"label": "Enter", "matrix": [7, 6], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+ {"label": "Shift", "matrix": [8, 0], "x": 0, "y": 4.5, "w": 1.25},
+ {"label": "\\", "matrix": [9, 0], "x": 1.25, "y": 4.5},
+ {"label": "Z", "matrix": [8, 1], "x": 2.25, "y": 4.5},
+ {"label": "X", "matrix": [9, 1], "x": 3.25, "y": 4.5},
+ {"label": "C", "matrix": [8, 2], "x": 4.25, "y": 4.5},
+ {"label": "V", "matrix": [9, 2], "x": 5.25, "y": 4.5},
+ {"label": "B", "matrix": [8, 3], "x": 6.25, "y": 4.5},
+ {"label": "N", "matrix": [9, 3], "x": 7.25, "y": 4.5},
+ {"label": "M", "matrix": [8, 4], "x": 8.25, "y": 4.5},
+ {"label": ",", "matrix": [9, 4], "x": 9.25, "y": 4.5},
+ {"label": ".", "matrix": [8, 5], "x": 10.25, "y": 4.5},
+ {"label": "/", "matrix": [9, 5], "x": 11.25, "y": 4.5},
+ {"label": "Shift", "matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 2.75},
+
+ {"label": "\u2191", "matrix": [9, 8], "x": 16.25, "y": 4.5},
+
+ {"label": "Ctrl", "matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5},
+ {"label": "GUI", "matrix": [10, 1], "x": 1.5, "y": 5.5},
+ {"label": "Alt", "matrix": [11, 1], "x": 2.5, "y": 5.5, "w": 1.5},
+ {"label": "Space", "matrix": [11, 3], "x": 4, "y": 5.5, "w": 7},
+ {"label": "Alt", "matrix": [11, 5], "x": 11, "y": 5.5, "w": 1.5},
+ {"label": "GUI", "matrix": [10, 6], "x": 12.5, "y": 5.5},
+ {"label": "Ctrl", "matrix": [11, 6], "x": 13.5, "y": 5.5, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [10, 7], "x": 15.25, "y": 5.5},
+ {"label": "\u2193", "matrix": [11, 8], "x": 16.25, "y": 5.5},
+ {"label": "\u2192", "matrix": [10, 8], "x": 17.25, "y": 5.5}
+ ]
+ },
+
+ "LAYOUT_tkl_iso_tsangan_split_bs_rshift": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+ {"label": "F2", "matrix": [1, 1], "x": 3, "y": 0},
+ {"label": "F3", "matrix": [0, 2], "x": 4, "y": 0},
+ {"label": "F4", "matrix": [1, 2], "x": 5, "y": 0},
+
+ {"label": "F5", "matrix": [0, 3], "x": 6.5, "y": 0},
+ {"label": "F6", "matrix": [1, 3], "x": 7.5, "y": 0},
+ {"label": "F7", "matrix": [0, 4], "x": 8.5, "y": 0},
+ {"label": "F8", "matrix": [1, 4], "x": 9.5, "y": 0},
+
+ {"label": "F9", "matrix": [0, 5], "x": 11, "y": 0},
+ {"label": "F10", "matrix": [1, 5], "x": 12, "y": 0},
+ {"label": "F11", "matrix": [0, 6], "x": 13, "y": 0},
+ {"label": "F12", "matrix": [1, 6], "x": 14, "y": 0},
+
+ {"label": "Print Screen", "matrix": [0, 7], "x": 15.25, "y": 0},
+ {"label": "Scroll Lock", "matrix": [1, 8], "x": 16.25, "y": 0},
+ {"label": "Pause", "matrix": [0, 8], "x": 17.25, "y": 0},
+
+ {"label": "`", "matrix": [2, 0], "x": 0, "y": 1.5},
+ {"label": "1", "matrix": [3, 0], "x": 1, "y": 1.5},
+ {"label": "2", "matrix": [2, 1], "x": 2, "y": 1.5},
+ {"label": "3", "matrix": [3, 1], "x": 3, "y": 1.5},
+ {"label": "4", "matrix": [2, 2], "x": 4, "y": 1.5},
+ {"label": "5", "matrix": [3, 2], "x": 5, "y": 1.5},
+ {"label": "6", "matrix": [2, 3], "x": 6, "y": 1.5},
+ {"label": "7", "matrix": [3, 3], "x": 7, "y": 1.5},
+ {"label": "8", "matrix": [2, 4], "x": 8, "y": 1.5},
+ {"label": "9", "matrix": [3, 4], "x": 9, "y": 1.5},
+ {"label": "0", "matrix": [2, 5], "x": 10, "y": 1.5},
+ {"label": "-", "matrix": [3, 5], "x": 11, "y": 1.5},
+ {"label": "=", "matrix": [2, 6], "x": 12, "y": 1.5},
+ {"label": "\\", "matrix": [3, 6], "x": 13, "y": 1.5},
+ {"label": "Backspace", "matrix": [2, 7], "x": 14, "y": 1.5},
+
+ {"label": "Insert", "matrix": [3, 7], "x": 15.25, "y": 1.5},
+ {"label": "Home", "matrix": [2, 8], "x": 16.25, "y": 1.5},
+ {"label": "Page Up", "matrix": [3, 8], "x": 17.25, "y": 1.5},
+
+ {"label": "Tab", "matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"label": "Q", "matrix": [5, 0], "x": 1.5, "y": 2.5},
+ {"label": "W", "matrix": [4, 1], "x": 2.5, "y": 2.5},
+ {"label": "E", "matrix": [5, 1], "x": 3.5, "y": 2.5},
+ {"label": "R", "matrix": [4, 2], "x": 4.5, "y": 2.5},
+ {"label": "T", "matrix": [5, 2], "x": 5.5, "y": 2.5},
+ {"label": "Y", "matrix": [4, 3], "x": 6.5, "y": 2.5},
+ {"label": "U", "matrix": [5, 3], "x": 7.5, "y": 2.5},
+ {"label": "I", "matrix": [4, 4], "x": 8.5, "y": 2.5},
+ {"label": "O", "matrix": [5, 4], "x": 9.5, "y": 2.5},
+ {"label": "P", "matrix": [4, 5], "x": 10.5, "y": 2.5},
+ {"label": "[", "matrix": [5, 5], "x": 11.5, "y": 2.5},
+ {"label": "]", "matrix": [4, 6], "x": 12.5, "y": 2.5},
+
+ {"label": "Delete", "matrix": [4, 7], "x": 15.25, "y": 2.5},
+ {"label": "End", "matrix": [4, 8], "x": 16.25, "y": 2.5},
+ {"label": "Page Down", "matrix": [5, 8], "x": 17.25, "y": 2.5},
+
+ {"label": "Caps Lock", "matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"label": "A", "matrix": [7, 0], "x": 1.75, "y": 3.5},
+ {"label": "S", "matrix": [6, 1], "x": 2.75, "y": 3.5},
+ {"label": "D", "matrix": [7, 1], "x": 3.75, "y": 3.5},
+ {"label": "F", "matrix": [6, 2], "x": 4.75, "y": 3.5},
+ {"label": "G", "matrix": [7, 2], "x": 5.75, "y": 3.5},
+ {"label": "H", "matrix": [6, 3], "x": 6.75, "y": 3.5},
+ {"label": "J", "matrix": [7, 3], "x": 7.75, "y": 3.5},
+ {"label": "K", "matrix": [6, 4], "x": 8.75, "y": 3.5},
+ {"label": "L", "matrix": [7, 4], "x": 9.75, "y": 3.5},
+ {"label": ";", "matrix": [6, 5], "x": 10.75, "y": 3.5},
+ {"label": "'", "matrix": [7, 5], "x": 11.75, "y": 3.5},
+ {"label": "#", "matrix": [6, 6], "x": 12.75, "y": 3.5},
+ {"label": "Enter", "matrix": [7, 6], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+ {"label": "Shift", "matrix": [8, 0], "x": 0, "y": 4.5, "w": 1.25},
+ {"label": "\\", "matrix": [9, 0], "x": 1.25, "y": 4.5},
+ {"label": "Z", "matrix": [8, 1], "x": 2.25, "y": 4.5},
+ {"label": "X", "matrix": [9, 1], "x": 3.25, "y": 4.5},
+ {"label": "C", "matrix": [8, 2], "x": 4.25, "y": 4.5},
+ {"label": "V", "matrix": [9, 2], "x": 5.25, "y": 4.5},
+ {"label": "B", "matrix": [8, 3], "x": 6.25, "y": 4.5},
+ {"label": "N", "matrix": [9, 3], "x": 7.25, "y": 4.5},
+ {"label": "M", "matrix": [8, 4], "x": 8.25, "y": 4.5},
+ {"label": ",", "matrix": [9, 4], "x": 9.25, "y": 4.5},
+ {"label": ".", "matrix": [8, 5], "x": 10.25, "y": 4.5},
+ {"label": "/", "matrix": [9, 5], "x": 11.25, "y": 4.5},
+ {"label": "Shift", "matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 1.75},
+ {"label": "Fn", "matrix": [9, 6], "x": 14, "y": 4.5},
+
+ {"label": "\u2191", "matrix": [9, 8], "x": 16.25, "y": 4.5},
+
+ {"label": "Ctrl", "matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5},
+ {"label": "GUI", "matrix": [10, 1], "x": 1.5, "y": 5.5},
+ {"label": "Alt", "matrix": [11, 1], "x": 2.5, "y": 5.5, "w": 1.5},
+ {"label": "Space", "matrix": [11, 3], "x": 4, "y": 5.5, "w": 7},
+ {"label": "Alt", "matrix": [11, 5], "x": 11, "y": 5.5, "w": 1.5},
+ {"label": "GUI", "matrix": [10, 6], "x": 12.5, "y": 5.5},
+ {"label": "Ctrl", "matrix": [11, 6], "x": 13.5, "y": 5.5, "w": 1.5},
+
+ {"label": "\u2190", "matrix": [10, 7], "x": 15.25, "y": 5.5},
+ {"label": "\u2193", "matrix": [11, 8], "x": 16.25, "y": 5.5},
+ {"label": "\u2192", "matrix": [10, 8], "x": 17.25, "y": 5.5}
+ ]
}
}
}
diff --git a/keyboards/4pplet/yakiimo/rev_a/matrix_diagram.md b/keyboards/4pplet/yakiimo/rev_a/matrix_diagram.md
new file mode 100644
index 0000000000..ca322171ae
--- /dev/null
+++ b/keyboards/4pplet/yakiimo/rev_a/matrix_diagram.md
@@ -0,0 +1,27 @@
+# Matrix Diagram for 4pplet Yakiimo Rev A
+
+```
+┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┬───┬───┐
+│00 │ │01 │11 │02 │12 │ │03 │13 │04 │14 │ │05 │15 │06 │16 ││07 │18 │08 │
+└───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐ ┌───────┐
+│20 │30 │21 │31 │22 │32 │23 │33 │24 │34 │25 │35 │26 │36 │27 ││37 │28 │38 │ │27 │ 2u Backspace
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤ └─┬─────┤
+│40 │50 │41 │51 │42 │52 │43 │53 │44 │54 │45 │55 │46 │56 ││47 │48 │58 │ │ │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘ ┌──┴┐76 │ ISO Enter
+│60 │70 │61 │71 │62 │72 │63 │73 │64 │74 │65 │75 │76 │ │66 │ │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌───┐ └───┴────┘
+│80 │90 │81 │91 │82 │92 │83 │93 │84 │94 │85 │95 │86 │96 │ │98 │
+├────┴┬──┴┬──┴──┬┴───┴───┴──┬┴──┬┴───┴───┴──┬┴───┴┬───┬─┴───┤┌───┼───┼───┐
+│A0 │A1 │B1 │B2 │B3 │B4 │B5 │A6 │B6 ││A7 │B8 │A8 │
+└─────┴───┴─────┴───────────┴───┴───────────┴─────┴───┴─────┘└───┴───┴───┘
+┌────────┐ ┌──────────┐
+│80 │ 2.25u LShift 2.75u RShift │86 │
+└────────┘ └──────────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+│A0 │A1 │B1 │B3 │B5 │A6 │B6 │ Tsangan/WKL
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+┌─────┬───┬───────────────────────────────────────┬───┬─────┐
+│A0 │A1 │B3 │A6 │B6 │ 10u Spacebar
+└─────┴───┴───────────────────────────────────────┴───┴─────┘
+```
diff --git a/keyboards/4pplet/yakiimo/rev_a/rev_a.c b/keyboards/4pplet/yakiimo/rev_a/rev_a.c
deleted file mode 100644
index f60dbbdf24..0000000000
--- a/keyboards/4pplet/yakiimo/rev_a/rev_a.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2022 Stefan Sundin "4pplet" <4pplet@protonmail.com>
-
-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 "rev_a.h"
diff --git a/keyboards/4pplet/yakiimo/rev_a/rev_a.h b/keyboards/4pplet/yakiimo/rev_a/rev_a.h
deleted file mode 100644
index cc3f9dee85..0000000000
--- a/keyboards/4pplet/yakiimo/rev_a/rev_a.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-Copyright 2022 Stefan Sundin "4pplet" <4pplet@protonmail.com>
-
-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( \
- k00, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k18, k08, \
- k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, k28, k38, \
- k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k48, k58, \
- k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, \
- k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86, k96, k98, \
- ka0, ka1, kb1, kb2, kb3, kb4, kb5, ka6, kb6, ka7, kb8, ka8 \
-) \
-{ \
- {k00, k01, k02, k03, k04, k05, k06, k07, k08}, \
- {KC_NO, k11, k12, k13, k14, k15, k16, KC_NO, k18}, \
- {k20, k21, k22, k23, k24, k25, k26, k27, k28}, \
- {k30, k31, k32, k33, k34, k35, k36, k37, k38}, \
- {k40, k41, k42, k43, k44, k45, k46, k47, k48}, \
- {k50, k51, k52, k53, k54, k55, k56, KC_NO, k58}, \
- {k60, k61, k62, k63, k64, k65, k66, KC_NO, KC_NO}, \
- {k70, k71, k72, k73, k74, k75, k76, KC_NO, KC_NO}, \
- {k80, k81, k82, k83, k84, k85, k86, KC_NO, KC_NO}, \
- {k90, k91, k92, k93, k94, k95, k96, KC_NO, k98}, \
- {ka0, ka1, KC_NO, KC_NO, KC_NO, KC_NO, ka6, ka7, ka8}, \
- {KC_NO, kb1, kb2, kb3, kb4, kb5, kb6, KC_NO, kb8} \
-}