github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-03-23 09:30:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Trim leading and trailing whitespace (#1008)

Browse Source
This commit is contained in:
Gunnar Skjold
2025-09-25 10:46:26 +02:00
committed by GitHub
parent f1089faab5
commit d3cc92949a
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/AmsConfiguration/src/hexutils.cpp
View File

@@ -28,7 +28,7 @@ void fromHex(uint8_t *out, String in, uint16_t size) {
}
}
bool stripNonAscii(uint8_t* in, uint16_t size, bool extended) {
bool stripNonAscii(uint8_t* in, uint16_t size, bool extended, bool trim) {
bool ret = false;
for(uint16_t i = 0; i < size; i++) {
if(in[i] == 0) { // Clear the rest with null-terminator
@@ -43,6 +43,22 @@ bool stripNonAscii(uint8_t* in, uint16_t size, bool extended) {
ret = true;
}
}
if(trim) {
// Strip leading spaces
while(in[0] == ' ') {
for(uint16_t i = 0; i < size; i++) {
in[i] = in[i+1];
}
}
// Strip trailing spaces
for(int i = size-1; i > 0; i--) {
if(in[i] == ' ' || in[i] == 0) {
memset(in+i, 0, 1);
} else {
break;
}
}
}
memset(in+size-1, 0, 1); // Make sure the last character is null-terminator
return ret;
}