aboutsummaryrefslogtreecommitdiff
path: root/quantum/keymap_common.c
diff options
context:
space:
mode:
authorIBNobody <ibnobody@gmail.com>2016-04-13 20:57:51 -0500
committerIBNobody <ibnobody@gmail.com>2016-04-13 20:57:51 -0500
commit3755ef5ddbdad9f25a53fee951c3eb78035b52c3 (patch)
tree7a495b8756261ab2cc89173c1d250435df1d78ec /quantum/keymap_common.c
parent01f5b35396e5558a39e6f35ef9128b96c289c05c (diff)
downloadqmk_firmware-3755ef5ddbdad9f25a53fee951c3eb78035b52c3.tar.gz
qmk_firmware-3755ef5ddbdad9f25a53fee951c3eb78035b52c3.zip
Compiler Warnings / Atomic TLC
Corrected compiler warnings for a number of issues. Gave Atomic some TLC.
Diffstat (limited to 'quantum/keymap_common.c')
-rw-r--r--quantum/keymap_common.c6
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)
87 return action; 87 return action;
88#endif 88#endif
89 } else if (keycode == RESET) { // RESET is 0x5000, which is why this is here 89 } else if (keycode == RESET) { // RESET is 0x5000, which is why this is here
90 action_t action;
90 clear_keyboard(); 91 clear_keyboard();
91 #ifdef AUDIO_ENABLE 92 #ifdef AUDIO_ENABLE
92 play_notes(&goodbye, 5, false); 93 play_notes(&goodbye, 5, false);
@@ -96,12 +97,13 @@ action_t action_for_key(uint8_t layer, keypos_t key)
96 *(uint16_t *)0x0800 = 0x7777; // these two are a-star-specific 97 *(uint16_t *)0x0800 = 0x7777; // these two are a-star-specific
97 #endif 98 #endif
98 bootloader_jump(); 99 bootloader_jump();
99 return; 100 return action;
100 } else if (keycode == DEBUG) { // DEBUG is 0x5001 101 } else if (keycode == DEBUG) { // DEBUG is 0x5001
101 // TODO: Does this actually work? 102 // TODO: Does this actually work?
103 action_t action;
102 print("\nDEBUG: enabled.\n"); 104 print("\nDEBUG: enabled.\n");
103 debug_enable = true; 105 debug_enable = true;
104 return; 106 return action;
105 } else if (keycode >= 0x5000 && keycode < 0x6000) { 107 } else if (keycode >= 0x5000 && keycode < 0x6000) {
106 // Layer movement shortcuts 108 // Layer movement shortcuts
107 // See .h to see constraints/usage 109 // See .h to see constraints/usage