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/tronguylabs/m122_3270/config.h | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/tronguylabs') diff --git a/keyboards/tronguylabs/m122_3270/config.h b/keyboards/tronguylabs/m122_3270/config.h index 801fc9ee50..575b7b9985 100644 --- a/keyboards/tronguylabs/m122_3270/config.h +++ b/keyboards/tronguylabs/m122_3270/config.h @@ -16,7 +16,6 @@ #pragma once -#include "config_common.h" // Both controllers draw 100 mA or less #define USB_MAX_POWER_CONSUMPTION 100 -- 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/tronguylabs/m122_3270/config.h | 3 --- keyboards/tronguylabs/m122_3270/info.json | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'keyboards/tronguylabs') diff --git a/keyboards/tronguylabs/m122_3270/config.h b/keyboards/tronguylabs/m122_3270/config.h index 575b7b9985..b0ae482b66 100644 --- a/keyboards/tronguylabs/m122_3270/config.h +++ b/keyboards/tronguylabs/m122_3270/config.h @@ -26,6 +26,3 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION ROW2COL - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 15 diff --git a/keyboards/tronguylabs/m122_3270/info.json b/keyboards/tronguylabs/m122_3270/info.json index f6fba523d6..23dc5366ed 100644 --- a/keyboards/tronguylabs/m122_3270/info.json +++ b/keyboards/tronguylabs/m122_3270/info.json @@ -6,6 +6,7 @@ "vid": "0x1209", "pid": "0x3270" }, + "debounce": 15, "layouts": { "LAYOUT": { "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/tronguylabs/m122_3270/blackpill/info.json | 5 ++++- keyboards/tronguylabs/m122_3270/blackpill/rules.mk | 7 ------- keyboards/tronguylabs/m122_3270/bluepill/info.json | 4 +++- keyboards/tronguylabs/m122_3270/bluepill/rules.mk | 7 ------- keyboards/tronguylabs/m122_3270/teensy/info.json | 4 +++- keyboards/tronguylabs/m122_3270/teensy/rules.mk | 6 ------ 6 files changed, 10 insertions(+), 23 deletions(-) (limited to 'keyboards/tronguylabs') diff --git a/keyboards/tronguylabs/m122_3270/blackpill/info.json b/keyboards/tronguylabs/m122_3270/blackpill/info.json index e557e4d307..f5e8f4835d 100644 --- a/keyboards/tronguylabs/m122_3270/blackpill/info.json +++ b/keyboards/tronguylabs/m122_3270/blackpill/info.json @@ -1,5 +1,8 @@ { "usb": { "device_version": "0.0.2" - } + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411" } diff --git a/keyboards/tronguylabs/m122_3270/blackpill/rules.mk b/keyboards/tronguylabs/m122_3270/blackpill/rules.mk index 821cf29632..0a85fffb85 100644 --- a/keyboards/tronguylabs/m122_3270/blackpill/rules.mk +++ b/keyboards/tronguylabs/m122_3270/blackpill/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/tronguylabs/m122_3270/bluepill/info.json b/keyboards/tronguylabs/m122_3270/bluepill/info.json index b377cdff00..86af52a58d 100644 --- a/keyboards/tronguylabs/m122_3270/bluepill/info.json +++ b/keyboards/tronguylabs/m122_3270/bluepill/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "0.0.3" - } + }, + "processor": "STM32F103", + "bootloader": "stm32duino" } diff --git a/keyboards/tronguylabs/m122_3270/bluepill/rules.mk b/keyboards/tronguylabs/m122_3270/bluepill/rules.mk index 023c22cd2c..e69de29bb2 100644 --- a/keyboards/tronguylabs/m122_3270/bluepill/rules.mk +++ b/keyboards/tronguylabs/m122_3270/bluepill/rules.mk @@ -1,7 +0,0 @@ -# Overrides for the Bluepill version - -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino diff --git a/keyboards/tronguylabs/m122_3270/teensy/info.json b/keyboards/tronguylabs/m122_3270/teensy/info.json index 90ac25f360..def31867f6 100644 --- a/keyboards/tronguylabs/m122_3270/teensy/info.json +++ b/keyboards/tronguylabs/m122_3270/teensy/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "0.0.1" - } + }, + "processor": "at90usb1286", + "bootloader": "halfkay" } diff --git a/keyboards/tronguylabs/m122_3270/teensy/rules.mk b/keyboards/tronguylabs/m122_3270/teensy/rules.mk index 16c4501c04..0a85fffb85 100644 --- a/keyboards/tronguylabs/m122_3270/teensy/rules.mk +++ b/keyboards/tronguylabs/m122_3270/teensy/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = halfkay - # 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/tronguylabs/m122_3270/config.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'keyboards/tronguylabs') diff --git a/keyboards/tronguylabs/m122_3270/config.h b/keyboards/tronguylabs/m122_3270/config.h index b0ae482b66..e51a882c42 100644 --- a/keyboards/tronguylabs/m122_3270/config.h +++ b/keyboards/tronguylabs/m122_3270/config.h @@ -20,9 +20,5 @@ // Both controllers draw 100 mA or less #define USB_MAX_POWER_CONSUMPTION 100 -/* key matrix size */ -#define MATRIX_ROWS 8 -#define MATRIX_COLS 20 - /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION ROW2COL -- cgit v1.2.3