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

Fix the formatting in parse_keymap.c

Browse Source
This commit is contained in:
Eric Tang
2017-07-21 12:56:56 -07:00
parent d14a7565a8
commit cbb0a02f19
1 changed files with 56 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
right/src/config/parse_keymap.c
View File

@@ -11,9 +11,9 @@ static parser_error_t parseNoneAction(key_action_t *keyAction, config_buffer_t *
} }
static parser_error_t parseKeyStrokeAction(key_action_t *keyAction, uint8_t keyStrokeAction, config_buffer_t *buffer) { static parser_error_t parseKeyStrokeAction(key_action_t *keyAction, uint8_t keyStrokeAction, config_buffer_t *buffer) {
keyAction->type = KeyActionType_Keystroke;
uint8_t keystrokeType = (SERIALIZED_KEYSTROKE_TYPE_MASK_KEYSTROKE_TYPE & keyStrokeAction) >> SERIALIZED_KEYSTROKE_TYPE_OFFSET_KEYSTROKE_TYPE; uint8_t keystrokeType = (SERIALIZED_KEYSTROKE_TYPE_MASK_KEYSTROKE_TYPE & keyStrokeAction) >> SERIALIZED_KEYSTROKE_TYPE_OFFSET_KEYSTROKE_TYPE;
keyAction->type = KeyActionType_Keystroke;
switch (keystrokeType) { switch (keystrokeType) {
case SerializedKeystrokeType_Basic: case SerializedKeystrokeType_Basic:
keyAction->keystroke.keystrokeType = KeystrokeType_Basic; keyAction->keystroke.keystrokeType = KeystrokeType_Basic;
@@ -73,47 +73,47 @@ static parser_error_t parseMouseAction(key_action_t *keyAction, config_buffer_t
keyAction->type = KeyActionType_Mouse; keyAction->type = KeyActionType_Mouse;
memset(&keyAction->mouse, 0, sizeof keyAction->mouse); memset(&keyAction->mouse, 0, sizeof keyAction->mouse);
switch (mouseAction) { switch (mouseAction) {
case SerializedMouseAction_LeftClick: case SerializedMouseAction_LeftClick:
keyAction->mouse.buttonActions = MouseButton_Left; keyAction->mouse.buttonActions = MouseButton_Left;
break; break;
case SerializedMouseAction_MiddleClick: case SerializedMouseAction_MiddleClick:
keyAction->mouse.buttonActions = MouseButton_Middle; keyAction->mouse.buttonActions = MouseButton_Middle;
break; break;
case SerializedMouseAction_RightClick: case SerializedMouseAction_RightClick:
keyAction->mouse.buttonActions = MouseButton_Right; keyAction->mouse.buttonActions = MouseButton_Right;
break; break;
case SerializedMouseAction_MoveUp: case SerializedMouseAction_MoveUp:
keyAction->mouse.moveActions = MouseMove_Up; keyAction->mouse.moveActions = MouseMove_Up;
break; break;
case SerializedMouseAction_MoveDown: case SerializedMouseAction_MoveDown:
keyAction->mouse.moveActions = MouseMove_Down; keyAction->mouse.moveActions = MouseMove_Down;
break; break;
case SerializedMouseAction_MoveLeft: case SerializedMouseAction_MoveLeft:
keyAction->mouse.moveActions = MouseMove_Left; keyAction->mouse.moveActions = MouseMove_Left;
break; break;
case SerializedMouseAction_MoveRight: case SerializedMouseAction_MoveRight:
keyAction->mouse.moveActions = MouseMove_Right; keyAction->mouse.moveActions = MouseMove_Right;
break; break;
case SerializedMouseAction_ScrollUp: case SerializedMouseAction_ScrollUp:
keyAction->mouse.scrollActions = MouseScroll_Up; keyAction->mouse.scrollActions = MouseScroll_Up;
break; break;
case SerializedMouseAction_ScrollDown: case SerializedMouseAction_ScrollDown:
keyAction->mouse.scrollActions = MouseScroll_Down; keyAction->mouse.scrollActions = MouseScroll_Down;
break; break;
case SerializedMouseAction_ScrollLeft: case SerializedMouseAction_ScrollLeft:
keyAction->mouse.scrollActions = MouseScroll_Left; keyAction->mouse.scrollActions = MouseScroll_Left;
break; break;
case SerializedMouseAction_ScrollRight: case SerializedMouseAction_ScrollRight:
keyAction->mouse.scrollActions = MouseScroll_Right; keyAction->mouse.scrollActions = MouseScroll_Right;
break; break;
case SerializedMouseAction_Accelerate: case SerializedMouseAction_Accelerate:
keyAction->mouse.moveActions = MouseMove_Accelerate; keyAction->mouse.moveActions = MouseMove_Accelerate;
break; break;
case SerializedMouseAction_Decelerate: case SerializedMouseAction_Decelerate:
keyAction->mouse.moveActions = MouseMove_Decelerate; keyAction->mouse.moveActions = MouseMove_Decelerate;
break; break;
default: default:
return ParserError_InvalidSerializedMouseAction; return ParserError_InvalidSerializedMouseAction;
} }
return ParserError_Success; return ParserError_Success;
} }
@@ -122,18 +122,18 @@ static parser_error_t parseKeyAction(key_action_t *keyAction, config_buffer_t *b
uint8_t keyActionType = readUInt8(buffer); uint8_t keyActionType = readUInt8(buffer);
switch (keyActionType) { switch (keyActionType) {
case SerializedKeyActionType_None: case SerializedKeyActionType_None:
return parseNoneAction(keyAction, buffer); return parseNoneAction(keyAction, buffer);
case SerializedKeyActionType_KeyStroke ... SerializedKeyActionType_LastKeyStroke: case SerializedKeyActionType_KeyStroke ... SerializedKeyActionType_LastKeyStroke:
return parseKeyStrokeAction(keyAction, keyActionType, buffer); return parseKeyStrokeAction(keyAction, keyActionType, buffer);
case SerializedKeyActionType_SwitchLayer: case SerializedKeyActionType_SwitchLayer:
return parseSwitchLayerAction(keyAction, buffer); return parseSwitchLayerAction(keyAction, buffer);
case SerializedKeyActionType_SwitchKeymap: case SerializedKeyActionType_SwitchKeymap:
return parseSwitchKeymapAction(keyAction, buffer); return parseSwitchKeymapAction(keyAction, buffer);
case SerializedKeyActionType_Mouse: case SerializedKeyActionType_Mouse:
return parseMouseAction(keyAction, buffer); return parseMouseAction(keyAction, buffer);
case SerializedKeyActionType_PlayMacro: case SerializedKeyActionType_PlayMacro:
return parsePlayMacroAction(keyAction, buffer); return parsePlayMacroAction(keyAction, buffer);
} }
return ParserError_InvalidSerializedKeyActionType; return ParserError_InvalidSerializedKeyActionType;
} }
@@ -158,6 +158,7 @@ static parser_error_t parseKeyActions(uint8_t targetLayer, config_buffer_t *buff
static parser_error_t parseModule(config_buffer_t *buffer, uint8_t layer) { static parser_error_t parseModule(config_buffer_t *buffer, uint8_t layer) {
uint8_t moduleId = readUInt8(buffer); uint8_t moduleId = readUInt8(buffer);
uint8_t pointerRole = readUInt8(buffer); uint8_t pointerRole = readUInt8(buffer);
return parseKeyActions(layer, buffer, moduleId, pointerRole); return parseKeyActions(layer, buffer, moduleId, pointerRole);
} }