gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-05-17 14:50:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reset macros as well.

Browse Source
This commit is contained in:
Nick Brassel 2023-01-05 11:08:45 +11:00
parent 312a261a4b
commit 8829d0431c
No known key found for this signature in database
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
quantum/eeconfig.c
View File

@ -20,6 +20,7 @@ void eeconfig_init_via(void);
#elif defined(DYNAMIC_KEYMAP_ENABLE) #elif defined(DYNAMIC_KEYMAP_ENABLE)
bool dynamic_keymap_is_valid(void); bool dynamic_keymap_is_valid(void);
void dynamic_keymap_reset(void); void dynamic_keymap_reset(void);
void dynamic_keymap_macro_reset(void);
#endif #endif
/** \brief eeconfig enable /** \brief eeconfig enable
@ -89,6 +90,7 @@ void eeconfig_init_quantum(void) {
eeconfig_init_via(); eeconfig_init_via();
#elif defined(DYNAMIC_KEYMAP_ENABLE) #elif defined(DYNAMIC_KEYMAP_ENABLE)
dynamic_keymap_reset(); dynamic_keymap_reset();
dynamic_keymap_macro_reset();
#endif #endif
eeconfig_init_kb(); eeconfig_init_kb();

4
quantum/keymap_introspection.c
View File

@ -27,7 +27,7 @@ uint16_t keycode_at_keymap_location_raw(uint8_t layer_num, uint8_t row, uint8_t
if (layer_num < NUM_KEYMAP_LAYERS && row < MATRIX_ROWS && column < MATRIX_COLS) { if (layer_num < NUM_KEYMAP_LAYERS && row < MATRIX_ROWS && column < MATRIX_COLS) {
return pgm_read_word(&keymaps[layer_num][row][column]); return pgm_read_word(&keymaps[layer_num][row][column]);
} }
return KC_NO; return KC_TRANSPARENT;
} }
__attribute__((weak)) uint16_t keycode_at_keymap_location(uint8_t layer_num, uint8_t row, uint8_t column) { __attribute__((weak)) uint16_t keycode_at_keymap_location(uint8_t layer_num, uint8_t row, uint8_t column) {
@ -48,7 +48,7 @@ uint16_t keycode_at_encodermap_location_raw(uint8_t layer_num, uint8_t encoder_i
if (layer_num < NUM_ENCODERMAP_LAYERS && encoder_idx < NUM_ENCODERS) { if (layer_num < NUM_ENCODERMAP_LAYERS && encoder_idx < NUM_ENCODERS) {
return pgm_read_word(&encoder_map[layer_num][encoder_idx][clockwise ? 0 : 1]); return pgm_read_word(&encoder_map[layer_num][encoder_idx][clockwise ? 0 : 1]);
} }
return KC_NO; return KC_TRANSPARENT;
} }
__attribute__((weak)) uint16_t keycode_at_encodermap_location(uint8_t layer_num, uint8_t encoder_idx, bool clockwise) { __attribute__((weak)) uint16_t keycode_at_encodermap_location(uint8_t layer_num, uint8_t encoder_idx, bool clockwise) {