Browse Source

Merge pull request #487 from adrianca88/restart_with_pin_param

Added pin parameter on restart() (necessary for init() with pin)
dependabot/github_actions/actions/checkout-4
Sara Damiano 4 years ago
committed by GitHub
parent
commit
88320025ec
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 30 additions and 30 deletions
  1. +2
    -2
      src/TinyGsmClientA6.h
  2. +2
    -2
      src/TinyGsmClientBG96.h
  3. +2
    -2
      src/TinyGsmClientESP8266.h
  4. +2
    -2
      src/TinyGsmClientM590.h
  5. +2
    -2
      src/TinyGsmClientM95.h
  6. +2
    -2
      src/TinyGsmClientMC60.h
  7. +2
    -2
      src/TinyGsmClientSIM5360.h
  8. +2
    -2
      src/TinyGsmClientSIM7000.h
  9. +2
    -2
      src/TinyGsmClientSIM7600.h
  10. +2
    -2
      src/TinyGsmClientSIM800.h
  11. +2
    -2
      src/TinyGsmClientSaraR4.h
  12. +2
    -2
      src/TinyGsmClientSequansMonarch.h
  13. +2
    -2
      src/TinyGsmClientUBLOX.h
  14. +2
    -2
      src/TinyGsmClientXBee.h
  15. +2
    -2
      src/TinyGsmModem.tpp

+ 2
- 2
src/TinyGsmClientA6.h View File

