summaryrefslogtreecommitdiffstats
path: root/quantum
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-02-07 15:30:39 +0100
committerJack Humbert <jack.humb@gmail.com>2016-02-07 15:30:39 +0100
commit8d785de796539ff54fa6c16d34c348d1c647b1f3 (patch)
tree391468e6679238c35203bb645a9fa492c79092e3 /quantum
parent240e8c634050558a98216691966dfdfab0a29c49 (diff)
parent65b41e2e59e274354e57ed36cad097823f111f1a (diff)
downloadqmk_firmware-8d785de796539ff54fa6c16d34c348d1c647b1f3.tar.gz
qmk_firmware-8d785de796539ff54fa6c16d34c348d1c647b1f3.tar.xz
Merge pull request #131 from Vifon/patch-1
Use boolean AND instead of bitwise (possible typo)
Diffstat (limited to 'quantum')
-rw-r--r--quantum/keymap_common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c
index 057c0c60e..ae109da16 100644
--- a/quantum/keymap_common.c
+++ b/quantum/keymap_common.c
@@ -64,7 +64,7 @@ action_t action_for_key(uint8_t layer, keypos_t key)
action.code = ACTION_MACRO(keycode & 0xFF);
return action;
#ifdef BACKLIGHT_ENABLE
- } else if (keycode >= BL_0 & keycode <= BL_15) {
+ } else if (keycode >= BL_0 && keycode <= BL_15) {
action_t action;
action.code = ACTION_BACKLIGHT_LEVEL(keycode & 0x000F);
return action;