Removal of bootmagic lite terminology (#22979)
This commit is contained in:
parent
5383335717
commit
e2dbe39b94
11 changed files with 103 additions and 78 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -18,5 +18,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#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
|
||||
|
|
|
@ -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();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue