From e2dbe39b9475b0d46702e5a32432cb248d72290c Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sat, 17 Feb 2024 12:27:34 +0000 Subject: Removal of bootmagic lite terminology (#22979) --- keyboards/crkbd/post_config.h | 16 ++++++++-------- .../handwired/tractyl_manuform/5x6_right/f411/f411.c | 12 ++++++------ keyboards/jorne/post_config.h | 16 ++++++++-------- keyboards/junco/rev1/post_config.h | 8 ++++---- keyboards/nullbitsco/scramble/keymaps/oled/config.h | 4 ++-- keyboards/phoenix/phoenix.c | 2 +- 6 files changed, 29 insertions(+), 29 deletions(-) (limited to 'keyboards') diff --git a/keyboards/crkbd/post_config.h b/keyboards/crkbd/post_config.h index 133014b02a..aaf405a5bf 100644 --- a/keyboards/crkbd/post_config.h +++ b/keyboards/crkbd/post_config.h @@ -16,18 +16,18 @@ #pragma once -#ifndef BOOTMAGIC_LITE_ROW -# define BOOTMAGIC_LITE_ROW 0 +#ifndef BOOTMAGIC_ROW +# define BOOTMAGIC_ROW 0 #endif -#ifndef BOOTMAGIC_LITE_COLUMN -# define BOOTMAGIC_LITE_COLUMN 1 +#ifndef BOOTMAGIC_COLUMN +# define BOOTMAGIC_COLUMN 1 #endif -#ifndef BOOTMAGIC_LITE_ROW_RIGHT -# define BOOTMAGIC_LITE_ROW_RIGHT 4 +#ifndef BOOTMAGIC_ROW_RIGHT +# define BOOTMAGIC_ROW_RIGHT 4 #endif -#ifndef BOOTMAGIC_LITE_COLUMN_RIGHT -# define BOOTMAGIC_LITE_COLUMN_RIGHT 1 +#ifndef BOOTMAGIC_COLUMN_RIGHT +# define BOOTMAGIC_COLUMN_RIGHT 1 #endif #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c index 10986fd25f..a0c3ee0f4e 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c @@ -24,7 +24,7 @@ void matrix_scan_sub_kb(void) { } } -__attribute__((weak)) void bootmagic_lite(void) { +__attribute__((weak)) void bootmagic_scan(void) { // We need multiple scans because debouncing can't be turned off. matrix_scan(); #if defined(DEBOUNCE) && DEBOUNCE > 0 @@ -34,13 +34,13 @@ __attribute__((weak)) void bootmagic_lite(void) { #endif matrix_scan(); - uint8_t row = BOOTMAGIC_LITE_ROW; - uint8_t col = BOOTMAGIC_LITE_COLUMN; + uint8_t row = BOOTMAGIC_ROW; + uint8_t col = BOOTMAGIC_COLUMN; -#if defined(SPLIT_KEYBOARD) && defined(BOOTMAGIC_LITE_ROW_RIGHT) && defined(BOOTMAGIC_LITE_COLUMN_RIGHT) +#if defined(SPLIT_KEYBOARD) && defined(BOOTMAGIC_ROW_RIGHT) && defined(BOOTMAGIC_COLUMN_RIGHT) if (!is_keyboard_left()) { - row = BOOTMAGIC_LITE_ROW_RIGHT; - col = BOOTMAGIC_LITE_COLUMN_RIGHT; + row = BOOTMAGIC_ROW_RIGHT; + col = BOOTMAGIC_COLUMN_RIGHT; } #endif diff --git a/keyboards/jorne/post_config.h b/keyboards/jorne/post_config.h index 4a4c71517a..7d159c0de2 100644 --- a/keyboards/jorne/post_config.h +++ b/keyboards/jorne/post_config.h @@ -2,18 +2,18 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#ifndef BOOTMAGIC_LITE_ROW -# define BOOTMAGIC_LITE_ROW 0 +#ifndef BOOTMAGIC_ROW +# define BOOTMAGIC_ROW 0 #endif -#ifndef BOOTMAGIC_LITE_COLUMN -# define BOOTMAGIC_LITE_COLUMN 1 +#ifndef BOOTMAGIC_COLUMN +# define BOOTMAGIC_COLUMN 1 #endif -#ifndef BOOTMAGIC_LITE_ROW_RIGHT -# define BOOTMAGIC_LITE_ROW_RIGHT 4 +#ifndef BOOTMAGIC_ROW_RIGHT +# define BOOTMAGIC_ROW_RIGHT 4 #endif -#ifndef BOOTMAGIC_LITE_COLUMN_RIGHT -# define BOOTMAGIC_LITE_COLUMN_RIGHT 1 +#ifndef BOOTMAGIC_COLUMN_RIGHT +# define BOOTMAGIC_COLUMN_RIGHT 1 #endif #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/junco/rev1/post_config.h b/keyboards/junco/rev1/post_config.h index bcc15a941a..d9fa5e4c60 100644 --- a/keyboards/junco/rev1/post_config.h +++ b/keyboards/junco/rev1/post_config.h @@ -7,9 +7,9 @@ // Top left for left side is default in core // Top right for right side -#ifndef BOOTMAGIC_LITE_ROW_RIGHT -# define BOOTMAGIC_LITE_ROW_RIGHT 5 +#ifndef BOOTMAGIC_ROW_RIGHT +# define BOOTMAGIC_ROW_RIGHT 5 #endif -#ifndef BOOTMAGIC_LITE_COLUMN_RIGHT -# define BOOTMAGIC_LITE_COLUMN_RIGHT 0 +#ifndef BOOTMAGIC_COLUMN_RIGHT +# define BOOTMAGIC_COLUMN_RIGHT 0 #endif diff --git a/keyboards/nullbitsco/scramble/keymaps/oled/config.h b/keyboards/nullbitsco/scramble/keymaps/oled/config.h index cd980b0936..67a896c8af 100644 --- a/keyboards/nullbitsco/scramble/keymaps/oled/config.h +++ b/keyboards/nullbitsco/scramble/keymaps/oled/config.h @@ -18,5 +18,5 @@ along with this program. If not, see . #pragma once // Alternate boot pins for accessing the bootloader, // since the boot switch is blocked by the OLED. -#define BOOTMAGIC_LITE_ROW 1 -#define BOOTMAGIC_LITE_COLUMN 2 +#define BOOTMAGIC_ROW 1 +#define BOOTMAGIC_COLUMN 2 diff --git a/keyboards/phoenix/phoenix.c b/keyboards/phoenix/phoenix.c index 706a65b4de..e870f987f4 100644 --- a/keyboards/phoenix/phoenix.c +++ b/keyboards/phoenix/phoenix.c @@ -2,7 +2,7 @@ #include "usb_main.h" #include "phoenix.h" -void bootmagic_lite(void) { +void bootmagic_scan(void) { matrix_scan(); wait_ms(5); matrix_scan(); -- cgit v1.2.3