Added pin parameter on restart() (necessary for init() with pin)

This commit is contained in:
Adrian Cervera Andes
2021-01-29 15:02:35 +01:00
parent 31bb5cbeed
commit a51cfda25d
15 changed files with 30 additions and 30 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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

View File

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