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

Rename serialized_buffer_t to config_buffer_t

Browse Source
This commit is contained in:
László Monda
2017-07-15 11:23:02 +02:00
parent 5d39c725f9
commit b8b1bc4979
6 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
right/src/config/config_state.c
View File

@@ -1,29 +1,29 @@
#include "config_state.h"
serialized_buffer_t ConfigBuffer;
config_buffer_t ConfigBuffer;
uint8_t readUInt8(serialized_buffer_t *buffer) {
uint8_t readUInt8(config_buffer_t *buffer) {
return buffer->buffer[buffer->offset++];
}
uint16_t readUInt16(serialized_buffer_t *buffer) {
uint16_t readUInt16(config_buffer_t *buffer) {
uint16_t uInt16 = *(uint16_t *)(buffer->buffer + buffer->offset);
buffer->offset += 2;
return uInt16;
}
bool readBool(serialized_buffer_t *buffer) {
bool readBool(config_buffer_t *buffer) {
return readUInt8(buffer);
}
uint16_t readCompactLength(serialized_buffer_t *buffer) {
uint16_t readCompactLength(config_buffer_t *buffer) {
uint16_t compactLength = readUInt8(buffer);
return compactLength == 0xFF ? readUInt16(buffer) : compactLength;
}
const char *readString(serialized_buffer_t *buffer, uint16_t *len) {
const char *readString(config_buffer_t *buffer, uint16_t *len) {
const char *string;
*len = readCompactLength(buffer);

14
right/src/config/config_state.h
View File

@@ -15,18 +15,18 @@
typedef struct {
uint8_t const buffer[EEPROM_SIZE];
uint16_t offset;
} serialized_buffer_t;
} config_buffer_t;
// Variables:
extern serialized_buffer_t ConfigBuffer;
extern config_buffer_t ConfigBuffer;
// Functions:
uint8_t readUInt8(serialized_buffer_t *buffer);
uint16_t readUInt16(serialized_buffer_t *buffer);
bool readBool(serialized_buffer_t *buffer);
uint16_t readCompactLength(serialized_buffer_t *buffer);
const char *readString(serialized_buffer_t *buffer, uint16_t *len);
uint8_t readUInt8(config_buffer_t *buffer);
uint16_t readUInt16(config_buffer_t *buffer);
bool readBool(config_buffer_t *buffer);
uint16_t readCompactLength(config_buffer_t *buffer);
const char *readString(config_buffer_t *buffer, uint16_t *len);
#endif

4
right/src/config/parse_config.c
View File

@@ -1,7 +1,7 @@
#include "parse_config.h"
#include "parse_keymap.h"
static parser_error_t parseModuleConfiguration(serialized_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);
@@ -14,7 +14,7 @@ static parser_error_t parseModuleConfiguration(serialized_buffer_t *buffer) {
return ParserError_Success;
}
parser_error_t ParseConfig(serialized_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);

2
right/src/config/parse_config.h
View File

@@ -19,6 +19,6 @@
// Functions:
parser_error_t ParseConfig(serialized_buffer_t *buffer);
parser_error_t ParseConfig(config_buffer_t *buffer);
#endif

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

@@ -5,12 +5,12 @@
static bool isDryRun;
static parser_error_t parseNoneAction(key_action_t *keyAction, serialized_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, serialized_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;
@@ -40,7 +40,7 @@ static parser_error_t parseKeyStrokeAction(key_action_t *keyAction, uint8_t keyS
return ParserError_Success;
}
static parser_error_t parseSwitchLayerAction(key_action_t *KeyAction, serialized_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);
@@ -50,7 +50,7 @@ static parser_error_t parseSwitchLayerAction(key_action_t *KeyAction, serialized
return ParserError_Success;
}
static parser_error_t parseSwitchKeymapAction(key_action_t *keyAction, serialized_buffer_t *buffer) {
static parser_error_t parseSwitchKeymapAction(key_action_t *keyAction, config_buffer_t *buffer) {
uint16_t keymapAbbreviationLen;
const char *keymapAbbreviation = readString(buffer, &keymapAbbreviationLen);
@@ -60,7 +60,7 @@ static parser_error_t parseSwitchKeymapAction(key_action_t *keyAction, serialize
return ParserError_Success;
}
static parser_error_t parseMouseAction(key_action_t *keyAction, serialized_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;
@@ -111,7 +111,7 @@ static parser_error_t parseMouseAction(key_action_t *keyAction, serialized_buffe
return ParserError_Success;
}
static parser_error_t parseKeyAction(key_action_t *keyAction, serialized_buffer_t *buffer) {
static parser_error_t parseKeyAction(key_action_t *keyAction, config_buffer_t *buffer) {
uint8_t keyActionType = readUInt8(buffer);
switch (keyActionType) {
@@ -131,7 +131,7 @@ static parser_error_t parseKeyAction(key_action_t *keyAction, serialized_buffer_
return ParserError_Success;
}
static parser_error_t parseKeyActions(uint8_t targetLayer, serialized_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;
@@ -148,13 +148,13 @@ static parser_error_t parseKeyActions(uint8_t targetLayer, serialized_buffer_t *
return ParserError_Success;
}
static parser_error_t parseModule(serialized_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(serialized_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);
@@ -170,7 +170,7 @@ static parser_error_t parseLayer(serialized_buffer_t *buffer, uint8_t layer) {
return ParserError_Success;
}
parser_error_t ParseKeymap(serialized_buffer_t *buffer) {;
parser_error_t ParseKeymap(config_buffer_t *buffer) {;
parser_error_t errorCode;
uint16_t abbreviationLen;
uint16_t nameLen;

2
right/src/config/parse_keymap.h
View File

@@ -52,6 +52,6 @@
// Functions:
parser_error_t ParseKeymap(serialized_buffer_t *buffer);
parser_error_t ParseKeymap(config_buffer_t *buffer);
#endif