@ -176,11 +176,11 @@ class TinyGsmA6 : public TinyGsmModem<TinyGsmA6>,
* Power functions
*/
protected:
bool restartImpl() {
bool restartImpl(const char* pin = NULL) {
if (!testAT()) { return false; }
sendAT(GF("+RST=1"));
delay(3000);
return init();
return init(pin);
}
bool powerOffImpl() {


+ 2
- 2
src/TinyGsmClientBG96.h View File

@ -202,11 +202,11 @@ class TinyGsmBG96 : public TinyGsmModem<TinyGsmBG96>,
* Power functions
*/
protected:
bool restartImpl() {
bool restartImpl(const char* pin = NULL) {
if (!testAT()) { return false; }
if (!setPhoneFunctionality(1, true)) { return false; }
waitResponse(10000L, GF("APP RDY"));
return init();
return init(pin);
}
bool powerOffImpl() {


+ 2
- 2
src/TinyGsmClientESP8266.h View File

@ -182,13 +182,13 @@ class TinyGsmESP8266 : public TinyGsmModem<TinyGsmESP8266>,
* Power functions
*/
protected:
bool restartImpl() {
bool restartImpl(const char* pin = NULL) {
if (!testAT()) { return false; }
sendAT(GF("+RST"));
if (waitResponse(10000L) != 1) { return false; }
if (waitResponse(10000L, GF(GSM_NL "ready" GSM_NL)) != 1) { return false; }
delay(500);
return init();
return init(pin);
}
bool powerOffImpl() {


+ 2
- 2
src/TinyGsmClientM590.h View File

@ -171,12 +171,12 @@ class TinyGsmM590 : public TinyGsmModem<TinyGsmM590>,
* Power functions
*/
protected:
bool restartImpl() {
bool restartImpl(const char* pin = NULL) {
if (!testAT()) { return false; }
if (!setPhoneFunctionality(15)) { return false; }
// MODEM:STARTUP
waitResponse(60000L, GF(GSM_NL "+PBREADY" GSM_NL));
return init();
return init(pin);
}
bool powerOffImpl() {


+ 2
- 2
src/TinyGsmClientM95.h View File

@ -198,7 +198,7 @@ class TinyGsmM95 : public TinyGsmModem<TinyGsmM95>,
* Power functions
*/
protected:
bool restartImpl() {
bool restartImpl(const char* pin = NULL) {
if (!testAT()) { return false; }
sendAT(GF("+CFUN=0"));
if (waitResponse(10000L, GF("NORMAL POWER DOWN"), GF("OK"), GF("FAIL")) ==
@ -209,7 +209,7 @@ class TinyGsmM95 : public TinyGsmModem<TinyGsmM95>,
if (waitResponse(10000L, GF("Call Ready"), GF("OK"), GF("FAIL")) == 3) {
return false;
}
return init();
return init(pin);
}
bool powerOffImpl() {


+ 2
- 2
src/TinyGsmClientMC60.h View File

@ -197,12 +197,12 @@ class TinyGsmMC60 : public TinyGsmModem<TinyGsmMC60>,
* Power functions
*/
protected:
bool restartImpl() {
bool restartImpl(const char* pin = NULL) {
if (!testAT()) { return false; }
if (!setPhoneFunctionality(0)) { return false; }
if (!setPhoneFunctionality(1, true)) { return false; }
delay(3000);
return init();
return init(pin);
}
bool powerOffImpl() {


+ 2
- 2
src/TinyGsmClientSIM5360.h View File

@ -215,7 +215,7 @@ class TinyGsmSim5360 : public TinyGsmModem<TinyGsmSim5360>,
* Power functions
*/
protected:
bool restartImpl() {
bool restartImpl(const char* pin = NULL) {
if (!testAT()) { return false; }
sendAT(GF("+REBOOT"));
// Should return an 'OK' after reboot command is sent
@ -223,7 +223,7 @@ class TinyGsmSim5360 : public TinyGsmModem<TinyGsmSim5360>,
// After booting, modem sends out messages as each of its
// internal modules loads. The final message is "PB DONE".
if (waitResponse(40000L, GF(GSM_NL "PB DONE")) != 1) { return false; }
return init();
return init(pin);
}
bool powerOffImpl() {


+ 2
- 2
src/TinyGsmClientSIM7000.h View File

@ -212,11 +212,11 @@ class TinyGsmSim7000 : public TinyGsmModem<TinyGsmSim7000>,
* Power functions
*/
protected:
bool restartImpl() {
bool restartImpl(const char* pin = NULL) {
if (!setPhoneFunctionality(0)) { return false; }
if (!setPhoneFunctionality(1, true)) { return false; }
waitResponse(10000L, GF("SMS Ready"), GF("RDY"));
return init();
return init(pin);
}
bool powerOffImpl() {


+ 2
- 2
src/TinyGsmClientSIM7600.h View File

@ -219,12 +219,12 @@ class TinyGsmSim7600 : public TinyGsmModem<TinyGsmSim7600>,
* Power functions
*/
protected:
bool restartImpl() {
bool restartImpl(const char* pin = NULL) {
if (!testAT()) { return false; }
sendAT(GF("+CRESET"));
if (waitResponse(10000L) != 1) { return false; }
delay(5000L); // TODO(?): Test this delay!
return init();
return init(pin);
}
bool powerOffImpl() {


+ 2
- 2
src/TinyGsmClientSIM800.h View File

@ -250,14 +250,14 @@ class TinyGsmSim800 : public TinyGsmModem<TinyGsmSim800>,
* Power functions
*/
protected:
bool restartImpl() {
bool restartImpl(const char* pin = NULL) {
if (!testAT()) { return false; }
sendAT(GF("&W"));
waitResponse();
if (!setPhoneFunctionality(0)) { return false; }
if (!setPhoneFunctionality(1, true)) { return false; }
delay(3000);
return init();
return init(pin);
}
bool powerOffImpl() {


+ 2
- 2
src/TinyGsmClientSaraR4.h View File

@ -297,11 +297,11 @@ class TinyGsmSaraR4 : public TinyGsmModem<TinyGsmSaraR4>,
*/
protected:
// using +CFUN=15 instead of the more common CFUN=1,1
bool restartImpl() {
bool restartImpl(const char* pin = NULL) {
if (!testAT()) { return false; }
if (!setPhoneFunctionality(15)) { return false; }
delay(3000); // TODO(?): Verify delay timing here
return init();
return init(pin);
}
bool powerOffImpl() {


+ 2
- 2
src/TinyGsmClientSequansMonarch.h View File

@ -283,7 +283,7 @@ class TinyGsmSequansMonarch
* Power functions
*/
protected:
bool restartImpl() {
bool restartImpl(const char* pin = NULL) {
if (!testAT()) { return false; }
sendAT(GF("+CFUN=0"));
@ -295,7 +295,7 @@ class TinyGsmSequansMonarch
res = waitResponse(20000L, GF("+SYSSTART"), GFP(GSM_ERROR));
if (res != 1 && res != 3) { return false; }
delay(1000);
return init();
return init(pin);
}
bool powerOffImpl() {


+ 2
- 2
src/TinyGsmClientUBLOX.h View File

@ -243,11 +243,11 @@ class TinyGsmUBLOX : public TinyGsmModem<TinyGsmUBLOX>,
* Power functions
*/
protected:
bool restartImpl() {
bool restartImpl(const char* pin = NULL) {
if (!testAT()) { return false; }
if (!setPhoneFunctionality(16)) { return false; }
delay(3000); // TODO(?): Verify delay timing here
return init();
return init(pin);
}
bool powerOffImpl() {


+ 2
- 2
src/TinyGsmClientXBee.h View File

@ -487,7 +487,7 @@ class TinyGsmXBee : public TinyGsmModem<TinyGsmXBee>,
}
}
bool restartImpl() {
bool restartImpl(const char* pin = NULL) {
if (!commandMode()) { return false; } // Return immediately
if (beeType == XBEE_UNKNOWN) getSeries(); // how we restart depends on this
@ -525,7 +525,7 @@ class TinyGsmXBee : public TinyGsmModem<TinyGsmXBee>,
exitCommand();
return init();
return init(pin);
}
void setupPinSleep(bool maintainAssociation = false) {


+ 2
- 2
src/TinyGsmModem.tpp View File

@ -53,8 +53,8 @@ class TinyGsmModem {
/*
* Power functions
*/
bool restart() {
return thisModem().restartImpl();
bool restart(const char* pin = NULL) {
return thisModem().restartImpl(pin);
}
bool poweroff() {
return thisModem().powerOffImpl();


Loading…
Cancel
Save