diff options
| author | Stephan Bösebeck <sb@caluga.de> | 2016-05-11 22:05:19 +0200 |
|---|---|---|
| committer | Stephan Bösebeck <sb@caluga.de> | 2016-05-11 22:05:19 +0200 |
| commit | d09d2da1c25b377b0f68ea83706903344c240ae1 (patch) | |
| tree | dc3e88ef91206ccc251af32543a01ec2e7a7c208 /quantum/keymap_common.c | |
| parent | 2e02886a1ec6d92c07f1edd13d4e68af1e861991 (diff) | |
| parent | 5845eb05b53ea685c9622abf011870ab4ce84f39 (diff) | |
| download | qmk_firmware-d09d2da1c25b377b0f68ea83706903344c240ae1.tar.gz qmk_firmware-d09d2da1c25b377b0f68ea83706903344c240ae1.zip | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'quantum/keymap_common.c')
| -rw-r--r-- | quantum/keymap_common.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c index 5e78d1157..8f00f9cc3 100644 --- a/quantum/keymap_common.c +++ b/quantum/keymap_common.c | |||
| @@ -272,6 +272,14 @@ static action_t keycode_to_action(uint16_t keycode) | |||
| 272 | // Set default layer | 272 | // Set default layer |
| 273 | int layer = keycode & 0xFF; | 273 | int layer = keycode & 0xFF; |
| 274 | action.code = ACTION_LAYER_TOGGLE(layer); | 274 | action.code = ACTION_LAYER_TOGGLE(layer); |
| 275 | } else if (type == 0x5) { | ||
| 276 | // OSL(layer) - One-shot layer | ||
| 277 | int layer = keycode & 0xFF; | ||
| 278 | action.code = ACTION_LAYER_ONESHOT(layer); | ||
| 279 | } else if (type == 0x6) { | ||
| 280 | // OSM(mod) - One-shot mod | ||
| 281 | int mod = keycode & 0xFF; | ||
| 282 | action.code = ACTION_MODS_ONESHOT(mod); | ||
| 275 | } | 283 | } |
| 276 | break; | 284 | break; |
| 277 | #ifdef MIDI_ENABLE | 285 | #ifdef MIDI_ENABLE |