From 8829d0431c0b04bd1797db823e87dff71e739824 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Thu, 5 Jan 2023 11:08:45 +1100 Subject: [PATCH] Reset macros as well. --- quantum/eeconfig.c | 2 ++ quantum/keymap_introspection.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/quantum/eeconfig.c b/quantum/eeconfig.c index 50f9a9b22f8..32c79526db1 100644 --- a/quantum/eeconfig.c +++ b/quantum/eeconfig.c @@ -20,6 +20,7 @@ void eeconfig_init_via(void); #elif defined(DYNAMIC_KEYMAP_ENABLE) bool dynamic_keymap_is_valid(void); void dynamic_keymap_reset(void); +void dynamic_keymap_macro_reset(void); #endif /** \brief eeconfig enable @@ -89,6 +90,7 @@ void eeconfig_init_quantum(void) { eeconfig_init_via(); #elif defined(DYNAMIC_KEYMAP_ENABLE) dynamic_keymap_reset(); + dynamic_keymap_macro_reset(); #endif eeconfig_init_kb(); diff --git a/quantum/keymap_introspection.c b/quantum/keymap_introspection.c index 1529ab9fe2d..1f4da2d975c 100644 --- a/quantum/keymap_introspection.c +++ b/quantum/keymap_introspection.c @@ -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) { 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) { @@ -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) { 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) {