From fc29f4b5809a00fa09df788c8c18a4628ec23167 Mon Sep 17 00:00:00 2001
From: Volodymyr Shymanskyy <vshymanskyi@gmail.com>
Date: Wed, 27 Sep 2017 13:58:05 +0300
Subject: [PATCH] Fix build

---
 TinyGsmClient.h                 |  8 ++++++++
 TinyGsmClientXBee.h             |  2 +-
 tools/test_build/test_build.ino | 20 +++++++++++---------
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/TinyGsmClient.h b/TinyGsmClient.h
index 1dba076..7d5974f 100644
--- a/TinyGsmClient.h
+++ b/TinyGsmClient.h
@@ -10,35 +10,43 @@
 #define TinyGsmClient_h
 
 #if   defined(TINY_GSM_MODEM_SIM800) || defined(TINY_GSM_MODEM_SIM900)
+  #define TINY_GSM_MODEM_HAS_GPRS
   #include <TinyGsmClientSIM800.h>
   typedef TinyGsmSim800 TinyGsm;
   typedef TinyGsmSim800::GsmClient TinyGsmClient;
   typedef TinyGsmSim800::GsmClientSecure TinyGsmClientSecure;
 
 #elif defined(TINY_GSM_MODEM_SIM808) || defined(TINY_GSM_MODEM_SIM868)
+  #define TINY_GSM_MODEM_HAS_GPRS
   #include <TinyGsmClientSIM808.h>
   typedef TinyGsmSim808 TinyGsm;
   typedef TinyGsmSim808::GsmClient TinyGsmClient;
   typedef TinyGsmSim808::GsmClientSecure TinyGsmClientSecure;
 
 #elif defined(TINY_GSM_MODEM_A6) || defined(TINY_GSM_MODEM_A7)
+  #define TINY_GSM_MODEM_HAS_GPRS
   #include <TinyGsmClientA6.h>
   typedef TinyGsm::GsmClient TinyGsmClient;
 
 #elif defined(TINY_GSM_MODEM_M590)
+  #define TINY_GSM_MODEM_HAS_GPRS
   #include <TinyGsmClientM590.h>
   typedef TinyGsm::GsmClient TinyGsmClient;
 
 #elif defined(TINY_GSM_MODEM_U201)
+  #define TINY_GSM_MODEM_HAS_GPRS
   #include <TinyGsmClientU201.h>
   typedef TinyGsmU201 TinyGsm;
   typedef TinyGsmU201::GsmClient TinyGsmClient;
 
 #elif defined(TINY_GSM_MODEM_ESP8266)
+  #define TINY_GSM_MODEM_HAS_WIFI
   #include <TinyGsmClientESP8266.h>
   typedef TinyGsm::GsmClient TinyGsmClient;
 
 #elif defined(TINY_GSM_MODEM_XBEE)
+  #define TINY_GSM_MODEM_HAS_GPRS
+  #define TINY_GSM_MODEM_HAS_WIFI
   #include <TinyGsmClientXBee.h>
   typedef TinyGsm::GsmClient TinyGsmClient;
 
diff --git a/TinyGsmClientXBee.h b/TinyGsmClientXBee.h
index 2814170..e8a0759 100644
--- a/TinyGsmClientXBee.h
+++ b/TinyGsmClientXBee.h
@@ -446,7 +446,7 @@ private:
     unsigned long startMillis = millis();
     while (stream.available() < 8 && millis() - startMillis < 30000) {};
     strIP = streamReadUntil('\r');  // read result
-    IPAddress ip = TinyGsmIpFromString(IPaddr);
+    IPAddress ip = TinyGsmIpFromString(strIP);
     return modemConnect(ip, port);
   }
 
diff --git a/tools/test_build/test_build.ino b/tools/test_build/test_build.ino
index 768271c..8ecabf8 100644
--- a/tools/test_build/test_build.ino
+++ b/tools/test_build/test_build.ino
@@ -27,7 +27,7 @@ void loop() {
   modem.factoryDefault();
 
   // Test the SIM card functions
-  #if defined(TINY_GSM_MODEM_SIM800) || defined(TINY_GSM_MODEM_A6) || defined(TINY_GSM_MODEM_M590) || defined(TINY_GSM_MODEM_XBEE)
+  #if defined(TINY_GSM_MODEM_HAS_GPRS)
   modem.getSimCCID();
   modem.getIMEI();
   modem.getSimStatus();
@@ -40,10 +40,11 @@ void loop() {
   modem.getSignalQuality();
 
 
-  #if defined(TINY_GSM_MODEM_SIM800) || defined(TINY_GSM_MODEM_A6) || defined(TINY_GSM_MODEM_M590)
-  modem.waitForNetwork();
-  modem.gprsConnect("YourAPN", "", "");
-  #else
+  #if defined(TINY_GSM_MODEM_HAS_GPRS)
+    modem.waitForNetwork();
+    modem.gprsConnect("YourAPN", "", "");
+  #endif
+  #if defined(TINY_GSM_MODEM_HAS_WIFI)
     modem.networkConnect("YourSSID", "YourPWD");
     modem.waitForNetwork();
   #endif
@@ -65,10 +66,11 @@ void loop() {
 
   client.stop();
 
-  #if defined(TINY_GSM_MODEM_SIM800) || defined(TINY_GSM_MODEM_A6) || defined(TINY_GSM_MODEM_M590)
-  modem.gprsDisconnect();
-  #else
-  modem.networkDisconnect();
+  #if defined(TINY_GSM_MODEM_HAS_GPRS)
+    modem.gprsDisconnect();
+  #endif
+  #if defined(TINY_GSM_MODEM_HAS_WIFI)
+    modem.networkDisconnect();
   #endif
 }