Made internal stream public again, fixing #373

Signed-off-by: Sara Damiano <sdamiano@stroudcenter.org>
This commit is contained in:
Sara Damiano
2020-04-15 08:41:33 -04:00
parent 9f2068cecb
commit 5a6936b37a
14 changed files with 28 additions and 14 deletions

View File

@@ -560,8 +560,9 @@ class TinyGsmA6 : public TinyGsmModem<TinyGsmA6>,
return waitResponse(1000, r1, r2, r3, r4, r5); return waitResponse(1000, r1, r2, r3, r4, r5);
} }
protected: public:
Stream& stream; Stream& stream;
protected:
GsmClientA6* sockets[TINY_GSM_MUX_COUNT]; GsmClientA6* sockets[TINY_GSM_MUX_COUNT];
const char* gsmNL = GSM_NL; const char* gsmNL = GSM_NL;
}; };

View File

@@ -673,8 +673,9 @@ class TinyGsmBG96 : public TinyGsmModem<TinyGsmBG96>,
return waitResponse(1000, r1, r2, r3, r4, r5); return waitResponse(1000, r1, r2, r3, r4, r5);
} }
protected: public:
Stream& stream; Stream& stream;
protected:
GsmClientBG96* sockets[TINY_GSM_MUX_COUNT]; GsmClientBG96* sockets[TINY_GSM_MUX_COUNT];
const char* gsmNL = GSM_NL; const char* gsmNL = GSM_NL;
}; };

View File

@@ -441,8 +441,9 @@ class TinyGsmESP8266 : public TinyGsmModem<TinyGsmESP8266>,
return waitResponse(1000, r1, r2, r3, r4, r5); return waitResponse(1000, r1, r2, r3, r4, r5);
} }
protected: public:
Stream& stream; Stream& stream;
protected:
GsmClientESP8266* sockets[TINY_GSM_MUX_COUNT]; GsmClientESP8266* sockets[TINY_GSM_MUX_COUNT];
const char* gsmNL = GSM_NL; const char* gsmNL = GSM_NL;
}; };

View File

@@ -452,8 +452,9 @@ class TinyGsmM590 : public TinyGsmModem<TinyGsmM590>,
return waitResponse(1000, r1, r2, r3, r4, r5); return waitResponse(1000, r1, r2, r3, r4, r5);
} }
protected: public:
Stream& stream; Stream& stream;
protected:
GsmClientM590* sockets[TINY_GSM_MUX_COUNT]; GsmClientM590* sockets[TINY_GSM_MUX_COUNT];
const char* gsmNL = GSM_NL; const char* gsmNL = GSM_NL;
}; };

View File

@@ -616,8 +616,9 @@ class TinyGsmM95 : public TinyGsmModem<TinyGsmM95>,
return waitResponse(1000, r1, r2, r3, r4, r5); return waitResponse(1000, r1, r2, r3, r4, r5);
} }
protected: public:
Stream& stream; Stream& stream;
protected:
GsmClientM95* sockets[TINY_GSM_MUX_COUNT]; GsmClientM95* sockets[TINY_GSM_MUX_COUNT];
const char* gsmNL = GSM_NL; const char* gsmNL = GSM_NL;
}; };

View File

@@ -588,8 +588,9 @@ class TinyGsmMC60 : public TinyGsmModem<TinyGsmMC60>,
return waitResponse(1000, r1, r2, r3, r4, r5, r6); return waitResponse(1000, r1, r2, r3, r4, r5, r6);
} }
protected: public:
Stream& stream; Stream& stream;
protected:
GsmClientMC60* sockets[TINY_GSM_MUX_COUNT]; GsmClientMC60* sockets[TINY_GSM_MUX_COUNT];
const char* gsmNL = GSM_NL; const char* gsmNL = GSM_NL;
}; };

View File

@@ -713,8 +713,9 @@ class TinyGsmSim5360 : public TinyGsmModem<TinyGsmSim5360>,
return waitResponse(1000, r1, r2, r3, r4, r5); return waitResponse(1000, r1, r2, r3, r4, r5);
} }
protected: public:
Stream& stream; Stream& stream;
protected:
GsmClientSim5360* sockets[TINY_GSM_MUX_COUNT]; GsmClientSim5360* sockets[TINY_GSM_MUX_COUNT];
const char* gsmNL = GSM_NL; const char* gsmNL = GSM_NL;
}; };

