diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-04-13 23:31:35 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2016-04-13 23:31:35 -0400 |
| commit | bdb6dceaebc358dd4aae593d51d3ba0dd61858a9 (patch) | |
| tree | e5a4513740d4629203d3a663f1c39895cc842267 /quantum/keymap_common.c | |
| parent | 200d5f506884ac2dda0bec2c0284f93a75ecad00 (diff) | |
| parent | 7ff57503c61d72be62bb737af5f0efc5ad74b82a (diff) | |
| download | firmware-bdb6dceaebc358dd4aae593d51d3ba0dd61858a9.tar.gz firmware-bdb6dceaebc358dd4aae593d51d3ba0dd61858a9.tar.bz2 firmware-bdb6dceaebc358dd4aae593d51d3ba0dd61858a9.zip | |
Merge pull request #254 from IBNobody/master
Atomic TLC / Compiler Warning Fixes
Diffstat (limited to 'quantum/keymap_common.c')
| -rw-r--r-- | quantum/keymap_common.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c index 2eef4f15a..ae6cddb34 100644 --- a/quantum/keymap_common.c +++ b/quantum/keymap_common.c @@ -87,6 +87,7 @@ action_t action_for_key(uint8_t layer, keypos_t key) return action; #endif } else if (keycode == RESET) { // RESET is 0x5000, which is why this is here + action_t action; clear_keyboard(); #ifdef AUDIO_ENABLE play_notes(&goodbye, 5, false); @@ -96,12 +97,13 @@ action_t action_for_key(uint8_t layer, keypos_t key) *(uint16_t *)0x0800 = 0x7777; // these two are a-star-specific #endif bootloader_jump(); - return; + return action; } else if (keycode == DEBUG) { // DEBUG is 0x5001 // TODO: Does this actually work? + action_t action; print("\nDEBUG: enabled.\n"); debug_enable = true; - return; + return action; } else if (keycode >= 0x5000 && keycode < 0x6000) { // Layer movement shortcuts // See .h to see constraints/usage |