Fixed XBee read and stop

This commit is contained in:
SRGDamia1
2017-10-31 16:45:06 -04:00
parent f899aeb126
commit 13ef06a733

View File

@@ -92,13 +92,13 @@ public:
// This is a hack to shut the socket by setting the timeout to zero and // This is a hack to shut the socket by setting the timeout to zero and
// then sending an empty line to the server. // then sending an empty line to the server.
virtual void stop() { virtual void stop() {
at->streamClear(); // Empty anything remaining in the buffer;
at->commandMode(); at->commandMode();
at->sendAT(GF("TM0")); // Set socket timeout to 0; at->sendAT(GF("TM0")); // Set socket timeout to 0;
at->waitResponse(); at->waitResponse();
at->writeChanges(); at->writeChanges();
at->exitCommand(); at->exitCommand();
at->modemSend("", 1, mux); at->modemSend("", 1, mux);
at->streamClear(); // Empty anything remaining in the buffer;
at->commandMode(); at->commandMode();
at->sendAT(GF("TM64")); // Set socket timeout back to 10seconds; at->sendAT(GF("TM64")); // Set socket timeout back to 10seconds;
at->waitResponse(); at->waitResponse();
@@ -124,7 +124,8 @@ public:
} }
virtual int read(uint8_t *buf, size_t size) { virtual int read(uint8_t *buf, size_t size) {
return available(); TINY_GSM_YIELD();
return at->stream.readBytes(buf, size);
} }
virtual int read() { virtual int read() {