Fix for Teensy RESET key. #160
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -74,7 +74,21 @@ action_t action_for_key(uint8_t layer, keypos_t key) | |||
| } else if (keycode == RESET) { // RESET is 0x5000, which is why this is here | |||
| clear_keyboard(); | |||
| _delay_ms(250); | |||
| // bootloader_jump doesn't work for the Teensy | |||
| #ifdef TEENSY | |||
There was a problem hiding this comment.
I found this code to be a straight copy of the ´#ifdef __AVR_ATmega32U4__´ in ´bootloader_jump()´ in tmk_core/common/avr/bootloader.c. As of such these changes can be reduced to what's defined in PR #162.
There was a problem hiding this comment.
I believe the line you're referring to is commented out via the #if 0 here.
|
This looks good, but seems to be conflicting with master - would you mind pulling the latest updates? |
|
@jackhumbert After some testing I have found that #162 fixes the problem much more succinctly - not sure why. |
|
Interesting! Let's move this over to #162 then. |
mfilej
added a commit
to mfilej/qmk_firmware
that referenced
this pull request
Apr 4, 2016
BlueTufa
pushed a commit
to BlueTufa/qmk_firmware
that referenced
this pull request
Aug 6, 2021
Remove EXT_PLV define from default keymap as configurator doesn't support defines.
Jpe230
pushed a commit
to Jpe230/qmk_firmware
that referenced
this pull request
Dec 15, 2021
* Made build fail if compilation fails * Update auto-build.yml * Create auto-build.yml * Create auto-build.yml * Remove "bin/"
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Let me know if there is a better way to declare the TEENSY config option.