drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Overhaul bootmagic logic to have single entrypoint (#8532)

Browse source 
* Relocate bootmagic logic to have single entrypoint

* Align init of layer state
This commit is contained in:
Joel Challis 2021-02-28 15:50:15 +00:00 • committed by GitHub
parent 02dc3b6722
commit a3cbc8a004
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 227 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

22
tmk_core/common.mk
View file

@ -24,28 +24,6 @@ else
include $(TMK_PATH)/$(COMMON_DIR)/lib_printf.mk
endif
# Option modules
BOOTMAGIC_ENABLE ?= no
VALID_MAGIC_TYPES := yes full lite
ifneq ($(strip $(BOOTMAGIC_ENABLE)), no)
ifeq ($(filter $(BOOTMAGIC_ENABLE),$(VALID_MAGIC_TYPES)),)
$(error BOOTMAGIC_ENABLE="$(BOOTMAGIC_ENABLE)" is not a valid type of magic)
endif
ifeq ($(strip $(BOOTMAGIC_ENABLE)), lite)
TMK_COMMON_DEFS += -DBOOTMAGIC_LITE
TMK_COMMON_SRC += $(COMMON_DIR)/bootmagic_lite.c
TMK_COMMON_DEFS += -DMAGIC_ENABLE
TMK_COMMON_SRC += $(COMMON_DIR)/magic.c
else
TMK_COMMON_DEFS += -DBOOTMAGIC_ENABLE
TMK_COMMON_SRC += $(COMMON_DIR)/bootmagic.c
endif
else
TMK_COMMON_DEFS += -DMAGIC_ENABLE
TMK_COMMON_SRC += $(COMMON_DIR)/magic.c
endif
SHARED_EP_ENABLE = no
MOUSE_SHARED_EP ?= yes
ifeq ($(strip $(KEYBOARD_SHARED_EP)), yes)