Browse Source

Oops, fixed some signed/unsigned comparisons

v_master
Sara Damiano 5 years ago
parent
commit
6c0ec95a7e
10 changed files with 13 additions and 11 deletions
  1. +1
    -1
      src/TinyGsmClientBG96.h
  2. +1
    -1
      src/TinyGsmClientM95.h
  3. +1
    -1
      src/TinyGsmClientMC60.h
  4. +4
    -2
      src/TinyGsmClientSIM5360.h
  5. +1
    -1
      src/TinyGsmClientSIM7000.h
  6. +1
    -1
      src/TinyGsmClientSIM7600.h
  7. +1
    -1
      src/TinyGsmClientSIM800.h
  8. +1
    -1
      src/TinyGsmClientSaraR4.h
  9. +1
    -1
      src/TinyGsmClientSequansMonarch.h
  10. +1
    -1
      src/TinyGsmClientUBLOX.h

+ 1
- 1
src/TinyGsmClientBG96.h View File

@ -556,7 +556,7 @@ protected:
}
int len = stream.readStringUntil('\n').toInt();
for (size_t i=0; i<len; i++) {
for (int i=0; i<len; i++) {
TINY_GSM_MODEM_STREAM_TO_MUX_FIFO_WITH_DOUBLE_TIMEOUT
}
waitResponse();


+ 1
- 1
src/TinyGsmClientM95.h View File

@ -645,7 +645,7 @@ protected:
streamSkipUntil(','); // skip port
streamSkipUntil(','); // skip connection type (TCP/UDP)
int len = stream.readStringUntil('\n').toInt(); // read length
for (size_t i=0; i<len; i++) {
for (int i=0; i<len; i++) {
TINY_GSM_MODEM_STREAM_TO_MUX_FIFO_WITH_DOUBLE_TIMEOUT
sockets[mux]->sock_available--;
// ^^ One less character available after moving from modem's FIFO to our FIFO


+ 1
- 1
src/TinyGsmClientMC60.h View File

@ -646,7 +646,7 @@ protected:
streamSkipUntil(','); // skip port
streamSkipUntil(','); // skip connection type (TCP/UDP)
int len = stream.readStringUntil('\n').toInt(); // read length
for (size_t i=0; i<len; i++) {
for (int i=0; i<len; i++) {
TINY_GSM_MODEM_STREAM_TO_MUX_FIFO_WITH_DOUBLE_TIMEOUT
sockets[mux]->sock_available--;
// ^^ One less character available after moving from modem's FIFO to our FIFO


+ 4
- 2
src/TinyGsmClientSIM5360.h View File

@ -660,7 +660,9 @@ protected:
return false;
}
if (ssl) DBG("SSL not yet supported on this module!");
if (ssl) {
DBG("SSL not yet supported on this module!");
}
// Establish a connection in multi-socket mode
uint32_t timeout_ms = ((uint32_t)timeout_s) * 1000;
@ -706,7 +708,7 @@ protected:
// ^^ Requested number of data bytes (1-1460 bytes)to be read
int len_confirmed = stream.readStringUntil('\n').toInt();
// ^^ The data length which not read in the buffer
for (size_t i=0; i<len_requested; i++) {
for (int i=0; i<len_requested; i++) {
uint32_t startMillis = millis();
#ifdef TINY_GSM_USE_HEX
while (stream.available() < 2 && (millis() - startMillis < sockets[mux]->_timeout)) { TINY_GSM_YIELD(); }


+ 1
- 1
src/TinyGsmClientSIM7000.h View File

@ -865,7 +865,7 @@ protected:
// ^^ Confirmed number of data bytes to be read, which may be less than requested.
// 0 indicates that no data can be read.
// This is actually be the number of bytes that will be remaining after the read
for (size_t i=0; i<len_requested; i++) {
for (int i=0; i<len_requested; i++) {
uint32_t startMillis = millis();
#ifdef TINY_GSM_USE_HEX
while (stream.available() < 2 && (millis() - startMillis < sockets[mux]->_timeout)) { TINY_GSM_YIELD(); }


+ 1
- 1
src/TinyGsmClientSIM7600.h View File

@ -712,7 +712,7 @@ protected:
// ^^ Requested number of data bytes (1-1460 bytes)to be read
int len_confirmed = stream.readStringUntil('\n').toInt();
// ^^ The data length which not read in the buffer
for (size_t i=0; i<len_requested; i++) {
for (int i=0; i<len_requested; i++) {
uint32_t startMillis = millis();
#ifdef TINY_GSM_USE_HEX
while (stream.available() < 2 && (millis() - startMillis < sockets[mux]->_timeout)) { TINY_GSM_YIELD(); }


+ 1
- 1
src/TinyGsmClientSIM800.h View File

@ -845,7 +845,7 @@ protected:
// ^^ Confirmed number of data bytes to be read, which may be less than requested.
// 0 indicates that no data can be read.
// This is actually be the number of bytes that will be remaining after the read
for (size_t i=0; i<len_requested; i++) {
for (int i=0; i<len_requested; i++) {
uint32_t startMillis = millis();
#ifdef TINY_GSM_USE_HEX
while (stream.available() < 2 && (millis() - startMillis < sockets[mux]->_timeout)) { TINY_GSM_YIELD(); }


+ 1
- 1
src/TinyGsmClientSaraR4.h View File

@ -622,7 +622,7 @@ protected:
int len = stream.readStringUntil(',').toInt();
streamSkipUntil('\"');
for (size_t i=0; i<len; i++) {
for (int i=0; i<len; i++) {
TINY_GSM_MODEM_STREAM_TO_MUX_FIFO_WITH_DOUBLE_TIMEOUT
}
streamSkipUntil('\"');


+ 1
- 1
src/TinyGsmClientSequansMonarch.h View File

@ -625,7 +625,7 @@ protected:
}
streamSkipUntil(','); // Skip mux
int len = stream.readStringUntil('\n').toInt();
for (size_t i=0; i<len; i++) {
for (int i=0; i<len; i++) {
uint32_t startMillis = millis(); \
while (!stream.available() && ((millis() - startMillis) < sockets[mux % TINY_GSM_MUX_COUNT]->_timeout)) { TINY_GSM_YIELD(); } \
char c = stream.read(); \


+ 1
- 1
src/TinyGsmClientUBLOX.h View File

@ -609,7 +609,7 @@ protected:
int len = stream.readStringUntil(',').toInt();
streamSkipUntil('\"');
for (size_t i=0; i<len; i++) {
for (int i=0; i<len; i++) {
TINY_GSM_MODEM_STREAM_TO_MUX_FIFO_WITH_DOUBLE_TIMEOUT
}
streamSkipUntil('\"');


Loading…
Cancel
Save