Apple-2-HW/unified_retro_keyboard
1
0
Fork 0
mirror of https://github.com/osiweb/unified_retro_keyboard.git synced 2024-11-22 04:33:19 +00:00
Code Issues Projects Releases Wiki Activity

Clean up keymap init routine

Browse Source 
- replace asdf_keymaps_clear() with asdf_keymaps_reset() which does the
  clear, and also resets hooks and virtual devices for the keymap
This commit is contained in:
Dave 2021-09-21 21:02:37 -05:00
parent fc22f5be53
commit ebe9344c82
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
firmware/asdf/src/asdf_keymaps.c
View File

@ -117,11 +117,14 @@ uint8_t asdf_keymaps_num_cols(void)
} }
// PROCEDURE: asdf_keymaps_clear // PROCEDURE: asdf_keymaps_reset
// INPUTS: none // INPUTS: none
// OUTPUTS: none // OUTPUTS: none
// //
// DESCRIPTION: Clear all keycode mapping matrices. // DESCRIPTION: Reset keymaps to initial state:
// - Clear all keycode mapping matrices.
// - Clear all virtual devices
// - Reset all hooks to default state.
// //
// SIDE EFFECTS: see DESCRIPTION // SIDE EFFECTS: see DESCRIPTION
// //
@ -129,11 +132,19 @@ uint8_t asdf_keymaps_num_cols(void)
// //
// COMPLEXITY: 2 // COMPLEXITY: 2
// //
static void asdf_keymaps_clear(void) static void asdf_keymaps_reset(void)
{ {
// Clear all keycode mappings
for (uint8_t i = 0; i < ASDF_MOD_NUM_MODIFIERS; i++) { for (uint8_t i = 0; i < ASDF_MOD_NUM_MODIFIERS; i++) {
asdf_keymaps_add_map(NULL, i, 0, 0); asdf_keymaps_add_map((const asdf_keycode_t *) NULL, (modifier_index_t) i,
0, 0);
} }
// Clear virtual devices
asdf_virtual_init();
// Reset hooks
asdf_hook_init();
} }
// PROCEDURE: asdf_keymaps_select // PROCEDURE: asdf_keymaps_select
@ -159,7 +170,7 @@ void asdf_keymaps_select(uint8_t index)
{ {
if (index < ASDF_NUM_KEYMAPS) { if (index < ASDF_NUM_KEYMAPS) {
asdf_arch_init(); asdf_arch_init();
asdf_keymaps_clear(); asdf_keymaps_reset();
current_keymap_index = index; current_keymap_index = index;
keymap_setup_function_lookup_table[index](); keymap_setup_function_lookup_table[index]();
} }
@ -198,6 +209,7 @@ void asdf_keymaps_init(void)
{ {
asdf_keymap_table_init(); asdf_keymap_table_init();
current_keymap_index = 0; current_keymap_index = 0;
asdf_keymaps_reset();
} }
// PROCEDURE: asdf_keymaps_map_select_0_clear // PROCEDURE: asdf_keymaps_map_select_0_clear