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

Uppercamelcase read*() config parser functions since they're not local.

Browse Source
This commit is contained in:
László Monda
2017-11-11 16:54:40 +01:00
parent 22141ba1e3
commit a4ddf1ff2a
5 changed files with 61 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,8 +13,8 @@ parser_error_t parseKeyMacroAction(config_buffer_t *buffer, macro_action_t *macr
keyMacroType >>= 2;
type = keyMacroType & 0b11;
keyMacroType >>= 2;
scancode = keyMacroType & 0b10 ? readUInt8(buffer) : 0;
modifierMask = keyMacroType & 0b01 ? readUInt8(buffer) : 0;
scancode = keyMacroType & 0b10 ? ReadUInt8(buffer) : 0;
modifierMask = keyMacroType & 0b01 ? ReadUInt8(buffer) : 0;
macroAction->type = MacroActionType_Key;
macroAction->key.action = action;
macroAction->key.type = type;
@@ -26,7 +26,7 @@ parser_error_t parseKeyMacroAction(config_buffer_t *buffer, macro_action_t *macr
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);
uint8_t mouseButtonsMask = ReadUInt8(buffer);
macroAction->type = MacroActionType_MouseButton;
macroAction->mouseButton.action = action;
@@ -36,8 +36,8 @@ parser_error_t parseMouseButtonMacroAction(config_buffer_t *buffer, macro_action
parser_error_t parseMoveMouseMacroAction(config_buffer_t *buffer, macro_action_t *macroAction)
{
int16_t x = readInt16(buffer);
int16_t y = readInt16(buffer);
int16_t x = ReadInt16(buffer);
int16_t y = ReadInt16(buffer);
macroAction->type = MacroActionType_MoveMouse;
macroAction->moveMouse.x = x;
@@ -47,8 +47,8 @@ parser_error_t parseMoveMouseMacroAction(config_buffer_t *buffer, macro_action_t
parser_error_t parseScrollMouseMacroAction(config_buffer_t *buffer, macro_action_t *macroAction)
{
int16_t x = readInt16(buffer);
int16_t y = readInt16(buffer);
int16_t x = ReadInt16(buffer);
int16_t y = ReadInt16(buffer);
macroAction->type = MacroActionType_ScrollMouse;
macroAction->scrollMouse.x = x;
@@ -58,7 +58,7 @@ parser_error_t parseScrollMouseMacroAction(config_buffer_t *buffer, macro_action
parser_error_t parseDelayMacroAction(config_buffer_t *buffer, macro_action_t *macroAction)
{
int16_t delay = readInt16(buffer);
int16_t delay = ReadInt16(buffer);
macroAction->type = MacroActionType_Delay;
macroAction->delay.delay = delay;
@@ -68,7 +68,7 @@ parser_error_t parseDelayMacroAction(config_buffer_t *buffer, macro_action_t *ma
parser_error_t parseTextMacroAction(config_buffer_t *buffer, macro_action_t *macroAction)
{
uint16_t textLen;
const char *text = readString(buffer, &textLen);
const char *text = ReadString(buffer, &textLen);
macroAction->type = MacroActionType_Text;
macroAction->text.text = text;
@@ -78,7 +78,7 @@ parser_error_t parseTextMacroAction(config_buffer_t *buffer, macro_action_t *mac
parser_error_t ParseMacroAction(config_buffer_t *buffer, macro_action_t *macroAction)
{
uint8_t macroActionType = readUInt8(buffer);
uint8_t macroActionType = ReadUInt8(buffer);
switch (macroActionType) {
case SerializedMacroActionType_KeyMacroAction ... SerializedMacroActionType_LastKeyMacroAction:
@@ -101,10 +101,10 @@ parser_error_t ParseMacro(config_buffer_t *buffer, uint8_t macroIdx)
{
parser_error_t errorCode;
uint16_t nameLen;
bool isLooped = readBool(buffer);
bool isPrivate = readBool(buffer);
const char *name = readString(buffer, &nameLen);
uint16_t macroActionsCount = readCompactLength(buffer);
bool isLooped = ReadBool(buffer);
bool isPrivate = ReadBool(buffer);
const char *name = ReadString(buffer, &nameLen);
uint16_t macroActionsCount = ReadCompactLength(buffer);
uint16_t firstMacroActionOffset = buffer->offset;
macro_action_t dummyMacroAction;