Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Bootmagic Lite to QMK #4215

Merged
merged 21 commits into from
Oct 27, 2018
Merged

Add Bootmagic Lite to QMK #4215

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
cadc6d9
Preliminary additon of bootmagic lite functionality
drashna Oct 22, 2018
084a1e9
Cleanup code
drashna Oct 22, 2018
30eaee2
Clean up bootmagic code
drashna Oct 23, 2018
6b9a25f
Add documentation and clean up code
drashna Oct 23, 2018
64d78b4
Make 'lite' an option for BOOTMAGIC_ENABLE
drashna Oct 23, 2018
145ee2b
Update Templates with note about Bootmagic Lite option
drashna Oct 23, 2018
af25c93
Detect Debounce variable
drashna Oct 23, 2018
89d90cf
Make sure debounce is a non-zero number
drashna Oct 23, 2018
91d9c7f
Capitalize Bootmagic
drashna Oct 23, 2018
e022f9c
Capitalize bootmagic
drashna Oct 23, 2018
ebf971a
Update wording
drashna Oct 23, 2018
c779bb2
Re-add EEPROM reset, by popular demand
drashna Oct 23, 2018
c42f222
Fix spacing
drashna Oct 23, 2018
0f15016
Set BOOTMAGIC_ENABLE to use full/lite/off
drashna Oct 27, 2018
032347c
Add Bootmagic lite info to templates
drashna Oct 27, 2018
2daf3d2
Remove text from makefiles
drashna Oct 27, 2018
6f092d8
Cleanup of makefile
drashna Oct 27, 2018
b5b9376
mention yes in bootmagic docs
drashna Oct 27, 2018
a0a425e
Wordsmitthing the docs
drashna Oct 27, 2018
fab3078
Fix white spaces
drashna Oct 27, 2018
08c5a81
Readd default bootmagic setting, because it's necessary
drashna Oct 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Cleanup code
  • Loading branch information
@drashna
drashna committed Oct 22, 2018
commit 084a1e92b21720f3a5b64f6a16f2017aa00d7f3f
3 changes: 3 additions & 0 deletions common_features.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,9 @@ ifeq ($(strip $(LEADER_ENABLE)), yes)
endif

ifeq ($(strip $(BOOTMAGIC_LITE)), yes)
ifeq ($(strip $(BOOTMAGIC_ENABLE)), yes)
$(error Cannot enable BOOTMAGIC and BOOTMAGIC LITE at the same time)
endif
OPT_DEFS += -DBOOTMAGIC_LITE
endif

Expand Down
13 changes: 7 additions & 6 deletions quantum/quantum.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -961,12 +961,13 @@ void bootmagic_lite(void)
// Assumes Esc is at [0,0] and spacebar is at [4,7].
// This isn't very generalized, but we need something that doesn't
// rely on user's keymaps in firmware or EEPROM.
if ((matrix_get_row(BOOTMAGIC_LITE_KEY_ROW) & (1 << BOOTMAGIC_LITE_KEY_COLUMN)) && (matrix_get_row(BOOTMAGIC_LITE_SPACE_ROW) & (1 << BOOTMAGIC_LITE_SPACE_COLUMN))) {
// Set the TMK/QMK EEPROM state as invalid.
eeconfig_disable();
//eeprom_set_valid(false);
// Jump to bootloader.
bootloader_jump();
// if ((matrix_get_row(BOOTMAGIC_LITE_KEY_ROW) & (1 << BOOTMAGIC_LITE_KEY_COLUMN)) && (matrix_get_row(BOOTMAGIC_LITE_SPACE_ROW) & (1 << BOOTMAGIC_LITE_SPACE_COLUMN))) {
if ((matrix_get_row(0) & (1 << 0)) && (matrix_get_row(4) & (1 << 7))) {
// Set the TMK/QMK EEPROM state as invalid.
eeconfig_disable();
//eeprom_set_valid(false);
// Jump to bootloader.
bootloader_jump();
}
}

Expand Down