X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=common%2Faction_macro.c;h=d85aee3796e58a85196fae6765f3025be53d84c7;hb=ff5f1b0552078dcee25d31723e236f525bbf85e8;hp=71d1506f5cabbe6e16392f8a0c6f1c9f4b105f7e;hpb=ff2d276b193632136c785d92ed01df48aea8461f;p=tmk_firmware.git
diff --git a/common/action_macro.c b/common/action_macro.c
index 71d1506..d85aee3 100644
--- a/common/action_macro.c
+++ b/common/action_macro.c
@@ -16,6 +16,7 @@ along with this program. If not, see .
*/
#include
#include "action.h"
+#include "action_util.h"
#include "action_macro.h"
#ifdef DEBUG_ACTION
@@ -28,7 +29,7 @@ along with this program. If not, see .
#ifndef NO_ACTION_MACRO
#define MACRO_READ() (macro = pgm_read_byte(macro_p++))
-void action_macro_play(const prog_macro_t *macro_p)
+void action_macro_play(const macro_t *macro_p)
{
macro_t macro = END;
uint8_t interval = 0;
@@ -36,31 +37,39 @@ void action_macro_play(const prog_macro_t *macro_p)
if (!macro_p) return;
while (true) {
switch (MACRO_READ()) {
- case INTERVAL:
- interval = MACRO_READ();
- debug("INTERVAL("); debug_dec(interval); debug(")\n");
- break;
- case WAIT:
+ case KEY_DOWN:
MACRO_READ();
- debug("WAIT("); debug_dec(macro); debug(")\n");
- { uint8_t ms = macro; while (ms--) _delay_ms(1); }
+ dprintf("KEY_DOWN(%02X)\n", macro);
+ if (IS_MOD(macro)) {
+ add_weak_mods(MOD_BIT(macro));
+ } else {
+ register_code(macro);
+ }
break;
- case MODS_DOWN:
+ case KEY_UP:
MACRO_READ();
- debug("MODS_DOWN("); debug_hex(macro); debug(")\n");
- add_mods(macro);
+ dprintf("KEY_UP(%02X)\n", macro);
+ if (IS_MOD(macro)) {
+ del_weak_mods(MOD_BIT(macro));
+ } else {
+ unregister_code(macro);
+ }
break;
- case MODS_UP:
+ case WAIT:
MACRO_READ();
- debug("MODS_UP("); debug_hex(macro); debug(")\n");
- del_mods(macro);
+ dprintf("WAIT(%u)\n", macro);
+ { uint8_t ms = macro; while (ms--) _delay_ms(1); }
+ break;
+ case INTERVAL:
+ interval = MACRO_READ();
+ dprintf("INTERVAL(%u)\n", interval);
break;
case 0x04 ... 0x73:
- debug("DOWN("); debug_hex(macro); debug(")\n");
+ dprintf("DOWN(%02X)\n", macro);
register_code(macro);
break;
case 0x84 ... 0xF3:
- debug("UP("); debug_hex(macro); debug(")\n");
+ dprintf("UP(%02X)\n", macro);
unregister_code(macro&0x7F);
break;
case END: