Undef GSM_NL

Signed-off-by: Sara Damiano <sdamiano@stroudcenter.org>

src/TinyGsmClientA6.h

@@ -14,7 +14,10 @@
 
 #define TINY_GSM_MUX_COUNT 8
 #define TINY_GSM_NO_MODEM_BUFFER
+#ifdef GSM_NL
+#undef GSM_NL
 #define GSM_NL "\r\n"  // NOTE:  define before including TinyGsmModem!
+#endif
 
 #include "TinyGsmBattery.tpp"
 #include "TinyGsmCalling.tpp"

src/TinyGsmClientBG96.h

@@ -14,7 +14,10 @@
 
 #define TINY_GSM_MUX_COUNT 12
 #define TINY_GSM_BUFFER_READ_AND_CHECK_SIZE
+#ifdef GSM_NL
+#undef GSM_NL
 #define GSM_NL "\r\n"  // NOTE:  define before including TinyGsmModem!
+#endif
 
 #include "TinyGsmBattery.tpp"
 #include "TinyGsmCalling.tpp"

src/TinyGsmClientESP8266.h

@@ -14,7 +14,10 @@
 
 #define TINY_GSM_MUX_COUNT 5
 #define TINY_GSM_NO_MODEM_BUFFER
+#ifdef GSM_NL
+#undef GSM_NL
 #define GSM_NL "\r\n"  // NOTE:  define before including TinyGsmModem!
+#endif
 
 #include "TinyGsmModem.tpp"
 #include "TinyGsmSSL.tpp"

src/TinyGsmClientM590.h

@@ -14,7 +14,10 @@
 
 #define TINY_GSM_MUX_COUNT 2
 #define TINY_GSM_NO_MODEM_BUFFER
+#ifdef GSM_NL
+#undef GSM_NL
 #define GSM_NL "\r\n"  // NOTE:  define before including TinyGsmModem!
+#endif
 
 #include "TinyGsmGPRS.tpp"
 #include "TinyGsmModem.tpp"

src/TinyGsmClientM95.h

@@ -15,7 +15,10 @@
 
 #define TINY_GSM_MUX_COUNT 6
 #define TINY_GSM_BUFFER_READ_NO_CHECK
+#ifdef GSM_NL
+#undef GSM_NL
 #define GSM_NL "\r\n"  // NOTE:  define before including TinyGsmModem!
+#endif
 
 #include "TinyGsmBattery.tpp"
 #include "TinyGsmCalling.tpp"

src/TinyGsmClientMC60.h

@@ -17,7 +17,10 @@
 
 #define TINY_GSM_MUX_COUNT 6
 #define TINY_GSM_BUFFER_READ_NO_CHECK
+#ifdef GSM_NL
+#undef GSM_NL
 #define GSM_NL "\r\n"  // NOTE:  define before including TinyGsmModem!
+#endif
 
 #include "TinyGsmBattery.tpp"
 #include "TinyGsmCalling.tpp"

src/TinyGsmClientSIM5360.h

@@ -14,7 +14,10 @@
 
 #define TINY_GSM_MUX_COUNT 10
 #define TINY_GSM_BUFFER_READ_AND_CHECK_SIZE
+#ifdef GSM_NL
+#undef GSM_NL
 #define GSM_NL "\r\n"  // NOTE:  define before including TinyGsmModem!
+#endif
 
 #include "TinyGsmBattery.tpp"
 #include "TinyGsmGPRS.tpp"

src/TinyGsmClientSIM70xx.h

@@ -11,7 +11,10 @@
 
 // #define TINY_GSM_DEBUG Serial
 // #define TINY_GSM_USE_HEX
+#ifdef GSM_NL
+#undef GSM_NL
 #define GSM_NL "\r\n"  // NOTE:  define before including TinyGsmModem!
+#endif
 
 #include "TinyGsmBattery.tpp"
 #include "TinyGsmGPRS.tpp"

src/TinyGsmClientSIM7600.h

@@ -14,7 +14,10 @@
 
 #define TINY_GSM_MUX_COUNT 10
 #define TINY_GSM_BUFFER_READ_AND_CHECK_SIZE
+#ifdef GSM_NL
+#undef GSM_NL
 #define GSM_NL "\r\n"  // NOTE:  define before including TinyGsmModem!
+#endif
 
 #include "TinyGsmBattery.tpp"
 #include "TinyGsmCalling.tpp"

src/TinyGsmClientSIM800.h

@@ -15,7 +15,10 @@
 
 #define TINY_GSM_MUX_COUNT 5
 #define TINY_GSM_BUFFER_READ_AND_CHECK_SIZE
+#ifdef GSM_NL
+#undef GSM_NL
 #define GSM_NL "\r\n"  // NOTE:  define before including TinyGsmModem!
+#endif
 
 #include "TinyGsmBattery.tpp"
 #include "TinyGsmCalling.tpp"

src/TinyGsmClientSaraR4.h

@@ -14,7 +14,10 @@
 
 #define TINY_GSM_MUX_COUNT 7
 #define TINY_GSM_BUFFER_READ_AND_CHECK_SIZE
+#ifdef GSM_NL
+#undef GSM_NL
 #define GSM_NL "\r\n"  // NOTE:  define before including TinyGsmModem!
+#endif
 
 #include "TinyGsmBattery.tpp"
 #include "TinyGsmGPRS.tpp"

src/TinyGsmClientSequansMonarch.h

@@ -13,7 +13,10 @@
 
 #define TINY_GSM_MUX_COUNT 6
 #define TINY_GSM_BUFFER_READ_AND_CHECK_SIZE
+#ifdef GSM_NL
+#undef GSM_NL
 #define GSM_NL "\r\n"  // NOTE:  define before including TinyGsmModem!
+#endif
 
 #include "TinyGsmCalling.tpp"
 #include "TinyGsmGPRS.tpp"

src/TinyGsmClientUBLOX.h

@@ -14,7 +14,10 @@
 
 #define TINY_GSM_MUX_COUNT 7
 #define TINY_GSM_BUFFER_READ_AND_CHECK_SIZE
+#ifdef GSM_NL
+#undef GSM_NL
 #define GSM_NL "\r\n"  // NOTE:  define before including TinyGsmModem!
+#endif
 
 #include "TinyGsmBattery.tpp"
 #include "TinyGsmCalling.tpp"

src/TinyGsmClientXBee.h

@@ -20,7 +20,10 @@
 // XBee's have a default guard time of 1 second (1000ms, 10 extra for safety
 // here)
 #define TINY_GSM_XBEE_GUARD_TIME 1010
+#ifdef GSM_NL
+#undef GSM_NL
 #define GSM_NL "\r"  // NOTE:  define before including TinyGsmModem!
+#endif
 
 #include "TinyGsmBattery.tpp"
 #include "TinyGsmGPRS.tpp"
@@ -1388,7 +1391,7 @@ class TinyGsmXBee : public TinyGsmModem<TinyGsmXBee>,
     }
   }
   // The XBee has no unsoliliced responses (URC's) when in command mode.
-  bool handleURCs(String& data) {
+  bool handleURCs(String&) {
     return true;
   }
 

src/TinyGsmModem.tpp

@@ -12,8 +12,11 @@
 #include "TinyGsmCommon.h"
 
 #ifndef GSM_NL
+#ifdef GSM_NL
+#undef GSM_NL
 #define GSM_NL "\r\n"
 #endif
+#endif
 
 static const char GSM_OK[] TINY_GSM_PROGMEM    = "OK" GSM_NL;
 static const char GSM_ERROR[] TINY_GSM_PROGMEM = "ERROR" GSM_NL;