gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-07-16 21:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

keycode_map simplification, encoder code removed

Browse Source
This commit is contained in:
Garretonzo 2024-11-14 22:09:26 -08:00
parent f512383a6e
commit 1378e56606
1 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
quantum/action_layer.c
View File

@ -289,25 +289,22 @@ uint8_t read_source_layers_cache(keypos_t key) {
} }
# ifdef KEYCODE_CACHE_ENABLE # ifdef KEYCODE_CACHE_ENABLE
uint16_t keycode_map[((MATRIX_ROWS * MATRIX_COLS) + (CHAR_BIT)-1) / (CHAR_BIT)][16] = {{KC_NO}}; static uint16_t keycode_map[MATRIX_ROWS][MATRIX_COLS] = {{KC_NO}};
# ifdef ENCODER_MAP_ENABLE
uint16_t encoder_keycode_map[(NUM_ENCODERS + (CHAR_BIT)-1) / (CHAR_BIT)][16] = {{KC_NO}};
# endif // ENCODER_MAP_ENABLE
/** \brief update keycode map /** \brief update keycode map
* *
* Updates map of keycodes when a key is pressed down * Updates map of keycodes when a key is pressed down
*/ */
void update_keycode_map_impl(uint16_t entry_number, uint16_t keycode, uint16_t cache[][16]) { void update_keycode_map_impl(uint16_t entry_number, uint16_t keycode) {
cache[entry_number / 16][entry_number % 16] = keycode; keycode_map[entry_number / 16][entry_number % 16] = keycode;
} }
/** \brief read keycode map /** \brief read keycode map
* *
* reads from map of keycodes when a key is released * reads from map of keycodes when a key is released
*/ */
uint16_t read_keycode_map_impl(uint16_t entry_number, uint16_t cache[][16]) { uint16_t read_keycode_map_impl(uint16_t entry_number) {
return cache[entry_number / 16][entry_number % 16]; return keycode_map[entry_number / 16][entry_number % 16];
} }
/** \brief update keycode map /** \brief update keycode map
@ -317,14 +314,8 @@ uint16_t read_keycode_map_impl(uint16_t entry_number, uint16_t cache[][16]) {
void update_keycode_map(keypos_t key, uint16_t keycode) { void update_keycode_map(keypos_t key, uint16_t keycode) {
if (key.row < MATRIX_ROWS && key.col < MATRIX_COLS) { if (key.row < MATRIX_ROWS && key.col < MATRIX_COLS) {
const uint16_t entry_number = (uint16_t)(key.row * MATRIX_COLS) + key.col; const uint16_t entry_number = (uint16_t)(key.row * MATRIX_COLS) + key.col;
update_keycode_map_impl(entry_number, keycode, keycode_map); update_keycode_map_impl(entry_number, keycode);
} }
# ifdef ENCODER_MAP_ENABLE
else if (key.row == KEYLOC_ENCODER_CW || key.row == KEYLOC_ENCODER_CCW) {
const uint16_t entry_number = key.col;
update_keycode_map_impl(entry_number, keycode, encoder_keycode_map);
}
# endif // ENCODER_MAP_ENABLE
} }
/** \brief read keycode map /** \brief read keycode map
@ -334,14 +325,8 @@ void update_keycode_map(keypos_t key, uint16_t keycode) {
uint16_t read_keycode_map(keypos_t key) { uint16_t read_keycode_map(keypos_t key) {
if (key.row < MATRIX_ROWS && key.col < MATRIX_COLS) { if (key.row < MATRIX_ROWS && key.col < MATRIX_COLS) {
const uint16_t entry_number = (uint16_t)(key.row * MATRIX_COLS) + key.col; const uint16_t entry_number = (uint16_t)(key.row * MATRIX_COLS) + key.col;
return read_keycode_map_impl(entry_number, keycode_map); return read_keycode_map_impl(entry_number);
} }
# ifdef ENCODER_MAP_ENABLE
else if (key.row == KEYLOC_ENCODER_CW || key.row == KEYLOC_ENCODER_CCW) {
const uint16_t entry_number = key.col;
return read_keycode_map_impl(entry_number, encoder_keycode_map);
}
# endif // ENCODER_MAP_ENABLE
return KC_NO; return KC_NO;
} }
# endif # endif