diff options
| author | cbbrowne <cbbrowne@cbbrowne.tor.int-afilias.info> | 2016-08-15 11:19:24 -0400 |
|---|---|---|
| committer | cbbrowne <cbbrowne@cbbrowne.tor.int-afilias.info> | 2016-08-15 11:19:24 -0400 |
| commit | 8a14952e44b3025cef81a7df9c282d2a062d3909 (patch) | |
| tree | 5eea0ac32b127705e60a70695f6aec8680f2166b /quantum | |
| parent | c21a882ec9d4d41419ffb0a191c6e6538d0cfd63 (diff) | |
| parent | bc8976d27781a45c735eb98d3110e7df6f8a0bad (diff) | |
| download | qmk_firmware-8a14952e44b3025cef81a7df9c282d2a062d3909.tar.gz qmk_firmware-8a14952e44b3025cef81a7df9c282d2a062d3909.zip | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/keymap.h | 22 | ||||
| -rw-r--r-- | quantum/process_keycode/process_unicode.c | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/quantum/keymap.h b/quantum/keymap.h index a158651839..f2d94d75c3 100644 --- a/quantum/keymap.h +++ b/quantum/keymap.h @@ -156,16 +156,16 @@ enum quantum_keycodes { BL_INC, BL_TOGG, BL_STEP, - - // RGB functionality - RGB_TOG, - RGB_MOD, - RGB_HUI, - RGB_HUD, - RGB_SAI, - RGB_SAD, - RGB_VAI, - RGB_VAD, + + // RGB functionality + RGB_TOG, + RGB_MOD, + RGB_HUI, + RGB_HUD, + RGB_SAI, + RGB_SAD, + RGB_VAI, + RGB_VAD, // Left shift, open paren KC_LSPO, @@ -309,7 +309,7 @@ enum quantum_keycodes { #define OSL(layer) (layer | QK_ONE_SHOT_LAYER) // One-shot mod -#define OSM(layer) (layer | QK_ONE_SHOT_MOD) +#define OSM(mod) (mod | QK_ONE_SHOT_MOD) // M-od, T-ap - 256 keycode max #define MT(mod, kc) (kc | QK_MOD_TAP | ((mod & 0xF) << 8)) diff --git a/quantum/process_keycode/process_unicode.c b/quantum/process_keycode/process_unicode.c index ad5d7f86b7..3fcac15ce3 100644 --- a/quantum/process_keycode/process_unicode.c +++ b/quantum/process_keycode/process_unicode.c @@ -13,7 +13,7 @@ uint16_t hex_to_keycode(uint8_t hex) } } -void set_unicode_mode(uint8_t os_target) +void set_unicode_input_mode(uint8_t os_target) { input_mode = os_target; } |