Make the .type method return MACRO_NONE

This way it can be used in place of a `return MACRO(...)` construct.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
pull/365/head
Gergely Nagy 8 years ago
parent 1206a3cafb
commit 306e450496

@ -51,7 +51,7 @@ const macro_t *macroAction(uint8_t macroIndex, uint8_t keyState) {
T(0), T(1) );
case MACRO_HELLO:
if (keyToggledOn(keyState)) {
Macros.type(PSTR("Hello world!"));
return Macros.type(PSTR("Hello world!"));
}
break;
case MACRO_SPECIAL:

@ -161,7 +161,7 @@ Key Macros_::lookupAsciiCode(uint8_t ascii_code) {
return key;
}
void Macros_::type(const char *string) {
const macro_t *Macros_::type(const char *string) {
while (true) {
uint8_t ascii_code = pgm_read_byte(string++);
if (!ascii_code)
@ -177,6 +177,8 @@ void Macros_::type(const char *string) {
playMacroKeyswitchEvent(key, WAS_PRESSED);
}
return MACRO_NONE;
}
static Key handleMacroEvent(Key mappedKey, byte row, byte col, uint8_t keyState) {

@ -14,7 +14,7 @@ class Macros_ : public KaleidoscopePlugin {
void begin(void) final;
void play(const macro_t *macro_p);
void type(const char *string);
const macro_t *type(const char *string);
static byte row, col;

Loading…
Cancel
Save