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

Parse long media macro actions.

Browse Source
This commit is contained in:
László Monda
2018-05-03 00:42:20 +02:00
parent bf69f28ed1
commit b917a97e93
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,13 +7,15 @@ parser_error_t parseKeyMacroAction(config_buffer_t *buffer, macro_action_t *macr
uint8_t keyMacroType = macroActionType - SerializedMacroActionType_KeyMacroAction; uint8_t keyMacroType = macroActionType - SerializedMacroActionType_KeyMacroAction;
uint8_t action = keyMacroType & 0b11; uint8_t action = keyMacroType & 0b11;
uint8_t type; uint8_t type;
uint8_t scancode; uint16_t scancode = 0;
uint8_t modifierMask; uint8_t modifierMask;
keyMacroType >>= 2; keyMacroType >>= 2;
type = keyMacroType & 0b11; type = keyMacroType & 0b11;
keyMacroType >>= 2; keyMacroType >>= 2;
scancode = keyMacroType & 0b10 ? ReadUInt8(buffer) : 0; if (keyMacroType & 0b10) {
scancode = type == SerializedKeystrokeType_LongMedia ? ReadUInt16(buffer) : ReadUInt8(buffer);
}
modifierMask = keyMacroType & 0b01 ? ReadUInt8(buffer) : 0; modifierMask = keyMacroType & 0b01 ? ReadUInt8(buffer) : 0;
macroAction->type = MacroActionType_Key; macroAction->type = MacroActionType_Key;
macroAction->key.action = action; macroAction->key.action = action;

2
right/src/macros.h
View File

@@ -39,7 +39,7 @@
struct { struct {
macro_sub_action_t action; macro_sub_action_t action;
keystroke_type_t type; keystroke_type_t type;
uint8_t scancode; uint16_t scancode;
uint8_t modifierMask; uint8_t modifierMask;
} ATTR_PACKED key; } ATTR_PACKED key;
struct { struct {