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

Move pointerRole from keymaps to module configurations as pointerMode. Add angularShift, baseLayerPointerFunction, modLayerPointerFunction, and mouseLayerPointerFunction to module configurations.

Browse Source
This commit is contained in:
László Monda
2017-12-03 23:25:55 +01:00
parent b3cbb8ea97
commit bb5c118e97
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,9 +9,14 @@
static parser_error_t parseModuleConfiguration(config_buffer_t *buffer)
{
uint8_t id = ReadUInt8(buffer);
uint8_t pointerMode = ReadUInt8(buffer); // move vs scroll
uint8_t deceleratedPointerSpeedMultiplier = ReadUInt8(buffer);
uint8_t basePointerSpeedMultiplier = ReadUInt8(buffer);
uint8_t acceleratedPointerSpeed = ReadUInt8(buffer);
uint16_t angularShift = ReadUInt16(buffer);
uint8_t baseLayerPointerFunction = ReadUInt8(buffer); // none vs invertMode vs decelerate vs accelerate
uint8_t modLayerPointerFunction = ReadUInt8(buffer); // none vs invertMode vs decelerate vs accelerate
uint8_t mouseLayerPointerFunction = ReadUInt8(buffer); // none vs invertMode vs decelerate vs accelerate
(void)id;
(void)deceleratedPointerSpeedMultiplier;

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

@@ -116,7 +116,7 @@ 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)
{
parser_error_t errorCode;
uint16_t actionCount = ReadCompactLength(buffer);
@@ -137,9 +137,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)
{
uint8_t moduleId = ReadUInt8(buffer);
uint8_t pointerRole = ReadUInt8(buffer);
return parseKeyActions(layer, buffer, moduleId, pointerRole);
return parseKeyActions(layer, buffer, moduleId);
}
static parser_error_t parseLayer(config_buffer_t *buffer, uint8_t layer)