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

When parsing a macro, store its offset and number of actions

Browse Source
This commit is contained in:
Eric Tang
2017-08-09 09:49:30 -07:00
parent 1c91a7d5d9
commit c983e58d8e
5 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
right/src/config_parser/parse_macro.c
View File

@@ -1,4 +1,6 @@
#include "parse_macro.h"
#include "config_globals.h"
#include "macros.h"
parser_error_t parseKeyMacroAction(config_buffer_t *buffer, serialized_macro_action_type_t macroActionType) {
uint8_t keyMacroType = macroActionType - SerializedMacroActionType_KeyMacroAction;
@@ -85,7 +87,8 @@ parser_error_t parseMacroAction(config_buffer_t *buffer) {
return ParserError_InvalidSerializedMacroActionType;
}
parser_error_t ParseMacro(config_buffer_t *buffer) {
parser_error_t ParseMacro(config_buffer_t *buffer, uint16_t macroIdx) {
uint16_t offset = buffer->offset;
parser_error_t errorCode;
uint16_t nameLen;
bool isLooped = readBool(buffer);
@@ -96,6 +99,10 @@ parser_error_t ParseMacro(config_buffer_t *buffer) {
(void)isLooped;
(void)isPrivate;
(void)name;
if (!ParserRunDry) {
AllMacros[macroIdx].offset = offset;
AllMacros[macroIdx].macroActionsCount = macroActionsCount;
}
for (uint16_t i = 0; i < macroActionsCount; i++) {
errorCode = parseMacroAction(buffer);
if (errorCode != ParserError_Success) {