From 2635842abaaca19af3d182273222075fef73abaf Mon Sep 17 00:00:00 2001 From: SRGDamia1 Date: Wed, 16 May 2018 12:15:18 -0400 Subject: [PATCH] Client reorder --- src/TinyGsmClient.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/TinyGsmClient.h b/src/TinyGsmClient.h index 63d5911..4e2e413 100644 --- a/src/TinyGsmClient.h +++ b/src/TinyGsmClient.h @@ -9,7 +9,7 @@ #ifndef TinyGsmClient_h #define TinyGsmClient_h -#if defined(TINY_GSM_MODEM_SIM800) || defined(TINY_GSM_MODEM_SIM868) || defined(TINY_GSM_MODEM_UBLOX) || defined(TINY_GSM_MODEM_ESP8266) || defined(TINY_GSM_MODEM_G350) +#if defined(TINY_GSM_MODEM_SIM800) || defined(TINY_GSM_MODEM_SIM868) || defined(TINY_GSM_MODEM_UBLOX) || defined(TINY_GSM_MODEM_ESP8266) #define TINY_GSM_MODEM_HAS_SSL #endif @@ -31,12 +31,6 @@ 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 - typedef TinyGsmA6 TinyGsm; - typedef TinyGsmA6::GsmClient TinyGsmClient; - #elif defined(TINY_GSM_MODEM_UBLOX) #define TINY_GSM_MODEM_HAS_GPRS #include @@ -44,12 +38,6 @@ typedef TinyGsmU201::GsmClient TinyGsmClient; typedef TinyGsmU201::GsmClientSecure TinyGsmClientSecure; -#elif defined(TINY_GSM_MODEM_M590) - #define TINY_GSM_MODEM_HAS_GPRS - #include - typedef TinyGsmM590 TinyGsm; - typedef TinyGsmM590::GsmClient TinyGsmClient; - #elif defined(TINY_GSM_MODEM_M95) #define TINY_GSM_MODEM_HAS_GPRS #include @@ -62,6 +50,18 @@ typedef TinyGsmBG96 TinyGsm; typedef TinyGsmBG96::GsmClient TinyGsmClient; +#elif defined(TINY_GSM_MODEM_A6) || defined(TINY_GSM_MODEM_A7) + #define TINY_GSM_MODEM_HAS_GPRS + #include + typedef TinyGsmA6 TinyGsm; + typedef TinyGsmA6::GsmClient TinyGsmClient; + +#elif defined(TINY_GSM_MODEM_M590) + #define TINY_GSM_MODEM_HAS_GPRS + #include + typedef TinyGsmM590 TinyGsm; + typedef TinyGsmM590::GsmClient TinyGsmClient; + #elif defined(TINY_GSM_MODEM_MC60) || defined(TINY_GSM_MODEM_MC60E) #include typedef TinyGsmMC60 TinyGsm;