diff options
| author | Drashna Jaelre <drashna@live.com> | 2018-10-27 11:53:50 -0700 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2018-10-27 14:53:50 -0400 |
| commit | 4ffcacd92086870eb7a3102d54178a7af64edb0c (patch) | |
| tree | b30479a70abc0d0dcd6c287383eb64e8f2fee104 /tmk_core | |
| parent | 5be438f03d0ae3ebdb9e24d249fdfd7f5c573634 (diff) | |
| download | qmk_firmware-4ffcacd92086870eb7a3102d54178a7af64edb0c.tar.gz qmk_firmware-4ffcacd92086870eb7a3102d54178a7af64edb0c.zip | |
Add Bootmagic Lite to QMK (#4215)
* Preliminary additon of bootmagic lite functionality
* Cleanup code
* Clean up bootmagic code
* Add documentation and clean up code
* Make 'lite' an option for BOOTMAGIC_ENABLE
* Update Templates with note about Bootmagic Lite option
* Detect Debounce variable
* Make sure debounce is a non-zero number
* Capitalize Bootmagic
* Capitalize bootmagic
* Update wording
* Re-add EEPROM reset, by popular demand
And add eeprom-less version to drashna userspace for his sanity
* Fix spacing
* Set BOOTMAGIC_ENABLE to use full/lite/off
And default yes to "full" for compatibility
* Add Bootmagic lite info to templates
* Remove text from makefiles
* Cleanup of makefile
* mention yes in bootmagic docs
* Wordsmitthing the docs
* Fix white spaces
* Readd default bootmagic setting, because it's necessary
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/common.mk | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/tmk_core/common.mk b/tmk_core/common.mk index 33bcc97b2..3844b13d4 100644 --- a/tmk_core/common.mk +++ b/tmk_core/common.mk | |||
| @@ -61,14 +61,26 @@ endif | |||
| 61 | 61 | ||
| 62 | 62 | ||
| 63 | # Option modules | 63 | # Option modules |
| 64 | ifeq ($(strip $(BOOTMAGIC_ENABLE)), yes) | 64 | BOOTMAGIC_ENABLE ?= no |
| 65 | VALID_MAGIC_TYPES := yes full lite | ||
| 66 | ifneq ($(strip $(BOOTMAGIC_ENABLE)), no) | ||
| 67 | ifeq ($(filter $(BOOTMAGIC_ENABLE),$(VALID_MAGIC_TYPES)),) | ||
| 68 | $(error BOOTMAGIC_ENABLE="$(BOOTMAGIC_ENABLE)" is not a valid type of magic) | ||
| 69 | endif | ||
| 70 | ifeq ($(strip $(BOOTMAGIC_ENABLE)), lite) | ||
| 71 | TMK_COMMON_DEFS += -DBOOTMAGIC_LITE | ||
| 72 | TMK_COMMON_DEFS += -DMAGIC_ENABLE | ||
| 73 | TMK_COMMON_SRC += $(COMMON_DIR)/magic.c | ||
| 74 | else | ||
| 65 | TMK_COMMON_DEFS += -DBOOTMAGIC_ENABLE | 75 | TMK_COMMON_DEFS += -DBOOTMAGIC_ENABLE |
| 66 | TMK_COMMON_SRC += $(COMMON_DIR)/bootmagic.c | 76 | TMK_COMMON_SRC += $(COMMON_DIR)/bootmagic.c |
| 77 | endif | ||
| 67 | else | 78 | else |
| 68 | TMK_COMMON_DEFS += -DMAGIC_ENABLE | 79 | TMK_COMMON_DEFS += -DMAGIC_ENABLE |
| 69 | TMK_COMMON_SRC += $(COMMON_DIR)/magic.c | 80 | TMK_COMMON_SRC += $(COMMON_DIR)/magic.c |
| 70 | endif | 81 | endif |
| 71 | 82 | ||
| 83 | |||
| 72 | ifeq ($(strip $(MOUSEKEY_ENABLE)), yes) | 84 | ifeq ($(strip $(MOUSEKEY_ENABLE)), yes) |
| 73 | TMK_COMMON_SRC += $(COMMON_DIR)/mousekey.c | 85 | TMK_COMMON_SRC += $(COMMON_DIR)/mousekey.c |
| 74 | TMK_COMMON_DEFS += -DMOUSEKEY_ENABLE | 86 | TMK_COMMON_DEFS += -DMOUSEKEY_ENABLE |
