aboutsummaryrefslogtreecommitdiffstats
path: root/quantum
diff options
context:
space:
mode:
authorGravatar Wojciech Siewierski <wojciech.siewierski@onet.pl>2017-05-04 01:37:46 +0200
committerGravatar Wojciech Siewierski <wojciech.siewierski@onet.pl>2017-05-04 01:42:09 +0200
commit4b50ea15a954de2e6062aa7228bd1f9f76669ce7 (patch)
treec8ecf1bbb2c23ba09f38e2b295d7ed5357b990fb /quantum
parent436d661775178fb62b46afdc3d755fdb413dcb35 (diff)
downloadqmk_firmware-4b50ea15a954de2e6062aa7228bd1f9f76669ce7.tar.gz
dynamic_macro.h: Do not save the keys being held when stopping the recording
More specifically, we save them and then place the `macro_end` pointer before them so they are essentially ignored and the other macro may freely overwrite them.
Diffstat (limited to 'quantum')
-rw-r--r--quantum/dynamic_macro.h18
1 files changed, 15 insertions, 3 deletions
diff --git a/quantum/dynamic_macro.h b/quantum/dynamic_macro.h
index 9e7845c99..c4017aec9 100644
--- a/quantum/dynamic_macro.h
+++ b/quantum/dynamic_macro.h
@@ -127,10 +127,22 @@ void dynamic_macro_record_key(
* End recording of the dynamic macro. Essentially just update the
* pointer to the end of the macro.
*/
-void dynamic_macro_record_end(keyrecord_t *macro_pointer, keyrecord_t **macro_end)
+void dynamic_macro_record_end(
+ keyrecord_t *macro_buffer,
+ keyrecord_t *macro_pointer,
+ int8_t direction,
+ keyrecord_t **macro_end)
{
dynamic_macro_led_blink();
+ /* Do not save the keys being held when stopping the recording,
+ * i.e. the keys used to access the layer DYN_REC_STOP is on.
+ */
+ while (macro_pointer != macro_buffer &&
+ (macro_pointer - direction)->event.pressed) {
+ macro_pointer -= direction;
+ }
+
*macro_end = macro_pointer;
}
@@ -222,10 +234,10 @@ bool process_record_dynamic_macro(uint16_t keycode, keyrecord_t *record)
* starts. */
switch (macro_id) {
case 1:
- dynamic_macro_record_end(macro_pointer, &macro_end);
+ dynamic_macro_record_end(macro_buffer, macro_pointer, +1, &macro_end);
break;
case 2:
- dynamic_macro_record_end(macro_pointer, &r_macro_end);
+ dynamic_macro_record_end(r_macro_buffer, macro_pointer, -1, &r_macro_end);
break;
}
macro_id = 0;