From 234a20e89431ce13512e330be88e7979ff07ca73 Mon Sep 17 00:00:00 2001 From: Sara Damiano Date: Mon, 22 Jun 2020 17:13:24 -0400 Subject: [PATCH] Catching CMS error on debug Signed-off-by: Sara Damiano --- src/TinyGsmClientA6.h | 16 ++++++++++------ src/TinyGsmClientBG96.h | 16 ++++++++++------ src/TinyGsmClientM590.h | 16 ++++++++++------ src/TinyGsmClientM95.h | 16 ++++++++++------ src/TinyGsmClientMC60.h | 23 ++++++++++++----------- src/TinyGsmClientSIM5360.h | 16 ++++++++++------ src/TinyGsmClientSIM7000.h | 16 ++++++++++------ src/TinyGsmClientSIM7600.h | 16 ++++++++++------ src/TinyGsmClientSIM800.h | 16 ++++++++++------ src/TinyGsmClientSaraR4.h | 16 ++++++++++------ src/TinyGsmClientSequansMonarch.h | 16 ++++++++++------ src/TinyGsmClientUBLOX.h | 16 ++++++++++------ src/TinyGsmCommon.h | 2 +- 13 files changed, 123 insertions(+), 78 deletions(-) diff --git a/src/TinyGsmClientA6.h b/src/TinyGsmClientA6.h index 0983597..a7c8f35 100644 --- a/src/TinyGsmClientA6.h +++ b/src/TinyGsmClientA6.h @@ -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; #if defined TINY_GSM_DEBUG 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 enum RegStatus { @@ -460,10 +461,11 @@ class TinyGsmA6 : public TinyGsmModem, GsmConstStr r2 = GFP(GSM_ERROR), #if defined TINY_GSM_DEBUG GsmConstStr r3 = GFP(GSM_CME_ERROR), + GsmConstStr r4 = GFP(GSM_CMS_ERROR), #else - GsmConstStr r3 = NULL, + GsmConstStr r3 = NULL, GsmConstStr r4 = NULL, #endif - GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { + GsmConstStr r5 = NULL) { /*String r1s(r1); r1s.trim(); String r2s(r2); r2s.trim(); String r3s(r3); r3s.trim(); @@ -547,10 +549,11 @@ class TinyGsmA6 : public TinyGsmModem, GsmConstStr r2 = GFP(GSM_ERROR), #if defined TINY_GSM_DEBUG GsmConstStr r3 = GFP(GSM_CME_ERROR), + GsmConstStr r4 = GFP(GSM_CMS_ERROR), #else - GsmConstStr r3 = NULL, + GsmConstStr r3 = NULL, GsmConstStr r4 = NULL, #endif - GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { + GsmConstStr r5 = NULL) { String data; return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5); } @@ -559,10 +562,11 @@ class TinyGsmA6 : public TinyGsmModem, GsmConstStr r2 = GFP(GSM_ERROR), #if defined TINY_GSM_DEBUG GsmConstStr r3 = GFP(GSM_CME_ERROR), + GsmConstStr r4 = GFP(GSM_CMS_ERROR), #else - GsmConstStr r3 = NULL, + GsmConstStr r3 = NULL, GsmConstStr r4 = NULL, #endif - GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { + GsmConstStr r5 = NULL) { return waitResponse(1000, r1, r2, r3, r4, r5); } diff --git a/src/TinyGsmClientBG96.h b/src/TinyGsmClientBG96.h index b5c36a0..e5c7570 100644 --- a/src/TinyGsmClientBG96.h +++ b/src/TinyGsmClientBG96.h @@ -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; #if defined TINY_GSM_DEBUG 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 enum RegStatus { @@ -578,10 +579,11 @@ class TinyGsmBG96 : public TinyGsmModem, GsmConstStr r2 = GFP(GSM_ERROR), #if defined TINY_GSM_DEBUG GsmConstStr r3 = GFP(GSM_CME_ERROR), + GsmConstStr r4 = GFP(GSM_CMS_ERROR), #else - GsmConstStr r3 = NULL, + GsmConstStr r3 = NULL, GsmConstStr r4 = NULL, #endif - GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { + GsmConstStr r5 = NULL) { /*String r1s(r1); r1s.trim(); String r2s(r2); r2s.trim(); String r3s(r3); r3s.trim(); @@ -656,10 +658,11 @@ class TinyGsmBG96 : public TinyGsmModem, GsmConstStr r2 = GFP(GSM_ERROR), #if defined TINY_GSM_DEBUG GsmConstStr r3 = GFP(GSM_CME_ERROR), + GsmConstStr r4 = GFP(GSM_CMS_ERROR), #else - GsmConstStr r3 = NULL, + GsmConstStr r3 = NULL, GsmConstStr r4 = NULL, #endif - GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { + GsmConstStr r5 = NULL) { String data; return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5); } @@ -668,10 +671,11 @@ class TinyGsmBG96 : public TinyGsmModem, GsmConstStr r2 = GFP(GSM_ERROR), #if defined TINY_GSM_DEBUG GsmConstStr r3 = GFP(GSM_CME_ERROR), + GsmConstStr r4 = GFP(GSM_CMS_ERROR), #else - GsmConstStr r3 = NULL, + GsmConstStr r3 = NULL, GsmConstStr r4 = NULL, #endif - GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { + GsmConstStr r5 = NULL) { return waitResponse(1000, r1, r2, r3, r4, r5); } diff --git a/src/TinyGsmClientM590.h b/src/TinyGsmClientM590.h index 8b915ee..091735b 100644 --- a/src/TinyGsmClientM590.h +++ b/src/TinyGsmClientM590.h @@ -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; #if defined TINY_GSM_DEBUG 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 enum RegStatus { @@ -351,10 +352,11 @@ class TinyGsmM590 : public TinyGsmModem, GsmConstStr r2 = GFP(GSM_ERROR), #if defined TINY_GSM_DEBUG GsmConstStr r3 = GFP(GSM_CME_ERROR), + GsmConstStr r4 = GFP(GSM_CMS_ERROR), #else - GsmConstStr r3 = NULL, + GsmConstStr r3 = NULL, GsmConstStr r4 = NULL, #endif - GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { + GsmConstStr r5 = NULL) { /*String r1s(r1); r1s.trim(); String r2s(r2); r2s.trim(); String r3s(r3); r3s.trim(); @@ -437,10 +439,11 @@ class TinyGsmM590 : public TinyGsmModem, GsmConstStr r2 = GFP(GSM_ERROR), #if defined TINY_GSM_DEBUG GsmConstStr r3 = GFP(GSM_CME_ERROR), + GsmConstStr r4 = GFP(GSM_CMS_ERROR), #else - GsmConstStr r3 = NULL, + GsmConstStr r3 = NULL, GsmConstStr r4 = NULL, #endif - GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { + GsmConstStr r5 = NULL) { String data; return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5); } @@ -449,10 +452,11 @@ class TinyGsmM590 : public TinyGsmModem, GsmConstStr r2 = GFP(GSM_ERROR), #if defined TINY_GSM_DEBUG GsmConstStr r3 = GFP(GSM_CME_ERROR), + GsmConstStr r4 = GFP(GSM_CMS_ERROR), #else - GsmConstStr r3 = NULL, + GsmConstStr r3 = NULL, GsmConstStr r4 = NULL, #endif - GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { + GsmConstStr r5 = NULL) { return waitResponse(1000, r1, r2, r3, r4, r5); } diff --git a/src/TinyGsmClientM95.h b/src/TinyGsmClientM95.h index a0878ab..fdb2c45 100644 --- a/src/TinyGsmClientM95.h +++ b/src/TinyGsmClientM95.h @@ -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; #if defined TINY_GSM_DEBUG 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 enum RegStatus { @@ -517,10 +518,11 @@ class TinyGsmM95 : public TinyGsmModem, GsmConstStr r2 = GFP(GSM_ERROR), #if defined TINY_GSM_DEBUG GsmConstStr r3 = GFP(GSM_CME_ERROR), + GsmConstStr r4 = GFP(GSM_CMS_ERROR), #else - GsmConstStr r3 = NULL, + GsmConstStr r3 = NULL, GsmConstStr r4 = NULL, #endif - GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { + GsmConstStr r5 = NULL) { /*String r1s(r1); r1s.trim(); String r2s(r2); r2s.trim(); String r3s(r3); r3s.trim(); @@ -599,10 +601,11 @@ class TinyGsmM95 : public TinyGsmModem, GsmConstStr r2 = GFP(GSM_ERROR), #if defined TINY_GSM_DEBUG GsmConstStr r3 = GFP(GSM_CME_ERROR), + GsmConstStr r4 = GFP(GSM_CMS_ERROR), #else - GsmConstStr r3 = NULL, + GsmConstStr r3 = NULL, GsmConstStr r4 = NULL, #endif - GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { + GsmConstStr r5 = NULL) { String data; return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5); } @@ -611,10 +614,11 @@ class TinyGsmM95 : public TinyGsmModem, GsmConstStr r2 = GFP(GSM_ERROR), #if defined TINY_GSM_DEBUG GsmConstStr r3 = GFP(GSM_CME_ERROR), + GsmConstStr r4 = GFP(GSM_CMS_ERROR), #else - GsmConstStr r3 = NULL, + GsmConstStr r3 = NULL, GsmConstStr r4 = NULL, #endif - GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { + GsmConstStr r5 = NULL) { return waitResponse(1000, r1, r2, r3, r4, r5); } diff --git a/src/TinyGsmClientMC60.h b/src/TinyGsmClientMC60.h index a71e96a..ed63281 100644 --- a/src/TinyGsmClientMC60.h +++ b/src/TinyGsmClientMC60.h @@ -27,10 +27,11 @@ #include "TinyGsmTime.tpp" #define GSM_NL "\r\n" -static const char GSM_OK[] TINY_GSM_PROGMEM = "OK" GSM_NL; +static const char GSM_OK[] TINY_GSM_PROGMEM = "OK" 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_CMS_ERROR[] TINY_GSM_PROGMEM = GSM_NL "+CMS ERROR:"; #endif enum RegStatus { @@ -476,11 +477,11 @@ class TinyGsmMC60 : public TinyGsmModem, GsmConstStr r2 = GFP(GSM_ERROR), #if defined TINY_GSM_DEBUG GsmConstStr r3 = GFP(GSM_CME_ERROR), + GsmConstStr r4 = GFP(GSM_CMS_ERROR), #else - GsmConstStr r3 = NULL, + GsmConstStr r3 = NULL, GsmConstStr r4 = NULL, #endif - GsmConstStr r4 = NULL, GsmConstStr r5 = NULL, - GsmConstStr r6 = NULL) { + GsmConstStr r5 = NULL, GsmConstStr r6 = NULL) { /*String r1s(r1); r1s.trim(); String r2s(r2); r2s.trim(); String r3s(r3); r3s.trim(); @@ -569,11 +570,11 @@ class TinyGsmMC60 : public TinyGsmModem, GsmConstStr r2 = GFP(GSM_ERROR), #if defined TINY_GSM_DEBUG GsmConstStr r3 = GFP(GSM_CME_ERROR), + GsmConstStr r4 = GFP(GSM_CMS_ERROR), #else - GsmConstStr r3 = NULL, + GsmConstStr r3 = NULL, GsmConstStr r4 = NULL, #endif - GsmConstStr r4 = NULL, GsmConstStr r5 = NULL, - GsmConstStr r6 = NULL) { + GsmConstStr r5 = NULL, GsmConstStr r6 = NULL) { String data; return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5, r6); } @@ -582,11 +583,11 @@ class TinyGsmMC60 : public TinyGsmModem, GsmConstStr r2 = GFP(GSM_ERROR), #if defined TINY_GSM_DEBUG GsmConstStr r3 = GFP(GSM_CME_ERROR), + GsmConstStr r4 = GFP(GSM_CMS_ERROR), #else - GsmConstStr r3 = NULL, + GsmConstStr r3 = NULL, GsmConstStr r4 = NULL, #endif - GsmConstStr r4 = NULL, GsmConstStr r5 = NULL, - GsmConstStr r6 = NULL) { + GsmConstStr r5 = NULL, GsmConstStr r6 = NULL) { return waitResponse(1000, r1, r2, r3, r4, r5, r6); } diff --git a/src/TinyGsmClientSIM5360.h b/src/TinyGsmClientSIM5360.h index 7ce9b50..a70f740 100644 --- a/src/TinyGsmClientSIM5360.h +++ b/src/TinyGsmClientSIM5360.h @@ -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; #if defined TINY_GSM_DEBUG 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 enum RegStatus { @@ -601,10 +602,11 @@ class TinyGsmSim5360 : public TinyGsmModem, GsmConstStr r2 = GFP(GSM_ERROR), #if defined TINY_GSM_DEBUG GsmConstStr r3 = GFP(GSM_CME_ERROR), + GsmConstStr r4 = GFP(GSM_CMS_ERROR), #else - GsmConstStr r3 = NULL, + GsmConstStr r3 = NULL, GsmConstStr r4 = NULL, #endif - GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { + GsmConstStr r5 = NULL) { /*String r1s(r1); r1s.trim(); String r2s(r2); r2s.trim(); String r3s(r3); r3s.trim(); @@ -694,10 +696,11 @@ class TinyGsmSim5360 : public TinyGsmModem, GsmConstStr r2 = GFP(GSM_ERROR), #if defined TINY_GSM_DEBUG GsmConstStr r3 = GFP(GSM_CME_ERROR), + GsmConstStr r4 = GFP(GSM_CMS_ERROR), #else - GsmConstStr r3 = NULL, + GsmConstStr r3 = NULL, GsmConstStr r4 = NULL, #endif - GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { + GsmConstStr r5 = NULL) { String data; return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5); } @@ -706,10 +709,11 @@ class TinyGsmSim5360 : public TinyGsmModem, GsmConstStr r2 = GFP(GSM_ERROR), #if defined TINY_GSM_DEBUG GsmConstStr r3 = GFP(GSM_CME_ERROR), + GsmConstStr r4 = GFP(GSM_CMS_ERROR), #else - GsmConstStr r3 = NULL, + GsmConstStr r3 = NULL, GsmConstStr r4 = NULL, #endif - GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { + GsmConstStr r5 = NULL) { return waitResponse(1000, r1, r2, r3, r4, r5); } diff --git a/src/TinyGsmClientSIM7000.h b/src/TinyGsmClientSIM7000.h index eab1d68..deae5fe 100644 --- a/src/TinyGsmClientSIM7000.h +++ b/src/TinyGsmClientSIM7000.h @@ -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; #if defined TINY_GSM_DEBUG 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 enum RegStatus { @@ -632,10 +633,11 @@ class TinyGsmSim7000 : public TinyGsmModem, GsmConstStr r2 = GFP(GSM_ERROR), #if defined TINY_GSM_DEBUG GsmConstStr r3 = GFP(GSM_CME_ERROR), + GsmConstStr r4 = GFP(GSM_CMS_ERROR), #else - GsmConstStr r3 = NULL, + GsmConstStr r3 = NULL, GsmConstStr r4 = NULL, #endif - GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { + GsmConstStr r5 = NULL) { /*String r1s(r1); r1s.trim(); String r2s(r2); r2s.trim(); String r3s(r3); r3s.trim(); @@ -737,10 +739,11 @@ class TinyGsmSim7000 : public TinyGsmModem, GsmConstStr r2 = GFP(GSM_ERROR), #if defined TINY_GSM_DEBUG GsmConstStr r3 = GFP(GSM_CME_ERROR), + GsmConstStr r4 = GFP(GSM_CMS_ERROR), #else - GsmConstStr r3 = NULL, + GsmConstStr r3 = NULL, GsmConstStr r4 = NULL, #endif - GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { + GsmConstStr r5 = NULL) { String data; return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5); } @@ -749,10 +752,11 @@ class TinyGsmSim7000 : public TinyGsmModem, GsmConstStr r2 = GFP(GSM_ERROR), #if defined TINY_GSM_DEBUG GsmConstStr r3 = GFP(GSM_CME_ERROR), + GsmConstStr r4 = GFP(GSM_CMS_ERROR), #else - GsmConstStr r3 = NULL, + GsmConstStr r3 = NULL, GsmConstStr r4 = NULL, #endif - GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { + GsmConstStr r5 = NULL) { return waitResponse(1000, r1, r2, r3, r4, r5); } diff --git a/src/TinyGsmClientSIM7600.h b/src/TinyGsmClientSIM7600.h index d2f2c35..7f21a16 100644 --- a/src/TinyGsmClientSIM7600.h +++ b/src/TinyGsmClientSIM7600.h @@ -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; #if defined TINY_GSM_DEBUG 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 enum RegStatus { @@ -694,10 +695,11 @@ class TinyGsmSim7600 : public TinyGsmModem, GsmConstStr r2 = GFP(GSM_ERROR), #if defined TINY_GSM_DEBUG GsmConstStr r3 = GFP(GSM_CME_ERROR), + GsmConstStr r4 = GFP(GSM_CMS_ERROR), #else - GsmConstStr r3 = NULL, + GsmConstStr r3 = NULL, GsmConstStr r4 = NULL, #endif - GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { + GsmConstStr r5 = NULL) { /*String r1s(r1); r1s.trim(); String r2s(r2); r2s.trim(); String r3s(r3); r3s.trim(); @@ -787,10 +789,11 @@ class TinyGsmSim7600 : public TinyGsmModem, GsmConstStr r2 = GFP(GSM_ERROR), #if defined TINY_GSM_DEBUG GsmConstStr r3 = GFP(GSM_CME_ERROR), + GsmConstStr r4 = GFP(GSM_CMS_ERROR), #else - GsmConstStr r3 = NULL, + GsmConstStr r3 = NULL, GsmConstStr r4 = NULL, #endif - GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { + GsmConstStr r5 = NULL) { String data; return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5); } @@ -799,10 +802,11 @@ class TinyGsmSim7600 : public TinyGsmModem, GsmConstStr r2 = GFP(GSM_ERROR), #if defined TINY_GSM_DEBUG GsmConstStr r3 = GFP(GSM_CME_ERROR), + GsmConstStr r4 = GFP(GSM_CMS_ERROR), #else - GsmConstStr r3 = NULL, + GsmConstStr r3 = NULL, GsmConstStr r4 = NULL, #endif - GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { + GsmConstStr r5 = NULL) { return waitResponse(1000, r1, r2, r3, r4, r5); } diff --git a/src/TinyGsmClientSIM800.h b/src/TinyGsmClientSIM800.h index cabfaca..2b4bd55 100644 --- a/src/TinyGsmClientSIM800.h +++ b/src/TinyGsmClientSIM800.h @@ -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; #if defined TINY_GSM_DEBUG 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 enum RegStatus { @@ -610,10 +611,11 @@ class TinyGsmSim800 : public TinyGsmModem, GsmConstStr r2 = GFP(GSM_ERROR), #if defined TINY_GSM_DEBUG GsmConstStr r3 = GFP(GSM_CME_ERROR), + GsmConstStr r4 = GFP(GSM_CMS_ERROR), #else - GsmConstStr r3 = NULL, + GsmConstStr r3 = NULL, GsmConstStr r4 = NULL, #endif - GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { + GsmConstStr r5 = NULL) { /*String r1s(r1); r1s.trim(); String r2s(r2); r2s.trim(); String r3s(r3); r3s.trim(); @@ -715,10 +717,11 @@ class TinyGsmSim800 : public TinyGsmModem, GsmConstStr r2 = GFP(GSM_ERROR), #if defined TINY_GSM_DEBUG GsmConstStr r3 = GFP(GSM_CME_ERROR), + GsmConstStr r4 = GFP(GSM_CMS_ERROR), #else - GsmConstStr r3 = NULL, + GsmConstStr r3 = NULL, GsmConstStr r4 = NULL, #endif - GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { + GsmConstStr r5 = NULL) { String data; return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5); } @@ -727,10 +730,11 @@ class TinyGsmSim800 : public TinyGsmModem, GsmConstStr r2 = GFP(GSM_ERROR), #if defined TINY_GSM_DEBUG GsmConstStr r3 = GFP(GSM_CME_ERROR), + GsmConstStr r4 = GFP(GSM_CMS_ERROR), #else - GsmConstStr r3 = NULL, + GsmConstStr r3 = NULL, GsmConstStr r4 = NULL, #endif - GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { + GsmConstStr r5 = NULL) { return waitResponse(1000, r1, r2, r3, r4, r5); } diff --git a/src/TinyGsmClientSaraR4.h b/src/TinyGsmClientSaraR4.h index 09dbd9f..75e85cc 100644 --- a/src/TinyGsmClientSaraR4.h +++ b/src/TinyGsmClientSaraR4.h @@ -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; #if defined TINY_GSM_DEBUG 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 enum RegStatus { @@ -776,10 +777,11 @@ class TinyGsmSaraR4 : public TinyGsmModem, GsmConstStr r2 = GFP(GSM_ERROR), #if defined TINY_GSM_DEBUG GsmConstStr r3 = GFP(GSM_CME_ERROR), + GsmConstStr r4 = GFP(GSM_CMS_ERROR), #else - GsmConstStr r3 = NULL, + GsmConstStr r3 = NULL, GsmConstStr r4 = NULL, #endif - GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { + GsmConstStr r5 = NULL) { /*String r1s(r1); r1s.trim(); String r2s(r2); r2s.trim(); String r3s(r3); r3s.trim(); @@ -860,10 +862,11 @@ class TinyGsmSaraR4 : public TinyGsmModem, GsmConstStr r2 = GFP(GSM_ERROR), #if defined TINY_GSM_DEBUG GsmConstStr r3 = GFP(GSM_CME_ERROR), + GsmConstStr r4 = GFP(GSM_CMS_ERROR), #else - GsmConstStr r3 = NULL, + GsmConstStr r3 = NULL, GsmConstStr r4 = NULL, #endif - GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { + GsmConstStr r5 = NULL) { String data; return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5); } @@ -872,10 +875,11 @@ class TinyGsmSaraR4 : public TinyGsmModem, GsmConstStr r2 = GFP(GSM_ERROR), #if defined TINY_GSM_DEBUG GsmConstStr r3 = GFP(GSM_CME_ERROR), + GsmConstStr r4 = GFP(GSM_CMS_ERROR), #else - GsmConstStr r3 = NULL, + GsmConstStr r3 = NULL, GsmConstStr r4 = NULL, #endif - GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { + GsmConstStr r5 = NULL) { return waitResponse(1000, r1, r2, r3, r4, r5); } diff --git a/src/TinyGsmClientSequansMonarch.h b/src/TinyGsmClientSequansMonarch.h index 8f85edd..d346343 100644 --- a/src/TinyGsmClientSequansMonarch.h +++ b/src/TinyGsmClientSequansMonarch.h @@ -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; #if defined TINY_GSM_DEBUG 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 enum RegStatus { @@ -611,10 +612,11 @@ class TinyGsmSequansMonarch GsmConstStr r2 = GFP(GSM_ERROR), #if defined TINY_GSM_DEBUG GsmConstStr r3 = GFP(GSM_CME_ERROR), + GsmConstStr r4 = GFP(GSM_CMS_ERROR), #else - GsmConstStr r3 = NULL, + GsmConstStr r3 = NULL, GsmConstStr r4 = NULL, #endif - GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { + GsmConstStr r5 = NULL) { /*String r1s(r1); r1s.trim(); String r2s(r2); r2s.trim(); String r3s(r3); r3s.trim(); @@ -689,10 +691,11 @@ class TinyGsmSequansMonarch GsmConstStr r2 = GFP(GSM_ERROR), #if defined TINY_GSM_DEBUG GsmConstStr r3 = GFP(GSM_CME_ERROR), + GsmConstStr r4 = GFP(GSM_CMS_ERROR), #else - GsmConstStr r3 = NULL, + GsmConstStr r3 = NULL, GsmConstStr r4 = NULL, #endif - GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { + GsmConstStr r5 = NULL) { String data; return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5); } @@ -701,10 +704,11 @@ class TinyGsmSequansMonarch GsmConstStr r2 = GFP(GSM_ERROR), #if defined TINY_GSM_DEBUG GsmConstStr r3 = GFP(GSM_CME_ERROR), + GsmConstStr r4 = GFP(GSM_CMS_ERROR), #else - GsmConstStr r3 = NULL, + GsmConstStr r3 = NULL, GsmConstStr r4 = NULL, #endif - GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { + GsmConstStr r5 = NULL) { return waitResponse(1000, r1, r2, r3, r4, r5); } diff --git a/src/TinyGsmClientUBLOX.h b/src/TinyGsmClientUBLOX.h index 98ea7a0..585f630 100644 --- a/src/TinyGsmClientUBLOX.h +++ b/src/TinyGsmClientUBLOX.h @@ -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; #if defined TINY_GSM_DEBUG 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 enum RegStatus { @@ -718,10 +719,11 @@ class TinyGsmUBLOX : public TinyGsmModem, GsmConstStr r2 = GFP(GSM_ERROR), #if defined TINY_GSM_DEBUG GsmConstStr r3 = GFP(GSM_CME_ERROR), + GsmConstStr r4 = GFP(GSM_CMS_ERROR), #else - GsmConstStr r3 = NULL, + GsmConstStr r3 = NULL, GsmConstStr r4 = NULL, #endif - GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { + GsmConstStr r5 = NULL) { /*String r1s(r1); r1s.trim(); String r2s(r2); r2s.trim(); String r3s(r3); r3s.trim(); @@ -793,10 +795,11 @@ class TinyGsmUBLOX : public TinyGsmModem, GsmConstStr r2 = GFP(GSM_ERROR), #if defined TINY_GSM_DEBUG GsmConstStr r3 = GFP(GSM_CME_ERROR), + GsmConstStr r4 = GFP(GSM_CMS_ERROR), #else - GsmConstStr r3 = NULL, + GsmConstStr r3 = NULL, GsmConstStr r4 = NULL, #endif - GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { + GsmConstStr r5 = NULL) { String data; return waitResponse(timeout_ms, data, r1, r2, r3, r4, r5); } @@ -805,10 +808,11 @@ class TinyGsmUBLOX : public TinyGsmModem, GsmConstStr r2 = GFP(GSM_ERROR), #if defined TINY_GSM_DEBUG GsmConstStr r3 = GFP(GSM_CME_ERROR), + GsmConstStr r4 = GFP(GSM_CMS_ERROR), #else - GsmConstStr r3 = NULL, + GsmConstStr r3 = NULL, GsmConstStr r4 = NULL, #endif - GsmConstStr r4 = NULL, GsmConstStr r5 = NULL) { + GsmConstStr r5 = NULL) { return waitResponse(1000, r1, r2, r3, r4, r5); } diff --git a/src/TinyGsmCommon.h b/src/TinyGsmCommon.h index bfea00f..0ec7677 100644 --- a/src/TinyGsmCommon.h +++ b/src/TinyGsmCommon.h @@ -10,7 +10,7 @@ #define SRC_TINYGSMCOMMON_H_ // The current library version number -#define TINYGSM_VERSION "0.10.6" +#define TINYGSM_VERSION "0.10.7" #if defined(SPARK) || defined(PARTICLE) #include "Particle.h"