diff options
Diffstat (limited to 'quantum/dynamic_keymap.c')
| -rw-r--r-- | quantum/dynamic_keymap.c | 25 | 
1 files changed, 13 insertions, 12 deletions
| diff --git a/quantum/dynamic_keymap.c b/quantum/dynamic_keymap.c index 01be9806e4..e9529ed14e 100644 --- a/quantum/dynamic_keymap.c +++ b/quantum/dynamic_keymap.c @@ -153,7 +153,7 @@ void dynamic_keymap_reset(void) {          for (int row = 0; row < MATRIX_ROWS; row++) {              for (int column = 0; column < MATRIX_COLS; column++) {                  if (layer < keymap_layer_count()) { -                    dynamic_keymap_set_keycode(layer, row, column, pgm_read_word(&keymaps[layer][row][column])); +                    dynamic_keymap_set_keycode(layer, row, column, keycode_at_keymap_location_raw(layer, row, column));                  } else {                      dynamic_keymap_set_keycode(layer, row, column, KC_TRANSPARENT);                  } @@ -162,8 +162,8 @@ void dynamic_keymap_reset(void) {  #ifdef ENCODER_MAP_ENABLE          for (int encoder = 0; encoder < NUM_ENCODERS; encoder++) {              if (layer < encodermap_layer_count()) { -                dynamic_keymap_set_encoder(layer, encoder, true, pgm_read_word(&encoder_map[layer][encoder][0])); -                dynamic_keymap_set_encoder(layer, encoder, false, pgm_read_word(&encoder_map[layer][encoder][1])); +                dynamic_keymap_set_encoder(layer, encoder, true, keycode_at_encodermap_location_raw(layer, encoder, true)); +                dynamic_keymap_set_encoder(layer, encoder, false, keycode_at_encodermap_location_raw(layer, encoder, false));              } else {                  dynamic_keymap_set_encoder(layer, encoder, true, KC_TRANSPARENT);                  dynamic_keymap_set_encoder(layer, encoder, false, KC_TRANSPARENT); @@ -201,20 +201,21 @@ void dynamic_keymap_set_buffer(uint16_t offset, uint16_t size, uint8_t *data) {      }  } -// This overrides the one in quantum/keymap_common.c -uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key) { -    if (layer < DYNAMIC_KEYMAP_LAYER_COUNT && key.row < MATRIX_ROWS && key.col < MATRIX_COLS) { -        return dynamic_keymap_get_keycode(layer, key.row, key.col); +uint16_t keycode_at_keymap_location(uint8_t layer_num, uint8_t row, uint8_t column) { +    if (layer_num < DYNAMIC_KEYMAP_LAYER_COUNT && row < MATRIX_ROWS && column < MATRIX_COLS) { +        return dynamic_keymap_get_keycode(layer_num, row, column);      } +    return KC_NO; +} +  #ifdef ENCODER_MAP_ENABLE -    else if (layer < DYNAMIC_KEYMAP_LAYER_COUNT && key.row == KEYLOC_ENCODER_CW && key.col < NUM_ENCODERS) { -        return dynamic_keymap_get_encoder(layer, key.col, true); -    } else if (layer < DYNAMIC_KEYMAP_LAYER_COUNT && key.row == KEYLOC_ENCODER_CCW && key.col < NUM_ENCODERS) { -        return dynamic_keymap_get_encoder(layer, key.col, false); +uint16_t keycode_at_encodermap_location(uint8_t layer_num, uint8_t encoder_idx, bool clockwise) { +    if (layer_num < DYNAMIC_KEYMAP_LAYER_COUNT && encoder_idx < NUM_ENCODERS) { +        return dynamic_keymap_get_encoder(layer_num, encoder_idx, clockwise);      } -#endif // ENCODER_MAP_ENABLE      return KC_NO;  } +#endif // ENCODER_MAP_ENABLE  uint8_t dynamic_keymap_macro_get_count(void) {      return DYNAMIC_KEYMAP_MACRO_COUNT; | 
