Browse Source

Rename

v_master
Sara Damiano 6 years ago
parent
commit
78cd41f8e2
11 changed files with 23 additions and 28 deletions
  1. +2
    -2
      src/TinyGsmClientA6.h
  2. +2
    -2
      src/TinyGsmClientBG96.h
  3. +2
    -2
      src/TinyGsmClientESP8266.h
  4. +2
    -2
      src/TinyGsmClientM590.h
  5. +2
    -2
      src/TinyGsmClientM95.h
  6. +2
    -2
      src/TinyGsmClientMC60.h
  7. +2
    -2
      src/TinyGsmClientSIM800.h
  8. +2
    -2
      src/TinyGsmClientUBLOX.h
  9. +2
    -2
      src/TinyGsmClientXBee.h
  10. +4
    -4
      src/TinyGsmCommon.h
  11. +1
    -6
      tools/test_build/test_build.ino

+ 2
- 2
src/TinyGsmClientA6.h View File

@ -39,7 +39,7 @@ enum RegStatus {
}; };
class TinyGsmA6 : public TinyGsmMasterModem
class TinyGsmA6 : public TinyGsmModem
{ {
public: public:
@ -182,7 +182,7 @@ public:
#else #else
TinyGsmA6(Stream& stream) TinyGsmA6(Stream& stream)
#endif #endif
: TinyGsmMasterModem(stream), stream(stream)
: TinyGsmModem(stream), stream(stream)
{ {
memset(sockets, 0, sizeof(sockets)); memset(sockets, 0, sizeof(sockets));
} }


+ 2
- 2
src/TinyGsmClientBG96.h View File

@ -40,7 +40,7 @@ enum RegStatus {
}; };
class TinyGsmBG96 : public TinyGsmMasterModem
class TinyGsmBG96 : public TinyGsmModem
{ {
public: public:
@ -206,7 +206,7 @@ public:
#else #else
TinyGsmBG96(Stream& stream) TinyGsmBG96(Stream& stream)
#endif #endif
: TinyGsmMasterModem(stream), stream(stream)
: TinyGsmModem(stream), stream(stream)
{ {
memset(sockets, 0, sizeof(sockets)); memset(sockets, 0, sizeof(sockets));
} }


+ 2
- 2
src/TinyGsmClientESP8266.h View File

@ -39,7 +39,7 @@ enum RegStatus {
class TinyGsmESP8266 : public TinyGsmMasterModem
class TinyGsmESP8266 : public TinyGsmModem
{ {
public: public:
@ -198,7 +198,7 @@ public:
#else #else
TinyGsmESP8266(Stream& stream) TinyGsmESP8266(Stream& stream)
#endif #endif
: TinyGsmMasterModem(stream), stream(stream)
: TinyGsmModem(stream), stream(stream)
{ {
memset(sockets, 0, sizeof(sockets)); memset(sockets, 0, sizeof(sockets));
} }


+ 2
- 2
src/TinyGsmClientM590.h View File

@ -39,7 +39,7 @@ enum RegStatus {
}; };
class TinyGsmM590 : public TinyGsmMasterModem
class TinyGsmM590 : public TinyGsmModem
{ {
public: public:
@ -179,7 +179,7 @@ public:
#else #else
TinyGsmM590(Stream& stream) TinyGsmM590(Stream& stream)
#endif #endif
: TinyGsmMasterModem(stream), stream(stream)
: TinyGsmModem(stream), stream(stream)
{ {
memset(sockets, 0, sizeof(sockets)); memset(sockets, 0, sizeof(sockets));
} }


+ 2
- 2
src/TinyGsmClientM95.h View File

@ -40,7 +40,7 @@ enum RegStatus {
}; };
class TinyGsmM95 : public TinyGsmMasterModem
class TinyGsmM95 : public TinyGsmModem
{ {
public: public:
@ -186,7 +186,7 @@ public:
#else #else
TinyGsmM95(Stream& stream) TinyGsmM95(Stream& stream)
#endif #endif
: TinyGsmMasterModem(stream), stream(stream)
: TinyGsmModem(stream), stream(stream)
{ {
memset(sockets, 0, sizeof(sockets)); memset(sockets, 0, sizeof(sockets));
} }


+ 2
- 2
src/TinyGsmClientMC60.h View File

@ -44,7 +44,7 @@ enum RegStatus {
}; };
class TinyGsmMC60 : public TinyGsmMasterModem
class TinyGsmMC60 : public TinyGsmModem
{ {
public: public:
@ -213,7 +213,7 @@ public:
#else #else
TinyGsmMC60(Stream& stream) TinyGsmMC60(Stream& stream)
#endif #endif
: TinyGsmMasterModem(stream), stream(stream)
: TinyGsmModem(stream), stream(stream)
{ {
memset(sockets, 0, sizeof(sockets)); memset(sockets, 0, sizeof(sockets));
} }


+ 2
- 2
src/TinyGsmClientSIM800.h View File

@ -46,7 +46,7 @@ enum RegStatus {
//============================================================================// //============================================================================//
class TinyGsmSim800 : public TinyGsmMasterModem
class TinyGsmSim800 : public TinyGsmModem
{ {
//============================================================================// //============================================================================//
@ -228,7 +228,7 @@ public:
#else #else
TinyGsmSim800(Stream& stream) TinyGsmSim800(Stream& stream)
#endif #endif
: TinyGsmMasterModem(stream), stream(stream)
: TinyGsmModem(stream), stream(stream)
{ {
memset(sockets, 0, sizeof(sockets)); memset(sockets, 0, sizeof(sockets));
} }


+ 2
- 2
src/TinyGsmClientUBLOX.h View File

@ -40,7 +40,7 @@ enum RegStatus {
}; };
class TinyGsmUBLOX : public TinyGsmMasterModem
class TinyGsmUBLOX : public TinyGsmModem
{ {
public: public:
@ -205,7 +205,7 @@ public:
#else #else
TinyGsmUBLOX(Stream& stream) TinyGsmUBLOX(Stream& stream)
#endif #endif
: TinyGsmMasterModem(stream), stream(stream)
: TinyGsmModem(stream), stream(stream)
{ {
memset(sockets, 0, sizeof(sockets)); memset(sockets, 0, sizeof(sockets));
} }


+ 2
- 2
src/TinyGsmClientXBee.h View File

@ -45,7 +45,7 @@ enum XBeeType {
}; };
class TinyGsmXBee : public TinyGsmMasterModem
class TinyGsmXBee : public TinyGsmModem
{ {
public: public:
@ -211,7 +211,7 @@ public:
#else #else
TinyGsmXBee(Stream& stream) TinyGsmXBee(Stream& stream)
#endif #endif
: TinyGsmMasterModem(stream), stream(stream)
: TinyGsmModem(stream), stream(stream)
{} {}
/* /*


+ 4
- 4
src/TinyGsmCommon.h View File

@ -197,23 +197,23 @@ String TinyGsmDecodeHex16bit(String &instr) {
class TinyGsmMasterModem
class TinyGsmModem
{ {
public: public:
class GsmClient : public Client class GsmClient : public Client
{ {
friend class TinyGsmMasterModem;
friend class TinyGsmModem;
}; };
public: public:
#ifdef GSM_DEFAULT_STREAM #ifdef GSM_DEFAULT_STREAM
TinyGsmMasterModem(Stream& stream = GSM_DEFAULT_STREAM)
TinyGsmModem(Stream& stream = GSM_DEFAULT_STREAM)
#else #else
TinyGsmMasterModem(Stream& stream)
TinyGsmModem(Stream& stream)
#endif #endif
: stream(stream) : stream(stream)
{} {}


+ 1
- 6
tools/test_build/test_build.ino View File

@ -3,12 +3,7 @@
* DO NOT USE THIS - this is just a compilation test! * DO NOT USE THIS - this is just a compilation test!
* *
**************************************************************/ **************************************************************/
// #define TINY_GSM_MODEM_SIM800 // Select for a SIM800, SIM900, or variant thereof
// #define TINY_GSM_MODEM_A6 // Select for a AI-Thinker A6 or A7 chip
// #define TINY_GSM_MODEM_M590 // Select for a Neoway M590
// #define TINY_GSM_MODEM_UBLOX // Select for most u-blox cellular modems
// #define TINY_GSM_MODEM_ESP8266 // Select for an ESP8266 using the DEFAULT AT COMMAND FIRMWARE
// #define TINY_GSM_MODEM_XBEE // Select for Digi brand WiFi or Cellular XBee's
#define TINY_GSM_MODEM_SIM800
#include <TinyGsmClient.h> #include <TinyGsmClient.h>


Loading…
Cancel
Save