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/crypt_macro/config.h | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/crypt_macro') diff --git a/keyboards/crypt_macro/config.h b/keyboards/crypt_macro/config.h index 4f1862b14f..e5d130268e 100644 --- a/keyboards/crypt_macro/config.h +++ b/keyboards/crypt_macro/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" #define MATRIX_ROWS 2 #define MATRIX_COLS 3 -- cgit v1.2.3 From b867522f8cf90aef6f4531e669e35aba5ec0bf1c Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 31 Jan 2023 07:45:41 +1100 Subject: Clean up Force NKRO in config.h (#19718) --- keyboards/crypt_macro/config.h | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'keyboards/crypt_macro') diff --git a/keyboards/crypt_macro/config.h b/keyboards/crypt_macro/config.h index e5d130268e..302dd8160e 100644 --- a/keyboards/crypt_macro/config.h +++ b/keyboards/crypt_macro/config.h @@ -65,27 +65,6 @@ along with this program. If not, see . */ // #define GRAVE_ESC_CTRL_OVERRIDE -/* - * Force NKRO - * - * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved - * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the - * makefile for this to work.) - * - * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) - * until the next keyboard reset. - * - * NKRO may prevent your keystrokes from being detected in the BIOS, but it is - * fully operational during normal computer usage. - * - * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) - * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by - * bootmagic, NKRO mode will always be enabled until it is toggled again during a - * power-up. - * - */ -//#define FORCE_NKRO - /* Bootmagic Lite key configuration */ #define BOOTMAGIC_LITE_ROW 0 #define BOOTMAGIC_LITE_COLUMN 0 -- 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/crypt_macro/config.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'keyboards/crypt_macro') diff --git a/keyboards/crypt_macro/config.h b/keyboards/crypt_macro/config.h index 302dd8160e..27c7ffdcca 100644 --- a/keyboards/crypt_macro/config.h +++ b/keyboards/crypt_macro/config.h @@ -57,9 +57,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - /* If defined, GRAVE_ESC will always act as ESC when CTRL is held. * This is userful for the Windows task manager shortcut (ctrl+shift+esc). */ -- 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/crypt_macro/config.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'keyboards/crypt_macro') diff --git a/keyboards/crypt_macro/config.h b/keyboards/crypt_macro/config.h index 27c7ffdcca..bf6da212ac 100644 --- a/keyboards/crypt_macro/config.h +++ b/keyboards/crypt_macro/config.h @@ -26,9 +26,6 @@ along with this program. If not, see . { NO_PIN, B5, NO_PIN} \ } -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */ #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE -- cgit v1.2.3 From a988f8a169112e31b21ff7c61870ab483c396cf3 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 6 Feb 2023 13:40:23 +1100 Subject: Remove unused `GRAVE_ESC_CTRL_OVERRIDE` from config.h (#19752) --- keyboards/crypt_macro/config.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'keyboards/crypt_macro') diff --git a/keyboards/crypt_macro/config.h b/keyboards/crypt_macro/config.h index bf6da212ac..2924acb84c 100644 --- a/keyboards/crypt_macro/config.h +++ b/keyboards/crypt_macro/config.h @@ -54,11 +54,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. - * This is userful for the Windows task manager shortcut (ctrl+shift+esc). - */ -// #define GRAVE_ESC_CTRL_OVERRIDE - /* Bootmagic Lite key configuration */ #define BOOTMAGIC_LITE_ROW 0 #define BOOTMAGIC_LITE_COLUMN 0 -- 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/crypt_macro/config.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'keyboards/crypt_macro') diff --git a/keyboards/crypt_macro/config.h b/keyboards/crypt_macro/config.h index 2924acb84c..97ea6e4619 100644 --- a/keyboards/crypt_macro/config.h +++ b/keyboards/crypt_macro/config.h @@ -53,7 +53,3 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE - -/* Bootmagic Lite key configuration */ -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 0 -- 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/crypt_macro/info.json | 2 ++ keyboards/crypt_macro/rules.mk | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'keyboards/crypt_macro') diff --git a/keyboards/crypt_macro/info.json b/keyboards/crypt_macro/info.json index f423ffade2..6945fe7391 100644 --- a/keyboards/crypt_macro/info.json +++ b/keyboards/crypt_macro/info.json @@ -8,6 +8,8 @@ "pid": "0x434D", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0.5, "y":1, "w":2}] diff --git a/keyboards/crypt_macro/rules.mk b/keyboards/crypt_macro/rules.mk index a53d7daeb0..f430af42f4 100644 --- a/keyboards/crypt_macro/rules.mk +++ b/keyboards/crypt_macro/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF -- 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/crypt_macro/config.h | 9 --------- keyboards/crypt_macro/info.json | 6 ++++++ 2 files changed, 6 insertions(+), 9 deletions(-) (limited to 'keyboards/crypt_macro') diff --git a/keyboards/crypt_macro/config.h b/keyboards/crypt_macro/config.h index 97ea6e4619..665340e7af 100644 --- a/keyboards/crypt_macro/config.h +++ b/keyboards/crypt_macro/config.h @@ -17,15 +17,6 @@ along with this program. If not, see . #pragma once - -#define MATRIX_ROWS 2 -#define MATRIX_COLS 3 - -#define DIRECT_PINS { \ - { B12, B6, B7 }, \ - { NO_PIN, B5, NO_PIN} \ -} - /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */ #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE diff --git a/keyboards/crypt_macro/info.json b/keyboards/crypt_macro/info.json index 6945fe7391..910777b90c 100644 --- a/keyboards/crypt_macro/info.json +++ b/keyboards/crypt_macro/info.json @@ -10,6 +10,12 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "matrix_pins": { + "direct": [ + ["B12", "B6", "B7"], + [null, "B5", null] + ] + }, "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0.5, "y":1, "w":2}] -- 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/crypt_macro/crypt_macro.c | 16 ---------------- keyboards/crypt_macro/crypt_macro.h | 28 ---------------------------- keyboards/crypt_macro/info.json | 7 ++++++- 3 files changed, 6 insertions(+), 45 deletions(-) delete mode 100644 keyboards/crypt_macro/crypt_macro.c delete mode 100644 keyboards/crypt_macro/crypt_macro.h (limited to 'keyboards/crypt_macro') diff --git a/keyboards/crypt_macro/crypt_macro.c b/keyboards/crypt_macro/crypt_macro.c deleted file mode 100644 index 32f8d0bf28..0000000000 --- a/keyboards/crypt_macro/crypt_macro.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2022 Yiancar-Designs - * - * 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 . - */ -#include "crypt_macro.h" diff --git a/keyboards/crypt_macro/crypt_macro.h b/keyboards/crypt_macro/crypt_macro.h deleted file mode 100644 index d128db4dff..0000000000 --- a/keyboards/crypt_macro/crypt_macro.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright 2022 Yiancar-Designs - * - * 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 - -#define XXX KC_NO - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, \ - K11 \ -) { \ - { K00, K01, K02 }, \ - { XXX, K11, XXX } \ -} diff --git a/keyboards/crypt_macro/info.json b/keyboards/crypt_macro/info.json index 910777b90c..c26bf041fa 100644 --- a/keyboards/crypt_macro/info.json +++ b/keyboards/crypt_macro/info.json @@ -18,7 +18,12 @@ }, "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0.5, "y":1, "w":2}] + "layout": [ + {"x":0, "y":0, "matrix": [0, 0]}, + {"x":1, "y":0, "matrix": [0, 1]}, + {"x":2, "y":0, "matrix": [0, 2]}, + {"x":0.5, "y":1, "w":2, "matrix": [1, 1]} + ] } } } -- cgit v1.2.3