diff options
| author | Joel Challis <git@zvecr.com> | 2024-01-28 22:51:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-28 22:51:58 +0000 |
| commit | 5cd31fda9c1302044f4423d940be7c888d15ad1a (patch) | |
| tree | 796fd88923fb0daba9f9cb0f67855b8b3b2e8805 /quantum/bootmagic | |
| parent | bb711456329beda1ab8573fbac3ad51bd398872b (diff) | |
Begin removal of bootmagic lite terminology (#22970)
Diffstat (limited to 'quantum/bootmagic')
| -rw-r--r-- | quantum/bootmagic/bootmagic.c (renamed from quantum/bootmagic/bootmagic_lite.c) | 0 | ||||
| -rw-r--r-- | quantum/bootmagic/bootmagic.h | 7 | ||||
| -rw-r--r-- | quantum/bootmagic/bootmagic_lite.h | 25 | ||||
| -rw-r--r-- | quantum/bootmagic/magic.c | 54 | ||||
| -rw-r--r-- | quantum/bootmagic/magic.h | 18 |
5 files changed, 5 insertions, 99 deletions
diff --git a/quantum/bootmagic/bootmagic_lite.c b/quantum/bootmagic/bootmagic.c index efce6bfd12..efce6bfd12 100644 --- a/quantum/bootmagic/bootmagic_lite.c +++ b/quantum/bootmagic/bootmagic.c | |||
diff --git a/quantum/bootmagic/bootmagic.h b/quantum/bootmagic/bootmagic.h index db826025ce..4b5f5f7c5e 100644 --- a/quantum/bootmagic/bootmagic.h +++ b/quantum/bootmagic/bootmagic.h | |||
| @@ -15,8 +15,11 @@ | |||
| 15 | */ | 15 | */ |
| 16 | #pragma once | 16 | #pragma once |
| 17 | 17 | ||
| 18 | #if defined(BOOTMAGIC_LITE) | 18 | #ifndef BOOTMAGIC_LITE_COLUMN |
| 19 | # include "bootmagic_lite.h" | 19 | # define BOOTMAGIC_LITE_COLUMN 0 |
| 20 | #endif | ||
| 21 | #ifndef BOOTMAGIC_LITE_ROW | ||
| 22 | # define BOOTMAGIC_LITE_ROW 0 | ||
| 20 | #endif | 23 | #endif |
| 21 | 24 | ||
| 22 | void bootmagic(void); | 25 | void bootmagic(void); |
diff --git a/quantum/bootmagic/bootmagic_lite.h b/quantum/bootmagic/bootmagic_lite.h deleted file mode 100644 index 17777e6b4a..0000000000 --- a/quantum/bootmagic/bootmagic_lite.h +++ /dev/null | |||
| @@ -1,25 +0,0 @@ | |||
| 1 | /* Copyright 2021 QMK | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 3 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | #pragma once | ||
| 17 | |||
| 18 | #ifndef BOOTMAGIC_LITE_COLUMN | ||
| 19 | # define BOOTMAGIC_LITE_COLUMN 0 | ||
| 20 | #endif | ||
| 21 | #ifndef BOOTMAGIC_LITE_ROW | ||
| 22 | # define BOOTMAGIC_LITE_ROW 0 | ||
| 23 | #endif | ||
| 24 | |||
| 25 | void bootmagic_lite(void); | ||
diff --git a/quantum/bootmagic/magic.c b/quantum/bootmagic/magic.c deleted file mode 100644 index d68df3fa58..0000000000 --- a/quantum/bootmagic/magic.c +++ /dev/null | |||
| @@ -1,54 +0,0 @@ | |||
| 1 | /* Copyright 2021 QMK | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 3 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | #include <stdint.h> | ||
| 17 | #include <stdbool.h> | ||
| 18 | #include "wait.h" | ||
| 19 | #include "matrix.h" | ||
| 20 | #include "bootloader.h" | ||
| 21 | #include "debug.h" | ||
| 22 | #include "keycode_config.h" | ||
| 23 | #include "host.h" | ||
| 24 | #include "action_layer.h" | ||
| 25 | #include "eeconfig.h" | ||
| 26 | #include "bootmagic.h" | ||
| 27 | |||
| 28 | keymap_config_t keymap_config; | ||
| 29 | |||
| 30 | __attribute__((weak)) void bootmagic(void) {} | ||
| 31 | |||
| 32 | /** \brief Magic | ||
| 33 | * | ||
| 34 | * FIXME: Needs doc | ||
| 35 | */ | ||
| 36 | void magic(void) { | ||
| 37 | /* check signature */ | ||
| 38 | if (!eeconfig_is_enabled()) { | ||
| 39 | eeconfig_init(); | ||
| 40 | } | ||
| 41 | |||
| 42 | /* init globals */ | ||
| 43 | debug_config.raw = eeconfig_read_debug(); | ||
| 44 | keymap_config.raw = eeconfig_read_keymap(); | ||
| 45 | |||
| 46 | bootmagic(); | ||
| 47 | |||
| 48 | /* read here just incase bootmagic process changed its value */ | ||
| 49 | layer_state_t default_layer = (layer_state_t)eeconfig_read_default_layer(); | ||
| 50 | default_layer_set(default_layer); | ||
| 51 | |||
| 52 | /* Also initialize layer state to trigger callback functions for layer_state */ | ||
| 53 | layer_state_set_kb((layer_state_t)layer_state); | ||
| 54 | } | ||
diff --git a/quantum/bootmagic/magic.h b/quantum/bootmagic/magic.h deleted file mode 100644 index 2c3969b85c..0000000000 --- a/quantum/bootmagic/magic.h +++ /dev/null | |||
| @@ -1,18 +0,0 @@ | |||
| 1 | /* Copyright 2021 QMK | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 3 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | #pragma once | ||
| 17 | |||
| 18 | void magic(void); | ||
