Skip to content

Commit 7746111

Browse files
NicolasdejeanFokkeZB
authored andcommitted
fix subString (#149)
1 parent 209b66a commit 7746111

File tree

1 file changed

+4
-11
lines changed

1 file changed

+4
-11
lines changed

src/TheThingsNetwork.cpp

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ bool TheThingsNetwork::join(int8_t retries, uint32_t retryDelay) {
368368
continue;
369369
}
370370
stateMessage(SUCCESS_MESSAGE, SCS_JOIN_ACCEPTED, readValue(MAC_TABLE, MAC_CH_TABLE, MAC_CHANNEL_STATUS));
371-
valueToShow(SHOW_DEVEUI, readValue(MAC_TABLE, MAC_GET_SET_TABLE, MAC_SET_DEVICEADDRESS));
371+
valueToShow(SHOW_DEVEUI, readValue(MAC_TABLE, MAC_GET_SET_TABLE, MAC_SET_DEVEUI));
372372
fillAirtimeInfo();
373373
return true;
374374
}
@@ -446,18 +446,11 @@ const char *TheThingsNetwork::subString(const char *response, int16_t start, int
446446
for (size_t l = TTN_BUFFER_SIZE; l--; ) {
447447
sub[l] = '\0';
448448
}
449-
size_t i;
450449
char *newString;
451-
if (end != -2) {
452-
for (i = 0; start < end; start++, i++) {
453-
sub[i] = response[start];
454-
}
455-
} else {
456-
for (i = 0; response[start] != '\0'; start++, i++) {
457-
sub[i] = response[start];
458-
}
450+
for (size_t i = 0; (end == -2 && response[start] != '\0') || start < end; start++, i++) {
451+
sub[i] = response[start];
459452
}
460-
sub[i] = '\0';
453+
sub[start] = '\0';
461454
delay(1);
462455
newString = sub;
463456
delay(1);

0 commit comments

Comments
 (0)