From 92c19dae8cfa1bbeeaa447353ac4d7a96e42b330 Mon Sep 17 00:00:00 2001 From: Wilba6582 Date: Mon, 11 Mar 2019 12:41:50 +1100 Subject: [PATCH 1/2] Fixed tap/down/up handling in dynamic keymap macros --- quantum/dynamic_keymap.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/quantum/dynamic_keymap.c b/quantum/dynamic_keymap.c index 14627a93d6de..53c18a7510be 100644 --- a/quantum/dynamic_keymap.c +++ b/quantum/dynamic_keymap.c @@ -210,19 +210,27 @@ void dynamic_keymap_macro_send( uint8_t id ) ++p; } - // Send the macro string one char at a time - // by making temporary 1 char strings - char data[2] = { 0, 0 }; + // Send the macro string one or two chars at a time + // by making temporary 1 or 2 char strings + char data[3] = { 0, 0, 0 }; // We already checked there was a null at the end of // the buffer, so this cannot go past the end while ( 1 ) { - data[0] = eeprom_read_byte(p); + data[0] = eeprom_read_byte(p++); + data[1] = 0; // Stop at the null terminator of this macro string if ( data[0] == 0 ) { break; } + // If the char is magic (tap, down, up), + // add the next char (key to use) and send a 2 char string. + if ( data[0] == 1 || data[0] == 2 || data[0] == 3 ) { + data[1] = eeprom_read_byte(p++); + if ( data[1] == 0 ) { + break; + } + } send_string(data); - ++p; } } From d15bb05c935e378f2e1e912a46c3114697dd00e4 Mon Sep 17 00:00:00 2001 From: Wilba6582 Date: Sat, 30 Mar 2019 14:24:13 +1100 Subject: [PATCH 2/2] Added SS_TAP_CODE, SS_DOWN_CODE, SS_UP_CODE --- quantum/dynamic_keymap.c | 2 +- quantum/quantum.c | 12 ++++++------ quantum/quantum.h | 4 ++++ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/quantum/dynamic_keymap.c b/quantum/dynamic_keymap.c index 53c18a7510be..38400e36f10d 100644 --- a/quantum/dynamic_keymap.c +++ b/quantum/dynamic_keymap.c @@ -224,7 +224,7 @@ void dynamic_keymap_macro_send( uint8_t id ) } // If the char is magic (tap, down, up), // add the next char (key to use) and send a 2 char string. - if ( data[0] == 1 || data[0] == 2 || data[0] == 3 ) { + if ( data[0] == SS_TAP_CODE || data[0] == SS_DOWN_CODE || data[0] == SS_UP_CODE ) { data[1] = eeprom_read_byte(p++); if ( data[1] == 0 ) { break; diff --git a/quantum/quantum.c b/quantum/quantum.c index 46d404029f8b..96760de87e70 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -900,16 +900,16 @@ void send_string_with_delay(const char *str, uint8_t interval) { while (1) { char ascii_code = *str; if (!ascii_code) break; - if (ascii_code == 1) { + if (ascii_code == SS_TAP_CODE) { // tap uint8_t keycode = *(++str); register_code(keycode); unregister_code(keycode); - } else if (ascii_code == 2) { + } else if (ascii_code == SS_DOWN_CODE) { // down uint8_t keycode = *(++str); register_code(keycode); - } else if (ascii_code == 3) { + } else if (ascii_code == SS_UP_CODE) { // up uint8_t keycode = *(++str); unregister_code(keycode); @@ -926,16 +926,16 @@ void send_string_with_delay_P(const char *str, uint8_t interval) { while (1) { char ascii_code = pgm_read_byte(str); if (!ascii_code) break; - if (ascii_code == 1) { + if (ascii_code == SS_TAP_CODE) { // tap uint8_t keycode = pgm_read_byte(++str); register_code(keycode); unregister_code(keycode); - } else if (ascii_code == 2) { + } else if (ascii_code == SS_DOWN_CODE) { // down uint8_t keycode = pgm_read_byte(++str); register_code(keycode); - } else if (ascii_code == 3) { + } else if (ascii_code == SS_UP_CODE) { // up uint8_t keycode = pgm_read_byte(++str); unregister_code(keycode); diff --git a/quantum/quantum.h b/quantum/quantum.h index d2c5862f881c..e1e20a7606ce 100644 --- a/quantum/quantum.h +++ b/quantum/quantum.h @@ -191,6 +191,10 @@ extern uint32_t default_layer_state; #define ADD_SLASH_X(y) STRINGIZE(\x ## y) #define SYMBOL_STR(x) ADD_SLASH_X(x) +#define SS_TAP_CODE 1 +#define SS_DOWN_CODE 2 +#define SS_UP_CODE 3 + #define SS_TAP(keycode) "\1" SYMBOL_STR(keycode) #define SS_DOWN(keycode) "\2" SYMBOL_STR(keycode) #define SS_UP(keycode) "\3" SYMBOL_STR(keycode)