X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=common%2Faction_macro.c;h=cc7ac18a099215defdf2772dfea49a37fef263c0;hb=772ab7025ddf88126d9d6ddb654f62434985504b;hp=72859c0dda429f152e0bab83f0854fce052e16a8;hpb=aad91a30a34d61739e1261bb82a1cb1ace581afa;p=tmk_firmware.git
diff --git a/common/action_macro.c b/common/action_macro.c
index 72859c0..cc7ac18 100644
--- a/common/action_macro.c
+++ b/common/action_macro.c
@@ -15,13 +15,20 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
#include
-#include "debug.h"
#include "action.h"
#include "action_macro.h"
+#ifdef DEBUG_ACTION
+#include "debug.h"
+#else
+#include "nodebug.h"
+#endif
+
+
+#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;
@@ -29,32 +36,31 @@ 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);
+ register_code(macro);
break;
- case MODS_DOWN:
+ case KEY_UP:
MACRO_READ();
- debug("MODS_DOWN("); debug_hex(macro); debug(")\n");
- debug("MODS_UP("); debug_hex(macro); debug(")\n");
- add_mods(macro);
+ dprintf("KEY_UP(%02X)\n", macro);
+ 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:
@@ -65,3 +71,4 @@ void action_macro_play(const prog_macro_t *macro_p)
{ uint8_t ms = interval; while (ms--) _delay_ms(1); }
}
}
+#endif