aboutsummaryrefslogtreecommitdiffstats
path: root/quantum/keymap_common.h
diff options
context:
space:
mode:
authorGravatar Olivier <olivier@gid0.org>2016-04-30 16:03:52 +0200
committerGravatar Olivier <olivier@gid0.org>2016-04-30 16:03:52 +0200
commit09ea12f9ca96fa89a500a5965bf074c4347d300d (patch)
tree747caedcbd529d068d6794a72e65a5bef274ed8e /quantum/keymap_common.h
parent9d48ba9713d17a8ebae99ef42bc7838402fc532f (diff)
parente7d56215deb253b44b190d12288076d03b206bdf (diff)
downloadqmk_firmware-09ea12f9ca96fa89a500a5965bf074c4347d300d.tar.gz
Merge https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'quantum/keymap_common.h')
-rw-r--r--quantum/keymap_common.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/quantum/keymap_common.h b/quantum/keymap_common.h
index ce87e4770..0ede0296b 100644
--- a/quantum/keymap_common.h
+++ b/quantum/keymap_common.h
@@ -213,7 +213,7 @@ extern const uint16_t fn_actions[];
#define GUI_T(kc) MT(0x8, kc)
#define C_S_T(kc) MT(0x3, kc) // Control + Shift e.g. for gnome-terminal
#define MEH_T(kc) MT(0x7, kc) // Meh is a less hyper version of the Hyper key -- doesn't include Win or Cmd, so just alt+shift+ctrl
-#define LCAG_T(kc) MT(0xD, kc) // Left control alt and gui
+#define LCAG_T(kc) MT(0xD, kc) // Left control alt and gui
#define ALL_T(kc) MT(0xF, kc) // see http://brettterpstra.com/2012/12/08/a-useful-caps-lock-key/
// Dedicated keycode versions for Hyper and Meh, if you want to use them as standalone keys rather than mod-tap
@@ -231,8 +231,8 @@ extern const uint16_t fn_actions[];
// For tri-layer
void update_tri_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3);
-#define IS_LAYER_ON(layer) ((layer_state) & (1UL<<(layer)))
-#define IS_LAYER_OFF(layer) ((!layer_state) & (1UL<<(layer)))
+#define IS_LAYER_ON(layer) (layer_state & (1UL << (layer)))
+#define IS_LAYER_OFF(layer) (~layer_state & (1UL << (layer)))
#endif