From 1978007faefc0fb3af809ddf0d2ff1274e540570 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 15 Dec 2022 07:40:25 +1100 Subject: Tap Dance: remove `qk_` prefix (#19313) --- keyboards/redox/keymaps/finex/keymap.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'keyboards/redox') diff --git a/keyboards/redox/keymaps/finex/keymap.c b/keyboards/redox/keymaps/finex/keymap.c index 6470addb27..9057dee074 100644 --- a/keyboards/redox/keymaps/finex/keymap.c +++ b/keyboards/redox/keymaps/finex/keymap.c @@ -47,7 +47,7 @@ enum tap_dance{ }; // Semicolon to Colon -void dance_scln_finished (qk_tap_dance_state_t *state, void *user_data) { +void dance_scln_finished (tap_dance_state_t *state, void *user_data) { if (state->count == 1) { register_code (KC_SCLN); } else { @@ -55,7 +55,7 @@ void dance_scln_finished (qk_tap_dance_state_t *state, void *user_data) { register_code (KC_SCLN); } } -void dance_scln_reset (qk_tap_dance_state_t *state, void *user_data) { +void dance_scln_reset (tap_dance_state_t *state, void *user_data) { if (state->count == 1) { unregister_code (KC_SCLN); } else { @@ -65,7 +65,7 @@ void dance_scln_reset (qk_tap_dance_state_t *state, void *user_data) { } // Square braket to curly bracket (left) -void dance_lbrc_finished (qk_tap_dance_state_t *state, void *user_data) { +void dance_lbrc_finished (tap_dance_state_t *state, void *user_data) { if (state->count == 1) { register_code (KC_LBRC); } else { @@ -73,7 +73,7 @@ void dance_lbrc_finished (qk_tap_dance_state_t *state, void *user_data) { register_code (KC_LBRC); } } -void dance_lbrc_reset (qk_tap_dance_state_t *state, void *user_data) { +void dance_lbrc_reset (tap_dance_state_t *state, void *user_data) { if (state->count == 1) { unregister_code (KC_LBRC); } else { @@ -83,7 +83,7 @@ void dance_lbrc_reset (qk_tap_dance_state_t *state, void *user_data) { } // Square braket to curly bracket (right) -void dance_rbrc_finished (qk_tap_dance_state_t *state, void *user_data) { +void dance_rbrc_finished (tap_dance_state_t *state, void *user_data) { if (state->count == 1) { register_code (KC_RBRC); } else { @@ -91,7 +91,7 @@ void dance_rbrc_finished (qk_tap_dance_state_t *state, void *user_data) { register_code (KC_RBRC); } } -void dance_rbrc_reset (qk_tap_dance_state_t *state, void *user_data) { +void dance_rbrc_reset (tap_dance_state_t *state, void *user_data) { if (state->count == 1) { unregister_code (KC_RBRC); } else { @@ -102,7 +102,7 @@ void dance_rbrc_reset (qk_tap_dance_state_t *state, void *user_data) { //Tap Dance Definitions -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [TD_SCLN] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_scln_finished, dance_scln_reset), [TD_LBRC] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_lbrc_finished, dance_lbrc_reset), [TD_RBRC] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_rbrc_finished, dance_rbrc_reset) -- cgit v1.2.3 From b7274343913eb3e019f0dc08fa8f7774165e787d Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 29 Jan 2023 02:42:44 +1100 Subject: Remove commented out backlight config & stray "backlight levels" (#19703) --- keyboards/redox/rev1/config.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'keyboards/redox') diff --git a/keyboards/redox/rev1/config.h b/keyboards/redox/rev1/config.h index 72874b66f5..259368f959 100644 --- a/keyboards/redox/rev1/config.h +++ b/keyboards/redox/rev1/config.h @@ -35,9 +35,6 @@ along with this program. If not, see . /* define if matrix has ghost */ //#define MATRIX_HAS_GHOST -/* number of backlight levels */ -// #define BACKLIGHT_LEVELS 3 - /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 5 -- 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/redox/config.h | 1 - keyboards/redox/rev1/config.h | 1 - keyboards/redox/rev1/proton_c/config.h | 1 - 3 files changed, 3 deletions(-) (limited to 'keyboards/redox') diff --git a/keyboards/redox/config.h b/keyboards/redox/config.h index 79316dd083..afd9b04cca 100644 --- a/keyboards/redox/config.h +++ b/keyboards/redox/config.h @@ -17,4 +17,3 @@ along with this program. If not, see . #pragma once -#include "config_common.h" \ No newline at end of file diff --git a/keyboards/redox/rev1/config.h b/keyboards/redox/rev1/config.h index 259368f959..7b2a76f23c 100644 --- a/keyboards/redox/rev1/config.h +++ b/keyboards/redox/rev1/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" /* key matrix size */ // Rows are doubled-up diff --git a/keyboards/redox/rev1/proton_c/config.h b/keyboards/redox/rev1/proton_c/config.h index 56cdb88126..1706236ca4 100644 --- a/keyboards/redox/rev1/proton_c/config.h +++ b/keyboards/redox/rev1/proton_c/config.h @@ -3,7 +3,6 @@ #pragma once -#include "config_common.h" // wiring of each half #undef MATRIX_ROW_PINS -- cgit v1.2.3 From f20a05440ed38bb3de754b2193e56d3e41a939a1 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 3 Feb 2023 11:04:10 +1100 Subject: Remove unused `MATRIX_HAS_GHOST` from config.h (#19726) --- keyboards/redox/rev1/config.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'keyboards/redox') diff --git a/keyboards/redox/rev1/config.h b/keyboards/redox/rev1/config.h index 7b2a76f23c..c498624ced 100644 --- a/keyboards/redox/rev1/config.h +++ b/keyboards/redox/rev1/config.h @@ -31,9 +31,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 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/redox/rev1/config.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'keyboards/redox') diff --git a/keyboards/redox/rev1/config.h b/keyboards/redox/rev1/config.h index c498624ced..e0938c6afd 100644 --- a/keyboards/redox/rev1/config.h +++ b/keyboards/redox/rev1/config.h @@ -31,9 +31,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - /* serial.c configuration for split keyboard */ #define SOFT_SERIAL_PIN D0 -- 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/redox/rev1/base/info.json | 4 +++- keyboards/redox/rev1/proton_c/info.json | 5 ++++- keyboards/redox/rev1/proton_c/rules.mk | 5 ----- keyboards/redox/rules.mk | 6 ------ 4 files changed, 7 insertions(+), 13 deletions(-) (limited to 'keyboards/redox') diff --git a/keyboards/redox/rev1/base/info.json b/keyboards/redox/rev1/base/info.json index ad889c2304..34566b32e8 100644 --- a/keyboards/redox/rev1/base/info.json +++ b/keyboards/redox/rev1/base/info.json @@ -1,5 +1,7 @@ { "usb": { "device_version": "1.0.0" - } + }, + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/redox/rev1/proton_c/info.json b/keyboards/redox/rev1/proton_c/info.json index 62a27157ad..4f6bae6891 100644 --- a/keyboards/redox/rev1/proton_c/info.json +++ b/keyboards/redox/rev1/proton_c/info.json @@ -1,5 +1,8 @@ { "usb": { "device_version": "1.0.1" - } + }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C" } diff --git a/keyboards/redox/rev1/proton_c/rules.mk b/keyboards/redox/rev1/proton_c/rules.mk index 829c8365ef..d45b778a1a 100644 --- a/keyboards/redox/rev1/proton_c/rules.mk +++ b/keyboards/redox/rev1/proton_c/rules.mk @@ -1,7 +1,2 @@ -# Proton C -MCU = STM32F303 -BOARD = QMK_PROTON_C -BOOTLOADER = stm32-dfu - # specific to using the serial serial driver SERIAL_DRIVER = usart diff --git a/keyboards/redox/rules.mk b/keyboards/redox/rules.mk index 181027c417..29ad3b9404 100644 --- a/keyboards/redox/rules.mk +++ b/keyboards/redox/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # -- cgit v1.2.3 From ccb6c908dd71fac3dfa89f2d8baa8196eac9994f Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 9 Feb 2023 10:57:42 +1100 Subject: Remove `SOFT_SERIAL_PIN` for non-split boards (#19774) * Remove `SOFT_SERIAL_PIN` for non-split boards * Delete more empty config.h --- keyboards/redox/config.h | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 keyboards/redox/config.h (limited to 'keyboards/redox') diff --git a/keyboards/redox/config.h b/keyboards/redox/config.h deleted file mode 100644 index afd9b04cca..0000000000 --- a/keyboards/redox/config.h +++ /dev/null @@ -1,19 +0,0 @@ -/* -Copyright 2018 Mattia Dal Ben - -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 - -- 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/redox/rev1/config.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'keyboards/redox') diff --git a/keyboards/redox/rev1/config.h b/keyboards/redox/rev1/config.h index e0938c6afd..3e05d861b8 100644 --- a/keyboards/redox/rev1/config.h +++ b/keyboards/redox/rev1/config.h @@ -18,11 +18,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -// Rows are doubled-up -#define MATRIX_ROWS 10 -#define MATRIX_COLS 7 - // wiring of each half #define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 } #define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 } -- cgit v1.2.3 From 8f6c228adbfec98828f0411f62bab07f96e5c020 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 16:40:49 +1100 Subject: Move `SOFT_SERIAL_PIN` to data driven (#19863) --- keyboards/redox/rev1/base/info.json | 3 +++ keyboards/redox/rev1/config.h | 3 --- keyboards/redox/rev1/proton_c/config.h | 8 +------- keyboards/redox/rev1/proton_c/info.json | 3 +++ 4 files changed, 7 insertions(+), 10 deletions(-) (limited to 'keyboards/redox') diff --git a/keyboards/redox/rev1/base/info.json b/keyboards/redox/rev1/base/info.json index 34566b32e8..d65f0e2b1b 100644 --- a/keyboards/redox/rev1/base/info.json +++ b/keyboards/redox/rev1/base/info.json @@ -2,6 +2,9 @@ "usb": { "device_version": "1.0.0" }, + "split": { + "soft_serial_pin": "D0" + }, "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/redox/rev1/config.h b/keyboards/redox/rev1/config.h index 3e05d861b8..b768d2f19f 100644 --- a/keyboards/redox/rev1/config.h +++ b/keyboards/redox/rev1/config.h @@ -26,9 +26,6 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* serial.c configuration for split keyboard */ -#define SOFT_SERIAL_PIN D0 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/redox/rev1/proton_c/config.h b/keyboards/redox/rev1/proton_c/config.h index 1706236ca4..71d3470569 100644 --- a/keyboards/redox/rev1/proton_c/config.h +++ b/keyboards/redox/rev1/proton_c/config.h @@ -14,15 +14,9 @@ /* serial.c configuration for split keyboard */ #define SERIAL_USART_FULL_DUPLEX // Enable full duplex operation mode. -/* - Because the rev1 config defines SOFT_SERIAL_PIN, we need to undef it, redefine it, and also assign - it to avoid a redefine error. - */ -#undef SOFT_SERIAL_PIN -#define SOFT_SERIAL_PIN B6 // USART TX pin #define SERIAL_USART_RX_PIN B7 // USART RX pin -#define SERIAL_USART_TX_PIN SOFT_SERIAL_PIN // USART TX pin +#define SERIAL_USART_TX_PIN B6 // USART TX pin #define SERIAL_USART_PIN_SWAP // Swap TX and RX pins if keyboard is master halve. // Check if this feature is necessary with your keyboard design and available on the mcu. diff --git a/keyboards/redox/rev1/proton_c/info.json b/keyboards/redox/rev1/proton_c/info.json index 4f6bae6891..fd61a7992b 100644 --- a/keyboards/redox/rev1/proton_c/info.json +++ b/keyboards/redox/rev1/proton_c/info.json @@ -2,6 +2,9 @@ "usb": { "device_version": "1.0.1" }, + "split": { + "soft_serial_pin": "B6" + }, "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C" -- cgit v1.2.3 From 86885ecbcccc322168577d86c418688d6b7f48d7 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 18 Feb 2023 02:21:00 +1100 Subject: Fix more build failures (#19869) --- keyboards/redox/rev1/proton_c/info.json | 3 --- 1 file changed, 3 deletions(-) (limited to 'keyboards/redox') diff --git a/keyboards/redox/rev1/proton_c/info.json b/keyboards/redox/rev1/proton_c/info.json index fd61a7992b..4f6bae6891 100644 --- a/keyboards/redox/rev1/proton_c/info.json +++ b/keyboards/redox/rev1/proton_c/info.json @@ -2,9 +2,6 @@ "usb": { "device_version": "1.0.1" }, - "split": { - "soft_serial_pin": "B6" - }, "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C" -- cgit v1.2.3