KevinMidboe/TinyGSM
1
0
Fork 0
mirror of https://github.com/KevinMidboe/TinyGSM.git synced 2025-10-29 18:00:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
Volodymyr Shymanskyy
2017-09-27 13:58:05 +03:00
parent 53dbcd9776
commit fc29f4b580
3 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
TinyGsmClient.h
View File

@@ -10,35 +10,43 @@
#define TinyGsmClient_h #define TinyGsmClient_h
#if defined(TINY_GSM_MODEM_SIM800) || defined(TINY_GSM_MODEM_SIM900) #if defined(TINY_GSM_MODEM_SIM800) || defined(TINY_GSM_MODEM_SIM900)
#define TINY_GSM_MODEM_HAS_GPRS
#include <TinyGsmClientSIM800.h> #include <TinyGsmClientSIM800.h>
typedef TinyGsmSim800 TinyGsm; typedef TinyGsmSim800 TinyGsm;
typedef TinyGsmSim800::GsmClient TinyGsmClient; typedef TinyGsmSim800::GsmClient TinyGsmClient;
typedef TinyGsmSim800::GsmClientSecure TinyGsmClientSecure; typedef TinyGsmSim800::GsmClientSecure TinyGsmClientSecure;
#elif defined(TINY_GSM_MODEM_SIM808) || defined(TINY_GSM_MODEM_SIM868) #elif defined(TINY_GSM_MODEM_SIM808) || defined(TINY_GSM_MODEM_SIM868)
#define TINY_GSM_MODEM_HAS_GPRS
#include <TinyGsmClientSIM808.h> #include <TinyGsmClientSIM808.h>
typedef TinyGsmSim808 TinyGsm; typedef TinyGsmSim808 TinyGsm;
typedef TinyGsmSim808::GsmClient TinyGsmClient; typedef TinyGsmSim808::GsmClient TinyGsmClient;
typedef TinyGsmSim808::GsmClientSecure TinyGsmClientSecure; typedef TinyGsmSim808::GsmClientSecure TinyGsmClientSecure;
#elif defined(TINY_GSM_MODEM_A6) || defined(TINY_GSM_MODEM_A7) #elif defined(TINY_GSM_MODEM_A6) || defined(TINY_GSM_MODEM_A7)
#define TINY_GSM_MODEM_HAS_GPRS
#include <TinyGsmClientA6.h> #include <TinyGsmClientA6.h>
typedef TinyGsm::GsmClient TinyGsmClient; typedef TinyGsm::GsmClient TinyGsmClient;
#elif defined(TINY_GSM_MODEM_M590) #elif defined(TINY_GSM_MODEM_M590)
#define TINY_GSM_MODEM_HAS_GPRS
#include <TinyGsmClientM590.h> #include <TinyGsmClientM590.h>
typedef TinyGsm::GsmClient TinyGsmClient; typedef TinyGsm::GsmClient TinyGsmClient;
#elif defined(TINY_GSM_MODEM_U201) #elif defined(TINY_GSM_MODEM_U201)
#define TINY_GSM_MODEM_HAS_GPRS
#include <TinyGsmClientU201.h> #include <TinyGsmClientU201.h>
typedef TinyGsmU201 TinyGsm; typedef TinyGsmU201 TinyGsm;
typedef TinyGsmU201::GsmClient TinyGsmClient; typedef TinyGsmU201::GsmClient TinyGsmClient;
#elif defined(TINY_GSM_MODEM_ESP8266) #elif defined(TINY_GSM_MODEM_ESP8266)
#define TINY_GSM_MODEM_HAS_WIFI
#include <TinyGsmClientESP8266.h> #include <TinyGsmClientESP8266.h>
typedef TinyGsm::GsmClient TinyGsmClient; typedef TinyGsm::GsmClient TinyGsmClient;
#elif defined(TINY_GSM_MODEM_XBEE) #elif defined(TINY_GSM_MODEM_XBEE)
#define TINY_GSM_MODEM_HAS_GPRS
#define TINY_GSM_MODEM_HAS_WIFI
#include <TinyGsmClientXBee.h> #include <TinyGsmClientXBee.h>
typedef TinyGsm::GsmClient TinyGsmClient; typedef TinyGsm::GsmClient TinyGsmClient;

2
TinyGsmClientXBee.h
View File

@@ -446,7 +446,7 @@ private:
unsigned long startMillis = millis(); unsigned long startMillis = millis();
while (stream.available() < 8 && millis() - startMillis < 30000) {}; while (stream.available() < 8 && millis() - startMillis < 30000) {};
strIP = streamReadUntil('\r'); // read result strIP = streamReadUntil('\r'); // read result
IPAddress ip = TinyGsmIpFromString(IPaddr); IPAddress ip = TinyGsmIpFromString(strIP);
return modemConnect(ip, port); return modemConnect(ip, port);
} }

20
tools/test_build/test_build.ino
View File

@@ -27,7 +27,7 @@ void loop() {
modem.factoryDefault(); modem.factoryDefault();
// Test the SIM card functions // 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.getSimCCID();
modem.getIMEI(); modem.getIMEI();
modem.getSimStatus(); modem.getSimStatus();
@@ -40,10 +40,11 @@ void loop() {
modem.getSignalQuality(); modem.getSignalQuality();
#if defined(TINY_GSM_MODEM_SIM800) || defined(TINY_GSM_MODEM_A6) || defined(TINY_GSM_MODEM_M590) #if defined(TINY_GSM_MODEM_HAS_GPRS)
modem.waitForNetwork(); modem.waitForNetwork();
modem.gprsConnect("YourAPN", "", ""); modem.gprsConnect("YourAPN", "", "");
#else #endif
#if defined(TINY_GSM_MODEM_HAS_WIFI)
modem.networkConnect("YourSSID", "YourPWD"); modem.networkConnect("YourSSID", "YourPWD");
modem.waitForNetwork(); modem.waitForNetwork();
#endif #endif
@@ -65,10 +66,11 @@ void loop() {
client.stop(); client.stop();
#if defined(TINY_GSM_MODEM_SIM800) || defined(TINY_GSM_MODEM_A6) || defined(TINY_GSM_MODEM_M590) #if defined(TINY_GSM_MODEM_HAS_GPRS)
modem.gprsDisconnect(); modem.gprsDisconnect();
#else #endif
modem.networkDisconnect(); #if defined(TINY_GSM_MODEM_HAS_WIFI)
modem.networkDisconnect();
#endif #endif
} }