X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=quantum%2Fkeymap_common.c;h=50af15d62696e9172a7c1dc023a4cd34a85ecaef;hb=44a348d56f661d22144202f440b87c26832a8170;hp=9dafc8b5165ff37c6d244c3ce872f6c03cf387d5;hpb=4f1007952b4deea2012be4787789289fae7c19e1;p=qmk_firmware.git diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c index 9dafc8b51..50af15d62 100644 --- a/quantum/keymap_common.c +++ b/quantum/keymap_common.c @@ -29,6 +29,10 @@ along with this program. If not, see . #include "backlight.h" #include "quantum.h" +#ifdef SPLIT_KEYBOARD + #include "split_flags.h" +#endif + #ifdef MIDI_ENABLE #include "process_midi.h" #endif @@ -122,26 +126,59 @@ action_t action_for_key(uint8_t layer, keypos_t key) case QK_LAYER_TAP_TOGGLE ... QK_LAYER_TAP_TOGGLE_MAX: action.code = ACTION_LAYER_TAP_TOGGLE(keycode & 0xFF); break; + case QK_LAYER_MOD ... QK_LAYER_MOD_MAX: + mod = keycode & 0xF; + action_layer = (keycode >> 4) & 0xF; + action.code = ACTION_LAYER_MODS(action_layer, mod); + break; case QK_MOD_TAP ... QK_MOD_TAP_MAX: - action.code = ACTION_MODS_TAP_KEY((keycode >> 0x8) & 0x1F, keycode & 0xFF); + mod = mod_config((keycode >> 0x8) & 0x1F); + action.code = ACTION_MODS_TAP_KEY(mod, keycode & 0xFF); break; #ifdef BACKLIGHT_ENABLE - case BL_0 ... BL_15: - action.code = ACTION_BACKLIGHT_LEVEL(keycode - BL_0); + case BL_ON: + action.code = ACTION_BACKLIGHT_ON(); + #ifdef SPLIT_KEYBOARD + BACKLIT_DIRTY = true; + #endif + break; + case BL_OFF: + action.code = ACTION_BACKLIGHT_OFF(); + #ifdef SPLIT_KEYBOARD + BACKLIT_DIRTY = true; + #endif break; case BL_DEC: action.code = ACTION_BACKLIGHT_DECREASE(); + #ifdef SPLIT_KEYBOARD + BACKLIT_DIRTY = true; + #endif break; case BL_INC: action.code = ACTION_BACKLIGHT_INCREASE(); + #ifdef SPLIT_KEYBOARD + BACKLIT_DIRTY = true; + #endif break; case BL_TOGG: action.code = ACTION_BACKLIGHT_TOGGLE(); + #ifdef SPLIT_KEYBOARD + BACKLIT_DIRTY = true; + #endif break; case BL_STEP: action.code = ACTION_BACKLIGHT_STEP(); + #ifdef SPLIT_KEYBOARD + BACKLIT_DIRTY = true; + #endif break; #endif + #ifdef SWAP_HANDS_ENABLE + case QK_SWAP_HANDS ... QK_SWAP_HANDS_MAX: + action.code = ACTION(ACT_SWAP_HANDS, keycode & 0xff); + break; + #endif + default: action.code = ACTION_NO; break;