JSD/TinyGSM_Senseright
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed modem name request on ublox

Browse Source
This commit is contained in:
Sara Damiano
2018-09-24 15:08:57 -04:00
parent 2d1d9deccd
commit 69c1824539
8 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/TinyGsmClientA6.h
View File

@@ -189,7 +189,6 @@ public:
*/
bool init(const char* pin = NULL) {
DBG(GF("### Modem Defined:"), getModemName());
if (!testAT()) {
return false;
}
@@ -197,12 +196,11 @@ public:
if (waitResponse() != 1) {
return false;
}
sendAT(GF("+CMEE=0"));
sendAT(GF("+CMEE=0")); // Turn of verbose errors
waitResponse();
sendAT(GF("+CMER=3,0,0,2"));
sendAT(GF("+CMER=3,0,0,2")); // Set unsolicited result code output destination
waitResponse();
DBG(GF("### Modem:"), getModemName());
getSimStatus();
return true;
}

2
src/TinyGsmClientBG96.h
View File

@@ -213,7 +213,6 @@ public:
*/
bool init(const char* pin = NULL) {
DBG(GF("### Modem Defined:"), getModemName());
if (!testAT()) {
return false;
}
@@ -221,6 +220,7 @@ public:
if (waitResponse() != 1) {
return false;
}
DBG(GF("### Modem:"), getModemName());
getSimStatus();
return true;
}

2
src/TinyGsmClientESP8266.h
View File

@@ -206,7 +206,6 @@ public:
*/
bool init(const char* pin = NULL) {
DBG(GF("### Modem Defined:"), getModemName());
if (!testAT()) {
return false;
}
@@ -222,6 +221,7 @@ public:
if (waitResponse() != 1) {
return false;
}
DBG(GF("### Modem:"), getModemName());
return true;
}

3
src/TinyGsmClientM590.h
View File

@@ -186,7 +186,6 @@ public:
*/
bool init(const char* pin = NULL) {
DBG(GF("### Modem Defined:"), getModemName());
if (!testAT()) {
return false;
}
@@ -198,7 +197,7 @@ public:
sendAT(GF("+CMEE=2"));
waitResponse();
#endif
DBG(GF("### Modem:"), getModemName());
getSimStatus();
return true;
}

10
src/TinyGsmClientM95.h
View File

@@ -213,7 +213,6 @@ public:
*/
bool init(const char* pin = NULL) {
DBG(GF("### Modem Defined:"), getModemName());
if (!testAT()) {
return false;
}
@@ -225,7 +224,7 @@ public:
sendAT(GF("+CMEE=2"));
waitResponse();
#endif
DBG(GF("### Modem:"), getModemName());
getSimStatus();
return true;
}
@@ -329,6 +328,8 @@ public:
return true;
}
bool sleepEnable(bool enable = true) TINY_GSM_ATTR_NOT_IMPLEMENTED;
/*
* SIM card functions
*/
@@ -644,14 +645,11 @@ public:
protected:
bool modemConnect(const char* host, uint16_t port, uint8_t mux, bool ssl = false) {
sendAT(GF("+QIOPEN="), GF("\"TCP"), GF("\",\""), host, GF("\","), port);
sendAT(GF("+QIOPEN="), mux, GF("\"TCP"), GF("\",\""), host, GF("\","), port);
int rsp = waitResponse(75000L,
GF("CONNECT OK" GSM_NL),
GF("CONNECT FAIL" GSM_NL),
GF("ALREADY CONNECT" GSM_NL));
if ( rsp != 1 ) {
return false;
}
return (1 == rsp);
}

9
src/TinyGsmClientMC60.h
View File

@@ -217,7 +217,6 @@ public:
*/
bool init(const char* pin = NULL) {
DBG(GF("### Modem Defined:"), getModemName());
if (!testAT()) {
return false;
}
@@ -227,6 +226,7 @@ public:
if (waitResponse() != 1) {
return false;
}
DBG(GF("### Modem:"), getModemName());
getSimStatus();
return true;
}
@@ -350,6 +350,8 @@ public:
return true;
}
bool sleepEnable(bool enable = true) TINY_GSM_ATTR_NOT_IMPLEMENTED;
/*
* SIM card functions
*/
@@ -671,14 +673,11 @@ public:
protected:
bool modemConnect(const char* host, uint16_t port, uint8_t mux, bool ssl = false) {
sendAT(GF("+QIOPEN="), GF("\"TCP"), GF("\",\""), host, GF("\","), port);
sendAT(GF("+QIOPEN="), mux, GF("\"TCP"), GF("\",\""), host, GF("\","), port);
int rsp = waitResponse(75000L,
GF("CONNECT OK" GSM_NL),
GF("CONNECT FAIL" GSM_NL),
GF("ALREADY CONNECT" GSM_NL));
if ( rsp != 1 ) {
return false;
}
return (1 == rsp);
}

2
src/TinyGsmClientSIM800.h
View File

@@ -227,7 +227,6 @@ public:
*/
bool init(const char* pin = NULL) {
DBG(GF("### Modem Defined:"), getModemName());
if (!testAT()) {
return false;
}
@@ -237,6 +236,7 @@ public:
if (waitResponse() != 1) {
return false;
}
DBG(GF("### Modem:"), getModemName());
getSimStatus();
return true;
}

12
src/TinyGsmClientUBLOX.h
View File

@@ -212,7 +212,6 @@ public:
*/
bool init(const char* pin = NULL) {
DBG(GF("### Modem Defined:"), getModemName());
if (!testAT()) {
return false;
}
@@ -220,6 +219,7 @@ public:
if (waitResponse() != 1) {
return false;
}
DBG(GF("### Modem:"), getModemName());
int ret = getSimStatus();
if (ret != SIM_READY && pin != NULL && strlen(pin) > 0) {
simUnlock(pin);
@@ -228,7 +228,7 @@ public:
}
String getModemName() {
sendAT(GF("CGMI"));
sendAT(GF("+CGMI"));
String res1;
if (waitResponse(1000L, res1) != 1) {
return "u-blox Cellular Modem";
@@ -237,7 +237,7 @@ public:
res1.replace(GSM_NL, " ");
res1.trim();
sendAT(GF("GMM"));
sendAT(GF("+GMM"));
String res2;
if (waitResponse(1000L, res1) != 1) {
return "u-blox Cellular Modem";
@@ -589,8 +589,8 @@ public:
protected:
bool modemConnect(const char* host, uint16_t port, uint8_t* mux, bool ssl = false) {
sendAT(GF("+USOCR=6"));
if (waitResponse(GF(GSM_NL "+USOCR:")) != 1) {
sendAT(GF("+USOCR=6")); // create a socket
if (waitResponse(GF(GSM_NL "+USOCR:")) != 1) { // reply is +USOCR: ## of socket created
return false;
}
*mux = stream.readStringUntil('\n').toInt();
@@ -609,7 +609,7 @@ protected:
//sendAT(GF("+USOSO="), *mux, GF(",6,2,30000"));
//waitResponse();
sendAT(GF("+USOCO="), *mux, ",\"", host, "\",", port);
sendAT(GF("+USOCO="), *mux, ",\"", host, "\",", port); // connect on socket
int rsp = waitResponse(75000L);
return (1 == rsp);
}