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

Fix #1

Browse Source
This commit is contained in:
Volodymyr Shymanskyy
2016-12-26 16:52:45 +02:00
parent 0d9bae9546
commit 02213b20d2
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
TinyGsmClient.h
View File

@@ -95,25 +95,27 @@ class GsmClient : public Client
typedef TinyGsmFifo<uint8_t, TINY_GSM_RX_BUFFER> RxFifo; typedef TinyGsmFifo<uint8_t, TINY_GSM_RX_BUFFER> RxFifo;
public: public:
GsmClient() {
init(NULL, -1); GsmClient() {}
GsmClient(TinyGsm& modem, uint8_t mux = 1) {
init(&modem, mux);
} }
GsmClient(TinyGsm& at, uint8_t mux = 1) { bool init(TinyGsm* modem, uint8_t mux = 1) {
init(&at, mux); this->at = modem;
}
bool init(TinyGsm* at, uint8_t mux = 1) {
this->at = at;
this->mux = mux; this->mux = mux;
at->sockets[mux] = this;
sock_available = 0; sock_available = 0;
sock_connected = false; sock_connected = false;
at->sockets[mux] = this;
return true; return true;
} }
public: public:
virtual int connect(const char *host, uint16_t port) { virtual int connect(const char *host, uint16_t port) {
TINY_GSM_YIELD();
rx.clear(); rx.clear();
sock_connected = at->modemConnect(host, port, mux); sock_connected = at->modemConnect(host, port, mux);
return sock_connected; return sock_connected;
@@ -132,12 +134,14 @@ public:
} }
virtual void stop() { virtual void stop() {
TINY_GSM_YIELD();
at->sendAT(GF("+CIPCLOSE="), mux); at->sendAT(GF("+CIPCLOSE="), mux);
sock_connected = false; sock_connected = false;
at->waitResponse(); at->waitResponse();
} }
virtual size_t write(const uint8_t *buf, size_t size) { virtual size_t write(const uint8_t *buf, size_t size) {
TINY_GSM_YIELD();
at->maintain(); at->maintain();
return at->modemSend(buf, size, mux); return at->modemSend(buf, size, mux);
} }
@@ -147,6 +151,7 @@ public:
} }
virtual int available() { virtual int available() {
TINY_GSM_YIELD();
if (!rx.size()) { if (!rx.size()) {
at->maintain(); at->maintain();
} }
@@ -154,6 +159,7 @@ public:
} }
virtual int read(uint8_t *buf, size_t size) { virtual int read(uint8_t *buf, size_t size) {
TINY_GSM_YIELD();
at->maintain(); at->maintain();
size_t cnt = 0; size_t cnt = 0;
while (cnt < size) { while (cnt < size) {
@@ -280,7 +286,7 @@ public:
*/ */
bool simUnlock(const char *pin) { bool simUnlock(const char *pin) {
sendAT(GF("+CPIN="), pin); sendAT(GF("+CPIN=\""), pin, GF("\""));
return waitResponse() == 1; return waitResponse() == 1;
} }