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

Make the macro parser store the data it extracts into macro_action_t variables

Browse Source
This commit is contained in:
Eric Tang
2017-08-09 13:09:17 -07:00
parent c342f75031
commit 22e49c50d1
2 changed files with 83 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
right/src/config_parser/parse_macro.c
View File

@@ -2,7 +2,7 @@
#include "config_globals.h"
#include "macros.h"
parser_error_t parseKeyMacroAction(config_buffer_t *buffer, serialized_macro_action_type_t macroActionType) {
parser_error_t parseKeyMacroAction(config_buffer_t *buffer, macro_action_t *macroAction, serialized_macro_action_type_t macroActionType) {
uint8_t keyMacroType = macroActionType - SerializedMacroActionType_KeyMacroAction;
uint8_t action = keyMacroType & 0b11;
uint8_t type;
@@ -12,77 +12,80 @@ parser_error_t parseKeyMacroAction(config_buffer_t *buffer, serialized_macro_act
keyMacroType >>= 2;
type = keyMacroType & 0b11;
keyMacroType >>= 2;
if (keyMacroType & 0b10) {
scancode = readUInt8(buffer);
}
if (keyMacroType & 0b01) {
modifierMask = readUInt8(buffer);
}
(void)action;
(void)type;
(void)scancode;
(void)modifierMask;
scancode = keyMacroType & 0b10 ? readUInt8(buffer) : 0;
modifierMask = keyMacroType & 0b01 ? readUInt8(buffer) : 0;
macroAction->type = MacroActionType_Key;
macroAction->key.action = action;
macroAction->key.type = type;
macroAction->key.scancode = scancode;
macroAction->key.modifierMask = modifierMask;
return ParserError_Success;
}
parser_error_t parseMouseButtonMacroAction(config_buffer_t *buffer, serialized_macro_action_type_t macroActionType) {
parser_error_t parseMouseButtonMacroAction(config_buffer_t *buffer, macro_action_t *macroAction, serialized_macro_action_type_t macroActionType) {
uint8_t action = macroActionType - SerializedMacroActionType_MouseButtonMacroAction;
uint8_t mouseButtonsMask = readUInt8(buffer);
(void)action;
(void)mouseButtonsMask;
macroAction->type = MacroActionType_MouseButton;
macroAction->mouseButton.action = action;
macroAction->mouseButton.mouseButtonsMask = mouseButtonsMask;
return ParserError_Success;
}
parser_error_t parseMoveMouseMacroAction(config_buffer_t *buffer) {
parser_error_t parseMoveMouseMacroAction(config_buffer_t *buffer, macro_action_t *macroAction) {
int16_t x = readInt16(buffer);
int16_t y = readInt16(buffer);
(void)x;
(void)y;
macroAction->type = MacroActionType_MoveMouse;
macroAction->moveMouse.x = x;
macroAction->moveMouse.y = y;
return ParserError_Success;
}
parser_error_t parseScrollMouseMacroAction(config_buffer_t *buffer) {
parser_error_t parseScrollMouseMacroAction(config_buffer_t *buffer, macro_action_t *macroAction) {
int16_t x = readInt16(buffer);
int16_t y = readInt16(buffer);
(void)x;
(void)y;
macroAction->type = MacroActionType_ScrollMouse;
macroAction->scrollMouse.x = x;
macroAction->scrollMouse.y = y;
return ParserError_Success;
}
parser_error_t parseDelayMacroAction(config_buffer_t *buffer) {
parser_error_t parseDelayMacroAction(config_buffer_t *buffer, macro_action_t *macroAction) {
int16_t delay = readInt16(buffer);
(void)delay;
macroAction->type = MacroActionType_Delay;
macroAction->delay.delay = delay;
return ParserError_Success;
}
parser_error_t parseTextMacroAction(config_buffer_t *buffer) {
parser_error_t parseTextMacroAction(config_buffer_t *buffer, macro_action_t *macroAction) {
uint16_t textLen;
const char *text = readString(buffer, &textLen);
(void)text;
macroAction->type = MacroActionType_Text;
macroAction->text.text = text;
macroAction->text.textLen = textLen;
return ParserError_Success;
}
parser_error_t parseMacroAction(config_buffer_t *buffer) {
parser_error_t parseMacroAction(config_buffer_t *buffer, macro_action_t *macroAction) {
uint8_t macroActionType = readUInt8(buffer);
switch (macroActionType) {
case SerializedMacroActionType_KeyMacroAction ... SerializedMacroActionType_LastKeyMacroAction:
return parseKeyMacroAction(buffer, macroActionType);
return parseKeyMacroAction(buffer, macroAction, macroActionType);
case SerializedMacroActionType_MouseButtonMacroAction ... SerializedMacroActionType_LastMouseButtonMacroAction:
return parseMouseButtonMacroAction(buffer, macroActionType);
return parseMouseButtonMacroAction(buffer, macroAction, macroActionType);
case SerializedMacroActionType_MoveMouseMacroAction:
return parseMoveMouseMacroAction(buffer);
return parseMoveMouseMacroAction(buffer, macroAction);
case SerializedMacroActionType_ScrollMouseMacroAction:
return parseScrollMouseMacroAction(buffer);
return parseScrollMouseMacroAction(buffer, macroAction);
case SerializedMacroActionType_DelayMacroAction:
return parseDelayMacroAction(buffer);
return parseDelayMacroAction(buffer, macroAction);
case SerializedMacroActionType_TextMacroAction:
return parseTextMacroAction(buffer);
return parseTextMacroAction(buffer, macroAction);
}
return ParserError_InvalidSerializedMacroActionType;
}
@@ -95,6 +98,7 @@ parser_error_t ParseMacro(config_buffer_t *buffer, uint8_t macroIdx) {
bool isPrivate = readBool(buffer);
const char *name = readString(buffer, &nameLen);
uint16_t macroActionsCount = readCompactLength(buffer);
macro_action_t dummyMacroAction;
(void)isLooped;
(void)isPrivate;
@@ -104,7 +108,7 @@ parser_error_t ParseMacro(config_buffer_t *buffer, uint8_t macroIdx) {
AllMacros[macroIdx].macroActionsCount = macroActionsCount;
}
for (uint16_t i = 0; i < macroActionsCount; i++) {
errorCode = parseMacroAction(buffer);
errorCode = parseMacroAction(buffer, &dummyMacroAction);
if (errorCode != ParserError_Success) {
return errorCode;
}