uhk/firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Implement the delay macro action

Browse Source
This commit is contained in:
Eric Tang
2018-06-26 12:36:58 -07:00
parent 314eb0d771
commit 5988fce59b
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
right/src/macros.c
View File

@@ -1,6 +1,7 @@
#include "macros.h" #include "macros.h"
#include "config_parser/parse_macro.h" #include "config_parser/parse_macro.h"
#include "config_parser/config_globals.h" #include "config_parser/config_globals.h"
#include "timer.h"
macro_reference_t AllMacros[MAX_MACRO_NUM]; macro_reference_t AllMacros[MAX_MACRO_NUM];
uint8_t AllMacrosCount; uint8_t AllMacrosCount;
@@ -242,11 +243,27 @@ bool processKeyMacroAction(void)
return false; return false;
} }
bool processDelayMacroAction(void)
{
static bool inDelay;
static uint32_t delayStart;
if (inDelay) {
if (Timer_GetElapsedTime(&delayStart) >= currentMacroAction.delay.delay) {
inDelay = false;
}
} else {
Timer_SetCurrentTime(&delayStart);
inDelay = true;
}
return inDelay;
}
bool processCurrentMacroAction(void) bool processCurrentMacroAction(void)
{ {
switch (currentMacroAction.type) { switch (currentMacroAction.type) {
case MacroActionType_Delay: case MacroActionType_Delay:
return false; return processDelayMacroAction();
case MacroActionType_Key: case MacroActionType_Key:
return processKeyMacroAction(); return processKeyMacroAction();
case MacroActionType_MouseButton: case MacroActionType_MouseButton: