diff options
| author | Christian Hammacher <bmasterc@gmail.com> | 2021-07-29 20:04:19 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2021-07-31 09:51:52 +0300 |
| commit | cef4926d6e6d004550e2dec20904de75886452ed (patch) | |
| tree | 866dac9271f0dfbf5fb66e33bc880e0e5ed3422c /src/GCodes/GCodeBuffer/StringParser.cpp | |
| parent | 2779dc5e86bed31e94b04aa3668c83ffca9f06db (diff) | |
Further improvements
Added support for expression lists (untested in standalone mode)
M23/M32 are invoked again by DSF in SBC mode
Increased SBC task priority
Bug fix: CAN diagnostics output extra NL
Bug fix: M999 P"ERASE" was not working on the Mini5+ series
Diffstat (limited to 'src/GCodes/GCodeBuffer/StringParser.cpp')
| -rw-r--r-- | src/GCodes/GCodeBuffer/StringParser.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/GCodes/GCodeBuffer/StringParser.cpp b/src/GCodes/GCodeBuffer/StringParser.cpp index d1e4d984..59915e8c 100644 --- a/src/GCodes/GCodeBuffer/StringParser.cpp +++ b/src/GCodes/GCodeBuffer/StringParser.cpp @@ -1092,7 +1092,7 @@ void StringParser::GetFloatArray(float arr[], size_t& returnedLength, bool doPad { CheckArrayLength(length, returnedLength); arr[length++] = ReadFloatValue(); - if (gb.buffer[readPointer] != LIST_SEPARATOR) + if (gb.buffer[readPointer] != EXPRESSION_LIST_SEPARATOR && gb.buffer[readPointer] != LIST_SEPARATOR) { break; } @@ -1129,7 +1129,7 @@ void StringParser::GetIntArray(int32_t arr[], size_t& returnedLength, bool doPad CheckArrayLength(length, returnedLength); arr[length] = ReadIValue(); length++; - if (gb.buffer[readPointer] != LIST_SEPARATOR) + if (gb.buffer[readPointer] != EXPRESSION_LIST_SEPARATOR && gb.buffer[readPointer] != LIST_SEPARATOR) { break; } @@ -1165,7 +1165,7 @@ void StringParser::GetUnsignedArray(uint32_t arr[], size_t& returnedLength, bool CheckArrayLength(length, returnedLength); arr[length] = ReadUIValue(); length++; - if (gb.buffer[readPointer] != LIST_SEPARATOR) + if (gb.buffer[readPointer] != EXPRESSION_LIST_SEPARATOR && gb.buffer[readPointer] != LIST_SEPARATOR) { break; } @@ -1202,7 +1202,7 @@ void StringParser::GetDriverIdArray(DriverId arr[], size_t& returnedLength) THRO CheckArrayLength(length, returnedLength); arr[length] = ReadDriverIdValue(); length++; - if (gb.buffer[readPointer] != LIST_SEPARATOR) + if (gb.buffer[readPointer] != EXPRESSION_LIST_SEPARATOR && gb.buffer[readPointer] != LIST_SEPARATOR) { break; } |