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

Catching CMS error on debug

Browse Source 
Signed-off-by: Sara Damiano <sdamiano@stroudcenter.org>
This commit is contained in:
Sara Damiano
2020-06-22 17:13:24 -04:00
parent 1f1b56833a
commit 234a20e894
13 changed files with 123 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/TinyGsmClientA6.h
View File

@@ -28,6 +28,7 @@ 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_ERROR[] TINY_GSM_PROGMEM = "ERROR" GSM_NL;
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
static const char GSM_CME_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CME ERROR:"; static const char GSM_CME_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CME ERROR:";
static const char GSM_CMS_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CMS ERROR:";
#endif #endif
enum RegStatus { enum RegStatus {
@@ -460,10 +461,11 @@ class TinyGsmA6 : public TinyGsmModem<TinyGsmA6>,
GsmConstStr r2 = GFP(GSM_ERROR), GsmConstStr r2 = GFP(GSM_ERROR),
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r3 = GFP(GSM_CME_ERROR),
GsmConstStr r4 = GFP(GSM_CMS_ERROR),
#else #else
GsmConstStr r3 = NULL, GsmConstStr r3 = NULL, GsmConstStr r4 = NULL,
#endif #endif
GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { GsmConstStr r5 = NULL) {
/*String r1s(r1); r1s.trim(); /*String r1s(r1); r1s.trim();
String r2s(r2); r2s.trim(); String r2s(r2); r2s.trim();
String r3s(r3); r3s.trim(); String r3s(r3); r3s.trim();
@@ -547,10 +549,11 @@ class TinyGsmA6 : public TinyGsmModem<TinyGsmA6>,
GsmConstStr r2 = GFP(GSM_ERROR), GsmConstStr r2 = GFP(GSM_ERROR),
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r3 = GFP(GSM_CME_ERROR),
GsmConstStr r4 = GFP(GSM_CMS_ERROR),
#else #else
GsmConstStr r3 = NULL, GsmConstStr r3 = NULL, GsmConstStr r4 = NULL,
#endif #endif
GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { GsmConstStr r5 = NULL) {
String data; String data;
return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5); return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5);
} }
@@ -559,10 +562,11 @@ class TinyGsmA6 : public TinyGsmModem<TinyGsmA6>,
GsmConstStr r2 = GFP(GSM_ERROR), GsmConstStr r2 = GFP(GSM_ERROR),
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r3 = GFP(GSM_CME_ERROR),
GsmConstStr r4 = GFP(GSM_CMS_ERROR),
#else #else
GsmConstStr r3 = NULL, GsmConstStr r3 = NULL, GsmConstStr r4 = NULL,
#endif #endif
GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { GsmConstStr r5 = NULL) {
return waitResponse(1000, r1, r2, r3, r4, r5); return waitResponse(1000, r1, r2, r3, r4, r5);
} }

16
src/TinyGsmClientBG96.h
View File

@@ -30,6 +30,7 @@ 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_ERROR[] TINY_GSM_PROGMEM = "ERROR" GSM_NL;
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
static const char GSM_CME_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CME ERROR:"; static const char GSM_CME_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CME ERROR:";
static const char GSM_CMS_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CMS ERROR:";
#endif #endif
enum RegStatus { enum RegStatus {
@@ -578,10 +579,11 @@ class TinyGsmBG96 : public TinyGsmModem<TinyGsmBG96>,
GsmConstStr r2 = GFP(GSM_ERROR), GsmConstStr r2 = GFP(GSM_ERROR),
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r3 = GFP(GSM_CME_ERROR),
GsmConstStr r4 = GFP(GSM_CMS_ERROR),
#else #else
GsmConstStr r3 = NULL, GsmConstStr r3 = NULL, GsmConstStr r4 = NULL,
#endif #endif
GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { GsmConstStr r5 = NULL) {
/*String r1s(r1); r1s.trim(); /*String r1s(r1); r1s.trim();
String r2s(r2); r2s.trim(); String r2s(r2); r2s.trim();
String r3s(r3); r3s.trim(); String r3s(r3); r3s.trim();
@@ -656,10 +658,11 @@ class TinyGsmBG96 : public TinyGsmModem<TinyGsmBG96>,
GsmConstStr r2 = GFP(GSM_ERROR), GsmConstStr r2 = GFP(GSM_ERROR),
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r3 = GFP(GSM_CME_ERROR),
GsmConstStr r4 = GFP(GSM_CMS_ERROR),
#else #else
GsmConstStr r3 = NULL, GsmConstStr r3 = NULL, GsmConstStr r4 = NULL,
#endif #endif
GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { GsmConstStr r5 = NULL) {
String data; String data;
return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5); return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5);
} }
@@ -668,10 +671,11 @@ class TinyGsmBG96 : public TinyGsmModem<TinyGsmBG96>,
GsmConstStr r2 = GFP(GSM_ERROR), GsmConstStr r2 = GFP(GSM_ERROR),
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r3 = GFP(GSM_CME_ERROR),
GsmConstStr r4 = GFP(GSM_CMS_ERROR),
#else #else
GsmConstStr r3 = NULL, GsmConstStr r3 = NULL, GsmConstStr r4 = NULL,
#endif #endif
GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { GsmConstStr r5 = NULL) {
return waitResponse(1000, r1, r2, r3, r4, r5); return waitResponse(1000, r1, r2, r3, r4, r5);
} }

16
src/TinyGsmClientM590.h
View File

@@ -26,6 +26,7 @@ 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_ERROR[] TINY_GSM_PROGMEM = "ERROR" GSM_NL;
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
static const char GSM_CME_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CME ERROR:"; static const char GSM_CME_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CME ERROR:";
static const char GSM_CMS_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CMS ERROR:";
#endif #endif
enum RegStatus { enum RegStatus {
@@ -351,10 +352,11 @@ class TinyGsmM590 : public TinyGsmModem<TinyGsmM590>,
GsmConstStr r2 = GFP(GSM_ERROR), GsmConstStr r2 = GFP(GSM_ERROR),
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r3 = GFP(GSM_CME_ERROR),
GsmConstStr r4 = GFP(GSM_CMS_ERROR),
#else #else
GsmConstStr r3 = NULL, GsmConstStr r3 = NULL, GsmConstStr r4 = NULL,
#endif #endif
GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { GsmConstStr r5 = NULL) {
/*String r1s(r1); r1s.trim(); /*String r1s(r1); r1s.trim();
String r2s(r2); r2s.trim(); String r2s(r2); r2s.trim();
String r3s(r3); r3s.trim(); String r3s(r3); r3s.trim();
@@ -437,10 +439,11 @@ class TinyGsmM590 : public TinyGsmModem<TinyGsmM590>,
GsmConstStr r2 = GFP(GSM_ERROR), GsmConstStr r2 = GFP(GSM_ERROR),
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r3 = GFP(GSM_CME_ERROR),
GsmConstStr r4 = GFP(GSM_CMS_ERROR),
#else #else
GsmConstStr r3 = NULL, GsmConstStr r3 = NULL, GsmConstStr r4 = NULL,
#endif #endif
GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { GsmConstStr r5 = NULL) {
String data; String data;
return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5); return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5);
} }
@@ -449,10 +452,11 @@ class TinyGsmM590 : public TinyGsmModem<TinyGsmM590>,
GsmConstStr r2 = GFP(GSM_ERROR), GsmConstStr r2 = GFP(GSM_ERROR),
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r3 = GFP(GSM_CME_ERROR),
GsmConstStr r4 = GFP(GSM_CMS_ERROR),
#else #else
GsmConstStr r3 = NULL, GsmConstStr r3 = NULL, GsmConstStr r4 = NULL,
#endif #endif
GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { GsmConstStr r5 = NULL) {
return waitResponse(1000, r1, r2, r3, r4, r5); return waitResponse(1000, r1, r2, r3, r4, r5);
} }

16
src/TinyGsmClientM95.h
View File

@@ -30,6 +30,7 @@ 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_ERROR[] TINY_GSM_PROGMEM = "ERROR" GSM_NL;
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
static const char GSM_CME_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CME ERROR:"; static const char GSM_CME_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CME ERROR:";
static const char GSM_CMS_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CMS ERROR:";
#endif #endif
enum RegStatus { enum RegStatus {
@@ -517,10 +518,11 @@ class TinyGsmM95 : public TinyGsmModem<TinyGsmM95>,
GsmConstStr r2 = GFP(GSM_ERROR), GsmConstStr r2 = GFP(GSM_ERROR),
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r3 = GFP(GSM_CME_ERROR),
GsmConstStr r4 = GFP(GSM_CMS_ERROR),
#else #else
GsmConstStr r3 = NULL, GsmConstStr r3 = NULL, GsmConstStr r4 = NULL,
#endif #endif
GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { GsmConstStr r5 = NULL) {
/*String r1s(r1); r1s.trim(); /*String r1s(r1); r1s.trim();
String r2s(r2); r2s.trim(); String r2s(r2); r2s.trim();
String r3s(r3); r3s.trim(); String r3s(r3); r3s.trim();
@@ -599,10 +601,11 @@ class TinyGsmM95 : public TinyGsmModem<TinyGsmM95>,
GsmConstStr r2 = GFP(GSM_ERROR), GsmConstStr r2 = GFP(GSM_ERROR),
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r3 = GFP(GSM_CME_ERROR),
GsmConstStr r4 = GFP(GSM_CMS_ERROR),
#else #else
GsmConstStr r3 = NULL, GsmConstStr r3 = NULL, GsmConstStr r4 = NULL,
#endif #endif
GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { GsmConstStr r5 = NULL) {
String data; String data;
return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5); return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5);
} }
@@ -611,10 +614,11 @@ class TinyGsmM95 : public TinyGsmModem<TinyGsmM95>,
GsmConstStr r2 = GFP(GSM_ERROR), GsmConstStr r2 = GFP(GSM_ERROR),
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r3 = GFP(GSM_CME_ERROR),
GsmConstStr r4 = GFP(GSM_CMS_ERROR),
#else #else
GsmConstStr r3 = NULL, GsmConstStr r3 = NULL, GsmConstStr r4 = NULL,
#endif #endif
GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { GsmConstStr r5 = NULL) {
return waitResponse(1000, r1, r2, r3, r4, r5); return waitResponse(1000, r1, r2, r3, r4, r5);
} }

19
src/TinyGsmClientMC60.h
View File

@@ -31,6 +31,7 @@ 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_ERROR[] TINY_GSM_PROGMEM = "ERROR" GSM_NL;
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
static const char GSM_CME_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CME ERROR:"; static const char GSM_CME_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CME ERROR:";
static const char GSM_CMS_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CMS ERROR:";
#endif #endif
enum RegStatus { enum RegStatus {
@@ -476,11 +477,11 @@ class TinyGsmMC60 : public TinyGsmModem<TinyGsmMC60>,
GsmConstStr r2 = GFP(GSM_ERROR), GsmConstStr r2 = GFP(GSM_ERROR),
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r3 = GFP(GSM_CME_ERROR),
GsmConstStr r4 = GFP(GSM_CMS_ERROR),
#else #else
GsmConstStr r3 = NULL, GsmConstStr r3 = NULL, GsmConstStr r4 = NULL,
#endif #endif
GsmConstStr r4 = NULL, GsmConstStr r5 = NULL, GsmConstStr r5 = NULL, GsmConstStr r6 = NULL) {
GsmConstStr r6 = NULL) {
/*String r1s(r1); r1s.trim(); /*String r1s(r1); r1s.trim();
String r2s(r2); r2s.trim(); String r2s(r2); r2s.trim();
String r3s(r3); r3s.trim(); String r3s(r3); r3s.trim();
@@ -569,11 +570,11 @@ class TinyGsmMC60 : public TinyGsmModem<TinyGsmMC60>,
GsmConstStr r2 = GFP(GSM_ERROR), GsmConstStr r2 = GFP(GSM_ERROR),
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r3 = GFP(GSM_CME_ERROR),
GsmConstStr r4 = GFP(GSM_CMS_ERROR),
#else #else
GsmConstStr r3 = NULL, GsmConstStr r3 = NULL, GsmConstStr r4 = NULL,
#endif #endif
GsmConstStr r4 = NULL, GsmConstStr r5 = NULL, GsmConstStr r5 = NULL, GsmConstStr r6 = NULL) {
GsmConstStr r6 = NULL) {
String data; String data;
return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5, r6); return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5, r6);
} }
@@ -582,11 +583,11 @@ class TinyGsmMC60 : public TinyGsmModem<TinyGsmMC60>,
GsmConstStr r2 = GFP(GSM_ERROR), GsmConstStr r2 = GFP(GSM_ERROR),
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r3 = GFP(GSM_CME_ERROR),
GsmConstStr r4 = GFP(GSM_CMS_ERROR),
#else #else
GsmConstStr r3 = NULL, GsmConstStr r3 = NULL, GsmConstStr r4 = NULL,
#endif #endif
GsmConstStr r4 = NULL, GsmConstStr r5 = NULL, GsmConstStr r5 = NULL, GsmConstStr r6 = NULL) {
GsmConstStr r6 = NULL) {
return waitResponse(1000, r1, r2, r3, r4, r5, r6); return waitResponse(1000, r1, r2, r3, r4, r5, r6);
} }

16
src/TinyGsmClientSIM5360.h
View File

@@ -29,6 +29,7 @@ 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_ERROR[] TINY_GSM_PROGMEM = "ERROR" GSM_NL;
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
static const char GSM_CME_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CME ERROR:"; static const char GSM_CME_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CME ERROR:";
static const char GSM_CMS_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CMS ERROR:";
#endif #endif
enum RegStatus { enum RegStatus {
@@ -601,10 +602,11 @@ class TinyGsmSim5360 : public TinyGsmModem<TinyGsmSim5360>,
GsmConstStr r2 = GFP(GSM_ERROR), GsmConstStr r2 = GFP(GSM_ERROR),
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r3 = GFP(GSM_CME_ERROR),
GsmConstStr r4 = GFP(GSM_CMS_ERROR),
#else #else
GsmConstStr r3 = NULL, GsmConstStr r3 = NULL, GsmConstStr r4 = NULL,
#endif #endif
GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { GsmConstStr r5 = NULL) {
/*String r1s(r1); r1s.trim(); /*String r1s(r1); r1s.trim();
String r2s(r2); r2s.trim(); String r2s(r2); r2s.trim();
String r3s(r3); r3s.trim(); String r3s(r3); r3s.trim();
@@ -694,10 +696,11 @@ class TinyGsmSim5360 : public TinyGsmModem<TinyGsmSim5360>,
GsmConstStr r2 = GFP(GSM_ERROR), GsmConstStr r2 = GFP(GSM_ERROR),
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r3 = GFP(GSM_CME_ERROR),
GsmConstStr r4 = GFP(GSM_CMS_ERROR),
#else #else
GsmConstStr r3 = NULL, GsmConstStr r3 = NULL, GsmConstStr r4 = NULL,
#endif #endif
GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { GsmConstStr r5 = NULL) {
String data; String data;
return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5); return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5);
} }
@@ -706,10 +709,11 @@ class TinyGsmSim5360 : public TinyGsmModem<TinyGsmSim5360>,
GsmConstStr r2 = GFP(GSM_ERROR), GsmConstStr r2 = GFP(GSM_ERROR),
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r3 = GFP(GSM_CME_ERROR),
GsmConstStr r4 = GFP(GSM_CMS_ERROR),
#else #else
GsmConstStr r3 = NULL, GsmConstStr r3 = NULL, GsmConstStr r4 = NULL,
#endif #endif
GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { GsmConstStr r5 = NULL) {
return waitResponse(1000, r1, r2, r3, r4, r5); return waitResponse(1000, r1, r2, r3, r4, r5);
} }

16
src/TinyGsmClientSIM7000.h
View File

@@ -28,6 +28,7 @@ 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_ERROR[] TINY_GSM_PROGMEM = "ERROR" GSM_NL;
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
static const char GSM_CME_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CME ERROR:"; static const char GSM_CME_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CME ERROR:";
static const char GSM_CMS_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CMS ERROR:";
#endif #endif
enum RegStatus { enum RegStatus {
@@ -632,10 +633,11 @@ class TinyGsmSim7000 : public TinyGsmModem<TinyGsmSim7000>,
GsmConstStr r2 = GFP(GSM_ERROR), GsmConstStr r2 = GFP(GSM_ERROR),
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r3 = GFP(GSM_CME_ERROR),
GsmConstStr r4 = GFP(GSM_CMS_ERROR),
#else #else
GsmConstStr r3 = NULL, GsmConstStr r3 = NULL, GsmConstStr r4 = NULL,
#endif #endif
GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { GsmConstStr r5 = NULL) {
/*String r1s(r1); r1s.trim(); /*String r1s(r1); r1s.trim();
String r2s(r2); r2s.trim(); String r2s(r2); r2s.trim();
String r3s(r3); r3s.trim(); String r3s(r3); r3s.trim();
@@ -737,10 +739,11 @@ class TinyGsmSim7000 : public TinyGsmModem<TinyGsmSim7000>,
GsmConstStr r2 = GFP(GSM_ERROR), GsmConstStr r2 = GFP(GSM_ERROR),
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r3 = GFP(GSM_CME_ERROR),
GsmConstStr r4 = GFP(GSM_CMS_ERROR),
#else #else
GsmConstStr r3 = NULL, GsmConstStr r3 = NULL, GsmConstStr r4 = NULL,
#endif #endif
GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { GsmConstStr r5 = NULL) {
String data; String data;
return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5); return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5);
} }
@@ -749,10 +752,11 @@ class TinyGsmSim7000 : public TinyGsmModem<TinyGsmSim7000>,
GsmConstStr r2 = GFP(GSM_ERROR), GsmConstStr r2 = GFP(GSM_ERROR),
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r3 = GFP(GSM_CME_ERROR),
GsmConstStr r4 = GFP(GSM_CMS_ERROR),
#else #else
GsmConstStr r3 = NULL, GsmConstStr r3 = NULL, GsmConstStr r4 = NULL,
#endif #endif
GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { GsmConstStr r5 = NULL) {
return waitResponse(1000, r1, r2, r3, r4, r5); return waitResponse(1000, r1, r2, r3, r4, r5);
} }

16
src/TinyGsmClientSIM7600.h
View File

@@ -30,6 +30,7 @@ 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_ERROR[] TINY_GSM_PROGMEM = "ERROR" GSM_NL;
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
static const char GSM_CME_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CME ERROR:"; static const char GSM_CME_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CME ERROR:";
static const char GSM_CMS_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CMS ERROR:";
#endif #endif
enum RegStatus { enum RegStatus {
@@ -694,10 +695,11 @@ class TinyGsmSim7600 : public TinyGsmModem<TinyGsmSim7600>,
GsmConstStr r2 = GFP(GSM_ERROR), GsmConstStr r2 = GFP(GSM_ERROR),
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r3 = GFP(GSM_CME_ERROR),
GsmConstStr r4 = GFP(GSM_CMS_ERROR),
#else #else
GsmConstStr r3 = NULL, GsmConstStr r3 = NULL, GsmConstStr r4 = NULL,
#endif #endif
GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { GsmConstStr r5 = NULL) {
/*String r1s(r1); r1s.trim(); /*String r1s(r1); r1s.trim();
String r2s(r2); r2s.trim(); String r2s(r2); r2s.trim();
String r3s(r3); r3s.trim(); String r3s(r3); r3s.trim();
@@ -787,10 +789,11 @@ class TinyGsmSim7600 : public TinyGsmModem<TinyGsmSim7600>,
GsmConstStr r2 = GFP(GSM_ERROR), GsmConstStr r2 = GFP(GSM_ERROR),
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r3 = GFP(GSM_CME_ERROR),
GsmConstStr r4 = GFP(GSM_CMS_ERROR),
#else #else
GsmConstStr r3 = NULL, GsmConstStr r3 = NULL, GsmConstStr r4 = NULL,
#endif #endif
GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { GsmConstStr r5 = NULL) {
String data; String data;
return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5); return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5);
} }
@@ -799,10 +802,11 @@ class TinyGsmSim7600 : public TinyGsmModem<TinyGsmSim7600>,
GsmConstStr r2 = GFP(GSM_ERROR), GsmConstStr r2 = GFP(GSM_ERROR),
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r3 = GFP(GSM_CME_ERROR),
GsmConstStr r4 = GFP(GSM_CMS_ERROR),
#else #else
GsmConstStr r3 = NULL, GsmConstStr r3 = NULL, GsmConstStr r4 = NULL,
#endif #endif
GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { GsmConstStr r5 = NULL) {
return waitResponse(1000, r1, r2, r3, r4, r5); return waitResponse(1000, r1, r2, r3, r4, r5);
} }

16
src/TinyGsmClientSIM800.h
View File

@@ -31,6 +31,7 @@ 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_ERROR[] TINY_GSM_PROGMEM = "ERROR" GSM_NL;
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
static const char GSM_CME_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CME ERROR:"; static const char GSM_CME_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CME ERROR:";
static const char GSM_CMS_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CMS ERROR:";
#endif #endif
enum RegStatus { enum RegStatus {
@@ -610,10 +611,11 @@ class TinyGsmSim800 : public TinyGsmModem<TinyGsmSim800>,
GsmConstStr r2 = GFP(GSM_ERROR), GsmConstStr r2 = GFP(GSM_ERROR),
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r3 = GFP(GSM_CME_ERROR),
GsmConstStr r4 = GFP(GSM_CMS_ERROR),
#else #else
GsmConstStr r3 = NULL, GsmConstStr r3 = NULL, GsmConstStr r4 = NULL,
#endif #endif
GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { GsmConstStr r5 = NULL) {
/*String r1s(r1); r1s.trim(); /*String r1s(r1); r1s.trim();
String r2s(r2); r2s.trim(); String r2s(r2); r2s.trim();
String r3s(r3); r3s.trim(); String r3s(r3); r3s.trim();
@@ -715,10 +717,11 @@ class TinyGsmSim800 : public TinyGsmModem<TinyGsmSim800>,
GsmConstStr r2 = GFP(GSM_ERROR), GsmConstStr r2 = GFP(GSM_ERROR),
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r3 = GFP(GSM_CME_ERROR),
GsmConstStr r4 = GFP(GSM_CMS_ERROR),
#else #else
GsmConstStr r3 = NULL, GsmConstStr r3 = NULL, GsmConstStr r4 = NULL,
#endif #endif
GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { GsmConstStr r5 = NULL) {
String data; String data;
return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5); return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5);
} }
@@ -727,10 +730,11 @@ class TinyGsmSim800 : public TinyGsmModem<TinyGsmSim800>,
GsmConstStr r2 = GFP(GSM_ERROR), GsmConstStr r2 = GFP(GSM_ERROR),
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r3 = GFP(GSM_CME_ERROR),
GsmConstStr r4 = GFP(GSM_CMS_ERROR),
#else #else
GsmConstStr r3 = NULL, GsmConstStr r3 = NULL, GsmConstStr r4 = NULL,
#endif #endif
GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { GsmConstStr r5 = NULL) {
return waitResponse(1000, r1, r2, r3, r4, r5); return waitResponse(1000, r1, r2, r3, r4, r5);
} }

16
src/TinyGsmClientSaraR4.h
View File

@@ -31,6 +31,7 @@ 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_ERROR[] TINY_GSM_PROGMEM = "ERROR" GSM_NL;
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
static const char GSM_CME_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CME ERROR:"; static const char GSM_CME_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CME ERROR:";
static const char GSM_CMS_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CMS ERROR:";
#endif #endif
enum RegStatus { enum RegStatus {
@@ -776,10 +777,11 @@ class TinyGsmSaraR4 : public TinyGsmModem<TinyGsmSaraR4>,
GsmConstStr r2 = GFP(GSM_ERROR), GsmConstStr r2 = GFP(GSM_ERROR),
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r3 = GFP(GSM_CME_ERROR),
GsmConstStr r4 = GFP(GSM_CMS_ERROR),
#else #else
GsmConstStr r3 = NULL, GsmConstStr r3 = NULL, GsmConstStr r4 = NULL,
#endif #endif
GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { GsmConstStr r5 = NULL) {
/*String r1s(r1); r1s.trim(); /*String r1s(r1); r1s.trim();
String r2s(r2); r2s.trim(); String r2s(r2); r2s.trim();
String r3s(r3); r3s.trim(); String r3s(r3); r3s.trim();
@@ -860,10 +862,11 @@ class TinyGsmSaraR4 : public TinyGsmModem<TinyGsmSaraR4>,
GsmConstStr r2 = GFP(GSM_ERROR), GsmConstStr r2 = GFP(GSM_ERROR),
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r3 = GFP(GSM_CME_ERROR),
GsmConstStr r4 = GFP(GSM_CMS_ERROR),
#else #else
GsmConstStr r3 = NULL, GsmConstStr r3 = NULL, GsmConstStr r4 = NULL,
#endif #endif
GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { GsmConstStr r5 = NULL) {
String data; String data;
return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5); return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5);
} }
@@ -872,10 +875,11 @@ class TinyGsmSaraR4 : public TinyGsmModem<TinyGsmSaraR4>,
GsmConstStr r2 = GFP(GSM_ERROR), GsmConstStr r2 = GFP(GSM_ERROR),
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r3 = GFP(GSM_CME_ERROR),
GsmConstStr r4 = GFP(GSM_CMS_ERROR),
#else #else
GsmConstStr r3 = NULL, GsmConstStr r3 = NULL, GsmConstStr r4 = NULL,
#endif #endif
GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { GsmConstStr r5 = NULL) {
return waitResponse(1000, r1, r2, r3, r4, r5); return waitResponse(1000, r1, r2, r3, r4, r5);
} }

16
src/TinyGsmClientSequansMonarch.h
View File

@@ -28,6 +28,7 @@ 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_ERROR[] TINY_GSM_PROGMEM = "ERROR" GSM_NL;
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
static const char GSM_CME_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CME ERROR:"; static const char GSM_CME_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CME ERROR:";
static const char GSM_CMS_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CMS ERROR:";
#endif #endif
enum RegStatus { enum RegStatus {
@@ -611,10 +612,11 @@ class TinyGsmSequansMonarch
GsmConstStr r2 = GFP(GSM_ERROR), GsmConstStr r2 = GFP(GSM_ERROR),
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r3 = GFP(GSM_CME_ERROR),
GsmConstStr r4 = GFP(GSM_CMS_ERROR),
#else #else
GsmConstStr r3 = NULL, GsmConstStr r3 = NULL, GsmConstStr r4 = NULL,
#endif #endif
GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { GsmConstStr r5 = NULL) {
/*String r1s(r1); r1s.trim(); /*String r1s(r1); r1s.trim();
String r2s(r2); r2s.trim(); String r2s(r2); r2s.trim();
String r3s(r3); r3s.trim(); String r3s(r3); r3s.trim();
@@ -689,10 +691,11 @@ class TinyGsmSequansMonarch
GsmConstStr r2 = GFP(GSM_ERROR), GsmConstStr r2 = GFP(GSM_ERROR),
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r3 = GFP(GSM_CME_ERROR),
GsmConstStr r4 = GFP(GSM_CMS_ERROR),
#else #else
GsmConstStr r3 = NULL, GsmConstStr r3 = NULL, GsmConstStr r4 = NULL,
#endif #endif
GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { GsmConstStr r5 = NULL) {
String data; String data;
return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5); return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5);
} }
@@ -701,10 +704,11 @@ class TinyGsmSequansMonarch
GsmConstStr r2 = GFP(GSM_ERROR), GsmConstStr r2 = GFP(GSM_ERROR),
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r3 = GFP(GSM_CME_ERROR),
GsmConstStr r4 = GFP(GSM_CMS_ERROR),
#else #else
GsmConstStr r3 = NULL, GsmConstStr r3 = NULL, GsmConstStr r4 = NULL,
#endif #endif
GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { GsmConstStr r5 = NULL) {
return waitResponse(1000, r1, r2, r3, r4, r5); return waitResponse(1000, r1, r2, r3, r4, r5);
} }

16
src/TinyGsmClientUBLOX.h
View File

@@ -31,6 +31,7 @@ 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_ERROR[] TINY_GSM_PROGMEM = "ERROR" GSM_NL;
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
static const char GSM_CME_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CME ERROR:"; static const char GSM_CME_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CME ERROR:";
static const char GSM_CMS_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CMS ERROR:";
#endif #endif
enum RegStatus { enum RegStatus {
@@ -718,10 +719,11 @@ class TinyGsmUBLOX : public TinyGsmModem<TinyGsmUBLOX>,
GsmConstStr r2 = GFP(GSM_ERROR), GsmConstStr r2 = GFP(GSM_ERROR),
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r3 = GFP(GSM_CME_ERROR),
GsmConstStr r4 = GFP(GSM_CMS_ERROR),
#else #else
GsmConstStr r3 = NULL, GsmConstStr r3 = NULL, GsmConstStr r4 = NULL,
#endif #endif
GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { GsmConstStr r5 = NULL) {
/*String r1s(r1); r1s.trim(); /*String r1s(r1); r1s.trim();
String r2s(r2); r2s.trim(); String r2s(r2); r2s.trim();
String r3s(r3); r3s.trim(); String r3s(r3); r3s.trim();
@@ -793,10 +795,11 @@ class TinyGsmUBLOX : public TinyGsmModem<TinyGsmUBLOX>,
GsmConstStr r2 = GFP(GSM_ERROR), GsmConstStr r2 = GFP(GSM_ERROR),
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r3 = GFP(GSM_CME_ERROR),
GsmConstStr r4 = GFP(GSM_CMS_ERROR),
#else #else
GsmConstStr r3 = NULL, GsmConstStr r3 = NULL, GsmConstStr r4 = NULL,
#endif #endif
GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { GsmConstStr r5 = NULL) {
String data; String data;
return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5); return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5);
} }
@@ -805,10 +808,11 @@ class TinyGsmUBLOX : public TinyGsmModem<TinyGsmUBLOX>,
GsmConstStr r2 = GFP(GSM_ERROR), GsmConstStr r2 = GFP(GSM_ERROR),
#if defined TINY_GSM_DEBUG #if defined TINY_GSM_DEBUG
GsmConstStr r3 = GFP(GSM_CME_ERROR), GsmConstStr r3 = GFP(GSM_CME_ERROR),
GsmConstStr r4 = GFP(GSM_CMS_ERROR),
#else #else
GsmConstStr r3 = NULL, GsmConstStr r3 = NULL, GsmConstStr r4 = NULL,
#endif #endif
GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { GsmConstStr r5 = NULL) {
return waitResponse(1000, r1, r2, r3, r4, r5); return waitResponse(1000, r1, r2, r3, r4, r5);
} }

2
src/TinyGsmCommon.h
View File

@@ -10,7 +10,7 @@
#define SRC_TINYGSMCOMMON_H_ #define SRC_TINYGSMCOMMON_H_
// The current library version number // The current library version number
#define TINYGSM_VERSION "0.10.6" #define TINYGSM_VERSION "0.10.7"
#if defined(SPARK) || defined(PARTICLE) #if defined(SPARK) || defined(PARTICLE)
#include "Particle.h" #include "Particle.h"