From f1cfe52ef308e67702d12d750862fad94682ddf7 Mon Sep 17 00:00:00 2001 From: Sara Damiano Date: Mon, 3 Jun 2019 11:52:49 -0400 Subject: [PATCH] Don't look for new line before ublox URC's --- src/TinyGsmClientSaraR4.h | 4 ++-- src/TinyGsmClientUBLOX.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/TinyGsmClientSaraR4.h b/src/TinyGsmClientSaraR4.h index 67291d5..2218a56 100644 --- a/src/TinyGsmClientSaraR4.h +++ b/src/TinyGsmClientSaraR4.h @@ -708,7 +708,7 @@ TINY_GSM_MODEM_STREAM_UTILITIES() } else if (r5 && data.endsWith(r5)) { index = 5; goto finish; - } else if (data.endsWith(GF(GSM_NL "+UUSORD:"))) { + } else if (data.endsWith(GF("+UUSORD:"))) { int mux = stream.readStringUntil(',').toInt(); int len = stream.readStringUntil('\n').toInt(); if (mux >= 0 && mux < TINY_GSM_MUX_COUNT && sockets[mux]) { @@ -717,7 +717,7 @@ TINY_GSM_MODEM_STREAM_UTILITIES() } data = ""; DBG("### URC Data Received:", len, "on", mux); - } else if (data.endsWith(GF(GSM_NL "+UUSOCL:"))) { + } else if (data.endsWith(GF("+UUSOCL:"))) { int mux = stream.readStringUntil('\n').toInt(); if (mux >= 0 && mux < TINY_GSM_MUX_COUNT && sockets[mux]) { sockets[mux]->sock_connected = false; diff --git a/src/TinyGsmClientUBLOX.h b/src/TinyGsmClientUBLOX.h index 4f61c13..3973681 100644 --- a/src/TinyGsmClientUBLOX.h +++ b/src/TinyGsmClientUBLOX.h @@ -726,7 +726,7 @@ TINY_GSM_MODEM_STREAM_UTILITIES() } else if (r5 && data.endsWith(r5)) { index = 5; goto finish; - } else if (data.endsWith(GF(GSM_NL "+UUSORD:"))) { + } else if (data.endsWith(GF("+UUSORD:"))) { int mux = stream.readStringUntil(',').toInt(); int len = stream.readStringUntil('\n').toInt(); if (mux >= 0 && mux < TINY_GSM_MUX_COUNT && sockets[mux]) { @@ -735,7 +735,7 @@ TINY_GSM_MODEM_STREAM_UTILITIES() } data = ""; DBG("### URC Data Received:", len, "on", mux); - } else if (data.endsWith(GF(GSM_NL "+UUSOCL:"))) { + } else if (data.endsWith(GF("+UUSOCL:"))) { int mux = stream.readStringUntil('\n').toInt(); if (mux >= 0 && mux < TINY_GSM_MUX_COUNT && sockets[mux]) { sockets[mux]->sock_connected = false;