KevinMidboe/TinyGSM
1
0
Fork 0
mirror of https://github.com/KevinMidboe/TinyGSM.git synced 2025-10-29 18:00:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated BG96 to match other Quectels where applicable

Browse Source
This commit is contained in:
Sara Damiano
2018-09-13 16:47:33 -04:00
parent 9f25adc2db
commit 9ff666a855
1 changed files with 52 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/TinyGsmClientBG96.h
View File

@@ -179,24 +179,24 @@ private:
}; };
class GsmClientSecure : public GsmClient // class GsmClientSecure : public GsmClient
{ // {
public: // public:
GsmClientSecure() {} // GsmClientSecure() {}
//
GsmClientSecure(TinyGsmBG96& modem, uint8_t mux = 1) // GsmClientSecure(TinyGsmBG96& modem, uint8_t mux = 1)
: GsmClient(modem, mux) // : GsmClient(modem, mux)
{} // {}
//
public: // public:
virtual int connect(const char *host, uint16_t port) { // virtual int connect(const char *host, uint16_t port) {
stop(); // stop();
TINY_GSM_YIELD(); // TINY_GSM_YIELD();
rx.clear(); // rx.clear();
sock_connected = at->modemConnect(host, port, mux, true); // sock_connected = at->modemConnect(host, port, mux, true);
return sock_connected; // return sock_connected;
} // }
}; // };
public: public:
@@ -416,22 +416,24 @@ public:
bool gprsConnect(const char* apn, const char* user = NULL, const char* pwd = NULL) { bool gprsConnect(const char* apn, const char* user = NULL, const char* pwd = NULL) {
gprsDisconnect(); gprsDisconnect();
//Configure the TCPIP Context
sendAT(GF("+QICSGP=1,1,\""), apn, GF("\",\""), user, GF("\",\""), pwd, GF("\"")); sendAT(GF("+QICSGP=1,1,\""), apn, GF("\",\""), user, GF("\",\""), pwd, GF("\""));
if (waitResponse() != 1) { if (waitResponse() != 1) {
return false; return false;
} }
//Activate GPRS/CSD Context
sendAT(GF("+QIACT=1")); sendAT(GF("+QIACT=1"));
if (waitResponse(150000L) != 1) { if (waitResponse(150000L) != 1) {
return false; return false;
} }
//Attach to Packet Domain service - is this necessary?
sendAT(GF("+CGATT=1")); sendAT(GF("+CGATT=1"));
if (waitResponse(60000L) != 1) { if (waitResponse(60000L) != 1) {
return false; return false;
} }
return true; return true;
} }
@@ -461,11 +463,8 @@ public:
*/ */
String getLocalIP() { String getLocalIP() {
sendAT(GF("+CGPADDR=1")); sendAT(GF("+QILOCIP"));
if (waitResponse(10000L, GF(GSM_NL "+CGPADDR:")) != 1) { stream.readStringUntil('\n');
return "";
}
streamSkipUntil(',');
String res = stream.readStringUntil('\n'); String res = stream.readStringUntil('\n');
if (waitResponse() != 1) { if (waitResponse() != 1) {
return ""; return "";
@@ -498,6 +497,8 @@ public:
bool sendSMS_UTF16(const String& number, const void* text, size_t len) { bool sendSMS_UTF16(const String& number, const void* text, size_t len) {
sendAT(GF("+CMGF=1")); sendAT(GF("+CMGF=1"));
waitResponse(); waitResponse();
sendAT(GF("+CSCS=\"HEX\""));
waitResponse();
sendAT(GF("+CSMP=17,167,0,8")); sendAT(GF("+CSMP=17,167,0,8"));
waitResponse(); waitResponse();
@@ -530,7 +531,31 @@ public:
/* /*
* Battery functions * Battery functions
*/ */
uint16_t getBattVoltage() TINY_GSM_ATTR_NOT_IMPLEMENTED;
// Use: float vBatt = modem.getBattVoltage() / 1000.0;
uint16_t getBattVoltage() {
sendAT(GF("+CBC"));
if (waitResponse(GF(GSM_NL "+CBC:")) != 1) {
return 0;
}
streamSkipUntil(','); // Skip
streamSkipUntil(','); // Skip
uint16_t res = stream.readStringUntil(',').toInt();
waitResponse();
return res;
}
int getBattPercent() {
sendAT(GF("+CBC"));
if (waitResponse(GF(GSM_NL "+CBC:")) != 1) {
return false;
}
stream.readStringUntil(',');
int res = stream.readStringUntil(',').toInt();
waitResponse();
return res;
}
int getBattPercent() TINY_GSM_ATTR_NOT_IMPLEMENTED; int getBattPercent() TINY_GSM_ATTR_NOT_IMPLEMENTED;
@@ -542,6 +567,8 @@ protected:
bool modemConnect(const char* host, uint16_t port, uint8_t mux, bool ssl = false) { bool modemConnect(const char* host, uint16_t port, uint8_t mux, bool ssl = false) {
int rsp; int rsp;
// <PDPcontextID>(1-16), <connectID>(0-11),"TCP/UDP/TCP LISTENER/UDP SERVICE",
// "<IP_address>/<domain_name>",<remote_port>,<local_port>,<access_mode>(0-2 0=buffer)
sendAT(GF("+QIOPEN=1,"), mux, ',', GF("\"TCP"), GF("\",\""), host, GF("\","), port, GF(",0,0")); sendAT(GF("+QIOPEN=1,"), mux, ',', GF("\"TCP"), GF("\",\""), host, GF("\","), port, GF(",0,0"));
rsp = waitResponse(); rsp = waitResponse();