diff options
Diffstat (limited to 'quantum/keymap_common.c')
| -rw-r--r-- | quantum/keymap_common.c | 38 | 
1 files changed, 18 insertions, 20 deletions
| diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c index 8d7a8bda9a..c4336440f9 100644 --- a/quantum/keymap_common.c +++ b/quantum/keymap_common.c @@ -61,79 +61,77 @@ action_t action_for_keycode(uint16_t keycode) {          case KC_SYSTEM_POWER ... KC_SYSTEM_WAKE:              action.code = ACTION_USAGE_SYSTEM(KEYCODE2SYSTEM(keycode));              break; -        case KC_AUDIO_MUTE ... KC_BRIGHTNESS_DOWN: +        case KC_AUDIO_MUTE ... KC_ASSISTANT:              action.code = ACTION_USAGE_CONSUMER(KEYCODE2CONSUMER(keycode));              break;  #endif -#ifdef MOUSEKEY_ENABLE          case KC_MS_UP ... KC_MS_ACCEL2:              action.code = ACTION_MOUSEKEY(keycode);              break; -#endif          case KC_TRANSPARENT:              action.code = ACTION_TRANSPARENT;              break;          case QK_MODS ... QK_MODS_MAX:;              // Has a modifier              // Split it up -            action.code = ACTION_MODS_KEY(keycode >> 8, keycode & 0xFF); // adds modifier to key +            action.code = ACTION_MODS_KEY(QK_MODS_GET_MODS(keycode), QK_MODS_GET_BASIC_KEYCODE(keycode)); // adds modifier to key              break;  #ifndef NO_ACTION_LAYER          case QK_LAYER_TAP ... QK_LAYER_TAP_MAX: -            action.code = ACTION_LAYER_TAP_KEY((keycode >> 0x8) & 0xF, keycode & 0xFF); +            action.code = ACTION_LAYER_TAP_KEY(QK_LAYER_TAP_GET_LAYER(keycode), QK_LAYER_TAP_GET_TAP_KEYCODE(keycode));              break;          case QK_TO ... QK_TO_MAX:;              // Layer set "GOTO" -            action_layer = keycode & 0xFF; +            action_layer = QK_TO_GET_LAYER(keycode);              action.code  = ACTION_LAYER_GOTO(action_layer);              break;          case QK_MOMENTARY ... QK_MOMENTARY_MAX:;              // Momentary action_layer -            action_layer = keycode & 0xFF; +            action_layer = QK_MOMENTARY_GET_LAYER(keycode);              action.code  = ACTION_LAYER_MOMENTARY(action_layer);              break;          case QK_DEF_LAYER ... QK_DEF_LAYER_MAX:;              // Set default action_layer -            action_layer = keycode & 0xFF; +            action_layer = QK_DEF_LAYER_GET_LAYER(keycode);              action.code  = ACTION_DEFAULT_LAYER_SET(action_layer);              break;          case QK_TOGGLE_LAYER ... QK_TOGGLE_LAYER_MAX:;              // Set toggle -            action_layer = keycode & 0xFF; +            action_layer = QK_TOGGLE_LAYER_GET_LAYER(keycode);              action.code  = ACTION_LAYER_TOGGLE(action_layer);              break;  #endif  #ifndef NO_ACTION_ONESHOT          case QK_ONE_SHOT_LAYER ... QK_ONE_SHOT_LAYER_MAX:;              // OSL(action_layer) - One-shot action_layer -            action_layer = keycode & 0xFF; +            action_layer = QK_ONE_SHOT_LAYER_GET_LAYER(keycode);              action.code  = ACTION_LAYER_ONESHOT(action_layer);              break;          case QK_ONE_SHOT_MOD ... QK_ONE_SHOT_MOD_MAX:;              // OSM(mod) - One-shot mod -            mod         = mod_config(keycode & 0xFF); +            mod         = mod_config(QK_ONE_SHOT_MOD_GET_MODS(keycode));              action.code = ACTION_MODS_ONESHOT(mod);              break;  #endif  #ifndef NO_ACTION_LAYER          case QK_LAYER_TAP_TOGGLE ... QK_LAYER_TAP_TOGGLE_MAX: -            action.code = ACTION_LAYER_TAP_TOGGLE(keycode & 0xFF); +            action.code = ACTION_LAYER_TAP_TOGGLE(QK_LAYER_TAP_TOGGLE_GET_LAYER(keycode));              break;          case QK_LAYER_MOD ... QK_LAYER_MOD_MAX: -            mod          = mod_config(keycode & 0xF); -            action_layer = (keycode >> 4) & 0xF; +            mod          = mod_config(QK_LAYER_MOD_GET_MODS(keycode)); +            action_layer = QK_LAYER_MOD_GET_LAYER(keycode);              action.code  = ACTION_LAYER_MODS(action_layer, mod);              break;  #endif  #ifndef NO_ACTION_TAPPING          case QK_MOD_TAP ... QK_MOD_TAP_MAX: -            mod         = mod_config((keycode >> 0x8) & 0x1F); -            action.code = ACTION_MODS_TAP_KEY(mod, keycode & 0xFF); +            mod         = mod_config(QK_MOD_TAP_GET_MODS(keycode)); +            action.code = ACTION_MODS_TAP_KEY(mod, QK_MOD_TAP_GET_TAP_KEYCODE(keycode));              break;  #endif  #ifdef SWAP_HANDS_ENABLE          case QK_SWAP_HANDS ... QK_SWAP_HANDS_MAX: -            action.code = ACTION(ACT_SWAP_HANDS, keycode & 0xff); +            action.code = ACTION(ACT_SWAP_HANDS, QK_SWAP_HANDS_GET_TAP_KEYCODE(keycode));              break;  #endif @@ -147,13 +145,13 @@ action_t action_for_keycode(uint16_t keycode) {  // translates key to keycode  __attribute__((weak)) uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key) {      if (key.row < MATRIX_ROWS && key.col < MATRIX_COLS) { -        return pgm_read_word(&keymaps[layer][key.row][key.col]); +        return keycode_at_keymap_location(layer, key.row, key.col);      }  #ifdef ENCODER_MAP_ENABLE      else if (key.row == KEYLOC_ENCODER_CW && key.col < NUM_ENCODERS) { -        return pgm_read_word(&encoder_map[layer][key.col][0]); +        return keycode_at_encodermap_location(layer, key.col, true);      } else if (key.row == KEYLOC_ENCODER_CCW && key.col < NUM_ENCODERS) { -        return pgm_read_word(&encoder_map[layer][key.col][1]); +        return keycode_at_encodermap_location(layer, key.col, false);      }  #endif // ENCODER_MAP_ENABLE      return KC_NO; | 
