diff options
| author | milestogo <milestogo@users.noreply.github.com> | 2017-02-10 08:28:39 +0100 |
|---|---|---|
| committer | milestogo <milestogo@users.noreply.github.com> | 2017-02-10 08:28:39 +0100 |
| commit | b0537f75df73ca5a55355c7546d45577cb2c6a38 (patch) | |
| tree | 0da100dc4fcbe21629a10879b53e13d02c25c170 /quantum/quantum_keycodes.h | |
| parent | 5ac0e6e6aee64c9b8fade79aaf22bc839e2c6b47 (diff) | |
| parent | 41c93575a838e9b201ca113165085f47198e109d (diff) | |
| download | qmk_firmware-b0537f75df73ca5a55355c7546d45577cb2c6a38.tar.gz qmk_firmware-b0537f75df73ca5a55355c7546d45577cb2c6a38.tar.xz | |
Merge branch 'master' into sculpt2
Diffstat (limited to 'quantum/quantum_keycodes.h')
| -rw-r--r-- | quantum/quantum_keycodes.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h index 4853655f9..8a78a58c9 100644 --- a/quantum/quantum_keycodes.h +++ b/quantum/quantum_keycodes.h @@ -141,6 +141,16 @@ enum quantum_keycodes { PRINT_ON, PRINT_OFF, + // output selection + OUT_AUTO, + OUT_USB, +#ifdef BLUETOOTH_ENABLE + OUT_BT, +#endif +#ifdef ADAFRUIT_BLE_ENABLE + OUT_BLE, +#endif + // always leave at the end SAFE_RANGE }; @@ -246,8 +256,10 @@ enum quantum_keycodes { #define M(kc) (kc | QK_MACRO) +#define MACROTAP(kc) (kc | QK_MACRO | FUNC_TAP<<8) #define MACRODOWN(...) (record->event.pressed ? MACRO(__VA_ARGS__) : MACRO_NONE) + // L-ayer, T-ap - 256 keycode max, 16 layer max #define LT(layer, kc) (kc | QK_LAYER_TAP | ((layer & 0xF) << 8)) @@ -290,6 +302,7 @@ enum quantum_keycodes { #define CTL_T(kc) MT(MOD_LCTL, kc) #define SFT_T(kc) MT(MOD_LSFT, kc) #define ALT_T(kc) MT(MOD_LALT, kc) +#define ALGR_T(kc) MT(MOD_RALT, kc) // dual-function AltGR #define GUI_T(kc) MT(MOD_LGUI, kc) #define C_S_T(kc) MT((MOD_LCTL | MOD_LSFT), kc) // Control + Shift e.g. for gnome-terminal #define MEH_T(kc) MT((MOD_LCTL | MOD_LSFT | MOD_LALT), kc) // Meh is a less hyper version of the Hyper key -- doesn't include Win or Cmd, so just alt+shift+ctrl |