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

Make macro_reference_t store the offset of the first macro action and expose ParseMacroAction

Browse Source
This commit is contained in:
Eric Tang
2017-08-09 13:13:50 -07:00
parent 22e49c50d1
commit b1fb5f62c1
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,7 +70,7 @@ parser_error_t parseTextMacroAction(config_buffer_t *buffer, macro_action_t *mac
return ParserError_Success; return ParserError_Success;
} }
parser_error_t parseMacroAction(config_buffer_t *buffer, macro_action_t *macroAction) { parser_error_t ParseMacroAction(config_buffer_t *buffer, macro_action_t *macroAction) {
uint8_t macroActionType = readUInt8(buffer); uint8_t macroActionType = readUInt8(buffer);
switch (macroActionType) { switch (macroActionType) {
@@ -91,24 +91,24 @@ parser_error_t parseMacroAction(config_buffer_t *buffer, macro_action_t *macroAc
} }
parser_error_t ParseMacro(config_buffer_t *buffer, uint8_t macroIdx) { parser_error_t ParseMacro(config_buffer_t *buffer, uint8_t macroIdx) {
uint16_t offset = buffer->offset;
parser_error_t errorCode; parser_error_t errorCode;
uint16_t nameLen; uint16_t nameLen;
bool isLooped = readBool(buffer); bool isLooped = readBool(buffer);
bool isPrivate = readBool(buffer); bool isPrivate = readBool(buffer);
const char *name = readString(buffer, &nameLen); const char *name = readString(buffer, &nameLen);
uint16_t macroActionsCount = readCompactLength(buffer); uint16_t macroActionsCount = readCompactLength(buffer);
uint16_t firstMacroActionOffset = buffer->offset;
macro_action_t dummyMacroAction; macro_action_t dummyMacroAction;
(void)isLooped; (void)isLooped;
(void)isPrivate; (void)isPrivate;
(void)name; (void)name;
if (!ParserRunDry) { if (!ParserRunDry) {
AllMacros[macroIdx].offset = offset; AllMacros[macroIdx].firstMacroActionOffset = firstMacroActionOffset;
AllMacros[macroIdx].macroActionsCount = macroActionsCount; AllMacros[macroIdx].macroActionsCount = macroActionsCount;
} }
for (uint16_t i = 0; i < macroActionsCount; i++) { for (uint16_t i = 0; i < macroActionsCount; i++) {
errorCode = parseMacroAction(buffer, &dummyMacroAction); errorCode = ParseMacroAction(buffer, &dummyMacroAction);
if (errorCode != ParserError_Success) { if (errorCode != ParserError_Success) {
return errorCode; return errorCode;
} }

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

@@ -4,6 +4,7 @@
// Includes: // Includes:
#include "parse_config.h" #include "parse_config.h"
#include "macros.h"
// Typedefs: // Typedefs:
@@ -20,6 +21,7 @@
// Functions: // Functions:
parser_error_t ParseMacroAction(config_buffer_t *buffer, macro_action_t *macroAction);
parser_error_t ParseMacro(config_buffer_t *buffer, uint8_t macroIdx); parser_error_t ParseMacro(config_buffer_t *buffer, uint8_t macroIdx);
#endif #endif

2
right/src/macros.h
View File

@@ -13,7 +13,7 @@
// Typedefs: // Typedefs:
typedef struct { typedef struct {
uint16_t offset; uint16_t firstMacroActionOffset;
uint16_t macroActionsCount; uint16_t macroActionsCount;
} macro_reference_t; } macro_reference_t;