diff options
| author | Wojciech Siewierski <wojciech.siewierski@onet.pl> | 2016-04-03 11:14:08 +0200 |
|---|---|---|
| committer | Wojciech Siewierski <wojciech.siewierski@onet.pl> | 2016-04-03 11:23:00 +0200 |
| commit | 47dd29513eeec7b7f639bef6df441a905ce8bacb (patch) | |
| tree | 29170847273e786384bd3d7c7781e67dc4335bbb /tmk_core/common/action.h | |
| parent | 8ef14d09b8451b3f2a77e6f019922eae0ac43642 (diff) | |
| parent | 8d39263d2444f0273327902684c802b218efb7b6 (diff) | |
| download | qmk_firmware-47dd29513eeec7b7f639bef6df441a905ce8bacb.tar.gz qmk_firmware-47dd29513eeec7b7f639bef6df441a905ce8bacb.zip | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware into modifier-release-fix
Diffstat (limited to 'tmk_core/common/action.h')
| -rw-r--r-- | tmk_core/common/action.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tmk_core/common/action.h b/tmk_core/common/action.h index 533e5d1a0..44ec3047b 100644 --- a/tmk_core/common/action.h +++ b/tmk_core/common/action.h | |||
| @@ -58,6 +58,9 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt); | |||
| 58 | /* user defined special function */ | 58 | /* user defined special function */ |
| 59 | void action_function(keyrecord_t *record, uint8_t id, uint8_t opt); | 59 | void action_function(keyrecord_t *record, uint8_t id, uint8_t opt); |
| 60 | 60 | ||
| 61 | /* keyboard-specific key event (pre)processing */ | ||
| 62 | void process_action_kb(keyrecord_t *record); | ||
| 63 | |||
| 61 | /* Utilities for actions. */ | 64 | /* Utilities for actions. */ |
| 62 | #if !defined(NO_ACTION_LAYER) && defined(PREVENT_STUCK_MODIFIERS) | 65 | #if !defined(NO_ACTION_LAYER) && defined(PREVENT_STUCK_MODIFIERS) |
| 63 | extern bool disable_action_cache; | 66 | extern bool disable_action_cache; |