aboutsummaryrefslogtreecommitdiffstats
path: root/quantum
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2020-03-21 23:10:39 +0000
committerGitHub <noreply@github.com>2020-03-21 23:10:39 +0000
commit789e19945038c3b98d6e80bc29166d493a8b1056 (patch)
treed3d5159d9390365a2374d72cf61bd9c7ecd37ae0 /quantum
parenta747c1c3dee728f5124a8effb8f52819f643de5f (diff)
downloadfirmware-789e19945038c3b98d6e80bc29166d493a8b1056.tar.gz
firmware-789e19945038c3b98d6e80bc29166d493a8b1056.tar.bz2
firmware-789e19945038c3b98d6e80bc29166d493a8b1056.zip
Add support for Bootmagic lite when using SPLIT_HAND_PIN (#8347)
* Add support for Bootmagic lite when using SPLIT_HAND_PIN * Deduplicate bootmagic_lite logic from within via * Revert location of defaults so that user overrides still work for now * Tidy up code slightly
Diffstat (limited to 'quantum')
-rw-r--r--quantum/quantum.c26
-rw-r--r--quantum/via.c30
2 files changed, 0 insertions, 56 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c
index e06448d9e..749a08eea 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -581,32 +581,6 @@ void tap_random_base64(void) {
}
}
-__attribute__((weak)) void bootmagic_lite(void) {
- // The lite version of TMK's bootmagic based on Wilba.
- // 100% less potential for accidentally making the
- // keyboard do stupid things.
-
- // We need multiple scans because debouncing can't be turned off.
- matrix_scan();
-#if defined(DEBOUNCE) && DEBOUNCE > 0
- wait_ms(DEBOUNCE * 2);
-#else
- wait_ms(30);
-#endif
- matrix_scan();
-
- // If the Esc and space bar are held down on power up,
- // reset the EEPROM valid state and jump to bootloader.
- // Assumes Esc is at [0,0].
- // 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_ROW) & (1 << BOOTMAGIC_LITE_COLUMN)) {
- eeconfig_disable();
- // Jump to bootloader.
- bootloader_jump();
- }
-}
-
void matrix_init_quantum() {
#ifdef BOOTMAGIC_LITE
bootmagic_lite();
diff --git a/quantum/via.c b/quantum/via.c
index f85af8d9e..288299ada 100644
--- a/quantum/via.c
+++ b/quantum/via.c
@@ -92,36 +92,6 @@ void via_eeprom_reset(void) {
eeconfig_disable();
}
-// Override bootmagic_lite() so it can flag EEPROM as invalid
-// as well as jump to bootloader, thus performing a "factory reset"
-// of dynamic keymaps and optionally backlight/other settings.
-void bootmagic_lite(void) {
- // The lite version of TMK's bootmagic based on Wilba.
- // 100% less potential for accidentally making the
- // keyboard do stupid things.
-
- // We need multiple scans because debouncing can't be turned off.
- matrix_scan();
-#if defined(DEBOUNCE) && DEBOUNCE > 0
- wait_ms(DEBOUNCE * 2);
-#else
- wait_ms(30);
-#endif
- matrix_scan();
-
- // If the Esc and space bar are held down on power up,
- // reset the EEPROM valid state and jump to bootloader.
- // Assumes Esc is at [0,0].
- // 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_ROW) & (1 << BOOTMAGIC_LITE_COLUMN)) {
- // This is the only difference from the default implementation.
- via_eeprom_reset();
- // Jump to bootloader.
- bootloader_jump();
- }
-}
-
// Override this at the keyboard code level to check
// VIA's EEPROM valid state and reset to defaults as needed.
// Used by keyboards that store their own state in EEPROM,