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

Move the opening braces of some functions onto their own lines

Browse Source
This commit is contained in:
Eric Tang
2017-08-08 16:20:48 -07:00
parent 17fd91c203
commit 2b97758ad2
4 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,8 @@
#include "keymaps.h"
#include "config_globals.h"
static parser_error_t parseModuleConfiguration(config_buffer_t *buffer) {
static parser_error_t parseModuleConfiguration(config_buffer_t *buffer)
{
uint8_t id = readUInt8(buffer);
uint8_t initialPointerSpeed = readUInt8(buffer);
uint8_t pointerAcceleration = readUInt8(buffer);
@@ -17,7 +18,8 @@ static parser_error_t parseModuleConfiguration(config_buffer_t *buffer) {
return ParserError_Success;
}
parser_error_t ParseConfig(config_buffer_t *buffer) {
parser_error_t ParseConfig(config_buffer_t *buffer)
{
uint16_t dataModelVersion = readUInt16(buffer);
parser_error_t errorCode;
uint16_t moduleConfigurationCount = readCompactLength(buffer);

30
right/src/config_parser/parse_keymap.c
View File

@@ -7,12 +7,14 @@
uint8_t tempKeymapCount;
static parser_error_t parseNoneAction(key_action_t *keyAction, config_buffer_t *buffer) {
static parser_error_t parseNoneAction(key_action_t *keyAction, config_buffer_t *buffer)
{
keyAction->type = KeyActionType_None;
return ParserError_Success;
}
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)
{
uint8_t keystrokeType = (SERIALIZED_KEYSTROKE_TYPE_MASK_KEYSTROKE_TYPE & keyStrokeAction) >> SERIALIZED_KEYSTROKE_TYPE_OFFSET_KEYSTROKE_TYPE;
keyAction->type = KeyActionType_Keystroke;
@@ -42,7 +44,8 @@ static parser_error_t parseKeyStrokeAction(key_action_t *keyAction, uint8_t keyS
return ParserError_Success;
}
static parser_error_t parseSwitchLayerAction(key_action_t *KeyAction, config_buffer_t *buffer) {
static parser_error_t parseSwitchLayerAction(key_action_t *KeyAction, config_buffer_t *buffer)
{
uint8_t layer = readUInt8(buffer) + 1;
bool isToggle = readBool(buffer);
@@ -52,7 +55,8 @@ static parser_error_t parseSwitchLayerAction(key_action_t *KeyAction, config_buf
return ParserError_Success;
}
static parser_error_t parseSwitchKeymapAction(key_action_t *keyAction, config_buffer_t *buffer) {
static parser_error_t parseSwitchKeymapAction(key_action_t *keyAction, config_buffer_t *buffer)
{
uint8_t keymapIndex = readUInt8(buffer);
if (keymapIndex >= tempKeymapCount) {
@@ -63,14 +67,16 @@ static parser_error_t parseSwitchKeymapAction(key_action_t *keyAction, config_bu
return ParserError_Success;
}
static parser_error_t parsePlayMacroAction(key_action_t *keyAction, config_buffer_t *buffer) {
static parser_error_t parsePlayMacroAction(key_action_t *keyAction, config_buffer_t *buffer)
{
uint8_t macroIndex = readUInt8(buffer);
(void)macroIndex;
return ParserError_Success;
}
static parser_error_t parseMouseAction(key_action_t *keyAction, config_buffer_t *buffer) {
static parser_error_t parseMouseAction(key_action_t *keyAction, config_buffer_t *buffer)
{
uint8_t mouseAction = readUInt8(buffer);
keyAction->type = KeyActionType_Mouse;
@@ -121,7 +127,8 @@ static parser_error_t parseMouseAction(key_action_t *keyAction, config_buffer_t
return ParserError_Success;
}
static parser_error_t parseKeyAction(key_action_t *keyAction, config_buffer_t *buffer) {
static parser_error_t parseKeyAction(key_action_t *keyAction, config_buffer_t *buffer)
{
uint8_t keyActionType = readUInt8(buffer);
switch (keyActionType) {
@@ -141,7 +148,8 @@ static parser_error_t parseKeyAction(key_action_t *keyAction, config_buffer_t *b
return ParserError_InvalidSerializedKeyActionType;
}
static parser_error_t parseKeyActions(uint8_t targetLayer, config_buffer_t *buffer, uint8_t moduleId, uint8_t pointerRole) {
static parser_error_t parseKeyActions(uint8_t targetLayer, config_buffer_t *buffer, uint8_t moduleId, uint8_t pointerRole)
{
parser_error_t errorCode;
uint16_t actionCount = readCompactLength(buffer);
key_action_t dummyKeyAction;
@@ -158,14 +166,16 @@ static parser_error_t parseKeyActions(uint8_t targetLayer, config_buffer_t *buff
return ParserError_Success;
}
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 pointerRole = readUInt8(buffer);
return parseKeyActions(layer, buffer, moduleId, pointerRole);
}
static parser_error_t parseLayer(config_buffer_t *buffer, uint8_t layer) {
static parser_error_t parseLayer(config_buffer_t *buffer, uint8_t layer)
{
parser_error_t errorCode;
uint16_t moduleCount = readCompactLength(buffer);

3
right/src/keymaps.c
View File

@@ -12,7 +12,8 @@ uint8_t AllKeymapsCount;
uint8_t DefaultKeymapIndex;
uint8_t CurrentKeymapIndex = 0;
void Keymaps_Switch(uint8_t index) {
void Keymaps_Switch(uint8_t index)
{
CurrentKeymapIndex = index;
UserConfigBuffer.offset = AllKeymaps[index].offset;
ParseKeymap(&UserConfigBuffer, index, AllKeymapsCount);

9
right/src/usb_protocol_handler.c
View File

@@ -16,7 +16,8 @@
// Functions for setting error statuses
void setError(uint8_t error) {
void setError(uint8_t error)
{
GenericHidOutBuffer[0] = error;
}
@@ -37,7 +38,8 @@ void SetResponseWord(uint16_t response)
// Per command protocol command handlers
void getSystemProperty(void) {
void getSystemProperty(void)
{
uint8_t propertyId = GenericHidInBuffer[1];
switch (propertyId) {
@@ -65,7 +67,8 @@ void getSystemProperty(void) {
}
}
void reenumerate(void) {
void reenumerate(void)
{
Wormhole.magicNumber = WORMHOLE_MAGIC_NUMBER;
Wormhole.enumerationMode = GenericHidInBuffer[1];
SCB->AIRCR = 0x5FA<<SCB_AIRCR_VECTKEY_Pos | SCB_AIRCR_SYSRESETREQ_Msk; // Reset the MCU.