aboutsummaryrefslogtreecommitdiffstats
path: root/quantum/dynamic_macro.h
diff options
context:
space:
mode:
authorGravatar Wojciech Siewierski <wojciech.siewierski@onet.pl>2017-05-03 23:47:52 +0200
committerGravatar Wojciech Siewierski <wojciech.siewierski@onet.pl>2017-05-04 00:14:38 +0200
commit40fe30e4d6b521284fa3cb7ae217ebb6d013bcdf (patch)
treeee4dd692ca3039c3f717399541710ed54e7882b5 /quantum/dynamic_macro.h
parentc8ac556e63c62078fe1edfc1a116c36ad34da8e3 (diff)
downloadqmk_firmware-40fe30e4d6b521284fa3cb7ae217ebb6d013bcdf.tar.gz
dynamic_macro.h: Ignore all the initial key releases
Right after the user initiates the macro recording, they usually need to release some keys used to access the DYN_REC_START layers. It makes sense to ignore them. Note: The keys used to access the DYN_REC_STOP key are *not* ignored.
Diffstat (limited to 'quantum/dynamic_macro.h')
-rw-r--r--quantum/dynamic_macro.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/quantum/dynamic_macro.h b/quantum/dynamic_macro.h
index 939816a59..1a8ec4032 100644
--- a/quantum/dynamic_macro.h
+++ b/quantum/dynamic_macro.h
@@ -97,17 +97,24 @@ void dynamic_macro_play(
/**
* Record a single key in a dynamic macro.
*
+ * @param macro_buffer[in] The start of the used macro buffer.
* @param macro_pointer[in,out] The current buffer position.
* @param macro_end2[in] The end of the other macro which shouldn't be overwritten.
* @param direction[in] Either +1 or -1, which way to iterate the buffer.
* @param record[in] The current keypress.
*/
void dynamic_macro_record_key(
+ keyrecord_t *macro_buffer,
keyrecord_t **macro_pointer,
keyrecord_t *macro_end2,
int8_t direction,
keyrecord_t *record)
{
+ /* If we've just started recording, ignore all the key releases. */
+ if (!record->event.pressed && *macro_pointer == macro_buffer) {
+ return;
+ }
+
if (*macro_pointer + direction != macro_end2) {
**macro_pointer = *record;
*macro_pointer += direction;
@@ -230,10 +237,10 @@ bool process_record_dynamic_macro(uint16_t keycode, keyrecord_t *record)
/* Store the key in the macro buffer and process it normally. */
switch (macro_id) {
case 1:
- dynamic_macro_record_key(&macro_pointer, r_macro_end, +1, record);
+ dynamic_macro_record_key(macro_buffer, &macro_pointer, r_macro_end, +1, record);
break;
case 2:
- dynamic_macro_record_key(&macro_pointer, macro_end, -1, record);
+ dynamic_macro_record_key(r_macro_buffer, &macro_pointer, macro_end, -1, record);
break;
}
return true;