From cbcf7734bb355f9fdda1c65eb6d1e9e75aa4090d Mon Sep 17 00:00:00 2001 From: Sara Damiano Date: Thu, 13 Feb 2020 17:34:46 -0500 Subject: [PATCH] Removed some non-ascii characters Signed-off-by: Sara Damiano --- examples/AllFunctions/AllFunctions.ino | 1 + src/TinyGsmClientM95.h | 2 +- src/TinyGsmClientMC60.h | 2 +- src/TinyGsmClientSIM5360.h | 6 +++--- src/TinyGsmClientSequansMonarch.h | 2 +- src/TinyGsmClientUBLOX.h | 2 +- src/TinyGsmClientXBee.h | 10 +++++----- src/TinyGsmGPRS.tpp | 2 ++ 8 files changed, 15 insertions(+), 12 deletions(-) diff --git a/examples/AllFunctions/AllFunctions.ino b/examples/AllFunctions/AllFunctions.ino index d2a41af..8e7573a 100644 --- a/examples/AllFunctions/AllFunctions.ino +++ b/examples/AllFunctions/AllFunctions.ino @@ -343,6 +343,7 @@ void loop() { DBG("Hour:", hour); DBG("Minute:", min); DBG("Second:", sec); + break; } else { DBG("Couldn't get GSM location, retrying in 10s."); delay(10000L); diff --git a/src/TinyGsmClientM95.h b/src/TinyGsmClientM95.h index 585c478..a42fcac 100644 --- a/src/TinyGsmClientM95.h +++ b/src/TinyGsmClientM95.h @@ -288,7 +288,7 @@ class TinyGsmM95 // Set Method to Handle Received TCP/IP Data // Mode = 1 - Output a notification when data is received - // “+QIRDI: ,,” + // +QIRDI: ,, sendAT(GF("+QINDI=1")); if (waitResponse() != 1) { return false; } diff --git a/src/TinyGsmClientMC60.h b/src/TinyGsmClientMC60.h index df637f2..9ed700c 100644 --- a/src/TinyGsmClientMC60.h +++ b/src/TinyGsmClientMC60.h @@ -282,7 +282,7 @@ class TinyGsmMC60 // Set Method to Handle Received TCP/IP Data // Mode=2 - Output a notification statement: - // “+QIRDI: ,,,,,< tlen>” + // +QIRDI: ,,,,,< tlen> sendAT(GF("+QINDI=2")); if (waitResponse() != 1) { return false; } diff --git a/src/TinyGsmClientSIM5360.h b/src/TinyGsmClientSIM5360.h index 7f3d132..3f5c1f0 100644 --- a/src/TinyGsmClientSIM5360.h +++ b/src/TinyGsmClientSIM5360.h @@ -305,7 +305,7 @@ class TinyGsmSim5360 : public TinyGsmModem, waitResponse(); } - // Set active PDP context’s profile number + // Set active PDP context's profile number // This ties the embedded TCP/IP application to the external PDP context sendAT(GF("+CSOCKSETPN=1")); waitResponse(); @@ -327,10 +327,10 @@ class TinyGsmSim5360 : public TinyGsmModem, // = 10 (default) // DelayTm = number of milliseconds to delay before outputting received data // = 0 (default) - // Ack = sets whether reporting a string “Send ok” = 0 (don't report) + // Ack = sets whether reporting a string "Send ok" = 0 (don't report) // errMode = mode of reporting error result code = 0 (numberic values) // HeaderType = which data header of receiving data in multi-client mode - // = 1 (“+RECEIVE,,”) + // = 1 (+RECEIVE,,) // AsyncMode = sets mode of executing commands // = 0 (synchronous command executing) // TimeoutVal = minimum retransmission timeout in milliseconds = 75000 diff --git a/src/TinyGsmClientSequansMonarch.h b/src/TinyGsmClientSequansMonarch.h index a9408ad..d1b17ac 100644 --- a/src/TinyGsmClientSequansMonarch.h +++ b/src/TinyGsmClientSequansMonarch.h @@ -429,7 +429,7 @@ class TinyGsmSequansMonarch // = Connection ID = mux // = Transmission protocol = 0 - TCP (1 for UDP) // = Remote host port to contact - // = Any valid IP address in the format “xxx.xxx.xxx.xxx” or any + // = Any valid IP address in the format xxx.xxx.xxx.xxx or any // host name solved with a DNS query // = Socket closure behaviour for TCP, has no effect for UDP // = 0 - local port closes when remote does (default) diff --git a/src/TinyGsmClientUBLOX.h b/src/TinyGsmClientUBLOX.h index 669ed43..e9287f2 100644 --- a/src/TinyGsmClientUBLOX.h +++ b/src/TinyGsmClientUBLOX.h @@ -590,7 +590,7 @@ class TinyGsmUBLOX uint32_t startMillis = millis(); // create a socket - sendAT(GF("+USOCR=6")); // create a socket + sendAT(GF("+USOCR=6")); // reply is +USOCR: ## of socket created if (waitResponse(GF(GSM_NL "+USOCR:")) != 1) { return false; } *mux = streamGetInt('\n'); diff --git a/src/TinyGsmClientXBee.h b/src/TinyGsmClientXBee.h index deba450..14658cc 100644 --- a/src/TinyGsmClientXBee.h +++ b/src/TinyGsmClientXBee.h @@ -58,11 +58,11 @@ enum RegStatus { // These are responses to the HS command to get "hardware series" enum XBeeType { XBEE_UNKNOWN = 0, - XBEE_S6B_WIFI = 0x601, // Digi XBee® Wi-Fi - XBEE_LTE1_VZN = 0xB01, // Digi XBee® Cellular LTE Cat 1 - XBEE_3G = 0xB02, // Digi XBee® Cellular 3G - XBEE3_LTE1_ATT = 0xB06, // Digi XBee3™ Cellular LTE CAT 1 - XBEE3_LTEM_ATT = 0xB08, // Digi XBee3™ Cellular LTE-M + XBEE_S6B_WIFI = 0x601, // Digi XBee Wi-Fi + XBEE_LTE1_VZN = 0xB01, // Digi XBee Cellular LTE Cat 1 + XBEE_3G = 0xB02, // Digi XBee Cellular 3G + XBEE3_LTE1_ATT = 0xB06, // Digi XBee3 Cellular LTE CAT 1 + XBEE3_LTEM_ATT = 0xB08, // Digi XBee3 Cellular LTE-M }; class TinyGsmXBee diff --git a/src/TinyGsmGPRS.tpp b/src/TinyGsmGPRS.tpp index 7a08598..6fadc0e 100644 --- a/src/TinyGsmGPRS.tpp +++ b/src/TinyGsmGPRS.tpp @@ -103,6 +103,7 @@ class TinyGsmGPRS { // AT+GSN command String getIMEIImpl() { thisModem().sendAT(GF("+GSN")); + thisModem().streamSkipUntil('\n'); // skip first newline String res = thisModem().stream.readStringUntil('\n'); thisModem().waitResponse(); res.trim(); @@ -113,6 +114,7 @@ class TinyGsmGPRS { // command String getIMSIImpl() { thisModem().sendAT(GF("+CIMI")); + thisModem().streamSkipUntil('\n'); // skip first newline String res = thisModem().stream.readStringUntil('\n'); thisModem().waitResponse(); res.trim();