X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=common%2Faction_macro.c;h=ba93fc8b2324b7cb96e9a5744a21eee89c3f588d;hb=fa545c87f74833856761572ef631d20accc1d026;hp=71d1506f5cabbe6e16392f8a0c6f1c9f4b105f7e;hpb=cbb9c408e46a7a7a567f3d6e07713256152106d0;p=tmk_firmware.git

diff --git a/common/action_macro.c b/common/action_macro.c
index 71d1506..ba93fc8 100644
--- a/common/action_macro.c
+++ b/common/action_macro.c
@@ -14,9 +14,10 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <util/delay.h>
 #include "action.h"
+#include "action_util.h"
 #include "action_macro.h"
+#include "wait.h"
 
 #ifdef DEBUG_ACTION
 #include "debug.h"
@@ -27,8 +28,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef NO_ACTION_MACRO
 
-#define MACRO_READ()  (macro = pgm_read_byte(macro_p++))
-void action_macro_play(const prog_macro_t *macro_p)
+#define MACRO_READ()  (macro = MACRO_GET(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--) wait_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:
@@ -68,7 +77,7 @@ void action_macro_play(const prog_macro_t *macro_p)
                 return;
         }
         // interval
-        { uint8_t ms = interval; while (ms--) _delay_ms(1); }
+        { uint8_t ms = interval; while (ms--) wait_ms(1); }
     }
 }
 #endif