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

Reduce code duplication

Browse Source
This commit is contained in:
Eric Tang
2018-06-24 14:24:10 -07:00
parent be82530412
commit 09a58b607c
1 changed files with 34 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
right/src/macros.c
View File

@@ -184,6 +184,36 @@ void deleteSystemScancode(uint8_t scancode)
} }
} }
void addScancode(uint16_t scancode, macro_sub_action_t type)
{
switch (type) {
case KeystrokeType_Basic:
addBasicScancode(scancode);
break;
case KeystrokeType_Media:
addMediaScancode(scancode);
break;
case KeystrokeType_System:
addSystemScancode(scancode);
break;
}
}
void deleteScancode(uint16_t scancode, macro_sub_action_t type)
{
switch (type) {
case KeystrokeType_Basic:
deleteBasicScancode(scancode);
break;
case KeystrokeType_Media:
deleteMediaScancode(scancode);
break;
case KeystrokeType_System:
deleteSystemScancode(scancode);
break;
}
}
bool processKeyMacroAction(void) bool processKeyMacroAction(void)
{ {
static bool pressStarted; static bool pressStarted;
@@ -193,60 +223,20 @@ bool processKeyMacroAction(void)
if (!pressStarted) { if (!pressStarted) {
pressStarted = true; pressStarted = true;
addModifiers(currentMacroAction.key.modifierMask); addModifiers(currentMacroAction.key.modifierMask);
switch (currentMacroAction.key.type) { addScancode(currentMacroAction.key.scancode, currentMacroAction.key.type);
case KeystrokeType_Basic:
addBasicScancode(currentMacroAction.key.scancode);
break;
case KeystrokeType_Media:
// addMediaScancode(currentMacroAction.key.scancode);
break;
case KeystrokeType_System:
addSystemScancode(currentMacroAction.key.scancode);
break;
}
return true; return true;
} }
pressStarted = false; pressStarted = false;
deleteModifiers(currentMacroAction.key.modifierMask); deleteModifiers(currentMacroAction.key.modifierMask);
switch (currentMacroAction.key.type) { deleteScancode(currentMacroAction.key.scancode, currentMacroAction.key.type);
case KeystrokeType_Basic:
deleteBasicScancode(currentMacroAction.key.scancode);
break;
case KeystrokeType_Media:
// deleteMediaScancode(currentMacroAction.key.scancode);
break;
case KeystrokeType_System:
deleteSystemScancode(currentMacroAction.key.scancode);
break;
}
break; break;
case MacroSubAction_Release: case MacroSubAction_Release:
deleteModifiers(currentMacroAction.key.modifierMask); deleteModifiers(currentMacroAction.key.modifierMask);
switch (currentMacroAction.key.type) { deleteScancode(currentMacroAction.key.scancode, currentMacroAction.key.type);
case KeystrokeType_Basic:
deleteBasicScancode(currentMacroAction.key.scancode);
break;
case KeystrokeType_Media:
// deleteMediaScancode(currentMacroAction.key.scancode);
break;
case KeystrokeType_System:
deleteSystemScancode(currentMacroAction.key.scancode);
break;
}
break; break;
case MacroSubAction_Press: case MacroSubAction_Press:
addModifiers(currentMacroAction.key.modifierMask); addModifiers(currentMacroAction.key.modifierMask);
switch (currentMacroAction.key.type) { addScancode(currentMacroAction.key.scancode, currentMacroAction.key.type);
case KeystrokeType_Basic:
addBasicScancode(currentMacroAction.key.scancode);
break;
case KeystrokeType_Media:
// addMediaScancode(currentMacroAction.key.scancode);
break;
case KeystrokeType_System:
addSystemScancode(currentMacroAction.key.scancode);
break;
}
break; break;
} }
return false; return false;