View File

@@ -754,8 +754,9 @@ class TinyGsmSim7000 : public TinyGsmModem<TinyGsmSim7000>,
return waitResponse(1000, r1, r2, r3, r4, r5); return waitResponse(1000, r1, r2, r3, r4, r5);
} }
protected: public:
Stream& stream; Stream& stream;
protected:
GsmClientSim7000* sockets[TINY_GSM_MUX_COUNT]; GsmClientSim7000* sockets[TINY_GSM_MUX_COUNT];
const char* gsmNL = GSM_NL; const char* gsmNL = GSM_NL;
}; };

View File

@@ -806,8 +806,9 @@ class TinyGsmSim7600 : public TinyGsmModem<TinyGsmSim7600>,
return waitResponse(1000, r1, r2, r3, r4, r5); return waitResponse(1000, r1, r2, r3, r4, r5);
} }
protected: public:
Stream& stream; Stream& stream;
protected:
GsmClientSim7600* sockets[TINY_GSM_MUX_COUNT]; GsmClientSim7600* sockets[TINY_GSM_MUX_COUNT];
const char* gsmNL = GSM_NL; const char* gsmNL = GSM_NL;
}; };

View File

@@ -720,8 +720,9 @@ class TinyGsmSim800 : public TinyGsmModem<TinyGsmSim800>,
return waitResponse(1000, r1, r2, r3, r4, r5); return waitResponse(1000, r1, r2, r3, r4, r5);
} }
protected: public:
Stream& stream; Stream& stream;
protected:
GsmClientSim800* sockets[TINY_GSM_MUX_COUNT]; GsmClientSim800* sockets[TINY_GSM_MUX_COUNT];
const char* gsmNL = GSM_NL; const char* gsmNL = GSM_NL;
}; };

View File

@@ -877,8 +877,9 @@ class TinyGsmSaraR4 : public TinyGsmModem<TinyGsmSaraR4>,
return waitResponse(1000, r1, r2, r3, r4, r5); return waitResponse(1000, r1, r2, r3, r4, r5);
} }
protected: public:
Stream& stream; Stream& stream;
protected:
GsmClientSaraR4* sockets[TINY_GSM_MUX_COUNT]; GsmClientSaraR4* sockets[TINY_GSM_MUX_COUNT];
const char* gsmNL = GSM_NL; const char* gsmNL = GSM_NL;
bool has2GFallback; bool has2GFallback;

View File

@@ -706,8 +706,9 @@ class TinyGsmSequansMonarch
return waitResponse(1000, r1, r2, r3, r4, r5); return waitResponse(1000, r1, r2, r3, r4, r5);
} }
protected: public:
Stream& stream; Stream& stream;
protected:
GsmClientSequansMonarch* sockets[TINY_GSM_MUX_COUNT]; GsmClientSequansMonarch* sockets[TINY_GSM_MUX_COUNT];
const char* gsmNL = GSM_NL; const char* gsmNL = GSM_NL;
}; };

View File

@@ -810,8 +810,9 @@ class TinyGsmUBLOX : public TinyGsmModem<TinyGsmUBLOX>,
return waitResponse(1000, r1, r2, r3, r4, r5); return waitResponse(1000, r1, r2, r3, r4, r5);
} }
protected: public:
Stream& stream; Stream& stream;
protected:
GsmClientUBLOX* sockets[TINY_GSM_MUX_COUNT]; GsmClientUBLOX* sockets[TINY_GSM_MUX_COUNT];
const char* gsmNL = GSM_NL; const char* gsmNL = GSM_NL;
}; };

View File

@@ -1440,8 +1440,9 @@ class TinyGsmXBee : public TinyGsmModem<TinyGsmXBee>,
return false; return false;
} }
protected: public:
Stream& stream; Stream& stream;
protected:
GsmClientXBee* sockets[TINY_GSM_MUX_COUNT]; GsmClientXBee* sockets[TINY_GSM_MUX_COUNT];
const char* gsmNL = GSM_NL; const char* gsmNL = GSM_NL;
int16_t guardTime; int16_t guardTime;