From 56555c61e1396a0b1f85105abe78f0a2b3a7c4f3 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 10 Jan 2023 13:48:20 +1100 Subject: Migrate `LAYOUTS` to data driven (#19541) * Migrate `LAYOUTS` to data driven, 0-9 * Migrate `LAYOUTS` to data driven, A * Migrate `LAYOUTS` to data driven, B * Migrate `LAYOUTS` to data driven, C * Migrate `LAYOUTS` to data driven, D * Migrate `LAYOUTS` to data driven, E * Migrate `LAYOUTS` to data driven, F * Migrate `LAYOUTS` to data driven, G * Migrate `LAYOUTS` to data driven, H * Migrate `LAYOUTS` to data driven, handwired * Migrate `LAYOUTS` to data driven, I * Migrate `LAYOUTS` to data driven, J * Migrate `LAYOUTS` to data driven, K * Migrate `LAYOUTS` to data driven, L * Migrate `LAYOUTS` to data driven, M * Migrate `LAYOUTS` to data driven, N * Migrate `LAYOUTS` to data driven, O * Migrate `LAYOUTS` to data driven, P * Migrate `LAYOUTS` to data driven, Q * Migrate `LAYOUTS` to data driven, R * Migrate `LAYOUTS` to data driven, S * Migrate `LAYOUTS` to data driven, T * Migrate `LAYOUTS` to data driven, U * Migrate `LAYOUTS` to data driven, V * Migrate `LAYOUTS` to data driven, W * Migrate `LAYOUTS` to data driven, X * Migrate `LAYOUTS` to data driven, Y * Migrate `LAYOUTS` to data driven, Z --- keyboards/4pplet/perk60_iso/rev_a/info.json | 1 + keyboards/4pplet/perk60_iso/rev_a/rules.mk | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'keyboards/4pplet') diff --git a/keyboards/4pplet/perk60_iso/rev_a/info.json b/keyboards/4pplet/perk60_iso/rev_a/info.json index 2c61e91a96..711dfb9bdf 100644 --- a/keyboards/4pplet/perk60_iso/rev_a/info.json +++ b/keyboards/4pplet/perk60_iso/rev_a/info.json @@ -8,6 +8,7 @@ "pid": "0x0009", "device_version": "0.0.1" }, + "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}] diff --git a/keyboards/4pplet/perk60_iso/rev_a/rules.mk b/keyboards/4pplet/perk60_iso/rev_a/rules.mk index 8182d9e7e2..bf1ca7b1b8 100644 --- a/keyboards/4pplet/perk60_iso/rev_a/rules.mk +++ b/keyboards/4pplet/perk60_iso/rev_a/rules.mk @@ -20,7 +20,5 @@ AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = IS31FL3733 -LAYOUTS = 60_iso - # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -- cgit v1.2.3 From f6dd8dea2e493dc549a60fee99de871c4088d09a Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Tue, 31 Jan 2023 06:03:30 +1100 Subject: Remove usages of config_common.h from config.h files. (#19714) --- keyboards/4pplet/aekiso60/rev_a/config.h | 1 - keyboards/4pplet/aekiso60/rev_b/config.h | 1 - keyboards/4pplet/bootleg/rev_a/config.h | 1 - keyboards/4pplet/steezy60/rev_a/config.h | 1 - keyboards/4pplet/waffling60/rev_a/config.h | 1 - keyboards/4pplet/waffling60/rev_b/config.h | 1 - keyboards/4pplet/waffling60/rev_c/config.h | 1 - keyboards/4pplet/waffling60/rev_d/config.h | 1 - keyboards/4pplet/waffling60/rev_d_ansi/config.h | 1 - keyboards/4pplet/waffling60/rev_d_iso/config.h | 1 - keyboards/4pplet/waffling80/rev_a/config.h | 1 - keyboards/4pplet/waffling80/rev_b/config.h | 1 - 12 files changed, 12 deletions(-) (limited to 'keyboards/4pplet') diff --git a/keyboards/4pplet/aekiso60/rev_a/config.h b/keyboards/4pplet/aekiso60/rev_a/config.h index 8a8c990202..7220a06e80 100644 --- a/keyboards/4pplet/aekiso60/rev_a/config.h +++ b/keyboards/4pplet/aekiso60/rev_a/config.h @@ -1,6 +1,5 @@ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 diff --git a/keyboards/4pplet/aekiso60/rev_b/config.h b/keyboards/4pplet/aekiso60/rev_b/config.h index 0278c9b2b9..574421972f 100644 --- a/keyboards/4pplet/aekiso60/rev_b/config.h +++ b/keyboards/4pplet/aekiso60/rev_b/config.h @@ -16,7 +16,6 @@ along with this program. If not, see . */ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 diff --git a/keyboards/4pplet/bootleg/rev_a/config.h b/keyboards/4pplet/bootleg/rev_a/config.h index 1fb06d5bf6..4ed176e7a9 100644 --- a/keyboards/4pplet/bootleg/rev_a/config.h +++ b/keyboards/4pplet/bootleg/rev_a/config.h @@ -16,7 +16,6 @@ along with this program. If not, see . */ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 diff --git a/keyboards/4pplet/steezy60/rev_a/config.h b/keyboards/4pplet/steezy60/rev_a/config.h index 716024d704..eddf8ff9eb 100644 --- a/keyboards/4pplet/steezy60/rev_a/config.h +++ b/keyboards/4pplet/steezy60/rev_a/config.h @@ -1,6 +1,5 @@ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 diff --git a/keyboards/4pplet/waffling60/rev_a/config.h b/keyboards/4pplet/waffling60/rev_a/config.h index 628acb2a9c..3c68760516 100644 --- a/keyboards/4pplet/waffling60/rev_a/config.h +++ b/keyboards/4pplet/waffling60/rev_a/config.h @@ -16,7 +16,6 @@ along with this program. If not, see . */ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 6 diff --git a/keyboards/4pplet/waffling60/rev_b/config.h b/keyboards/4pplet/waffling60/rev_b/config.h index abf6a286f5..d5de58f267 100644 --- a/keyboards/4pplet/waffling60/rev_b/config.h +++ b/keyboards/4pplet/waffling60/rev_b/config.h @@ -16,7 +16,6 @@ along with this program. If not, see . */ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 diff --git a/keyboards/4pplet/waffling60/rev_c/config.h b/keyboards/4pplet/waffling60/rev_c/config.h index 6afdcced5b..ce4ad40408 100644 --- a/keyboards/4pplet/waffling60/rev_c/config.h +++ b/keyboards/4pplet/waffling60/rev_c/config.h @@ -16,7 +16,6 @@ along with this program. If not, see . */ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 diff --git a/keyboards/4pplet/waffling60/rev_d/config.h b/keyboards/4pplet/waffling60/rev_d/config.h index cfb2ed37e8..aa934e82f3 100644 --- a/keyboards/4pplet/waffling60/rev_d/config.h +++ b/keyboards/4pplet/waffling60/rev_d/config.h @@ -16,7 +16,6 @@ along with this program. If not, see . */ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/config.h b/keyboards/4pplet/waffling60/rev_d_ansi/config.h index 9c4ac8885e..5a943f513e 100644 --- a/keyboards/4pplet/waffling60/rev_d_ansi/config.h +++ b/keyboards/4pplet/waffling60/rev_d_ansi/config.h @@ -16,7 +16,6 @@ along with this program. If not, see . */ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 diff --git a/keyboards/4pplet/waffling60/rev_d_iso/config.h b/keyboards/4pplet/waffling60/rev_d_iso/config.h index dafc628703..40dd3b2939 100644 --- a/keyboards/4pplet/waffling60/rev_d_iso/config.h +++ b/keyboards/4pplet/waffling60/rev_d_iso/config.h @@ -16,7 +16,6 @@ along with this program. If not, see . */ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 diff --git a/keyboards/4pplet/waffling80/rev_a/config.h b/keyboards/4pplet/waffling80/rev_a/config.h index a5eed83a80..a34a5564c3 100644 --- a/keyboards/4pplet/waffling80/rev_a/config.h +++ b/keyboards/4pplet/waffling80/rev_a/config.h @@ -16,7 +16,6 @@ along with this program. If not, see . */ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 12 diff --git a/keyboards/4pplet/waffling80/rev_b/config.h b/keyboards/4pplet/waffling80/rev_b/config.h index 843c9918e2..c777afad0e 100644 --- a/keyboards/4pplet/waffling80/rev_b/config.h +++ b/keyboards/4pplet/waffling80/rev_b/config.h @@ -16,7 +16,6 @@ along with this program. If not, see . */ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 12 -- cgit v1.2.3 From f20a05440ed38bb3de754b2193e56d3e41a939a1 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 3 Feb 2023 11:04:10 +1100 Subject: Remove unused `MATRIX_HAS_GHOST` from config.h (#19726) --- keyboards/4pplet/aekiso60/rev_a/config.h | 3 --- keyboards/4pplet/waffling60/rev_a/config.h | 3 --- keyboards/4pplet/waffling60/rev_b/config.h | 3 --- keyboards/4pplet/waffling60/rev_c/config.h | 3 --- keyboards/4pplet/waffling80/rev_a/config.h | 3 --- keyboards/4pplet/waffling80/rev_b/config.h | 3 --- 6 files changed, 18 deletions(-) (limited to 'keyboards/4pplet') diff --git a/keyboards/4pplet/aekiso60/rev_a/config.h b/keyboards/4pplet/aekiso60/rev_a/config.h index 7220a06e80..2fb0079f45 100644 --- a/keyboards/4pplet/aekiso60/rev_a/config.h +++ b/keyboards/4pplet/aekiso60/rev_a/config.h @@ -11,9 +11,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 5 diff --git a/keyboards/4pplet/waffling60/rev_a/config.h b/keyboards/4pplet/waffling60/rev_a/config.h index 3c68760516..631ee88e34 100644 --- a/keyboards/4pplet/waffling60/rev_a/config.h +++ b/keyboards/4pplet/waffling60/rev_a/config.h @@ -28,9 +28,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 5 diff --git a/keyboards/4pplet/waffling60/rev_b/config.h b/keyboards/4pplet/waffling60/rev_b/config.h index d5de58f267..b5963d1c19 100644 --- a/keyboards/4pplet/waffling60/rev_b/config.h +++ b/keyboards/4pplet/waffling60/rev_b/config.h @@ -28,9 +28,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 5 diff --git a/keyboards/4pplet/waffling60/rev_c/config.h b/keyboards/4pplet/waffling60/rev_c/config.h index ce4ad40408..69a7dd5c77 100644 --- a/keyboards/4pplet/waffling60/rev_c/config.h +++ b/keyboards/4pplet/waffling60/rev_c/config.h @@ -28,9 +28,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 5 diff --git a/keyboards/4pplet/waffling80/rev_a/config.h b/keyboards/4pplet/waffling80/rev_a/config.h index a34a5564c3..d11d98420d 100644 --- a/keyboards/4pplet/waffling80/rev_a/config.h +++ b/keyboards/4pplet/waffling80/rev_a/config.h @@ -28,9 +28,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 5 diff --git a/keyboards/4pplet/waffling80/rev_b/config.h b/keyboards/4pplet/waffling80/rev_b/config.h index c777afad0e..52b4d806e1 100644 --- a/keyboards/4pplet/waffling80/rev_b/config.h +++ b/keyboards/4pplet/waffling80/rev_b/config.h @@ -28,9 +28,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 5 -- cgit v1.2.3 From ebb512db827e84619e7151fcf76e3daf9328fe59 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 4 Feb 2023 06:19:58 +1100 Subject: Debounce defines cleanup (#19742) * Clean up `DEBOUNCE` in config.h, 0-9 * Clean up `DEBOUNCE` in config.h, A * Clean up `DEBOUNCE` in config.h, B * Clean up `DEBOUNCE` in config.h, C * Clean up `DEBOUNCE` in config.h, D * Clean up `DEBOUNCE` in config.h, E * Clean up `DEBOUNCE` in config.h, F * Clean up `DEBOUNCE` in config.h, G * Clean up `DEBOUNCE` in config.h, H * Clean up `DEBOUNCE` in config.h, handwired * Clean up `DEBOUNCE` in config.h, I * Clean up `DEBOUNCE` in config.h, J * Clean up `DEBOUNCE` in config.h, K * Clean up `DEBOUNCE` in config.h, L * Clean up `DEBOUNCE` in config.h, M * Clean up `DEBOUNCE` in config.h, N * Clean up `DEBOUNCE` in config.h, O * Clean up `DEBOUNCE` in config.h, P * Clean up `DEBOUNCE` in config.h, Q * Clean up `DEBOUNCE` in config.h, R * Clean up `DEBOUNCE` in config.h, S * Clean up `DEBOUNCE` in config.h, T * Clean up `DEBOUNCE` in config.h, U * Clean up `DEBOUNCE` in config.h, V * Clean up `DEBOUNCE` in config.h, W * Clean up `DEBOUNCE` in config.h, X * Clean up `DEBOUNCE` in config.h, Y * Clean up `DEBOUNCE` in config.h, Z * Remove default debounce from info.json * Migrate non-default debounce to info.json --- keyboards/4pplet/aekiso60/rev_a/config.h | 3 --- keyboards/4pplet/aekiso60/rev_b/config.h | 3 --- keyboards/4pplet/bootleg/rev_a/config.h | 3 --- keyboards/4pplet/eagle_viper_rep/rev_a/config.h | 3 --- keyboards/4pplet/eagle_viper_rep/rev_b/config.h | 3 --- keyboards/4pplet/perk60_iso/rev_a/config.h | 3 --- keyboards/4pplet/steezy60/rev_a/config.h | 3 --- keyboards/4pplet/waffling60/rev_a/config.h | 3 --- keyboards/4pplet/waffling60/rev_b/config.h | 3 --- keyboards/4pplet/waffling60/rev_c/config.h | 3 --- keyboards/4pplet/waffling60/rev_d/config.h | 3 --- keyboards/4pplet/waffling60/rev_d_ansi/config.h | 3 --- keyboards/4pplet/waffling60/rev_d_iso/config.h | 3 --- keyboards/4pplet/waffling80/rev_a/config.h | 3 --- keyboards/4pplet/waffling80/rev_b/config.h | 3 --- keyboards/4pplet/yakiimo/rev_a/config.h | 3 --- 16 files changed, 48 deletions(-) (limited to 'keyboards/4pplet') diff --git a/keyboards/4pplet/aekiso60/rev_a/config.h b/keyboards/4pplet/aekiso60/rev_a/config.h index 2fb0079f45..aaac4f6b70 100644 --- a/keyboards/4pplet/aekiso60/rev_a/config.h +++ b/keyboards/4pplet/aekiso60/rev_a/config.h @@ -11,9 +11,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - #define QMK_ESC_OUTPUT C4 // usually COL #define QMK_ESC_INPUT C2 // usually ROW diff --git a/keyboards/4pplet/aekiso60/rev_b/config.h b/keyboards/4pplet/aekiso60/rev_b/config.h index 574421972f..0828658de4 100644 --- a/keyboards/4pplet/aekiso60/rev_b/config.h +++ b/keyboards/4pplet/aekiso60/rev_b/config.h @@ -28,9 +28,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - #define QMK_ESC_OUTPUT A3 // usually COL #define QMK_ESC_INPUT B14 // usually ROW diff --git a/keyboards/4pplet/bootleg/rev_a/config.h b/keyboards/4pplet/bootleg/rev_a/config.h index 4ed176e7a9..5dfc0a3a98 100644 --- a/keyboards/4pplet/bootleg/rev_a/config.h +++ b/keyboards/4pplet/bootleg/rev_a/config.h @@ -27,8 +27,5 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - #define QMK_ESC_OUTPUT C4 // usually COL #define QMK_ESC_INPUT D0 // usually ROW diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h index 3c8f4abd66..86eeeeb5c8 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h +++ b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h @@ -70,8 +70,5 @@ along with this program. If not, see . #define LAYER_4 A9 #define LAYER_5 B9 -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - /* Added extra layer for use of layer leds */ #define DYNAMIC_KEYMAP_LAYER_COUNT 5 diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h index f0969f788d..016d30286c 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h +++ b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h @@ -67,8 +67,5 @@ along with this program. If not, see . #define LAYER_4 B9 #define LAYER_5 A9 -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - /* Added extra layer for use of layer leds */ #define DYNAMIC_KEYMAP_LAYER_COUNT 5 diff --git a/keyboards/4pplet/perk60_iso/rev_a/config.h b/keyboards/4pplet/perk60_iso/rev_a/config.h index 233d8e7d36..d272dd3003 100644 --- a/keyboards/4pplet/perk60_iso/rev_a/config.h +++ b/keyboards/4pplet/perk60_iso/rev_a/config.h @@ -28,9 +28,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - #define DRIVER_ADDR_1 0b1010000 #define DRIVER_COUNT 1 #define RGB_MATRIX_LED_COUNT 62 diff --git a/keyboards/4pplet/steezy60/rev_a/config.h b/keyboards/4pplet/steezy60/rev_a/config.h index eddf8ff9eb..692b823655 100644 --- a/keyboards/4pplet/steezy60/rev_a/config.h +++ b/keyboards/4pplet/steezy60/rev_a/config.h @@ -11,9 +11,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - #define QMK_ESC_OUTPUT C4 // usually COL #define QMK_ESC_INPUT C2 // usually ROW diff --git a/keyboards/4pplet/waffling60/rev_a/config.h b/keyboards/4pplet/waffling60/rev_a/config.h index 631ee88e34..c9755f329a 100644 --- a/keyboards/4pplet/waffling60/rev_a/config.h +++ b/keyboards/4pplet/waffling60/rev_a/config.h @@ -28,8 +28,5 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - #define QMK_ESC_OUTPUT D3 // usually COL #define QMK_ESC_INPUT D4 // usually ROW diff --git a/keyboards/4pplet/waffling60/rev_b/config.h b/keyboards/4pplet/waffling60/rev_b/config.h index b5963d1c19..2306c51075 100644 --- a/keyboards/4pplet/waffling60/rev_b/config.h +++ b/keyboards/4pplet/waffling60/rev_b/config.h @@ -28,9 +28,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - #define QMK_ESC_OUTPUT C2 // usually COL #define QMK_ESC_INPUT C4 // usually ROW diff --git a/keyboards/4pplet/waffling60/rev_c/config.h b/keyboards/4pplet/waffling60/rev_c/config.h index 69a7dd5c77..3d69a8748b 100644 --- a/keyboards/4pplet/waffling60/rev_c/config.h +++ b/keyboards/4pplet/waffling60/rev_c/config.h @@ -28,9 +28,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - #define QMK_ESC_OUTPUT C2 // usually COL #define QMK_ESC_INPUT C4 // usually ROW diff --git a/keyboards/4pplet/waffling60/rev_d/config.h b/keyboards/4pplet/waffling60/rev_d/config.h index aa934e82f3..65fedadffc 100644 --- a/keyboards/4pplet/waffling60/rev_d/config.h +++ b/keyboards/4pplet/waffling60/rev_d/config.h @@ -28,9 +28,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - #define QMK_ESC_OUTPUT B2 // usually COL #define QMK_ESC_INPUT B14 // usually ROW diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/config.h b/keyboards/4pplet/waffling60/rev_d_ansi/config.h index 5a943f513e..2cdf024029 100644 --- a/keyboards/4pplet/waffling60/rev_d_ansi/config.h +++ b/keyboards/4pplet/waffling60/rev_d_ansi/config.h @@ -28,8 +28,5 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - #define QMK_ESC_OUTPUT B2 // usually COL #define QMK_ESC_INPUT B14 // usually ROW diff --git a/keyboards/4pplet/waffling60/rev_d_iso/config.h b/keyboards/4pplet/waffling60/rev_d_iso/config.h index 40dd3b2939..c367b2e73e 100644 --- a/keyboards/4pplet/waffling60/rev_d_iso/config.h +++ b/keyboards/4pplet/waffling60/rev_d_iso/config.h @@ -28,8 +28,5 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - #define QMK_ESC_OUTPUT B2 // usually COL #define QMK_ESC_INPUT B14 // usually ROW diff --git a/keyboards/4pplet/waffling80/rev_a/config.h b/keyboards/4pplet/waffling80/rev_a/config.h index d11d98420d..48e96b6c1b 100644 --- a/keyboards/4pplet/waffling80/rev_a/config.h +++ b/keyboards/4pplet/waffling80/rev_a/config.h @@ -28,9 +28,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - #define QMK_ESC_OUTPUT C6 // usually COL #define QMK_ESC_INPUT C4 // usually ROW diff --git a/keyboards/4pplet/waffling80/rev_b/config.h b/keyboards/4pplet/waffling80/rev_b/config.h index 52b4d806e1..899716599d 100644 --- a/keyboards/4pplet/waffling80/rev_b/config.h +++ b/keyboards/4pplet/waffling80/rev_b/config.h @@ -28,9 +28,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - #define QMK_ESC_OUTPUT B2 // usually COL #define QMK_ESC_INPUT B13 // usually ROW diff --git a/keyboards/4pplet/yakiimo/rev_a/config.h b/keyboards/4pplet/yakiimo/rev_a/config.h index 4200eb10c7..2a64b1dde1 100644 --- a/keyboards/4pplet/yakiimo/rev_a/config.h +++ b/keyboards/4pplet/yakiimo/rev_a/config.h @@ -30,6 +30,3 @@ along with this program. If not, see . #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 -- cgit v1.2.3 From f9aeea64c1f85d388485503e52035b5f7533ed26 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 8 Feb 2023 18:41:46 +1100 Subject: Migrate `MCU` and `BOOTLOADER` to data-driven (#19529) --- keyboards/4pplet/aekiso60/rev_a/info.json | 2 ++ keyboards/4pplet/aekiso60/rev_a/rules.mk | 6 ------ keyboards/4pplet/aekiso60/rev_b/info.json | 2 ++ keyboards/4pplet/aekiso60/rev_b/rules.mk | 6 ------ keyboards/4pplet/bootleg/rev_a/info.json | 2 ++ keyboards/4pplet/bootleg/rev_a/rules.mk | 6 ------ keyboards/4pplet/eagle_viper_rep/rev_a/info.json | 2 ++ keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk | 6 ------ keyboards/4pplet/eagle_viper_rep/rev_b/info.json | 2 ++ keyboards/4pplet/eagle_viper_rep/rev_b/rules.mk | 6 ------ keyboards/4pplet/perk60_iso/rev_a/info.json | 2 ++ keyboards/4pplet/perk60_iso/rev_a/rules.mk | 7 ------- keyboards/4pplet/steezy60/rev_a/info.json | 2 ++ keyboards/4pplet/steezy60/rev_a/rules.mk | 6 ------ keyboards/4pplet/waffling60/rev_a/info.json | 2 ++ keyboards/4pplet/waffling60/rev_a/rules.mk | 6 ------ keyboards/4pplet/waffling60/rev_b/info.json | 2 ++ keyboards/4pplet/waffling60/rev_b/rules.mk | 6 ------ keyboards/4pplet/waffling60/rev_c/info.json | 2 ++ keyboards/4pplet/waffling60/rev_c/rules.mk | 6 ------ keyboards/4pplet/waffling60/rev_d/info.json | 2 ++ keyboards/4pplet/waffling60/rev_d/rules.mk | 6 ------ keyboards/4pplet/waffling60/rev_d_ansi/info.json | 2 ++ keyboards/4pplet/waffling60/rev_d_ansi/rules.mk | 6 ------ keyboards/4pplet/waffling60/rev_d_iso/info.json | 2 ++ keyboards/4pplet/waffling60/rev_d_iso/rules.mk | 6 ------ keyboards/4pplet/waffling80/rev_a/info.json | 2 ++ keyboards/4pplet/waffling80/rev_a/rules.mk | 6 ------ keyboards/4pplet/waffling80/rev_b/info.json | 2 ++ keyboards/4pplet/waffling80/rev_b/rules.mk | 6 ------ keyboards/4pplet/yakiimo/rev_a/info.json | 2 ++ keyboards/4pplet/yakiimo/rev_a/rules.mk | 7 ------- 32 files changed, 32 insertions(+), 98 deletions(-) (limited to 'keyboards/4pplet') diff --git a/keyboards/4pplet/aekiso60/rev_a/info.json b/keyboards/4pplet/aekiso60/rev_a/info.json index f838933c08..e43265fcdd 100644 --- a/keyboards/4pplet/aekiso60/rev_a/info.json +++ b/keyboards/4pplet/aekiso60/rev_a/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/4pplet/aekiso60/rev_a/rules.mk b/keyboards/4pplet/aekiso60/rev_a/rules.mk index 43eb792fc1..6fe874e748 100644 --- a/keyboards/4pplet/aekiso60/rev_a/rules.mk +++ b/keyboards/4pplet/aekiso60/rev_a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/4pplet/aekiso60/rev_b/info.json b/keyboards/4pplet/aekiso60/rev_b/info.json index 948c6f6515..ecaa326e51 100644 --- a/keyboards/4pplet/aekiso60/rev_b/info.json +++ b/keyboards/4pplet/aekiso60/rev_b/info.json @@ -8,6 +8,8 @@ "pid": "0x0011", "device_version": "0.0.2" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/4pplet/aekiso60/rev_b/rules.mk b/keyboards/4pplet/aekiso60/rev_b/rules.mk index 8dc60fa527..041df45eca 100644 --- a/keyboards/4pplet/aekiso60/rev_b/rules.mk +++ b/keyboards/4pplet/aekiso60/rev_b/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/4pplet/bootleg/rev_a/info.json b/keyboards/4pplet/bootleg/rev_a/info.json index 007ba9fef4..5654de5fa9 100644 --- a/keyboards/4pplet/bootleg/rev_a/info.json +++ b/keyboards/4pplet/bootleg/rev_a/info.json @@ -8,6 +8,8 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/4pplet/bootleg/rev_a/rules.mk b/keyboards/4pplet/bootleg/rev_a/rules.mk index 43eb792fc1..6fe874e748 100644 --- a/keyboards/4pplet/bootleg/rev_a/rules.mk +++ b/keyboards/4pplet/bootleg/rev_a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/info.json b/keyboards/4pplet/eagle_viper_rep/rev_a/info.json index 110e1cce92..b896f02ad9 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_a/info.json +++ b/keyboards/4pplet/eagle_viper_rep/rev_a/info.json @@ -8,6 +8,8 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk b/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk index 35f765bc83..70dd3e445a 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk +++ b/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/info.json b/keyboards/4pplet/eagle_viper_rep/rev_b/info.json index 0a86c6fab9..f97a4bab9a 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_b/info.json +++ b/keyboards/4pplet/eagle_viper_rep/rev_b/info.json @@ -8,6 +8,8 @@ "pid": "0x0010", "device_version": "0.0.2" }, + "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}] diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/rules.mk b/keyboards/4pplet/eagle_viper_rep/rev_b/rules.mk index 877f1939f2..09e14f7540 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_b/rules.mk +++ b/keyboards/4pplet/eagle_viper_rep/rev_b/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/4pplet/perk60_iso/rev_a/info.json b/keyboards/4pplet/perk60_iso/rev_a/info.json index 711dfb9bdf..07bd69f22e 100644 --- a/keyboards/4pplet/perk60_iso/rev_a/info.json +++ b/keyboards/4pplet/perk60_iso/rev_a/info.json @@ -8,6 +8,8 @@ "pid": "0x0009", "device_version": "0.0.1" }, + "processor": "STM32F411", + "bootloader": "stm32-dfu", "community_layouts": ["60_iso"], "layouts": { "LAYOUT_60_iso": { diff --git a/keyboards/4pplet/perk60_iso/rev_a/rules.mk b/keyboards/4pplet/perk60_iso/rev_a/rules.mk index bf1ca7b1b8..dbdd70b907 100644 --- a/keyboards/4pplet/perk60_iso/rev_a/rules.mk +++ b/keyboards/4pplet/perk60_iso/rev_a/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F411 -BOARD = GENERIC_STM32_F411XE - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/4pplet/steezy60/rev_a/info.json b/keyboards/4pplet/steezy60/rev_a/info.json index ba16d348b9..d2c271ba63 100644 --- a/keyboards/4pplet/steezy60/rev_a/info.json +++ b/keyboards/4pplet/steezy60/rev_a/info.json @@ -8,6 +8,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/4pplet/steezy60/rev_a/rules.mk b/keyboards/4pplet/steezy60/rev_a/rules.mk index 43eb792fc1..6fe874e748 100644 --- a/keyboards/4pplet/steezy60/rev_a/rules.mk +++ b/keyboards/4pplet/steezy60/rev_a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/4pplet/waffling60/rev_a/info.json b/keyboards/4pplet/waffling60/rev_a/info.json index ecbffb1e17..872b9a8116 100644 --- a/keyboards/4pplet/waffling60/rev_a/info.json +++ b/keyboards/4pplet/waffling60/rev_a/info.json @@ -8,6 +8,8 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "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}] diff --git a/keyboards/4pplet/waffling60/rev_a/rules.mk b/keyboards/4pplet/waffling60/rev_a/rules.mk index 43eb792fc1..6fe874e748 100644 --- a/keyboards/4pplet/waffling60/rev_a/rules.mk +++ b/keyboards/4pplet/waffling60/rev_a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/4pplet/waffling60/rev_b/info.json b/keyboards/4pplet/waffling60/rev_b/info.json index 1c2af5598f..4a1cf0180c 100644 --- a/keyboards/4pplet/waffling60/rev_b/info.json +++ b/keyboards/4pplet/waffling60/rev_b/info.json @@ -8,6 +8,8 @@ "pid": "0x0005", "device_version": "0.0.2" }, + "processor": "atmega32u2", + "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}] diff --git a/keyboards/4pplet/waffling60/rev_b/rules.mk b/keyboards/4pplet/waffling60/rev_b/rules.mk index 88173a40c2..a927de843c 100644 --- a/keyboards/4pplet/waffling60/rev_b/rules.mk +++ b/keyboards/4pplet/waffling60/rev_b/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/4pplet/waffling60/rev_c/info.json b/keyboards/4pplet/waffling60/rev_c/info.json index 1e464574a1..20e4445b2a 100644 --- a/keyboards/4pplet/waffling60/rev_c/info.json +++ b/keyboards/4pplet/waffling60/rev_c/info.json @@ -8,6 +8,8 @@ "pid": "0x0008", "device_version": "0.0.3" }, + "processor": "atmega32u2", + "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}] diff --git a/keyboards/4pplet/waffling60/rev_c/rules.mk b/keyboards/4pplet/waffling60/rev_c/rules.mk index 88173a40c2..a927de843c 100644 --- a/keyboards/4pplet/waffling60/rev_c/rules.mk +++ b/keyboards/4pplet/waffling60/rev_c/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/4pplet/waffling60/rev_d/info.json b/keyboards/4pplet/waffling60/rev_d/info.json index ea5b142c25..7b09f0a0d3 100644 --- a/keyboards/4pplet/waffling60/rev_d/info.json +++ b/keyboards/4pplet/waffling60/rev_d/info.json @@ -8,6 +8,8 @@ "pid": "0x000E", "device_version": "0.0.4" }, + "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}] diff --git a/keyboards/4pplet/waffling60/rev_d/rules.mk b/keyboards/4pplet/waffling60/rev_d/rules.mk index 8dc60fa527..041df45eca 100644 --- a/keyboards/4pplet/waffling60/rev_d/rules.mk +++ b/keyboards/4pplet/waffling60/rev_d/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/info.json b/keyboards/4pplet/waffling60/rev_d_ansi/info.json index ba198ef935..dc3ea424bb 100644 --- a/keyboards/4pplet/waffling60/rev_d_ansi/info.json +++ b/keyboards/4pplet/waffling60/rev_d_ansi/info.json @@ -8,6 +8,8 @@ "pid": "0x000D", "device_version": "0.0.4" }, + "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}] diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/rules.mk b/keyboards/4pplet/waffling60/rev_d_ansi/rules.mk index df10992a48..5192065644 100644 --- a/keyboards/4pplet/waffling60/rev_d_ansi/rules.mk +++ b/keyboards/4pplet/waffling60/rev_d_ansi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/4pplet/waffling60/rev_d_iso/info.json b/keyboards/4pplet/waffling60/rev_d_iso/info.json index 3712a5c055..8f9c34b563 100644 --- a/keyboards/4pplet/waffling60/rev_d_iso/info.json +++ b/keyboards/4pplet/waffling60/rev_d_iso/info.json @@ -8,6 +8,8 @@ "pid": "0x000C", "device_version": "0.0.1" }, + "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}] diff --git a/keyboards/4pplet/waffling60/rev_d_iso/rules.mk b/keyboards/4pplet/waffling60/rev_d_iso/rules.mk index d9584ba09d..e8184d57ab 100644 --- a/keyboards/4pplet/waffling60/rev_d_iso/rules.mk +++ b/keyboards/4pplet/waffling60/rev_d_iso/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/4pplet/waffling80/rev_a/info.json b/keyboards/4pplet/waffling80/rev_a/info.json index 16ff5f8cef..1f334dcb63 100644 --- a/keyboards/4pplet/waffling80/rev_a/info.json +++ b/keyboards/4pplet/waffling80/rev_a/info.json @@ -8,6 +8,8 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "processor": "atmega32u2", + "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}] diff --git a/keyboards/4pplet/waffling80/rev_a/rules.mk b/keyboards/4pplet/waffling80/rev_a/rules.mk index 7bc59aaef6..ceea2d612c 100644 --- a/keyboards/4pplet/waffling80/rev_a/rules.mk +++ b/keyboards/4pplet/waffling80/rev_a/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/4pplet/waffling80/rev_b/info.json b/keyboards/4pplet/waffling80/rev_b/info.json index 88a5cdf0a9..f6a835652f 100644 --- a/keyboards/4pplet/waffling80/rev_b/info.json +++ b/keyboards/4pplet/waffling80/rev_b/info.json @@ -8,6 +8,8 @@ "pid": "0x000F", "device_version": "0.0.2" }, + "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}] diff --git a/keyboards/4pplet/waffling80/rev_b/rules.mk b/keyboards/4pplet/waffling80/rev_b/rules.mk index 8dc60fa527..041df45eca 100644 --- a/keyboards/4pplet/waffling80/rev_b/rules.mk +++ b/keyboards/4pplet/waffling80/rev_b/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/4pplet/yakiimo/rev_a/info.json b/keyboards/4pplet/yakiimo/rev_a/info.json index f4eeba747f..e271095e66 100644 --- a/keyboards/4pplet/yakiimo/rev_a/info.json +++ b/keyboards/4pplet/yakiimo/rev_a/info.json @@ -8,6 +8,8 @@ "pid": "0x000A", "device_version": "0.0.2" }, + "processor": "STM32F411", + "bootloader": "stm32-dfu", "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}] diff --git a/keyboards/4pplet/yakiimo/rev_a/rules.mk b/keyboards/4pplet/yakiimo/rev_a/rules.mk index 2f1c4fc78b..9e42693cb6 100644 --- a/keyboards/4pplet/yakiimo/rev_a/rules.mk +++ b/keyboards/4pplet/yakiimo/rev_a/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F411 -BOARD = GENERIC_STM32_F411XE - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # -- cgit v1.2.3 From f4ba17c4a0ee59603c167b04f2d6f6eee8b2cf1b Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 13:14:29 +1100 Subject: Move LED indicator config to data driven (#19800) --- keyboards/4pplet/aekiso60/rev_b/config.h | 2 -- keyboards/4pplet/aekiso60/rev_b/info.json | 3 +++ keyboards/4pplet/eagle_viper_rep/rev_b/config.h | 3 --- keyboards/4pplet/eagle_viper_rep/rev_b/info.json | 5 +++++ keyboards/4pplet/yakiimo/rev_a/config.h | 3 --- keyboards/4pplet/yakiimo/rev_a/info.json | 4 ++++ 6 files changed, 12 insertions(+), 8 deletions(-) (limited to 'keyboards/4pplet') diff --git a/keyboards/4pplet/aekiso60/rev_b/config.h b/keyboards/4pplet/aekiso60/rev_b/config.h index 0828658de4..f6e636c526 100644 --- a/keyboards/4pplet/aekiso60/rev_b/config.h +++ b/keyboards/4pplet/aekiso60/rev_b/config.h @@ -48,6 +48,4 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define LED_CAPS_LOCK_PIN A10 - #define BACKLIGHT_LEVELS 5 diff --git a/keyboards/4pplet/aekiso60/rev_b/info.json b/keyboards/4pplet/aekiso60/rev_b/info.json index ecaa326e51..fe2e424999 100644 --- a/keyboards/4pplet/aekiso60/rev_b/info.json +++ b/keyboards/4pplet/aekiso60/rev_b/info.json @@ -8,6 +8,9 @@ "pid": "0x0011", "device_version": "0.0.2" }, + "indicators": { + "caps_lock": "A10" + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h index 016d30286c..ba94c0c5d3 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h +++ b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h @@ -58,9 +58,6 @@ along with this program. If not, see . #define LOCKING_RESYNC_ENABLE /* Indicator leds */ -#define LED_CAPS_LOCK_PIN B1 -#define LED_NUM_LOCK_PIN B12 -#define LED_SCROLL_LOCK_PIN B13 #define LAYER_1 B14 #define LAYER_2 B15 #define LAYER_3 B0 diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/info.json b/keyboards/4pplet/eagle_viper_rep/rev_b/info.json index f97a4bab9a..e6ac536f43 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" }, + "indicators": { + "caps_lock": "B1", + "num_lock": "B12", + "scroll_lock": "B13" + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/4pplet/yakiimo/rev_a/config.h b/keyboards/4pplet/yakiimo/rev_a/config.h index 2a64b1dde1..60716bbd7a 100644 --- a/keyboards/4pplet/yakiimo/rev_a/config.h +++ b/keyboards/4pplet/yakiimo/rev_a/config.h @@ -23,9 +23,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { B10, B1, C13, C14, B14, B12, B9, B8, B5, B4, A15, B3 } #define DIODE_DIRECTION COL2ROW -#define LED_CAPS_LOCK_PIN A6 -#define LED_SCROLL_LOCK_PIN A7 - /* 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 e271095e66..b902a0d6cf 100644 --- a/keyboards/4pplet/yakiimo/rev_a/info.json +++ b/keyboards/4pplet/yakiimo/rev_a/info.json @@ -8,6 +8,10 @@ "pid": "0x000A", "device_version": "0.0.2" }, + "indicators": { + "caps_lock": "A6", + "scroll_lock": "A7" + }, "processor": "STM32F411", "bootloader": "stm32-dfu", "layouts": { -- cgit v1.2.3 From 2da0827d4ffbcba161126d6001f370e97d0172a8 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 16:08:25 +1100 Subject: Remove matrix size defines (#19581) --- keyboards/4pplet/aekiso60/rev_a/config.h | 3 --- keyboards/4pplet/aekiso60/rev_b/config.h | 3 --- keyboards/4pplet/bootleg/rev_a/config.h | 3 --- keyboards/4pplet/eagle_viper_rep/rev_a/config.h | 3 --- keyboards/4pplet/eagle_viper_rep/rev_b/config.h | 3 --- keyboards/4pplet/perk60_iso/rev_a/config.h | 3 --- keyboards/4pplet/steezy60/rev_a/config.h | 3 --- keyboards/4pplet/waffling60/rev_a/config.h | 3 --- keyboards/4pplet/waffling60/rev_b/config.h | 3 --- keyboards/4pplet/waffling60/rev_c/config.h | 3 --- keyboards/4pplet/waffling60/rev_d/config.h | 3 --- keyboards/4pplet/waffling60/rev_d_ansi/config.h | 3 --- keyboards/4pplet/waffling60/rev_d_iso/config.h | 3 --- keyboards/4pplet/waffling80/rev_a/config.h | 4 ---- keyboards/4pplet/waffling80/rev_b/config.h | 4 ---- keyboards/4pplet/yakiimo/rev_a/config.h | 3 --- 16 files changed, 50 deletions(-) (limited to 'keyboards/4pplet') diff --git a/keyboards/4pplet/aekiso60/rev_a/config.h b/keyboards/4pplet/aekiso60/rev_a/config.h index aaac4f6b70..d9f0e2e63c 100644 --- a/keyboards/4pplet/aekiso60/rev_a/config.h +++ b/keyboards/4pplet/aekiso60/rev_a/config.h @@ -1,9 +1,6 @@ #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 14 // 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} diff --git a/keyboards/4pplet/aekiso60/rev_b/config.h b/keyboards/4pplet/aekiso60/rev_b/config.h index f6e636c526..e3800ad576 100644 --- a/keyboards/4pplet/aekiso60/rev_b/config.h +++ b/keyboards/4pplet/aekiso60/rev_b/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 14 // ROWS: Top to bottom, COLS: Left to right #define MATRIX_ROW_PINS {B15,A9,B7,A1,A2} diff --git a/keyboards/4pplet/bootleg/rev_a/config.h b/keyboards/4pplet/bootleg/rev_a/config.h index 5dfc0a3a98..5ce36a22bd 100644 --- a/keyboards/4pplet/bootleg/rev_a/config.h +++ b/keyboards/4pplet/bootleg/rev_a/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 15 // 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} diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h index 86eeeeb5c8..a10e1255ec 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h +++ b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h @@ -16,9 +16,6 @@ along with this program. If not, see . */ #pragma once -#define MATRIX_ROWS 10 -#define MATRIX_COLS 7 - #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 diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h index ba94c0c5d3..8c3bb820a4 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h +++ b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h @@ -16,9 +16,6 @@ along with this program. If not, see . */ #pragma once -#define MATRIX_ROWS 10 -#define MATRIX_COLS 7 - #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 diff --git a/keyboards/4pplet/perk60_iso/rev_a/config.h b/keyboards/4pplet/perk60_iso/rev_a/config.h index d272dd3003..2764861e97 100644 --- a/keyboards/4pplet/perk60_iso/rev_a/config.h +++ b/keyboards/4pplet/perk60_iso/rev_a/config.h @@ -16,9 +16,6 @@ along with this program. If not, see . */ #pragma once -#define MATRIX_ROWS 10 -#define MATRIX_COLS 7 - #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 diff --git a/keyboards/4pplet/steezy60/rev_a/config.h b/keyboards/4pplet/steezy60/rev_a/config.h index 692b823655..0f2e475460 100644 --- a/keyboards/4pplet/steezy60/rev_a/config.h +++ b/keyboards/4pplet/steezy60/rev_a/config.h @@ -1,9 +1,6 @@ #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 14 // 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} diff --git a/keyboards/4pplet/waffling60/rev_a/config.h b/keyboards/4pplet/waffling60/rev_a/config.h index c9755f329a..302d40911e 100644 --- a/keyboards/4pplet/waffling60/rev_a/config.h +++ b/keyboards/4pplet/waffling60/rev_a/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 11 // ROWS: Top to bottom, COLS: Left to right #define MATRIX_ROW_PINS {D4,D1,C2,C4,C7,B2} diff --git a/keyboards/4pplet/waffling60/rev_b/config.h b/keyboards/4pplet/waffling60/rev_b/config.h index 2306c51075..de947eda06 100644 --- a/keyboards/4pplet/waffling60/rev_b/config.h +++ b/keyboards/4pplet/waffling60/rev_b/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 14 // ROWS: Top to bottom, COLS: Left to right #define MATRIX_ROW_PINS {C2,D0,B0,D6,D5} diff --git a/keyboards/4pplet/waffling60/rev_c/config.h b/keyboards/4pplet/waffling60/rev_c/config.h index 3d69a8748b..aca43c8c83 100644 --- a/keyboards/4pplet/waffling60/rev_c/config.h +++ b/keyboards/4pplet/waffling60/rev_c/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 14 // ROWS: Top to bottom, COLS: Left to right #define MATRIX_ROW_PINS {C2,D0,B0,D6,D5} diff --git a/keyboards/4pplet/waffling60/rev_d/config.h b/keyboards/4pplet/waffling60/rev_d/config.h index 65fedadffc..0d9ec62665 100644 --- a/keyboards/4pplet/waffling60/rev_d/config.h +++ b/keyboards/4pplet/waffling60/rev_d/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 14 // ROWS: Top to bottom, COLS: Left to right #define MATRIX_ROW_PINS {B14,A9,B6,B5,B4} diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/config.h b/keyboards/4pplet/waffling60/rev_d_ansi/config.h index 2cdf024029..255ba2f2d5 100644 --- a/keyboards/4pplet/waffling60/rev_d_ansi/config.h +++ b/keyboards/4pplet/waffling60/rev_d_ansi/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 14 // ROWS: Top to bottom, COLS: Left to right #define MATRIX_ROW_PINS {B14,A9,B6,B5,B4} diff --git a/keyboards/4pplet/waffling60/rev_d_iso/config.h b/keyboards/4pplet/waffling60/rev_d_iso/config.h index c367b2e73e..06c34408f3 100644 --- a/keyboards/4pplet/waffling60/rev_d_iso/config.h +++ b/keyboards/4pplet/waffling60/rev_d_iso/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 14 // ROWS: Top to bottom, COLS: Left to right #define MATRIX_ROW_PINS {B14,A9,B6,B5,B4} diff --git a/keyboards/4pplet/waffling80/rev_a/config.h b/keyboards/4pplet/waffling80/rev_a/config.h index 48e96b6c1b..cc729dc505 100644 --- a/keyboards/4pplet/waffling80/rev_a/config.h +++ b/keyboards/4pplet/waffling80/rev_a/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 12 -#define MATRIX_COLS 8 - // 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} diff --git a/keyboards/4pplet/waffling80/rev_b/config.h b/keyboards/4pplet/waffling80/rev_b/config.h index 899716599d..c065fac544 100644 --- a/keyboards/4pplet/waffling80/rev_b/config.h +++ b/keyboards/4pplet/waffling80/rev_b/config.h @@ -17,10 +17,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 12 -#define MATRIX_COLS 8 - // 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} diff --git a/keyboards/4pplet/yakiimo/rev_a/config.h b/keyboards/4pplet/yakiimo/rev_a/config.h index 60716bbd7a..959bd92622 100644 --- a/keyboards/4pplet/yakiimo/rev_a/config.h +++ b/keyboards/4pplet/yakiimo/rev_a/config.h @@ -16,9 +16,6 @@ along with this program. If not, see . */ #pragma once -#define MATRIX_ROWS 12 -#define MATRIX_COLS 9 - #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 -- cgit v1.2.3 From 9c0ce80d7e7d266cfd2d8fb0d92889db06ea95ff Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 21 Feb 2023 12:05:40 +1100 Subject: Move backlight config to data driven, part 1 (#19887) --- keyboards/4pplet/eagle_viper_rep/rev_a/config.h | 1 - keyboards/4pplet/eagle_viper_rep/rev_b/config.h | 2 -- 2 files changed, 3 deletions(-) (limited to 'keyboards/4pplet') diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h index a10e1255ec..ac93743ec6 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h +++ b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h @@ -25,7 +25,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_DRIVER PWMD2 #define BACKLIGHT_PWM_CHANNEL 4 #define BACKLIGHT_PAL_MODE 2 -#define BACKLIGHT_ON_STATE 1 #define BACKLIGHT_LEVELS 10 #define BACKLIGHT_BREATHING TRUE diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h index 8c3bb820a4..5e1d995a68 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h +++ b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h @@ -27,8 +27,6 @@ along with this program. If not, see . #define BACKLIGHT_PAL_MODE 1 #define BACKLIGHT_LEVELS 6 #define BACKLIGHT_BREATHING -#define BREATHING_PERIOD 6 -#define BACKLIGHT_ON_STATE 1 /* Underglow */ #define RGBLED_NUM 16 -- cgit v1.2.3 From 26854f59402f3f4b7ca5cfe0f3dd665a680715f5 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 22 Feb 2023 12:12:42 +1100 Subject: Remove default and unused `BACKLIGHT_LEVELS` (#19898) --- keyboards/4pplet/aekiso60/rev_a/config.h | 1 - keyboards/4pplet/aekiso60/rev_b/config.h | 2 -- keyboards/4pplet/steezy60/rev_a/config.h | 1 - keyboards/4pplet/waffling60/rev_b/config.h | 1 - keyboards/4pplet/waffling60/rev_c/config.h | 1 - keyboards/4pplet/waffling60/rev_d/config.h | 2 -- 6 files changed, 8 deletions(-) (limited to 'keyboards/4pplet') diff --git a/keyboards/4pplet/aekiso60/rev_a/config.h b/keyboards/4pplet/aekiso60/rev_a/config.h index d9f0e2e63c..da29046991 100644 --- a/keyboards/4pplet/aekiso60/rev_a/config.h +++ b/keyboards/4pplet/aekiso60/rev_a/config.h @@ -13,7 +13,6 @@ #define RGB_DI_PIN D3 #define RGBLED_NUM 12 -#define BACKLIGHT_LEVELS 5 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/4pplet/aekiso60/rev_b/config.h b/keyboards/4pplet/aekiso60/rev_b/config.h index e3800ad576..1162b4acd1 100644 --- a/keyboards/4pplet/aekiso60/rev_b/config.h +++ b/keyboards/4pplet/aekiso60/rev_b/config.h @@ -44,5 +44,3 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE - -#define BACKLIGHT_LEVELS 5 diff --git a/keyboards/4pplet/steezy60/rev_a/config.h b/keyboards/4pplet/steezy60/rev_a/config.h index 0f2e475460..9b3480fe8f 100644 --- a/keyboards/4pplet/steezy60/rev_a/config.h +++ b/keyboards/4pplet/steezy60/rev_a/config.h @@ -13,7 +13,6 @@ #define RGB_DI_PIN D3 #define RGBLED_NUM 12 -#define BACKLIGHT_LEVELS 5 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/4pplet/waffling60/rev_b/config.h b/keyboards/4pplet/waffling60/rev_b/config.h index de947eda06..8f56bc1327 100644 --- a/keyboards/4pplet/waffling60/rev_b/config.h +++ b/keyboards/4pplet/waffling60/rev_b/config.h @@ -30,7 +30,6 @@ along with this program. If not, see . #define RGB_DI_PIN D3 #define RGBLED_NUM 1 -#define BACKLIGHT_LEVELS 5 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/4pplet/waffling60/rev_c/config.h b/keyboards/4pplet/waffling60/rev_c/config.h index aca43c8c83..015532bb8c 100644 --- a/keyboards/4pplet/waffling60/rev_c/config.h +++ b/keyboards/4pplet/waffling60/rev_c/config.h @@ -30,7 +30,6 @@ along with this program. If not, see . #define RGB_DI_PIN D3 #define RGBLED_NUM 1 -#define BACKLIGHT_LEVELS 5 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/4pplet/waffling60/rev_d/config.h b/keyboards/4pplet/waffling60/rev_d/config.h index 0d9ec62665..a1f5ac032d 100644 --- a/keyboards/4pplet/waffling60/rev_d/config.h +++ b/keyboards/4pplet/waffling60/rev_d/config.h @@ -32,8 +32,6 @@ along with this program. If not, see . #define WS2812_EXTERNAL_PULLUP #define RGB_DI_PIN A8 -#define BACKLIGHT_LEVELS 5 - #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -- cgit v1.2.3 From 3bf01bb9ed202b14f78105db2aa2a75d01fc4323 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 23 Feb 2023 09:20:23 +1100 Subject: Move QMK LUFA bootloader config to data driven (#19879) --- keyboards/4pplet/aekiso60/rev_a/config.h | 3 --- keyboards/4pplet/aekiso60/rev_a/info.json | 4 ++++ keyboards/4pplet/aekiso60/rev_b/config.h | 3 --- keyboards/4pplet/bootleg/rev_a/config.h | 3 --- keyboards/4pplet/bootleg/rev_a/info.json | 4 ++++ keyboards/4pplet/steezy60/rev_a/config.h | 3 --- keyboards/4pplet/steezy60/rev_a/info.json | 4 ++++ keyboards/4pplet/waffling60/rev_a/config.h | 3 --- keyboards/4pplet/waffling60/rev_a/info.json | 4 ++++ keyboards/4pplet/waffling60/rev_b/config.h | 3 --- keyboards/4pplet/waffling60/rev_b/info.json | 4 ++++ keyboards/4pplet/waffling60/rev_c/config.h | 3 --- keyboards/4pplet/waffling60/rev_c/info.json | 4 ++++ keyboards/4pplet/waffling60/rev_d/config.h | 3 --- keyboards/4pplet/waffling60/rev_d_ansi/config.h | 3 --- keyboards/4pplet/waffling60/rev_d_iso/config.h | 3 --- keyboards/4pplet/waffling80/rev_a/config.h | 3 --- keyboards/4pplet/waffling80/rev_a/info.json | 4 ++++ keyboards/4pplet/waffling80/rev_b/config.h | 3 --- 19 files changed, 28 insertions(+), 36 deletions(-) (limited to 'keyboards/4pplet') diff --git a/keyboards/4pplet/aekiso60/rev_a/config.h b/keyboards/4pplet/aekiso60/rev_a/config.h index da29046991..f7ef22d986 100644 --- a/keyboards/4pplet/aekiso60/rev_a/config.h +++ b/keyboards/4pplet/aekiso60/rev_a/config.h @@ -8,9 +8,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define QMK_ESC_OUTPUT C4 // usually COL -#define QMK_ESC_INPUT C2 // usually ROW - #define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/4pplet/aekiso60/rev_a/info.json b/keyboards/4pplet/aekiso60/rev_a/info.json index e43265fcdd..9932b6ec55 100644 --- a/keyboards/4pplet/aekiso60/rev_a/info.json +++ b/keyboards/4pplet/aekiso60/rev_a/info.json @@ -8,6 +8,10 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "qmk_lufa_bootloader": { + "esc_input": "C2", + "esc_output": "C4" + }, "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/4pplet/aekiso60/rev_b/config.h b/keyboards/4pplet/aekiso60/rev_b/config.h index 1162b4acd1..b5602b1cc0 100644 --- a/keyboards/4pplet/aekiso60/rev_b/config.h +++ b/keyboards/4pplet/aekiso60/rev_b/config.h @@ -25,9 +25,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define QMK_ESC_OUTPUT A3 // usually COL -#define QMK_ESC_INPUT B14 // usually ROW - #define RGBLED_NUM 12 #define WS2812_EXTERNAL_PULLUP #define RGB_DI_PIN A8 diff --git a/keyboards/4pplet/bootleg/rev_a/config.h b/keyboards/4pplet/bootleg/rev_a/config.h index 5ce36a22bd..b1743d0982 100644 --- a/keyboards/4pplet/bootleg/rev_a/config.h +++ b/keyboards/4pplet/bootleg/rev_a/config.h @@ -23,6 +23,3 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW - -#define QMK_ESC_OUTPUT C4 // usually COL -#define QMK_ESC_INPUT D0 // usually ROW diff --git a/keyboards/4pplet/bootleg/rev_a/info.json b/keyboards/4pplet/bootleg/rev_a/info.json index 5654de5fa9..8f3b5eb2bf 100644 --- a/keyboards/4pplet/bootleg/rev_a/info.json +++ b/keyboards/4pplet/bootleg/rev_a/info.json @@ -8,6 +8,10 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "qmk_lufa_bootloader": { + "esc_input": "D0", + "esc_output": "C4" + }, "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/4pplet/steezy60/rev_a/config.h b/keyboards/4pplet/steezy60/rev_a/config.h index 9b3480fe8f..f7ef22d986 100644 --- a/keyboards/4pplet/steezy60/rev_a/config.h +++ b/keyboards/4pplet/steezy60/rev_a/config.h @@ -8,9 +8,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define QMK_ESC_OUTPUT C4 // usually COL -#define QMK_ESC_INPUT C2 // usually ROW - #define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/4pplet/steezy60/rev_a/info.json b/keyboards/4pplet/steezy60/rev_a/info.json index d2c271ba63..b6e9c37ba2 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", "layouts": { diff --git a/keyboards/4pplet/waffling60/rev_a/config.h b/keyboards/4pplet/waffling60/rev_a/config.h index 302d40911e..670c8132a1 100644 --- a/keyboards/4pplet/waffling60/rev_a/config.h +++ b/keyboards/4pplet/waffling60/rev_a/config.h @@ -24,6 +24,3 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW - -#define QMK_ESC_OUTPUT D3 // usually COL -#define QMK_ESC_INPUT D4 // usually ROW diff --git a/keyboards/4pplet/waffling60/rev_a/info.json b/keyboards/4pplet/waffling60/rev_a/info.json index 872b9a8116..0b98be4876 100644 --- a/keyboards/4pplet/waffling60/rev_a/info.json +++ b/keyboards/4pplet/waffling60/rev_a/info.json @@ -8,6 +8,10 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "qmk_lufa_bootloader": { + "esc_input": "D4", + "esc_output": "D3" + }, "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/4pplet/waffling60/rev_b/config.h b/keyboards/4pplet/waffling60/rev_b/config.h index 8f56bc1327..7c1e13ce84 100644 --- a/keyboards/4pplet/waffling60/rev_b/config.h +++ b/keyboards/4pplet/waffling60/rev_b/config.h @@ -25,9 +25,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define QMK_ESC_OUTPUT C2 // usually COL -#define QMK_ESC_INPUT C4 // usually ROW - #define RGB_DI_PIN D3 #define RGBLED_NUM 1 diff --git a/keyboards/4pplet/waffling60/rev_b/info.json b/keyboards/4pplet/waffling60/rev_b/info.json index 4a1cf0180c..866ae5c1ac 100644 --- a/keyboards/4pplet/waffling60/rev_b/info.json +++ b/keyboards/4pplet/waffling60/rev_b/info.json @@ -8,6 +8,10 @@ "pid": "0x0005", "device_version": "0.0.2" }, + "qmk_lufa_bootloader": { + "esc_input": "C4", + "esc_output": "C2" + }, "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/4pplet/waffling60/rev_c/config.h b/keyboards/4pplet/waffling60/rev_c/config.h index 015532bb8c..689a515013 100644 --- a/keyboards/4pplet/waffling60/rev_c/config.h +++ b/keyboards/4pplet/waffling60/rev_c/config.h @@ -25,9 +25,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define QMK_ESC_OUTPUT C2 // usually COL -#define QMK_ESC_INPUT C4 // usually ROW - #define RGB_DI_PIN D3 #define RGBLED_NUM 1 diff --git a/keyboards/4pplet/waffling60/rev_c/info.json b/keyboards/4pplet/waffling60/rev_c/info.json index 20e4445b2a..1a6937b096 100644 --- a/keyboards/4pplet/waffling60/rev_c/info.json +++ b/keyboards/4pplet/waffling60/rev_c/info.json @@ -8,6 +8,10 @@ "pid": "0x0008", "device_version": "0.0.3" }, + "qmk_lufa_bootloader": { + "esc_input": "C4", + "esc_output": "C2" + }, "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/4pplet/waffling60/rev_d/config.h b/keyboards/4pplet/waffling60/rev_d/config.h index a1f5ac032d..05e66f6a79 100644 --- a/keyboards/4pplet/waffling60/rev_d/config.h +++ b/keyboards/4pplet/waffling60/rev_d/config.h @@ -25,9 +25,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define QMK_ESC_OUTPUT B2 // usually COL -#define QMK_ESC_INPUT B14 // usually ROW - #define RGBLED_NUM 1 #define WS2812_EXTERNAL_PULLUP #define RGB_DI_PIN A8 diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/config.h b/keyboards/4pplet/waffling60/rev_d_ansi/config.h index 255ba2f2d5..beb204bb2d 100644 --- a/keyboards/4pplet/waffling60/rev_d_ansi/config.h +++ b/keyboards/4pplet/waffling60/rev_d_ansi/config.h @@ -24,6 +24,3 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW - -#define QMK_ESC_OUTPUT B2 // usually COL -#define QMK_ESC_INPUT B14 // usually ROW diff --git a/keyboards/4pplet/waffling60/rev_d_iso/config.h b/keyboards/4pplet/waffling60/rev_d_iso/config.h index 06c34408f3..cb2e06921a 100644 --- a/keyboards/4pplet/waffling60/rev_d_iso/config.h +++ b/keyboards/4pplet/waffling60/rev_d_iso/config.h @@ -24,6 +24,3 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW - -#define QMK_ESC_OUTPUT B2 // usually COL -#define QMK_ESC_INPUT B14 // usually ROW diff --git a/keyboards/4pplet/waffling80/rev_a/config.h b/keyboards/4pplet/waffling80/rev_a/config.h index cc729dc505..8b3dc47247 100644 --- a/keyboards/4pplet/waffling80/rev_a/config.h +++ b/keyboards/4pplet/waffling80/rev_a/config.h @@ -24,9 +24,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define QMK_ESC_OUTPUT C6 // usually COL -#define QMK_ESC_INPUT C4 // usually ROW - #define RGB_DI_PIN D7 #define RGBLED_NUM 2 diff --git a/keyboards/4pplet/waffling80/rev_a/info.json b/keyboards/4pplet/waffling80/rev_a/info.json index 1f334dcb63..13bffb7384 100644 --- a/keyboards/4pplet/waffling80/rev_a/info.json +++ b/keyboards/4pplet/waffling80/rev_a/info.json @@ -8,6 +8,10 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "qmk_lufa_bootloader": { + "esc_input": "C4", + "esc_output": "C6" + }, "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/4pplet/waffling80/rev_b/config.h b/keyboards/4pplet/waffling80/rev_b/config.h index c065fac544..c863208012 100644 --- a/keyboards/4pplet/waffling80/rev_b/config.h +++ b/keyboards/4pplet/waffling80/rev_b/config.h @@ -24,9 +24,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define QMK_ESC_OUTPUT B2 // usually COL -#define QMK_ESC_INPUT B13 // usually ROW - #define RGBLED_NUM 2 #define WS2812_EXTERNAL_PULLUP #define RGB_DI_PIN A8 -- cgit v1.2.3 From 314f6c1ddba09851b33e4f3b4bd43bdbc55f9628 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 26 Feb 2023 08:37:57 +1100 Subject: Move backlight config to data driven (#19910) --- keyboards/4pplet/eagle_viper_rep/rev_a/config.h | 4 ---- keyboards/4pplet/eagle_viper_rep/rev_a/info.json | 5 +++++ keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk | 1 - keyboards/4pplet/eagle_viper_rep/rev_b/config.h | 4 ---- keyboards/4pplet/eagle_viper_rep/rev_b/info.json | 5 +++++ 5 files changed, 10 insertions(+), 9 deletions(-) (limited to 'keyboards/4pplet') diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h index ac93743ec6..3d480a1e93 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_a/config.h +++ b/keyboards/4pplet/eagle_viper_rep/rev_a/config.h @@ -20,13 +20,9 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { A2, A1, B8, A10, C15, A15, B7, B6, C14, C13} #define DIODE_DIRECTION COL2ROW -/* In switch leds */ -#define BACKLIGHT_PIN A3 #define BACKLIGHT_PWM_DRIVER PWMD2 #define BACKLIGHT_PWM_CHANNEL 4 #define BACKLIGHT_PAL_MODE 2 -#define BACKLIGHT_LEVELS 10 -#define BACKLIGHT_BREATHING TRUE /* Underglow */ #define RGB_DI_PIN A7 diff --git a/keyboards/4pplet/eagle_viper_rep/rev_a/info.json b/keyboards/4pplet/eagle_viper_rep/rev_a/info.json index b896f02ad9..8748b32480 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_a/info.json +++ b/keyboards/4pplet/eagle_viper_rep/rev_a/info.json @@ -8,6 +8,11 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "backlight": { + "pin": "A3", + "levels": 10, + "breathing": true + }, "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 70dd3e445a..8b5bef208b 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk +++ b/keyboards/4pplet/eagle_viper_rep/rev_a/rules.mk @@ -8,7 +8,6 @@ CONSOLE_ENABLE = yes # Console for debug COMMAND_ENABLE = yes # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = yes -BACKLIGHT_DRIVER = pwm RGBLIGHT_ENABLE = yes WS2812_DRIVER = spi diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h index 5e1d995a68..eed3b708c4 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_b/config.h +++ b/keyboards/4pplet/eagle_viper_rep/rev_b/config.h @@ -20,13 +20,9 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { A2, A1, B8, A10, C15, A15, B7, B6, C14, C13} #define DIODE_DIRECTION COL2ROW -/* In switch leds */ -#define BACKLIGHT_PIN A6 #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING /* Underglow */ #define RGBLED_NUM 16 diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/info.json b/keyboards/4pplet/eagle_viper_rep/rev_b/info.json index e6ac536f43..7ced2cf40c 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" }, + "backlight": { + "pin": "A6", + "levels": 6, + "breathing": true + }, "indicators": { "caps_lock": "B1", "num_lock": "B12", -- cgit v1.2.3