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/cannonkeys/nearfield/config.h | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/cannonkeys/nearfield') diff --git a/keyboards/cannonkeys/nearfield/config.h b/keyboards/cannonkeys/nearfield/config.h index a275a6213c..4bf17e0839 100755 --- a/keyboards/cannonkeys/nearfield/config.h +++ b/keyboards/cannonkeys/nearfield/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 -- 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/cannonkeys/nearfield/config.h | 3 --- keyboards/cannonkeys/nearfield/info.json | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'keyboards/cannonkeys/nearfield') diff --git a/keyboards/cannonkeys/nearfield/config.h b/keyboards/cannonkeys/nearfield/config.h index 4bf17e0839..4335c00020 100755 --- a/keyboards/cannonkeys/nearfield/config.h +++ b/keyboards/cannonkeys/nearfield/config.h @@ -28,6 +28,3 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 0 diff --git a/keyboards/cannonkeys/nearfield/info.json b/keyboards/cannonkeys/nearfield/info.json index ffd1bf6ac6..07985ea893 100644 --- a/keyboards/cannonkeys/nearfield/info.json +++ b/keyboards/cannonkeys/nearfield/info.json @@ -8,6 +8,7 @@ "pid":"0x0002", "device_version":"0.0.1" }, + "debounce": 0, "layouts":{ "LAYOUT_all":{ "layout":[ -- 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/cannonkeys/nearfield/info.json | 2 ++ keyboards/cannonkeys/nearfield/rules.mk | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'keyboards/cannonkeys/nearfield') diff --git a/keyboards/cannonkeys/nearfield/info.json b/keyboards/cannonkeys/nearfield/info.json index 07985ea893..83550cbd36 100644 --- a/keyboards/cannonkeys/nearfield/info.json +++ b/keyboards/cannonkeys/nearfield/info.json @@ -8,6 +8,8 @@ "pid":"0x0002", "device_version":"0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "debounce": 0, "layouts":{ "LAYOUT_all":{ diff --git a/keyboards/cannonkeys/nearfield/rules.mk b/keyboards/cannonkeys/nearfield/rules.mk index 476cf49f27..3b6a1809db 100755 --- a/keyboards/cannonkeys/nearfield/rules.mk +++ b/keyboards/cannonkeys/nearfield/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 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/cannonkeys/nearfield/config.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'keyboards/cannonkeys/nearfield') diff --git a/keyboards/cannonkeys/nearfield/config.h b/keyboards/cannonkeys/nearfield/config.h index 4335c00020..5c989ba3f3 100755 --- a/keyboards/cannonkeys/nearfield/config.h +++ b/keyboards/cannonkeys/nearfield/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 16 - /* key matrix pins */ #define MATRIX_ROW_PINS { B4, D2, D4, D6, D7 } #define MATRIX_COL_PINS { D3, D5, C6, C7, B6, B5, B7, F0, F1, F4, F5, F6, F7, B3, B2, D1 } -- cgit v1.2.3