Browse Source

Add new functions 19Feb20's XBee firmware

Signed-off-by: Sara Damiano <sdamiano@stroudcenter.org>
v_master
Sara Damiano 5 years ago
parent
commit
18ae639241
2 changed files with 10 additions and 10 deletions
  1. +2
    -6
      src/TinyGsmClientSequansMonarch.h
  2. +8
    -4
      src/TinyGsmClientXBee.h

+ 2
- 6
src/TinyGsmClientSequansMonarch.h View File

@ -238,18 +238,14 @@ class TinyGsmSequansMonarch
String getModemNameImpl() { String getModemNameImpl() {
sendAT(GF("+CGMI")); sendAT(GF("+CGMI"));
String res1; String res1;
if (waitResponse(1000L, res1) != 1) {
return "unknown";
}
if (waitResponse(1000L, res1) != 1) { return "unknown"; }
res1.replace("\r\nOK\r\n", ""); res1.replace("\r\nOK\r\n", "");
res1.replace("\rOK\r", ""); res1.replace("\rOK\r", "");
res1.trim(); res1.trim();
sendAT(GF("+CGMM")); sendAT(GF("+CGMM"));
String res2; String res2;
if (waitResponse(1000L, res2) != 1) {
return "unknown";
}
if (waitResponse(1000L, res2) != 1) { return "unknown"; }
res2.replace("\r\nOK\r\n", ""); res2.replace("\r\nOK\r\n", "");
res2.replace("\rOK\r", ""); res2.replace("\rOK\r", "");
res2.trim(); res2.trim();


+ 8
- 4
src/TinyGsmClientXBee.h View File

@ -780,15 +780,18 @@ class TinyGsmXBee : public TinyGsmModem<TinyGsmXBee>,
protected: protected:
bool gprsConnectImpl(const char* apn, const char* user = NULL, bool gprsConnectImpl(const char* apn, const char* user = NULL,
const char* pwd = NULL) { const char* pwd = NULL) {
bool success = true;
if (user && strlen(user) > 0) { if (user && strlen(user) > 0) {
DBG("XBee's do not support SIMs that a user name/password!");
sendAT(GF("CU"), user); // Set the user for the APN
success &= waitResponse() == 1;
} }
if (pwd && strlen(pwd) > 0) { if (pwd && strlen(pwd) > 0) {
DBG("XBee's do not support SIMs that a user name/password!");
sendAT(GF("CW"), pwd); // Set the password for the APN
success &= waitResponse() == 1;
} }
XBEE_COMMAND_START_DECORATOR(5, false) XBEE_COMMAND_START_DECORATOR(5, false)
sendAT(GF("AN"), apn); // Set the APN sendAT(GF("AN"), apn); // Set the APN
bool success = waitResponse() == 1;
success &= waitResponse() == 1;
sendAT(GF("AM0")); // Airplane mode off sendAT(GF("AM0")); // Airplane mode off
waitResponse(5000); waitResponse(5000);
writeChanges(); writeChanges();
@ -823,7 +826,8 @@ class TinyGsmXBee : public TinyGsmModem<TinyGsmXBee>,
protected: protected:
bool simUnlockImpl(const char* pin) { // Not supported bool simUnlockImpl(const char* pin) { // Not supported
if (pin && strlen(pin) > 0) { if (pin && strlen(pin) > 0) {
DBG("XBee's do not support SIMs that require an unlock pin!");
sendAT(GF("PN"), pin);
return waitResponse() == 1;
} }
return false; return false;
} }


Loading…
Cancel
Save