ceres-sees-all/qmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

[Feature Improvement]add option to keep layer state when recording dynamic macros (#24418)

Browse source 
* feat: add option to keep layer state when recording dynamic macros

* Better option macro name and lint changes
This commit is contained in:
Chaser Huang 2025-11-11 07:30:42 -05:00 • committed by GitHub
parent e06d79e9c6
commit 1ddcf57382
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 29 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
quantum/process_keycode/process_dynamic_macro.c
View file

@ -89,6 +89,11 @@ __attribute__((weak)) bool dynamic_macro_valid_key_user(uint16_t keycode, keyrec
#define DYNAMIC_MACRO_CURRENT_LENGTH(BEGIN, POINTER) ((int)(direction * ((POINTER) - (BEGIN))))
#define DYNAMIC_MACRO_CURRENT_CAPACITY(BEGIN, END2) ((int)(direction * ((END2) - (BEGIN)) + 1))
#ifdef DYNAMIC_MACRO_KEEP_ORIGINAL_LAYER_STATE
static layer_state_t dm1_layer_state;
static layer_state_t dm2_layer_state;
#endif
/**
* Start recording of the dynamic macro.
*
@ -100,8 +105,16 @@ void dynamic_macro_record_start(keyrecord_t **macro_pointer, keyrecord_t *macro_
dynamic_macro_record_start_kb(direction);
clear_keyboard();
#ifdef DYNAMIC_MACRO_KEEP_ORIGINAL_LAYER_STATE
if (direction == 1) {
dm1_layer_state = layer_state;
} else if (direction == -1) {
dm2_layer_state = layer_state;
}
#else
layer_clear();
#endif
clear_keyboard();
*macro_pointer = macro_buffer;
}
@ -118,7 +131,15 @@ void dynamic_macro_play(keyrecord_t *macro_buffer, keyrecord_t *macro_end, int8_
layer_state_t saved_layer_state = layer_state;
clear_keyboard();
#ifdef DYNAMIC_MACRO_KEEP_ORIGINAL_LAYER_STATE
if (direction == 1) {
layer_state_set(dm1_layer_state);
} else if (direction == -1) {
layer_state_set(dm2_layer_state);
}
#else
layer_clear();
#endif
while (macro_buffer != macro_end) {
process_record(macro_buffer);