|
|
|
@ -9,32 +9,23 @@ |
|
|
|
* |
|
|
|
*/ |
|
|
|
|
|
|
|
#ifndef TinyGsmClientMC60_h |
|
|
|
#define TinyGsmClientMC60_h |
|
|
|
//#pragma message("TinyGSM: TinyGsmClientMC60") |
|
|
|
#ifndef SRC_TINYGSMCLIENTMC60_H_ |
|
|
|
#define SRC_TINYGSMCLIENTMC60_H_ |
|
|
|
// #pragma message("TinyGSM: TinyGsmClientMC60") |
|
|
|
|
|
|
|
//#define TINY_GSM_DEBUG Serial |
|
|
|
|
|
|
|
#if !defined(TINY_GSM_RX_BUFFER) |
|
|
|
#define TINY_GSM_RX_BUFFER 64 |
|
|
|
#endif |
|
|
|
// #define TINY_GSM_DEBUG Serial |
|
|
|
|
|
|
|
#define TINY_GSM_MUX_COUNT 6 |
|
|
|
|
|
|
|
#include <TinyGsmCommon.h> |
|
|
|
#include "TinyGsmCommon.h" |
|
|
|
|
|
|
|
#define GSM_NL "\r\n" |
|
|
|
static const char GSM_OK[] TINY_GSM_PROGMEM = "OK" GSM_NL; |
|
|
|
static const char GSM_ERROR[] TINY_GSM_PROGMEM = "ERROR" GSM_NL; |
|
|
|
|
|
|
|
enum SimStatus { |
|
|
|
SIM_ERROR = 0, |
|
|
|
SIM_READY = 1, |
|
|
|
SIM_LOCKED = 2, |
|
|
|
SIM_ANTITHEFT_LOCKED = 3, |
|
|
|
}; |
|
|
|
static const char GSM_OK[] TINY_GSM_PROGMEM = "OK" GSM_NL; |
|
|
|
static const char GSM_ERROR[] TINY_GSM_PROGMEM = "ERROR" GSM_NL; |
|
|
|
static const char GSM_CME_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CME ERROR:"; |
|
|
|
|
|
|
|
enum RegStatus { |
|
|
|
REG_NO_RESULT = -1, |
|
|
|
REG_UNREGISTERED = 0, |
|
|
|
REG_SEARCHING = 2, |
|
|
|
REG_DENIED = 3, |
|
|
|
@ -43,178 +34,150 @@ enum RegStatus { |
|
|
|
REG_UNKNOWN = 4, |
|
|
|
}; |
|
|
|
|
|
|
|
class TinyGsmMC60 |
|
|
|
: public TinyGsmModem<TinyGsmMC60, READ_NO_CHECK, TINY_GSM_MUX_COUNT> { |
|
|
|
friend class TinyGsmModem<TinyGsmMC60, READ_NO_CHECK, TINY_GSM_MUX_COUNT>; |
|
|
|
|
|
|
|
class TinyGsmMC60: public TinyGsmUTFSMS<TinyGsmMC60> |
|
|
|
{ |
|
|
|
|
|
|
|
public: |
|
|
|
|
|
|
|
class GsmClient : public Client |
|
|
|
{ |
|
|
|
friend class TinyGsmMC60; |
|
|
|
typedef TinyGsmFifo<uint8_t, TINY_GSM_RX_BUFFER> RxFifo; |
|
|
|
/* |
|
|
|
* Inner Client |
|
|
|
*/ |
|
|
|
public: |
|
|
|
class GsmClientMC60 : public GsmClient { |
|
|
|
friend class TinyGsmMC60; |
|
|
|
|
|
|
|
public: |
|
|
|
GsmClient() {} |
|
|
|
public: |
|
|
|
GsmClientMC60() {} |
|
|
|
|
|
|
|
GsmClient(TinyGsmMC60& modem, uint8_t mux = 1) { |
|
|
|
init(&modem, mux); |
|
|
|
} |
|
|
|
explicit GsmClientMC60(TinyGsmMC60& modem, uint8_t mux = 1) { |
|
|
|
init(&modem, mux); |
|
|
|
} |
|
|
|
|
|
|
|
virtual ~GsmClient(){} |
|
|
|
bool init(TinyGsmMC60* modem, uint8_t mux = 1) { |
|
|
|
this->at = modem; |
|
|
|
this->mux = mux; |
|
|
|
sock_available = 0; |
|
|
|
sock_connected = false; |
|
|
|
|
|
|
|
bool init(TinyGsmMC60* modem, uint8_t mux = 1) { |
|
|
|
this->at = modem; |
|
|
|
this->mux = mux; |
|
|
|
sock_available = 0; |
|
|
|
sock_connected = false; |
|
|
|
at->sockets[mux] = this; |
|
|
|
|
|
|
|
at->sockets[mux] = this; |
|
|
|
return true; |
|
|
|
} |
|
|
|
|
|
|
|
return true; |
|
|
|
} |
|
|
|
public: |
|
|
|
int connect(const char* host, uint16_t port, int timeout_s) { |
|
|
|
stop(); |
|
|
|
TINY_GSM_YIELD(); |
|
|
|
rx.clear(); |
|
|
|
sock_connected = at->modemConnect(host, port, mux, false, timeout_s); |
|
|
|
return sock_connected; |
|
|
|
} |
|
|
|
int connect(IPAddress ip, uint16_t port, int timeout_s) { |
|
|
|
return connect(TinyGsmStringFromIp(ip).c_str(), port, timeout_s); |
|
|
|
} |
|
|
|
int connect(const char* host, uint16_t port) override { |
|
|
|
return connect(host, port, 75); |
|
|
|
} |
|
|
|
int connect(IPAddress ip, uint16_t port) override { |
|
|
|
return connect(ip, port, 75); |
|
|
|
} |
|
|
|
|
|
|
|
public: |
|
|
|
virtual int connect(const char *host, uint16_t port, int timeout_s) { |
|
|
|
stop(); |
|
|
|
TINY_GSM_YIELD(); |
|
|
|
rx.clear(); |
|
|
|
sock_connected = at->modemConnect(host, port, mux, false, timeout_s); |
|
|
|
return sock_connected; |
|
|
|
} |
|
|
|
void stop(uint32_t maxWaitMs) { |
|
|
|
uint32_t startMillis = millis(); |
|
|
|
dumpModemBuffer(maxWaitMs); |
|
|
|
at->sendAT(GF("+QICLOSE="), mux); |
|
|
|
sock_connected = false; |
|
|
|
at->waitResponse((maxWaitMs - (millis() - startMillis)), GF("CLOSED"), |
|
|
|
GF("CLOSE OK"), GF("ERROR")); |
|
|
|
} |
|
|
|
void stop() override { |
|
|
|
stop(75000L); |
|
|
|
} |
|
|
|
|
|
|
|
TINY_GSM_CLIENT_CONNECT_OVERLOADS() |
|
|
|
/* |
|
|
|
* Extended API |
|
|
|
*/ |
|
|
|
|
|
|
|
virtual void stop(uint32_t maxWaitMs) { |
|
|
|
TINY_GSM_CLIENT_DUMP_MODEM_BUFFER() |
|
|
|
at->sendAT(GF("+QICLOSE="), mux); |
|
|
|
sock_connected = false; |
|
|
|
at->waitResponse((maxWaitMs - (millis() - startMillis)), GF("CLOSED"), GF("CLOSE OK"), GF("ERROR")); |
|
|
|
} |
|
|
|
String remoteIP() TINY_GSM_ATTR_NOT_IMPLEMENTED; |
|
|
|
}; |
|
|
|
|
|
|
|
virtual void stop() { stop(75000L); } |
|
|
|
/* |
|
|
|
* Inner Secure Client |
|
|
|
*/ |
|
|
|
|
|
|
|
TINY_GSM_CLIENT_WRITE() |
|
|
|
/* |
|
|
|
class GsmClientSecureMC60 : public GsmClientMC60 |
|
|
|
{ |
|
|
|
public: |
|
|
|
GsmClientSecure() {} |
|
|
|
|
|
|
|
TINY_GSM_CLIENT_AVAILABLE_NO_BUFFER_CHECK() |
|
|
|
GsmClientSecure(TinyGsmMC60& modem, uint8_t mux = 1) |
|
|
|
: GsmClient(modem, mux) |
|
|
|
{} |
|
|
|
|
|
|
|
TINY_GSM_CLIENT_READ_NO_BUFFER_CHECK() |
|
|
|
|
|
|
|
TINY_GSM_CLIENT_PEEK_FLUSH_CONNECTED() |
|
|
|
public: |
|
|
|
virtual int connect(const char *host, uint16_t port, int timeout_s) { |
|
|
|
stop(); |
|
|
|
TINY_GSM_YIELD(); |
|
|
|
rx.clear(); |
|
|
|
sock_connected = at->modemConnect(host, port, mux, true, timeout_s); |
|
|
|
return sock_connected; |
|
|
|
} |
|
|
|
}; |
|
|
|
*/ |
|
|
|
|
|
|
|
/* |
|
|
|
* Extended API |
|
|
|
* Constructor |
|
|
|
*/ |
|
|
|
|
|
|
|
String remoteIP() TINY_GSM_ATTR_NOT_IMPLEMENTED; |
|
|
|
|
|
|
|
private: |
|
|
|
TinyGsmMC60* at; |
|
|
|
uint8_t mux; |
|
|
|
uint16_t sock_available; |
|
|
|
bool sock_connected; |
|
|
|
RxFifo rx; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
// class GsmClientSecure : public GsmClient |
|
|
|
// { |
|
|
|
// public: |
|
|
|
// GsmClientSecure() {} |
|
|
|
// |
|
|
|
// GsmClientSecure(TinyGsmMC60& modem, uint8_t mux = 1) |
|
|
|
// : GsmClient(modem, mux) |
|
|
|
// {} |
|
|
|
// |
|
|
|
// virtual ~GsmClientSecure(){} |
|
|
|
// |
|
|
|
// public: |
|
|
|
// virtual int connect(const char *host, uint16_t port, int timeout_s) { |
|
|
|
// stop(); |
|
|
|
// TINY_GSM_YIELD(); |
|
|
|
// rx.clear(); |
|
|
|
// sock_connected = at->modemConnect(host, port, mux, true, timeout_s); |
|
|
|
// return sock_connected; |
|
|
|
// } |
|
|
|
// }; |
|
|
|
|
|
|
|
|
|
|
|
public: |
|
|
|
|
|
|
|
TinyGsmMC60(Stream& stream) |
|
|
|
: stream(stream) |
|
|
|
{ |
|
|
|
public: |
|
|
|
explicit TinyGsmMC60(Stream& stream) : stream(stream) { |
|
|
|
memset(sockets, 0, sizeof(sockets)); |
|
|
|
} |
|
|
|
|
|
|
|
/* |
|
|
|
* Basic functions |
|
|
|
*/ |
|
|
|
|
|
|
|
bool begin(const char* pin = NULL) { |
|
|
|
return init(pin); |
|
|
|
} |
|
|
|
|
|
|
|
bool init(const char* pin = NULL) { |
|
|
|
protected: |
|
|
|
bool initImpl(const char* pin = NULL) { |
|
|
|
DBG(GF("### TinyGSM Version:"), TINYGSM_VERSION); |
|
|
|
|
|
|
|
if (!testAT()) { |
|
|
|
return false; |
|
|
|
} |
|
|
|
if (!testAT()) { return false; } |
|
|
|
|
|
|
|
// sendAT(GF("&FZ")); // Factory + Reset |
|
|
|
// waitResponse(); |
|
|
|
|
|
|
|
sendAT(GF("E0")); // Echo Off |
|
|
|
if (waitResponse() != 1) { |
|
|
|
return false; |
|
|
|
} |
|
|
|
sendAT(GF("E0")); // Echo Off |
|
|
|
if (waitResponse() != 1) { return false; } |
|
|
|
|
|
|
|
#ifdef TINY_GSM_DEBUG |
|
|
|
sendAT(GF("+CMEE=2")); // turn on verbose error codes |
|
|
|
#else |
|
|
|
sendAT(GF("+CMEE=0")); // turn off error codes |
|
|
|
#endif |
|
|
|
waitResponse(); |
|
|
|
|
|
|
|
DBG(GF("### Modem:"), getModemName()); |
|
|
|
|
|
|
|
// Enable network time synchronization |
|
|
|
sendAT(GF("+QNITZ=1")); |
|
|
|
if (waitResponse(10000L) != 1) { return false; } |
|
|
|
|
|
|
|
int ret = getSimStatus(); |
|
|
|
// if the sim isn't ready and a pin has been provided, try to unlock the sim |
|
|
|
if (ret != SIM_READY && pin != NULL && strlen(pin) > 0) { |
|
|
|
simUnlock(pin); |
|
|
|
return (getSimStatus() == SIM_READY); |
|
|
|
} |
|
|
|
// if the sim is ready, or it's locked but no pin has been provided, return |
|
|
|
// true |
|
|
|
else { |
|
|
|
} else { |
|
|
|
// if the sim is ready, or it's locked but no pin has been provided, |
|
|
|
// return true |
|
|
|
return (ret == SIM_READY || ret == SIM_LOCKED); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
String getModemName() { |
|
|
|
#if defined(TINY_GSM_MODEM_MC60) |
|
|
|
return "Quectel MC60"; |
|
|
|
#elif defined(TINY_GSM_MODEM_MC60E) |
|
|
|
return "Quectel MC60E"; |
|
|
|
#endif |
|
|
|
return "Quectel MC60"; |
|
|
|
} |
|
|
|
|
|
|
|
TINY_GSM_MODEM_SET_BAUD_IPR() |
|
|
|
|
|
|
|
TINY_GSM_MODEM_TEST_AT() |
|
|
|
|
|
|
|
TINY_GSM_MODEM_MAINTAIN_LISTEN() |
|
|
|
|
|
|
|
bool factoryDefault() { |
|
|
|
sendAT(GF("&FZE0&W")); // Factory + Reset + Echo Off + Write |
|
|
|
waitResponse(); |
|
|
|
sendAT(GF("+IPR=0")); // Auto-baud |
|
|
|
waitResponse(); |
|
|
|
sendAT(GF("&W")); // Write configuration |
|
|
|
return waitResponse() == 1; |
|
|
|
} |
|
|
|
|
|
|
|
TINY_GSM_MODEM_GET_INFO_ATI() |
|
|
|
|
|
|
|
/* |
|
|
|
* under development |
|
|
|
*/ |
|
|
|
// bool hasSSL() { |
|
|
|
* under development |
|
|
|
*/ |
|
|
|
// bool thisHasSSL() { |
|
|
|
// sendAT(GF("+QIPSSL=?")); |
|
|
|
// if (waitResponse(GF(GSM_NL "+CIPSSL:")) != 1) { |
|
|
|
// return false; |
|
|
|
@ -222,125 +185,106 @@ TINY_GSM_MODEM_GET_INFO_ATI() |
|
|
|
// return waitResponse() == 1; |
|
|
|
// } |
|
|
|
|
|
|
|
bool hasSSL() { |
|
|
|
return false; // TODO: For now |
|
|
|
bool thisHasSSL() { |
|
|
|
return false; // TODO(?): Add SSL support |
|
|
|
} |
|
|
|
|
|
|
|
bool hasWifi() { |
|
|
|
bool thisHasWifi() { |
|
|
|
return false; |
|
|
|
} |
|
|
|
|
|
|
|
bool hasGPRS() { |
|
|
|
bool thisHasGPRS() { |
|
|
|
return true; |
|
|
|
} |
|
|
|
|
|
|
|
/* |
|
|
|
* Power functions |
|
|
|
*/ |
|
|
|
|
|
|
|
bool restart() { |
|
|
|
if (!testAT()) { |
|
|
|
return false; |
|
|
|
} |
|
|
|
protected: |
|
|
|
bool restartImpl() { |
|
|
|
if (!testAT()) { return false; } |
|
|
|
sendAT(GF("+CFUN=0")); |
|
|
|
if (waitResponse(10000L) != 1) { |
|
|
|
return false; |
|
|
|
} |
|
|
|
if (waitResponse(10000L) != 1) { return false; } |
|
|
|
sendAT(GF("+CFUN=1,1")); |
|
|
|
if (waitResponse(10000L) != 1) { |
|
|
|
return false; |
|
|
|
} |
|
|
|
if (waitResponse(10000L) != 1) { return false; } |
|
|
|
delay(3000); |
|
|
|
return init(); |
|
|
|
} |
|
|
|
|
|
|
|
bool poweroff() { |
|
|
|
bool powerOffImpl() { |
|
|
|
sendAT(GF("+QPOWD=1")); |
|
|
|
return waitResponse(GF("NORMAL POWER DOWN")) == 1; |
|
|
|
} |
|
|
|
|
|
|
|
bool radioOff() { |
|
|
|
if (!testAT()) { |
|
|
|
return false; |
|
|
|
} |
|
|
|
sendAT(GF("+CFUN=0")); |
|
|
|
if (waitResponse(10000L) != 1) { |
|
|
|
return false; |
|
|
|
} |
|
|
|
delay(3000); |
|
|
|
return true; |
|
|
|
// When entering into sleep mode is enabled, DTR is pulled up, and WAKEUP_IN |
|
|
|
// is pulled up, the module can directly enter into sleep mode.If entering |
|
|
|
// into sleep mode is enabled, DTR is pulled down, and WAKEUP_IN is pulled |
|
|
|
// down, there is a need to pull the DTR pin and the WAKEUP_IN pin up first, |
|
|
|
// and then the module can enter into sleep mode. |
|
|
|
bool sleepEnableImpl(bool enable = true) { |
|
|
|
sendAT(GF("+QSCLK="), enable); |
|
|
|
return waitResponse() == 1; |
|
|
|
} |
|
|
|
|
|
|
|
bool sleepEnable(bool enable = true) TINY_GSM_ATTR_NOT_IMPLEMENTED; |
|
|
|
|
|
|
|
/* |
|
|
|
* SIM card functions |
|
|
|
*/ |
|
|
|
|
|
|
|
TINY_GSM_MODEM_SIM_UNLOCK_CPIN() |
|
|
|
|
|
|
|
TINY_GSM_MODEM_GET_SIMCCID_CCID() |
|
|
|
|
|
|
|
TINY_GSM_MODEM_GET_IMEI_GSN() |
|
|
|
|
|
|
|
SimStatus getSimStatus(unsigned long timeout_ms = 10000L) { |
|
|
|
for (unsigned long start = millis(); millis() - start < timeout_ms; ) { |
|
|
|
protected: |
|
|
|
SimStatus getSimStatusImpl(uint32_t timeout_ms = 10000L) { |
|
|
|
for (uint32_t start = millis(); millis() - start < timeout_ms;) { |
|
|
|
sendAT(GF("+CPIN?")); |
|
|
|
if (waitResponse(GF(GSM_NL "+CPIN:")) != 1) { |
|
|
|
delay(1000); |
|
|
|
continue; |
|
|
|
} |
|
|
|
int status = waitResponse(GF("READY"), GF("SIM PIN"), GF("SIM PUK"), GF("NOT INSERTED"), GF("PH_SIM PIN"), GF("PH_SIM PUK")); |
|
|
|
int status = |
|
|
|
waitResponse(GF("READY"), GF("SIM PIN"), GF("SIM PUK"), |
|
|
|
GF("NOT INSERTED"), GF("PH_SIM PIN"), GF("PH_SIM PUK")); |
|
|
|
waitResponse(); |
|
|
|
switch (status) { |
|
|
|
case 2: |
|
|
|
case 3: return SIM_LOCKED; |
|
|
|
case 3: return SIM_LOCKED; |
|
|
|
case 5: |
|
|
|
case 6: return SIM_ANTITHEFT_LOCKED; |
|
|
|
case 1: return SIM_READY; |
|
|
|
case 6: return SIM_ANTITHEFT_LOCKED; |
|
|
|
case 1: return SIM_READY; |
|
|
|
default: return SIM_ERROR; |
|
|
|
} |
|
|
|
} |
|
|
|
return SIM_ERROR; |
|
|
|
} |
|
|
|
|
|
|
|
TINY_GSM_MODEM_GET_REGISTRATION_XREG(CREG) |
|
|
|
|
|
|
|
TINY_GSM_MODEM_GET_OPERATOR_COPS() |
|
|
|
|
|
|
|
/* |
|
|
|
* Generic network functions |
|
|
|
*/ |
|
|
|
public: |
|
|
|
RegStatus getRegistrationStatus() { |
|
|
|
return (RegStatus)getRegistrationStatusXREG("CREG"); |
|
|
|
} |
|
|
|
|
|
|
|
TINY_GSM_MODEM_GET_CSQ() |
|
|
|
|
|
|
|
bool isNetworkConnected() { |
|
|
|
protected: |
|
|
|
bool isNetworkConnectedImpl() { |
|
|
|
RegStatus s = getRegistrationStatus(); |
|
|
|
return (s == REG_OK_HOME || s == REG_OK_ROAMING); |
|
|
|
} |
|
|
|
|
|
|
|
TINY_GSM_MODEM_WAIT_FOR_NETWORK() |
|
|
|
|
|
|
|
/* |
|
|
|
* GPRS functions |
|
|
|
*/ |
|
|
|
|
|
|
|
bool gprsConnect(const char* apn, const char* user = NULL, const char* pwd = NULL) { |
|
|
|
protected: |
|
|
|
bool gprsConnectImpl(const char* apn, const char* user = NULL, |
|
|
|
const char* pwd = NULL) { |
|
|
|
gprsDisconnect(); |
|
|
|
|
|
|
|
// select foreground context 0 = VIRTUAL_UART_1 |
|
|
|
sendAT(GF("+QIFGCNT=0")); |
|
|
|
if (waitResponse() != 1) { |
|
|
|
return false; |
|
|
|
} |
|
|
|
if (waitResponse() != 1) { return false; } |
|
|
|
|
|
|
|
//Select GPRS (=1) as the Bearer |
|
|
|
sendAT(GF("+QICSGP=1,\""), apn, GF("\",\""), user, GF("\",\""), pwd, GF("\"")); |
|
|
|
if (waitResponse() != 1) { |
|
|
|
return false; |
|
|
|
} |
|
|
|
// Select GPRS (=1) as the Bearer |
|
|
|
sendAT(GF("+QICSGP=1,\""), apn, GF("\",\""), user, GF("\",\""), pwd, |
|
|
|
GF("\"")); |
|
|
|
if (waitResponse() != 1) { return false; } |
|
|
|
|
|
|
|
//Define PDP context - is this necessary? |
|
|
|
// Define PDP context - is this necessary? |
|
|
|
sendAT(GF("+CGDCONT=1,\"IP\",\""), apn, '"'); |
|
|
|
waitResponse(); |
|
|
|
|
|
|
|
@ -350,56 +294,42 @@ TINY_GSM_MODEM_WAIT_FOR_NETWORK() |
|
|
|
|
|
|
|
// Select TCP/IP transfer mode - NOT transparent mode |
|
|
|
sendAT(GF("+QIMODE=0")); |
|
|
|
if (waitResponse() != 1) { |
|
|
|
return false; |
|
|
|
} |
|
|
|
if (waitResponse() != 1) { return false; } |
|
|
|
|
|
|
|
// Enable multiple TCP/IP connections |
|
|
|
sendAT(GF("+QIMUX=1")); |
|
|
|
if (waitResponse() != 1) { |
|
|
|
return false; |
|
|
|
} |
|
|
|
if (waitResponse() != 1) { return false; } |
|
|
|
|
|
|
|
//Start TCPIP Task and Set APN, User Name and Password |
|
|
|
sendAT("+QIREGAPP=\"", apn, "\",\"", user, "\",\"", pwd, "\"" ); |
|
|
|
if (waitResponse() != 1) { |
|
|
|
return false; |
|
|
|
} |
|
|
|
// Start TCPIP Task and Set APN, User Name and Password |
|
|
|
sendAT("+QIREGAPP=\"", apn, "\",\"", user, "\",\"", pwd, "\""); |
|
|
|
if (waitResponse() != 1) { return false; } |
|
|
|
|
|
|
|
//Activate GPRS/CSD Context |
|
|
|
// Activate GPRS/CSD Context |
|
|
|
sendAT(GF("+QIACT")); |
|
|
|
if (waitResponse(60000L) != 1) { |
|
|
|
return false; |
|
|
|
} |
|
|
|
if (waitResponse(60000L) != 1) { return false; } |
|
|
|
|
|
|
|
// Check that we have a local IP address |
|
|
|
if (localIP() == IPAddress(0,0,0,0)) { |
|
|
|
return false; |
|
|
|
} |
|
|
|
if (localIP() == IPAddress(0, 0, 0, 0)) { return false; } |
|
|
|
|
|
|
|
//Set Method to Handle Received TCP/IP Data |
|
|
|
// Set Method to Handle Received TCP/IP Data |
|
|
|
// Mode=2 - Output a notification statement: |
|
|
|
// “+QIRDI: <id>,<sc>,<sid>,<num>,<len>,< tlen>” |
|
|
|
sendAT(GF("+QINDI=2")); |
|
|
|
if (waitResponse() != 1) { |
|
|
|
return false; |
|
|
|
} |
|
|
|
if (waitResponse() != 1) { return false; } |
|
|
|
|
|
|
|
return true; |
|
|
|
} |
|
|
|
|
|
|
|
bool gprsDisconnect() { |
|
|
|
sendAT(GF("+QIDEACT")); |
|
|
|
bool gprsDisconnectImpl() { |
|
|
|
sendAT(GF("+QIDEACT")); // Deactivate the bearer context |
|
|
|
return waitResponse(60000L, GF("DEACT OK"), GF("ERROR")) == 1; |
|
|
|
} |
|
|
|
|
|
|
|
TINY_GSM_MODEM_GET_GPRS_IP_CONNECTED() |
|
|
|
|
|
|
|
/* |
|
|
|
* IP Address functions |
|
|
|
*/ |
|
|
|
|
|
|
|
String getLocalIP() { |
|
|
|
protected: |
|
|
|
String getLocalIPImpl() { |
|
|
|
sendAT(GF("+QILOCIP")); |
|
|
|
stream.readStringUntil('\n'); |
|
|
|
String res = stream.readStringUntil('\n'); |
|
|
|
@ -407,61 +337,23 @@ TINY_GSM_MODEM_GET_GPRS_IP_CONNECTED() |
|
|
|
return res; |
|
|
|
} |
|
|
|
|
|
|
|
IPAddress localIP() { |
|
|
|
return TinyGsmIpFromString(getLocalIP()); |
|
|
|
} |
|
|
|
/* |
|
|
|
* Phone Call functions |
|
|
|
*/ |
|
|
|
protected: |
|
|
|
// Can follow all of the phone call functions from the template |
|
|
|
|
|
|
|
/* |
|
|
|
* Messaging functions |
|
|
|
*/ |
|
|
|
protected: |
|
|
|
// Can follow all template functions |
|
|
|
|
|
|
|
String sendUSSD(const String& code) { |
|
|
|
sendAT(GF("+CMGF=1")); |
|
|
|
waitResponse(); |
|
|
|
sendAT(GF("+CSCS=\"HEX\"")); |
|
|
|
waitResponse(); |
|
|
|
sendAT(GF("+CUSD=1,\""), code, GF("\"")); |
|
|
|
if (waitResponse(10000L, GF(GSM_NL "+CUSD:")) != 1) { |
|
|
|
return ""; |
|
|
|
} |
|
|
|
stream.readStringUntil('"'); |
|
|
|
String hex = stream.readStringUntil('"'); |
|
|
|
stream.readStringUntil(','); |
|
|
|
int dcs = stream.readStringUntil('\n').toInt(); |
|
|
|
|
|
|
|
if (waitResponse() != 1) { |
|
|
|
return ""; |
|
|
|
} |
|
|
|
|
|
|
|
if (dcs == 15) { |
|
|
|
return TinyGsmDecodeHex8bit(hex); |
|
|
|
} else if (dcs == 72) { |
|
|
|
return TinyGsmDecodeHex16bit(hex); |
|
|
|
} else { |
|
|
|
return hex; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
bool sendSMS(const String& number, const String& text) { |
|
|
|
sendAT(GF("+CMGF=1")); |
|
|
|
waitResponse(); |
|
|
|
//Set GSM 7 bit default alphabet (3GPP TS 23.038) |
|
|
|
sendAT(GF("+CSCS=\"GSM\"")); |
|
|
|
waitResponse(); |
|
|
|
sendAT(GF("+CMGS=\""), number, GF("\"")); |
|
|
|
if (waitResponse(GF(">")) != 1) { |
|
|
|
return false; |
|
|
|
} |
|
|
|
stream.print(text); |
|
|
|
stream.write((char)0x1A); |
|
|
|
stream.flush(); |
|
|
|
return waitResponse(60000L) == 1; |
|
|
|
} |
|
|
|
|
|
|
|
public: |
|
|
|
/** Delete all SMS */ |
|
|
|
bool deleteAllSMS() { |
|
|
|
sendAT(GF("+QMGDA=6")); |
|
|
|
if (waitResponse(waitResponse(60000L, GF("OK"), GF("ERROR")) == 1) ) { |
|
|
|
if (waitResponse(waitResponse(60000L, GF("OK"), GF("ERROR")) == 1)) { |
|
|
|
return true; |
|
|
|
} |
|
|
|
return false; |
|
|
|
@ -470,118 +362,60 @@ TINY_GSM_MODEM_GET_GPRS_IP_CONNECTED() |
|
|
|
/* |
|
|
|
* Location functions |
|
|
|
*/ |
|
|
|
|
|
|
|
String getGsmLocation() { |
|
|
|
sendAT(GF("+CIPGSMLOC=1,1")); |
|
|
|
if (waitResponse(10000L, GF(GSM_NL "+CIPGSMLOC:")) != 1) { |
|
|
|
return ""; |
|
|
|
} |
|
|
|
String res = stream.readStringUntil('\n'); |
|
|
|
waitResponse(); |
|
|
|
res.trim(); |
|
|
|
return res; |
|
|
|
} |
|
|
|
protected: |
|
|
|
// Can use CIPGSMLOC as inherited from the template |
|
|
|
|
|
|
|
/* |
|
|
|
* Battery & temperature functions |
|
|
|
* GPS location functions |
|
|
|
*/ |
|
|
|
public: |
|
|
|
// No functions of this type supported |
|
|
|
|
|
|
|
// Use: float vBatt = modem.getBattVoltage() / 1000.0; |
|
|
|
uint16_t getBattVoltage() { |
|
|
|
sendAT(GF("+CBC")); |
|
|
|
if (waitResponse(GF(GSM_NL "+CBC:")) != 1) { |
|
|
|
return 0; |
|
|
|
} |
|
|
|
streamSkipUntil(','); // Skip battery charge status |
|
|
|
streamSkipUntil(','); // Skip battery charge level |
|
|
|
// return voltage in mV |
|
|
|
uint16_t res = stream.readStringUntil(',').toInt(); |
|
|
|
// Wait for final OK |
|
|
|
waitResponse(); |
|
|
|
return res; |
|
|
|
} |
|
|
|
|
|
|
|
int8_t getBattPercent() { |
|
|
|
sendAT(GF("+CBC")); |
|
|
|
if (waitResponse(GF(GSM_NL "+CBC:")) != 1) { |
|
|
|
return false; |
|
|
|
} |
|
|
|
streamSkipUntil(','); // Skip battery charge status |
|
|
|
// Read battery charge level |
|
|
|
int res = stream.readStringUntil(',').toInt(); |
|
|
|
// Wait for final OK |
|
|
|
waitResponse(); |
|
|
|
return res; |
|
|
|
} |
|
|
|
|
|
|
|
uint8_t getBattChargeState() { |
|
|
|
sendAT(GF("+CBC?")); |
|
|
|
if (waitResponse(GF(GSM_NL "+CBC:")) != 1) { |
|
|
|
return false; |
|
|
|
} |
|
|
|
// Read battery charge status |
|
|
|
int res = stream.readStringUntil(',').toInt(); |
|
|
|
// Wait for final OK |
|
|
|
waitResponse(); |
|
|
|
return res; |
|
|
|
} |
|
|
|
|
|
|
|
bool getBattStats(uint8_t &chargeState, int8_t &percent, uint16_t &milliVolts) { |
|
|
|
sendAT(GF("+CBC?")); |
|
|
|
if (waitResponse(GF(GSM_NL "+CBC:")) != 1) { |
|
|
|
return false; |
|
|
|
} |
|
|
|
chargeState = stream.readStringUntil(',').toInt(); |
|
|
|
percent = stream.readStringUntil(',').toInt(); |
|
|
|
milliVolts = stream.readStringUntil('\n').toInt(); |
|
|
|
// Wait for final OK |
|
|
|
waitResponse(); |
|
|
|
return true; |
|
|
|
} |
|
|
|
/* |
|
|
|
* Time functions |
|
|
|
*/ |
|
|
|
protected: |
|
|
|
// Can follow the standard CCLK function in the template |
|
|
|
|
|
|
|
float getTemperature() TINY_GSM_ATTR_NOT_AVAILABLE; |
|
|
|
/* |
|
|
|
* Battery & temperature functions |
|
|
|
*/ |
|
|
|
protected: |
|
|
|
float getTemperatureImpl() TINY_GSM_ATTR_NOT_AVAILABLE; |
|
|
|
|
|
|
|
/* |
|
|
|
* Client related functions |
|
|
|
*/ |
|
|
|
|
|
|
|
protected: |
|
|
|
|
|
|
|
protected: |
|
|
|
bool modemConnect(const char* host, uint16_t port, uint8_t mux, |
|
|
|
bool ssl = false, int timeout_s = 75) { |
|
|
|
if (ssl) { |
|
|
|
DBG("SSL not yet supported on this module!"); |
|
|
|
} |
|
|
|
uint32_t timeout_ms = ((uint32_t)timeout_s) * 1000; |
|
|
|
sendAT(GF("+QIOPEN="), mux, GF(",\""), GF("TCP"), GF("\",\""), host, GF("\","), port); |
|
|
|
int rsp = waitResponse(timeout_ms, |
|
|
|
GF("CONNECT OK" GSM_NL), |
|
|
|
GF("CONNECT FAIL" GSM_NL), |
|
|
|
GF("ALREADY CONNECT" GSM_NL)); |
|
|
|
bool ssl = false, int timeout_s = 75) { |
|
|
|
if (ssl) { DBG("SSL not yet supported on this module!"); } |
|
|
|
uint32_t timeout_ms = ((uint32_t)timeout_s) * 1000; |
|
|
|
sendAT(GF("+QIOPEN="), mux, GF(",\""), GF("TCP"), GF("\",\""), host, |
|
|
|
GF("\","), port); |
|
|
|
int rsp = |
|
|
|
waitResponse(timeout_ms, GF("CONNECT OK" GSM_NL), |
|
|
|
GF("CONNECT FAIL" GSM_NL), GF("ALREADY CONNECT" GSM_NL)); |
|
|
|
return (1 == rsp); |
|
|
|
} |
|
|
|
|
|
|
|
int16_t modemSend(const void* buff, size_t len, uint8_t mux) { |
|
|
|
sendAT(GF("+QISEND="), mux, ',', (uint16_t)len); |
|
|
|
if (waitResponse(GF(">")) != 1) { |
|
|
|
return 0; |
|
|
|
} |
|
|
|
stream.write((uint8_t*)buff, len); |
|
|
|
if (waitResponse(GF(">")) != 1) { return 0; } |
|
|
|
stream.write(reinterpret_cast<const uint8_t*>(buff), len); |
|
|
|
stream.flush(); |
|
|
|
if (waitResponse(GF(GSM_NL "SEND OK")) != 1) { |
|
|
|
return 0; |
|
|
|
} |
|
|
|
if (waitResponse(GF(GSM_NL "SEND OK")) != 1) { return 0; } |
|
|
|
|
|
|
|
bool allAcknowledged = false; |
|
|
|
// bool failed = false; |
|
|
|
while ( !allAcknowledged ) { |
|
|
|
sendAT( GF("+QISACK")); |
|
|
|
while (!allAcknowledged) { |
|
|
|
sendAT(GF("+QISACK")); |
|
|
|
if (waitResponse(5000L, GF(GSM_NL "+QISACK:")) != 1) { |
|
|
|
return -1; |
|
|
|
} else { |
|
|
|
streamSkipUntil(','); /** Skip total */ |
|
|
|
streamSkipUntil(','); /** Skip acknowledged data size */ |
|
|
|
if ( stream.readStringUntil('\n').toInt() == 0 ) { |
|
|
|
if (stream.readStringUntil('\n').toInt() == 0) { |
|
|
|
allAcknowledged = true; |
|
|
|
} |
|
|
|
} |
|
|
|
@ -591,16 +425,16 @@ protected: |
|
|
|
// streamSkipUntil(','); // Skip mux |
|
|
|
// return stream.readStringUntil('\n').toInt(); |
|
|
|
|
|
|
|
return len; // TODO |
|
|
|
return len; // TODO(?): verify len/ack |
|
|
|
} |
|
|
|
|
|
|
|
size_t modemRead(size_t size, uint8_t mux) { |
|
|
|
// TODO: Does this work???? |
|
|
|
// TODO(?): Does this work???? |
|
|
|
// AT+QIRD=<id>,<sc>,<sid>,<len> |
|
|
|
// id = GPRS context number - 0, set in GPRS connect |
|
|
|
// sc = roll in connection - 1, client of connection |
|
|
|
// sid = index of connection - mux |
|
|
|
// len = maximum length of data to send |
|
|
|
// id = GPRS context number = 0, set in GPRS connect |
|
|
|
// sc = role in connection = 1, client of connection |
|
|
|
// sid = index of connection = mux |
|
|
|
// len = maximum length of data to retrieve |
|
|
|
sendAT(GF("+QIRD=0,1,"), mux, ',', (uint16_t)size); |
|
|
|
// If it replies only OK for the write command, it means there is no |
|
|
|
// received data in the buffer of the connection. |
|
|
|
@ -615,36 +449,38 @@ protected: |
|
|
|
// This is quite likely if the buffer is broken into packets - which may |
|
|
|
// be different sizes. |
|
|
|
// If so, make sure we make sure we re-set the amount of data available. |
|
|
|
if (len < size) { |
|
|
|
sockets[mux]->sock_available = len; |
|
|
|
} |
|
|
|
for (uint16_t i=0; i<len; i++) { |
|
|
|
TINY_GSM_MODEM_STREAM_TO_MUX_FIFO_WITH_DOUBLE_TIMEOUT |
|
|
|
if (len < size) { sockets[mux]->sock_available = len; } |
|
|
|
for (uint16_t i = 0; i < len; i++) { |
|
|
|
moveCharFromStreamToFifo(mux); |
|
|
|
sockets[mux]->sock_available--; |
|
|
|
// ^^ One less character available after moving from modem's FIFO to our FIFO |
|
|
|
// ^^ One less character available after moving from modem's FIFO to our |
|
|
|
// FIFO |
|
|
|
} |
|
|
|
waitResponse(); |
|
|
|
waitResponse(); // ends with an OK |
|
|
|
DBG("### READ:", len, "from", mux); |
|
|
|
return len; |
|
|
|
} else { |
|
|
|
sockets[mux]->sock_available = 0; |
|
|
|
return 0; |
|
|
|
sockets[mux]->sock_available = 0; |
|
|
|
return 0; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
size_t modemGetAvailable(uint8_t) { |
|
|
|
return 0; |
|
|
|
} |
|
|
|
|
|
|
|
bool modemGetConnected(uint8_t mux) { |
|
|
|
sendAT(GF("+QISTATE=1,"), mux); |
|
|
|
//+QISTATE: 0,"TCP","151.139.237.11",80,5087,4,1,0,0,"uart1" |
|
|
|
// +QISTATE: 0,"TCP","151.139.237.11",80,5087,4,1,0,0,"uart1" |
|
|
|
|
|
|
|
if (waitResponse(GF("+QISTATE:"))) |
|
|
|
return false; |
|
|
|
if (waitResponse(GF("+QISTATE:")) != 1) { return false; } |
|
|
|
|
|
|
|
streamSkipUntil(','); // Skip mux |
|
|
|
streamSkipUntil(','); // Skip socket type |
|
|
|
streamSkipUntil(','); // Skip remote ip |
|
|
|
streamSkipUntil(','); // Skip remote port |
|
|
|
streamSkipUntil(','); // Skip local port |
|
|
|
int res = stream.readStringUntil(',').toInt(); // socket state |
|
|
|
streamSkipUntil(','); // Skip mux |
|
|
|
streamSkipUntil(','); // Skip socket type |
|
|
|
streamSkipUntil(','); // Skip remote ip |
|
|
|
streamSkipUntil(','); // Skip remote port |
|
|
|
streamSkipUntil(','); // Skip local port |
|
|
|
int res = stream.readStringUntil(',').toInt(); // socket state |
|
|
|
|
|
|
|
waitResponse(); |
|
|
|
|
|
|
|
@ -652,19 +488,16 @@ protected: |
|
|
|
return 2 == res; |
|
|
|
} |
|
|
|
|
|
|
|
public: |
|
|
|
|
|
|
|
/* |
|
|
|
Utilities |
|
|
|
* Utilities |
|
|
|
*/ |
|
|
|
|
|
|
|
TINY_GSM_MODEM_STREAM_UTILITIES() |
|
|
|
|
|
|
|
// TODO: Optimize this! |
|
|
|
uint8_t waitResponse(uint32_t timeout_ms, String& data, |
|
|
|
GsmConstStr r1=GFP(GSM_OK), GsmConstStr r2=GFP(GSM_ERROR), |
|
|
|
GsmConstStr r3=NULL, GsmConstStr r4=NULL, GsmConstStr r5=NULL, GsmConstStr r6=NULL) |
|
|
|
{ |
|
|
|
public: |
|
|
|
// TODO(vshymanskyy): Optimize this! |
|
|
|
uint8_t |
|
|
|
waitResponse(uint32_t timeout_ms, String& data, GsmConstStr r1 = GFP(GSM_OK), |
|
|
|
GsmConstStr r2 = GFP(GSM_ERROR), |
|
|
|
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r4 = NULL, |
|
|
|
GsmConstStr r5 = NULL, GsmConstStr r6 = NULL) { |
|
|
|
/*String r1s(r1); r1s.trim(); |
|
|
|
String r2s(r2); r2s.trim(); |
|
|
|
String r3s(r3); r3s.trim(); |
|
|
|
@ -673,15 +506,15 @@ TINY_GSM_MODEM_STREAM_UTILITIES() |
|
|
|
String r6s(r6); r6s.trim(); |
|
|
|
DBG("### ..:", r1s, ",", r2s, ",", r3s, ",", r4s, ",", r5s, ",", r6s);*/ |
|
|
|
data.reserve(64); |
|
|
|
int index = 0; |
|
|
|
unsigned long startMillis = millis(); |
|
|
|
int index = 0; |
|
|
|
uint32_t startMillis = millis(); |
|
|
|
do { |
|
|
|
TINY_GSM_YIELD(); |
|
|
|
while (stream.available() > 0) { |
|
|
|
TINY_GSM_YIELD(); |
|
|
|
int a = stream.read(); |
|
|
|
if (a <= 0) continue; // Skip 0x00 bytes, just in case |
|
|
|
data += (char)a; |
|
|
|
if (a <= 0) continue; // Skip 0x00 bytes, just in case |
|
|
|
data += static_cast<char>(a); |
|
|
|
if (r1 && data.endsWith(r1)) { |
|
|
|
index = 1; |
|
|
|
goto finish; |
|
|
|
@ -700,7 +533,8 @@ TINY_GSM_MODEM_STREAM_UTILITIES() |
|
|
|
} else if (r6 && data.endsWith(r6)) { |
|
|
|
index = 6; |
|
|
|
goto finish; |
|
|
|
} else if (data.endsWith(GF(GSM_NL "+QIRD:"))) { // TODO: QIRD? or QIRDI? |
|
|
|
} else if (data.endsWith( |
|
|
|
GF(GSM_NL "+QIRD:"))) { // TODO(?): QIRD? or QIRDI? |
|
|
|
// +QIRDI: <id>,<sc>,<sid>,<num>,<len>,< tlen> |
|
|
|
streamSkipUntil(','); // Skip the context |
|
|
|
streamSkipUntil(','); // Skip the role |
|
|
|
@ -711,14 +545,14 @@ TINY_GSM_MODEM_STREAM_UTILITIES() |
|
|
|
// read the length of the current packet |
|
|
|
int len_packet = stream.readStringUntil('\n').toInt(); |
|
|
|
if (mux >= 0 && mux < TINY_GSM_MUX_COUNT && sockets[mux]) { |
|
|
|
sockets[mux]->sock_available = len_packet*num_packets; |
|
|
|
sockets[mux]->sock_available = len_packet * num_packets; |
|
|
|
} |
|
|
|
data = ""; |
|
|
|
DBG("### Got Data:", len, "on", mux); |
|
|
|
DBG("### Got Data:", len_packet * num_packets, "on", mux); |
|
|
|
} else if (data.endsWith(GF("CLOSED" GSM_NL))) { |
|
|
|
int nl = data.lastIndexOf(GSM_NL, data.length()-8); |
|
|
|
int coma = data.indexOf(',', nl+2); |
|
|
|
int mux = data.substring(nl+2, coma).toInt(); |
|
|
|
int nl = data.lastIndexOf(GSM_NL, data.length() - 8); |
|
|
|
int coma = data.indexOf(',', nl + 2); |
|
|
|
int mux = data.substring(nl + 2, coma).toInt(); |
|
|
|
if (mux >= 0 && mux < TINY_GSM_MUX_COUNT && sockets[mux]) { |
|
|
|
sockets[mux]->sock_connected = false; |
|
|
|
} |
|
|
|
@ -727,38 +561,37 @@ TINY_GSM_MODEM_STREAM_UTILITIES() |
|
|
|
} |
|
|
|
} |
|
|
|
} while (millis() - startMillis < timeout_ms); |
|
|
|
finish: |
|
|
|
finish: |
|
|
|
if (!index) { |
|
|
|
data.trim(); |
|
|
|
if (data.length()) { |
|
|
|
DBG("### Unhandled:", data); |
|
|
|
} |
|
|
|
if (data.length()) { DBG("### Unhandled:", data); } |
|
|
|
data = ""; |
|
|
|
} |
|
|
|
//data.replace(GSM_NL, "/"); |
|
|
|
//DBG('<', index, '>', data); |
|
|
|
// data.replace(GSM_NL, "/"); |
|
|
|
// DBG('<', index, '>', data); |
|
|
|
return index; |
|
|
|
} |
|
|
|
|
|
|
|
uint8_t waitResponse(uint32_t timeout_ms, |
|
|
|
GsmConstStr r1=GFP(GSM_OK), GsmConstStr r2=GFP(GSM_ERROR), |
|
|
|
GsmConstStr r3=NULL, GsmConstStr r4=NULL, GsmConstStr r5=NULL, GsmConstStr r6=NULL) |
|
|
|
{ |
|
|
|
uint8_t |
|
|
|
waitResponse(uint32_t timeout_ms, GsmConstStr r1 = GFP(GSM_OK), |
|
|
|
GsmConstStr r2 = GFP(GSM_ERROR), |
|
|
|
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r4 = NULL, |
|
|
|
GsmConstStr r5 = NULL, GsmConstStr r6 = NULL) { |
|
|
|
String data; |
|
|
|
return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5, r6); |
|
|
|
} |
|
|
|
|
|
|
|
uint8_t waitResponse(GsmConstStr r1=GFP(GSM_OK), GsmConstStr r2=GFP(GSM_ERROR), |
|
|
|
GsmConstStr r3=NULL, GsmConstStr r4=NULL, GsmConstStr r5=NULL, GsmConstStr r6=NULL) |
|
|
|
{ |
|
|
|
uint8_t |
|
|
|
waitResponse(GsmConstStr r1 = GFP(GSM_OK), GsmConstStr r2 = GFP(GSM_ERROR), |
|
|
|
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r4 = NULL, |
|
|
|
GsmConstStr r5 = NULL, GsmConstStr r6 = NULL) { |
|
|
|
return waitResponse(1000, r1, r2, r3, r4, r5, r6); |
|
|
|
} |
|
|
|
|
|
|
|
public: |
|
|
|
Stream& stream; |
|
|
|
|
|
|
|
protected: |
|
|
|
GsmClient* sockets[TINY_GSM_MUX_COUNT]; |
|
|
|
protected: |
|
|
|
Stream& stream; |
|
|
|
GsmClientMC60* sockets[TINY_GSM_MUX_COUNT]; |
|
|
|
const char* gsmNL = GSM_NL; |
|
|
|
}; |
|
|
|
|
|
|
|
#endif |
|
|
|
#endif // SRC_TINYGSMCLIENTMC60_H_ |
Sara Damiano
5 years ago