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/geekboards/macropad_v2/config.h | 1 - keyboards/geekboards/tester/config.h | 1 - 2 files changed, 2 deletions(-) (limited to 'keyboards/geekboards') diff --git a/keyboards/geekboards/macropad_v2/config.h b/keyboards/geekboards/macropad_v2/config.h index 151c74bc37..f4fe1cd4a2 100644 --- a/keyboards/geekboards/macropad_v2/config.h +++ b/keyboards/geekboards/macropad_v2/config.h @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 2 diff --git a/keyboards/geekboards/tester/config.h b/keyboards/geekboards/tester/config.h index c8f3aa4977..4a8bb181db 100644 --- a/keyboards/geekboards/tester/config.h +++ b/keyboards/geekboards/tester/config.h @@ -1,6 +1,5 @@ #pragma once -#include "config_common.h" #define MATRIX_ROWS 2 #define MATRIX_COLS 4 -- 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/geekboards/macropad_v2/config.h | 3 --- keyboards/geekboards/macropad_v2/info.json | 1 + keyboards/geekboards/tester/config.h | 1 - keyboards/geekboards/tester/info.json | 1 + 4 files changed, 2 insertions(+), 4 deletions(-) (limited to 'keyboards/geekboards') diff --git a/keyboards/geekboards/macropad_v2/config.h b/keyboards/geekboards/macropad_v2/config.h index f4fe1cd4a2..e4e2e955d1 100644 --- a/keyboards/geekboards/macropad_v2/config.h +++ b/keyboards/geekboards/macropad_v2/config.h @@ -92,9 +92,6 @@ #define RGB_DISABLE_WHEN_USB_SUSPENDED #define WAIT_FOR_USB -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 3 - /* Bootmagic Lite key configuration */ #define BOOTMAGIC_LITE_ROW 0 #define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/geekboards/macropad_v2/info.json b/keyboards/geekboards/macropad_v2/info.json index bac03b43f1..4671440fef 100644 --- a/keyboards/geekboards/macropad_v2/info.json +++ b/keyboards/geekboards/macropad_v2/info.json @@ -8,6 +8,7 @@ "pid": "0xA372", "device_version": "0.0.2" }, + "debounce": 3, "layouts": { "LAYOUT_ortho_2x4": { "layout": [ diff --git a/keyboards/geekboards/tester/config.h b/keyboards/geekboards/tester/config.h index 4a8bb181db..96aa0afbe4 100644 --- a/keyboards/geekboards/tester/config.h +++ b/keyboards/geekboards/tester/config.h @@ -11,7 +11,6 @@ #define LOCKING_SUPPORT_ENABL #define LOCKING_RESYNC_ENABLE -#define DEBOUNCE 3 #ifdef RGB_MATRIX_ENABLE #define RGB_DISABLE_WHEN_USB_SUSPENDED #define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/geekboards/tester/info.json b/keyboards/geekboards/tester/info.json index 2da610fb3f..9da0d0edb6 100644 --- a/keyboards/geekboards/tester/info.json +++ b/keyboards/geekboards/tester/info.json @@ -8,6 +8,7 @@ "pid": "0x1319", "device_version": "0.0.1" }, + "debounce": 3, "layouts": { "LAYOUT": { "layout": [ -- cgit v1.2.3 From 11b6bb8179ce93c5954c96e24ef6dd09c497a131 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 7 Feb 2023 11:05:37 +1100 Subject: Remove unused Bootmagic row/col defines from config.h (#19761) --- keyboards/geekboards/macropad_v2/config.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'keyboards/geekboards') diff --git a/keyboards/geekboards/macropad_v2/config.h b/keyboards/geekboards/macropad_v2/config.h index e4e2e955d1..ec6cc2949e 100644 --- a/keyboards/geekboards/macropad_v2/config.h +++ b/keyboards/geekboards/macropad_v2/config.h @@ -92,8 +92,4 @@ #define RGB_DISABLE_WHEN_USB_SUSPENDED #define WAIT_FOR_USB -/* Bootmagic Lite key configuration */ -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 0 - #define TAP_CODE_DELAY 10 -- 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/geekboards/macropad_v2/info.json | 2 ++ keyboards/geekboards/macropad_v2/rules.mk | 6 ------ keyboards/geekboards/tester/info.json | 2 ++ keyboards/geekboards/tester/rules.mk | 6 ------ 4 files changed, 4 insertions(+), 12 deletions(-) (limited to 'keyboards/geekboards') diff --git a/keyboards/geekboards/macropad_v2/info.json b/keyboards/geekboards/macropad_v2/info.json index 4671440fef..2a18038e4f 100644 --- a/keyboards/geekboards/macropad_v2/info.json +++ b/keyboards/geekboards/macropad_v2/info.json @@ -8,6 +8,8 @@ "pid": "0xA372", "device_version": "0.0.2" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "debounce": 3, "layouts": { "LAYOUT_ortho_2x4": { diff --git a/keyboards/geekboards/macropad_v2/rules.mk b/keyboards/geekboards/macropad_v2/rules.mk index 4aa4ccfdef..f81c11eb7d 100644 --- a/keyboards/geekboards/macropad_v2/rules.mk +++ b/keyboards/geekboards/macropad_v2/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/geekboards/tester/info.json b/keyboards/geekboards/tester/info.json index 9da0d0edb6..fdc0463e41 100644 --- a/keyboards/geekboards/tester/info.json +++ b/keyboards/geekboards/tester/info.json @@ -8,6 +8,8 @@ "pid": "0x1319", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", "debounce": 3, "layouts": { "LAYOUT": { diff --git a/keyboards/geekboards/tester/rules.mk b/keyboards/geekboards/tester/rules.mk index 923f1f383c..e17c577cc4 100644 --- a/keyboards/geekboards/tester/rules.mk +++ b/keyboards/geekboards/tester/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 2cdf99ae950a82e233482347651b7689c4896827 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 14 Feb 2023 18:39:41 +1100 Subject: Migrate `DIRECT_PINS` to data driven (#19826) --- keyboards/geekboards/macropad_v2/config.h | 6 ------ keyboards/geekboards/macropad_v2/info.json | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'keyboards/geekboards') diff --git a/keyboards/geekboards/macropad_v2/config.h b/keyboards/geekboards/macropad_v2/config.h index ec6cc2949e..eb9850804f 100644 --- a/keyboards/geekboards/macropad_v2/config.h +++ b/keyboards/geekboards/macropad_v2/config.h @@ -14,12 +14,6 @@ * along with this program. If not, see . */ -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 4 - -#define DIRECT_PINS {{B13, B15, B3, B5}, {B12, B14, A13, B7}} - #define RGBLED_NUM 42 #define RGB_MATRIX_LED_COUNT 42 #define RGB_DI_PIN A7 diff --git a/keyboards/geekboards/macropad_v2/info.json b/keyboards/geekboards/macropad_v2/info.json index 2a18038e4f..b84877a8dc 100644 --- a/keyboards/geekboards/macropad_v2/info.json +++ b/keyboards/geekboards/macropad_v2/info.json @@ -10,6 +10,12 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "matrix_pins": { + "direct": [ + ["B13", "B15", "B3", "B5"], + ["B12", "B14", "A13", "B7"] + ] + }, "debounce": 3, "layouts": { "LAYOUT_ortho_2x4": { -- 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/geekboards/tester/config.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'keyboards/geekboards') diff --git a/keyboards/geekboards/tester/config.h b/keyboards/geekboards/tester/config.h index 96aa0afbe4..0a184388ae 100644 --- a/keyboards/geekboards/tester/config.h +++ b/keyboards/geekboards/tester/config.h @@ -1,9 +1,6 @@ #pragma once -#define MATRIX_ROWS 2 -#define MATRIX_COLS 4 - #define MATRIX_ROW_PINS { B0, D4} #define MATRIX_COL_PINS { F7, F6, D2, D3} -- cgit v1.2.3 From e837a32b2b4d6eb96ffacad0022699d67c0f8f1e Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 19 Feb 2023 18:55:12 +1100 Subject: Move layouts for direct_pins boards to data driven (#19872) --- keyboards/geekboards/macropad_v2/info.json | 16 ++++++++-------- keyboards/geekboards/macropad_v2/macropad_v2.c | 2 +- keyboards/geekboards/macropad_v2/macropad_v2.h | 26 -------------------------- 3 files changed, 9 insertions(+), 35 deletions(-) delete mode 100644 keyboards/geekboards/macropad_v2/macropad_v2.h (limited to 'keyboards/geekboards') diff --git a/keyboards/geekboards/macropad_v2/info.json b/keyboards/geekboards/macropad_v2/info.json index b84877a8dc..5bb1cc5ee8 100644 --- a/keyboards/geekboards/macropad_v2/info.json +++ b/keyboards/geekboards/macropad_v2/info.json @@ -20,15 +20,15 @@ "layouts": { "LAYOUT_ortho_2x4": { "layout": [ - {"label": "K0", "x": 0, "y": 0}, - {"label": "K1", "x": 1, "y": 0}, - {"label": "K2", "x": 2, "y": 0}, - {"label": "K3", "x": 3, "y": 0}, + {"x": 0, "y": 0, "matrix": [0, 0]}, + {"x": 1, "y": 0, "matrix": [0, 1]}, + {"x": 2, "y": 0, "matrix": [0, 2]}, + {"x": 3, "y": 0, "matrix": [0, 3]}, - {"label": "K4", "x": 0, "y": 1}, - {"label": "K5", "x": 1, "y": 1}, - {"label": "K6", "x": 2, "y": 1}, - {"label": "K7", "x": 3, "y": 1} + {"x": 0, "y": 1, "matrix": [1, 0]}, + {"x": 1, "y": 1, "matrix": [1, 1]}, + {"x": 2, "y": 1, "matrix": [1, 2]}, + {"x": 3, "y": 1, "matrix": [1, 3]} ] } } diff --git a/keyboards/geekboards/macropad_v2/macropad_v2.c b/keyboards/geekboards/macropad_v2/macropad_v2.c index df8581cc58..191290d3fa 100644 --- a/keyboards/geekboards/macropad_v2/macropad_v2.c +++ b/keyboards/geekboards/macropad_v2/macropad_v2.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include QMK_KEYBOARD_H +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/geekboards/macropad_v2/macropad_v2.h b/keyboards/geekboards/macropad_v2/macropad_v2.h deleted file mode 100644 index 7fe684deb7..0000000000 --- a/keyboards/geekboards/macropad_v2/macropad_v2.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2020 Geekboards ltd. (geekboards.ru / geekboards.de) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#pragma once - -#include "quantum.h" - -#define LAYOUT_ortho_2x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13 \ -) { \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 } \ -} -- cgit v1.2.3 From 499fc3b85e99de725535eb73f653d77a71339e3f Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 22 Feb 2023 02:55:23 +1100 Subject: Add some missing `#pragma once`s (#19902) --- keyboards/geekboards/macropad_v2/config.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'keyboards/geekboards') diff --git a/keyboards/geekboards/macropad_v2/config.h b/keyboards/geekboards/macropad_v2/config.h index eb9850804f..eb01b1ad13 100644 --- a/keyboards/geekboards/macropad_v2/config.h +++ b/keyboards/geekboards/macropad_v2/config.h @@ -14,6 +14,8 @@ * along with this program. If not, see . */ +#pragma once + #define RGBLED_NUM 42 #define RGB_MATRIX_LED_COUNT 42 #define RGB_DI_PIN A7 -- cgit v1.2.3 From 7f805cc7799deb0ca75f751cebd32c6640058af9 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Thu, 23 Feb 2023 09:19:00 +1100 Subject: VIA Protocol 12 + fixes (#19916) Co-authored-by: Wilba Co-authored-by: zvecr --- keyboards/geekboards/macropad_v2/keymaps/via/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/geekboards') diff --git a/keyboards/geekboards/macropad_v2/keymaps/via/keymap.c b/keyboards/geekboards/macropad_v2/keymaps/via/keymap.c index b0e5b9327d..4e6655c23c 100644 --- a/keyboards/geekboards/macropad_v2/keymaps/via/keymap.c +++ b/keyboards/geekboards/macropad_v2/keymaps/via/keymap.c @@ -20,12 +20,12 @@ bool is_alt_tab_active = false; uint16_t alt_tab_timer = 0; enum custom_keycodes { - ALT_TAB = USER00, + ALT_TAB = QK_KB_0, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_ortho_2x4( - LT(1, KC_MUTE), KC_VOLD, KC_VOLU, MACRO00, + LT(1, KC_MUTE), KC_VOLD, KC_VOLU, MC_0, ALT_TAB, KC_MPRV, KC_MNXT, KC_MPLY ), [1] = LAYOUT_ortho_2x4( -- cgit v1.2.3