summaryrefslogtreecommitdiff
path: root/tmk_core/common
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 /tmk_core/common
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 'tmk_core/common')
-rw-r--r--tmk_core/common/action_code.h2
-rw-r--r--tmk_core/common/keymap.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/tmk_core/common/action_code.h b/tmk_core/common/action_code.h
index 4fe9c1d581..2b0b0b077e 100644
--- a/tmk_core/common/action_code.h
+++ b/tmk_core/common/action_code.h
@@ -301,7 +301,7 @@ enum backlight_opt {
#define ACTION_BACKLIGHT_DECREASE() ACTION(ACT_BACKLIGHT, BACKLIGHT_DECREASE << 8)
#define ACTION_BACKLIGHT_TOGGLE() ACTION(ACT_BACKLIGHT, BACKLIGHT_TOGGLE << 8)
#define ACTION_BACKLIGHT_STEP() ACTION(ACT_BACKLIGHT, BACKLIGHT_STEP << 8)
-#define ACTION_BACKLIGHT_LEVEL(level) ACTION(ACT_BACKLIGHT, BACKLIGHT_LEVEL << 8 | level)
+#define ACTION_BACKLIGHT_LEVEL(level) ACTION(ACT_BACKLIGHT, BACKLIGHT_LEVEL << 8 | (level))
/* Command */
#define ACTION_COMMAND(id, opt) ACTION(ACT_COMMAND, (opt)<<8 | (addr))
/* Function */
diff --git a/tmk_core/common/keymap.c b/tmk_core/common/keymap.c
index 11f4aa8aaa..8955fc710d 100644
--- a/tmk_core/common/keymap.c
+++ b/tmk_core/common/keymap.c
@@ -22,7 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "action_macro.h"
#include "wait.h"
#include "debug.h"
-
+#include "bootloader.h"
static action_t keycode_to_action(uint8_t keycode);
@@ -143,6 +143,7 @@ static action_t keycode_to_action(uint8_t keycode)
action.code = ACTION_TRANSPARENT;
break;
case KC_BOOTLOADER:
+ action.code = ACTION_NO;
clear_keyboard();
wait_ms(50);
bootloader_jump(); // not return