Merge pull request #27 from beegee-tokyo/master

BG96
This commit is contained in:
Sara Damiano
2020-01-31 17:12:23 -05:00
committed by GitHub
3 changed files with 17 additions and 4 deletions

View File

@@ -116,9 +116,8 @@ Watch this repo for new updates! And of course, contributions are welcome ;)
- SIM800, SIM and SIM7000 only - SIM800, SIM and SIM7000 only
**Credits** **Credits**
- Primary Author/Contributor: - Primary Authors/Contributors:
- [vshymanskyy](https://github.com/vshymanskyy) - [vshymanskyy](https://github.com/vshymanskyy)
- Digi XBee, editing of all modules:
- [SRGDamia1](https://github.com/SRGDamia1/) - [SRGDamia1](https://github.com/SRGDamia1/)
- SIM7000: - SIM7000:
- [captFuture](https://github.com/captFuture/) - [captFuture](https://github.com/captFuture/)

View File

@@ -596,7 +596,7 @@ protected:
return len; return len;
} }
bool modemGetConnected(uint8_t mux) { bool modemGetConnected(uint8_t) {
sendAT(GF("+CIPSTATUS")); //TODO mux? sendAT(GF("+CIPSTATUS")); //TODO mux?
int res = waitResponse(GF(",\"CONNECTED\""), GF(",\"CLOSED\""), GF(",\"CLOSING\""), GF(",\"INITIAL\"")); int res = waitResponse(GF(",\"CONNECTED\""), GF(",\"CLOSED\""), GF(",\"CLOSING\""), GF(",\"INITIAL\""));
waitResponse(); waitResponse();

View File

@@ -341,7 +341,21 @@ TINY_GSM_MODEM_WAIT_FOR_NETWORK()
return true; return true;
} }
TINY_GSM_MODEM_GET_GPRS_IP_CONNECTED() // TINY_GSM_MODEM_GET_GPRS_IP_CONNECTED()
bool isGprsConnected()
{
sendAT(GF("+CGATT?"));
if (waitResponse(GF(GSM_NL "+CGATT:")) != 1)
{
return false;
}
int res = stream.readStringUntil('\n').toInt();
waitResponse();
if (res != 1)
return false;
return true;
}
/* /*
* IP Address functions * IP Address functions