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/superuser/ext/config.h | 1 - keyboards/superuser/frl/config.h | 1 - keyboards/superuser/tkl/config.h | 1 - 3 files changed, 3 deletions(-) (limited to 'keyboards/superuser') diff --git a/keyboards/superuser/ext/config.h b/keyboards/superuser/ext/config.h index 84c71b0195..9c9d3f8d13 100644 --- a/keyboards/superuser/ext/config.h +++ b/keyboards/superuser/ext/config.h @@ -17,7 +17,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/superuser/frl/config.h b/keyboards/superuser/frl/config.h index 021cb0f57d..ffadb081b7 100644 --- a/keyboards/superuser/frl/config.h +++ b/keyboards/superuser/frl/config.h @@ -17,7 +17,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/superuser/tkl/config.h b/keyboards/superuser/tkl/config.h index 768cd26fa6..5eb205e840 100644 --- a/keyboards/superuser/tkl/config.h +++ b/keyboards/superuser/tkl/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 6 -- 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/superuser/ext/config.h | 3 --- keyboards/superuser/frl/config.h | 3 --- keyboards/superuser/tkl/config.h | 3 --- 3 files changed, 9 deletions(-) (limited to 'keyboards/superuser') diff --git a/keyboards/superuser/ext/config.h b/keyboards/superuser/ext/config.h index 9c9d3f8d13..6ff087efac 100644 --- a/keyboards/superuser/ext/config.h +++ b/keyboards/superuser/ext/config.h @@ -38,7 +38,4 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - #define LED_CAPS_LOCK_PIN B7 diff --git a/keyboards/superuser/frl/config.h b/keyboards/superuser/frl/config.h index ffadb081b7..fedbdb32f4 100644 --- a/keyboards/superuser/frl/config.h +++ b/keyboards/superuser/frl/config.h @@ -38,7 +38,4 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - #define LED_CAPS_LOCK_PIN B7 diff --git a/keyboards/superuser/tkl/config.h b/keyboards/superuser/tkl/config.h index 5eb205e840..edc831c747 100644 --- a/keyboards/superuser/tkl/config.h +++ b/keyboards/superuser/tkl/config.h @@ -38,7 +38,4 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - #define LED_CAPS_LOCK_PIN B7 -- 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/superuser/ext/info.json | 2 ++ keyboards/superuser/ext/rules.mk | 6 ------ keyboards/superuser/frl/info.json | 2 ++ keyboards/superuser/frl/rules.mk | 6 ------ keyboards/superuser/tkl/info.json | 2 ++ keyboards/superuser/tkl/rules.mk | 6 ------ 6 files changed, 6 insertions(+), 18 deletions(-) (limited to 'keyboards/superuser') diff --git a/keyboards/superuser/ext/info.json b/keyboards/superuser/ext/info.json index d19f1e524d..0057690f68 100644 --- a/keyboards/superuser/ext/info.json +++ b/keyboards/superuser/ext/info.json @@ -8,6 +8,8 @@ "pid": "0x4558", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layout_aliases": { "LAYOUT_tkl": "LAYOUT_all" }, diff --git a/keyboards/superuser/ext/rules.mk b/keyboards/superuser/ext/rules.mk index 4fdac83bca..58cb1ddd55 100644 --- a/keyboards/superuser/ext/rules.mk +++ b/keyboards/superuser/ext/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/superuser/frl/info.json b/keyboards/superuser/frl/info.json index 5a01d0a39d..6d108dd971 100644 --- a/keyboards/superuser/frl/info.json +++ b/keyboards/superuser/frl/info.json @@ -8,6 +8,8 @@ "pid": "0x4652", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layouts": { "LAYOUT_tkl": { "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}, {"label":"Bksp", "x":13, "y":0}, {"label":"Bksp", "x":14, "y":0}, {"label":"Insert", "x":15.25, "y":0}, {"label":"Home", "x":16.25, "y":0}, {"label":"PgUp", "x":17.25, "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":"Delete", "x":15.25, "y":1}, {"label":"End", "x":16.25, "y":1}, {"label":"PgDn", "x":17.25, "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":"Enter", "x":12.75, "y":2, "w":2.25}, {"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}, {"label":"Fn", "x":14, "y":3}, {"label":"\u2191", "x":16.25, "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":7}, {"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}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}] diff --git a/keyboards/superuser/frl/rules.mk b/keyboards/superuser/frl/rules.mk index 4fdac83bca..58cb1ddd55 100644 --- a/keyboards/superuser/frl/rules.mk +++ b/keyboards/superuser/frl/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/superuser/tkl/info.json b/keyboards/superuser/tkl/info.json index ff8a6b7895..ebaeb95a5c 100644 --- a/keyboards/superuser/tkl/info.json +++ b/keyboards/superuser/tkl/info.json @@ -8,6 +8,8 @@ "pid": "0x544B", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "layout_aliases": { "LAYOUT_tkl": "LAYOUT_all" }, diff --git a/keyboards/superuser/tkl/rules.mk b/keyboards/superuser/tkl/rules.mk index 4fdac83bca..58cb1ddd55 100644 --- a/keyboards/superuser/tkl/rules.mk +++ b/keyboards/superuser/tkl/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-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/superuser/ext/config.h | 2 -- keyboards/superuser/ext/info.json | 3 +++ keyboards/superuser/frl/config.h | 2 -- keyboards/superuser/frl/info.json | 3 +++ keyboards/superuser/tkl/config.h | 2 -- keyboards/superuser/tkl/info.json | 3 +++ 6 files changed, 9 insertions(+), 6 deletions(-) (limited to 'keyboards/superuser') diff --git a/keyboards/superuser/ext/config.h b/keyboards/superuser/ext/config.h index 6ff087efac..9327d9a927 100644 --- a/keyboards/superuser/ext/config.h +++ b/keyboards/superuser/ext/config.h @@ -37,5 +37,3 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW - -#define LED_CAPS_LOCK_PIN B7 diff --git a/keyboards/superuser/ext/info.json b/keyboards/superuser/ext/info.json index 0057690f68..57d4ccbb18 100644 --- a/keyboards/superuser/ext/info.json +++ b/keyboards/superuser/ext/info.json @@ -8,6 +8,9 @@ "pid": "0x4558", "device_version": "0.0.1" }, + "indicators": { + "caps_lock": "B7" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "layout_aliases": { diff --git a/keyboards/superuser/frl/config.h b/keyboards/superuser/frl/config.h index fedbdb32f4..d29fd72da6 100644 --- a/keyboards/superuser/frl/config.h +++ b/keyboards/superuser/frl/config.h @@ -37,5 +37,3 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW - -#define LED_CAPS_LOCK_PIN B7 diff --git a/keyboards/superuser/frl/info.json b/keyboards/superuser/frl/info.json index 6d108dd971..14c7b1e54f 100644 --- a/keyboards/superuser/frl/info.json +++ b/keyboards/superuser/frl/info.json @@ -8,6 +8,9 @@ "pid": "0x4652", "device_version": "0.0.1" }, + "indicators": { + "caps_lock": "B7" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "layouts": { diff --git a/keyboards/superuser/tkl/config.h b/keyboards/superuser/tkl/config.h index edc831c747..af91392de1 100644 --- a/keyboards/superuser/tkl/config.h +++ b/keyboards/superuser/tkl/config.h @@ -37,5 +37,3 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW - -#define LED_CAPS_LOCK_PIN B7 diff --git a/keyboards/superuser/tkl/info.json b/keyboards/superuser/tkl/info.json index ebaeb95a5c..6e94c7a28e 100644 --- a/keyboards/superuser/tkl/info.json +++ b/keyboards/superuser/tkl/info.json @@ -8,6 +8,9 @@ "pid": "0x544B", "device_version": "0.0.1" }, + "indicators": { + "caps_lock": "B7" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "layout_aliases": { -- 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/superuser/ext/config.h | 4 ---- keyboards/superuser/frl/config.h | 4 ---- keyboards/superuser/tkl/config.h | 4 ---- 3 files changed, 12 deletions(-) (limited to 'keyboards/superuser') diff --git a/keyboards/superuser/ext/config.h b/keyboards/superuser/ext/config.h index 9327d9a927..0bcd052fed 100644 --- a/keyboards/superuser/ext/config.h +++ b/keyboards/superuser/ext/config.h @@ -18,10 +18,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 19 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/superuser/frl/config.h b/keyboards/superuser/frl/config.h index d29fd72da6..607133eaf8 100644 --- a/keyboards/superuser/frl/config.h +++ b/keyboards/superuser/frl/config.h @@ -18,10 +18,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 17 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/superuser/tkl/config.h b/keyboards/superuser/tkl/config.h index af91392de1..665276c79d 100644 --- a/keyboards/superuser/tkl/config.h +++ b/keyboards/superuser/tkl/config.h @@ -18,10 +18,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 17 - /* * Keyboard Matrix Assignments * -- cgit v1.2.3