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/dp60/info.json | 1 + keyboards/dp60/rules.mk | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'keyboards/dp60') diff --git a/keyboards/dp60/info.json b/keyboards/dp60/info.json index 783999f8ed..fd97cf38fe 100644 --- a/keyboards/dp60/info.json +++ b/keyboards/dp60/info.json @@ -12,6 +12,7 @@ "LAYOUT_60_wkl": "LAYOUT_60_ansi_tsangan_split_rshift", "LAYOUT_60_wkl_split_bs": "LAYOUT_60_tsangan_hhkb" }, + "community_layouts": ["60_ansi", "60_hhkb", "60_iso", "60_ansi_split_bs_rshift"], "layouts": { "LAYOUT_60_ansi_tsangan_split_rshift": { "layout": [ diff --git a/keyboards/dp60/rules.mk b/keyboards/dp60/rules.mk index 8acc7d85d4..3d162925f2 100644 --- a/keyboards/dp60/rules.mk +++ b/keyboards/dp60/rules.mk @@ -19,7 +19,5 @@ RGBLIGHT_ENABLE = no # Use RGB underglow light RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = IS31FL3731 # Use RGB matrix -LAYOUTS = 60_ansi 60_hhkb 60_iso 60_ansi_split_bs_rshift - CUSTOM_MATRIX = yes SRC += matrix.c -- cgit v1.2.3 From cf935d97ae479e7a1e1f2f2f248b93e52e4cc69e Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 21 Jan 2023 03:21:17 +1100 Subject: Fix functions with empty params (#19647) * Fix functions with empty params * Found a bunch more --- keyboards/dp60/matrix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/dp60') diff --git a/keyboards/dp60/matrix.c b/keyboards/dp60/matrix.c index a9974757dd..dbcc68056d 100644 --- a/keyboards/dp60/matrix.c +++ b/keyboards/dp60/matrix.c @@ -123,7 +123,7 @@ static void init_rows(void) setPinInputHigh(D4); } -static uint8_t read_rows() +static uint8_t read_rows(void) { return ((readPin(E6) ? 0 : (1 << 0)) | (readPin(F6) ? 0 : (1 << 1)) | -- 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/dp60/config.h | 1 - keyboards/dp60/keymaps/indicator/config.h | 1 - 2 files changed, 2 deletions(-) (limited to 'keyboards/dp60') diff --git a/keyboards/dp60/config.h b/keyboards/dp60/config.h index 9105e1ffb9..a9164df835 100644 --- a/keyboards/dp60/config.h +++ b/keyboards/dp60/config.h @@ -15,7 +15,6 @@ */ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 diff --git a/keyboards/dp60/keymaps/indicator/config.h b/keyboards/dp60/keymaps/indicator/config.h index 0476faca94..c7b52b27a5 100644 --- a/keyboards/dp60/keymaps/indicator/config.h +++ b/keyboards/dp60/keymaps/indicator/config.h @@ -15,7 +15,6 @@ */ #pragma once -#include "config_common.h" #define RGB_INDICATOR_NUM 8 #undef RGBLED_NUM -- 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/dp60/config.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'keyboards/dp60') diff --git a/keyboards/dp60/config.h b/keyboards/dp60/config.h index a9164df835..16df72781b 100644 --- a/keyboards/dp60/config.h +++ b/keyboards/dp60/config.h @@ -21,9 +21,6 @@ #define MATRIX_COLS 15 #define DIODE_DIRECTION COL2ROW -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* * Feature disable options * These options are also useful to firmware size reduction. -- cgit v1.2.3 From d5e622b979c54ddc8f9ad97116c302e29c6aed12 Mon Sep 17 00:00:00 2001 From: jack <0x6A73@pm.me> Date: Sun, 5 Feb 2023 14:36:01 -0700 Subject: Remove `DEBOUNCE` macro usage (#19750) --- keyboards/dp60/matrix.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'keyboards/dp60') diff --git a/keyboards/dp60/matrix.c b/keyboards/dp60/matrix.c index dbcc68056d..1803e0f94f 100644 --- a/keyboards/dp60/matrix.c +++ b/keyboards/dp60/matrix.c @@ -15,6 +15,10 @@ */ #include "quantum.h" +#ifndef DEBOUNCE +# define DEBOUNCE 5 +#endif + static uint8_t debouncing = DEBOUNCE; static matrix_row_t matrix[MATRIX_ROWS]; -- 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/dp60/info.json | 2 ++ keyboards/dp60/rules.mk | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'keyboards/dp60') diff --git a/keyboards/dp60/info.json b/keyboards/dp60/info.json index fd97cf38fe..605c66bb0d 100644 --- a/keyboards/dp60/info.json +++ b/keyboards/dp60/info.json @@ -8,6 +8,8 @@ "pid": "0x00BE", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_60_wkl": "LAYOUT_60_ansi_tsangan_split_rshift", "LAYOUT_60_wkl_split_bs": "LAYOUT_60_tsangan_hhkb" diff --git a/keyboards/dp60/rules.mk b/keyboards/dp60/rules.mk index 3d162925f2..491e8e34a7 100644 --- a/keyboards/dp60/rules.mk +++ b/keyboards/dp60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # -- cgit v1.2.3 From 11d49d00e74618500e5c51e4c7f858eb906ccea8 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sat, 11 Feb 2023 03:47:17 +0000 Subject: Remove matrix_init_quantum/matrix_scan_quantum (#19806) --- keyboards/dp60/matrix.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/dp60') diff --git a/keyboards/dp60/matrix.c b/keyboards/dp60/matrix.c index 1803e0f94f..e32c9a58f9 100644 --- a/keyboards/dp60/matrix.c +++ b/keyboards/dp60/matrix.c @@ -64,7 +64,7 @@ void matrix_init(void) matrix_debouncing[i] = 0; } - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) @@ -96,7 +96,7 @@ uint8_t matrix_scan(void) } } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } -- cgit v1.2.3