diff options
| author | tmk <nobody@nowhere> | 2013-07-23 07:54:14 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2013-07-23 07:56:28 +0900 |
| commit | 5b425731c5b662d107ba0f970a7ae7c7fe97d01b (patch) | |
| tree | 25c8f53490930e4e70638211cec159f86e4018d5 /common/action_macro.c | |
| parent | 25aec56c082936a463d609357a04332c97c9940b (diff) | |
| parent | 6aaa6e0ef9aa1e464b67723fd4cdd0d63b2c861d (diff) | |
| download | firmware-5b425731c5b662d107ba0f970a7ae7c7fe97d01b.tar.gz firmware-5b425731c5b662d107ba0f970a7ae7c7fe97d01b.tar.bz2 firmware-5b425731c5b662d107ba0f970a7ae7c7fe97d01b.zip | |
Merge branch 'macro_mediakey'(Fix issue #42)
Diffstat (limited to 'common/action_macro.c')
| -rw-r--r-- | common/action_macro.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/common/action_macro.c b/common/action_macro.c index 29cfd23df..cc7ac18a0 100644 --- a/common/action_macro.c +++ b/common/action_macro.c @@ -36,31 +36,31 @@ void action_macro_play(const 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"); - 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: |