Browse Source

Pull some updates from upstream

v_master
Sara Damiano 6 years ago
parent
commit
da6732b5a9
4 changed files with 7 additions and 7 deletions
  1. +4
    -3
      src/TinyGsmClientA6.h
  2. +1
    -2
      src/TinyGsmClientSIM800.h
  3. +1
    -1
      src/TinyGsmClientSIM808.h
  4. +1
    -1
      src/TinyGsmClientUBLOX.h

+ 4
- 3
src/TinyGsmClientA6.h View File

@ -49,7 +49,7 @@ class TinyGsmA6
//============================================================================//
//============================================================================//
// The Internal A6 Client Class
// The Internal A6 Client Class
//============================================================================//
//============================================================================//
@ -418,8 +418,9 @@ public:
bool gprsConnect(const char* apn, const char* user = NULL, const char* pwd = NULL) {
gprsDisconnect();
sendAT(GF("EE"), 2); // Set security to WPA2
if (waitResponse() != 1) goto fail;
sendAT(GF("+CGATT=1"));
if (waitResponse(60000L) != 1)
return false;
// TODO: wait AT+CGATT?


+ 1
- 2
src/TinyGsmClientSIM800.h View File

@ -852,8 +852,7 @@ public:
streamWrite(tail...);
}
bool streamSkipUntil(char c) {
const unsigned long timeout = 1000L;
bool streamSkipUntil(const char c, const unsigned long timeout = 3000L) {
unsigned long startMillis = millis();
while (millis() - startMillis < timeout) {
while (millis() - startMillis < timeout && !stream.available()) {


+ 1
- 1
src/TinyGsmClientSIM808.h View File

@ -14,7 +14,7 @@
//============================================================================//
//============================================================================//
// Declaration and Definitio of the TinyGsmSim808 Class
// Declaration and Definition of the TinyGsmSim808 Class
//============================================================================//
//============================================================================//


+ 1
- 1
src/TinyGsmClientUBLOX.h View File

@ -726,7 +726,7 @@ public:
TINY_GSM_YIELD();
while (stream.available() > 0) {
int a = stream.read();
if (a <= 0) continue; // Skip 0x00 bytes, just in case
if (a < 0) continue;
data += (char)a;
if (r1 && data.endsWith(r1)) {
index = 1;


Loading…
Cancel
Save