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

Implement keymap switching

Browse Source
This commit is contained in:
Eric Tang
2017-08-08 09:40:31 -07:00
parent 599e701479
commit 2621707206
7 changed files with 69 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,7 @@ parser_error_t ParseConfig(config_buffer_t *buffer) {
}
keymapCount = readCompactLength(buffer);
for (uint16_t keymapIdx = 0; keymapIdx < keymapCount; keymapIdx++) {
errorCode = ParseKeymap(buffer);
errorCode = ParseKeymap(buffer, keymapIdx, keymapCount);
if (errorCode != ParserError_Success) {
return errorCode;
}

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

@@ -174,7 +174,8 @@ static parser_error_t parseLayer(config_buffer_t *buffer, uint8_t layer) {
return ParserError_Success;
}
parser_error_t ParseKeymap(config_buffer_t *buffer) {;
parser_error_t ParseKeymap(config_buffer_t *buffer, uint8_t keymapIdx, uint8_t keymapCount) {;
uint16_t offset = buffer->offset;
parser_error_t errorCode;
uint16_t abbreviationLen;
uint16_t nameLen;
@@ -191,7 +192,13 @@ parser_error_t ParseKeymap(config_buffer_t *buffer) {;
return ParserError_InvalidLayerCount;
}
if (!ParserRunDry) {
LedDisplay_SetText(abbreviationLen, abbreviation);
AllKeymapsCount = keymapCount;
AllKeymaps[keymapIdx].abbreviation = abbreviation;
AllKeymaps[keymapIdx].abbreviationLen = abbreviationLen;
AllKeymaps[keymapIdx].offset = offset;
if (isDefault) {
DefaultKeymapIndex = keymapIdx;
}
}
for (uint16_t layerIdx = 0; layerIdx < layerCount; layerIdx++) {
errorCode = parseLayer(buffer, layerIdx);

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

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