support Macros as tapkeys

dhowland · dhowland · commit ce2a5e18ec8a · 2020-05-31T15:57:02.000-04:00
diff --git a/firmware/src/keymap.c b/firmware/src/keymap.c
@@ -464,14 +464,13 @@ void play_macro(const uint8_t code)
 
 inline void send_tapkey(const uint8_t code)
 {
-	if ((code > 0) && (code <= MAX_NKRO_CODE))
+	if (code <= MAX_NKRO_CODE)
 	{
 		queue_autokeys(code, g_modifier_state);
 	}
-	else if ((code & 0xE0) == 0xE0)
+	else if ((code & 0x70) == 0x70)
 	{
-		unset_modifier(code);
-		queue_autokeys(0, get_modfier_mask(code));
+		play_macro(code + 0x60);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -464,14 +464,13 @@ void play_macro(const uint8_t code)`
`464`	`464`
`465`	`465`	`inline void send_tapkey(const uint8_t code)`
`466`	`466`	`{`
`467`		`- if ((code > 0) && (code <= MAX_NKRO_CODE))`
	`467`	`+ if (code <= MAX_NKRO_CODE)`
`468`	`468`	`{`
`469`	`469`	`queue_autokeys(code, g_modifier_state);`
`470`	`470`	`}`
`471`		`- else if ((code & 0xE0) == 0xE0)`
	`471`	`+ else if ((code & 0x70) == 0x70)`
`472`	`472`	`{`
`473`		`- unset_modifier(code);`
`474`		`- queue_autokeys(0, get_modfier_mask(code));`
	`473`	`+ play_macro(code + 0x60);`
`475`	`474`	`}`
`476`	`475`	`}`
`477`	`476`