Merge pull request #87 from sparkfun/release_candidate

v3.1.13 - make millis timeouts wrap-safe

Author: PaulZC

.github/workflows/compile-sketch.yml

@@ -92,7 +92,7 @@ jobs:
         run: echo running on branch ${GITHUB_REF##*/}
 
       - name: Compile Sketch
-        uses: arduino/compile-sketches@v1
+        uses: arduino/compile-sketches@v1.1.0
         with:
           platforms: ${{ matrix.board.platforms }}
           fqbn: ${{ matrix.board.fqbn }}

examples/Basics/Example34_I2C_Serial_Passthrough/Example34_I2C_Serial_Passthrough.ino

@@ -87,7 +87,7 @@ void loop()
     // If it is more than i2cReadInterval_ms since the last read, read how
     // many bytes are available in the GNSS I2C buffer. This will leave the register
     // address pointing at 0xFF.
-    if ((millis() > (i2cLastRead_ms + i2cReadInterval_ms)) || (i2cLastRead_ms == 0))
+    if ((((millis() - i2cLastRead_ms) > i2cReadInterval_ms)) || (i2cLastRead_ms == 0))
     {
         i2cBytesAvailable = gnssI2cAvailable();
         i2cLastRead_ms = millis();
@@ -115,7 +115,7 @@ void loop()
         }
         // Else if uartI2cRingBuffer contains data and it is more than uartI2cSendInterval_ms
         // since the last send, send them
-        else if ((bytesToSend > 0) && (millis() > (uartI2cLastSend_ms + uartI2cSendInterval_ms)))
+        else if ((bytesToSend > 0) && ((millis() - uartI2cLastSend_ms) > uartI2cSendInterval_ms))
         {
             sendI2cBytes(bytesToSend);
             uartI2cLastSend_ms = millis();
@@ -148,7 +148,7 @@ void loop()
         }
         // Else if i2cUartRingBuffer contains data and it is more than i2cUartSendInterval_ms
         // since the last send, send them
-        else if ((bytesToSend > 0) && (millis() > (i2cUartLastSend_ms + i2cUartSendInterval_ms)))
+        else if ((bytesToSend > 0) && ((millis() - i2cUartLastSend_ms) > i2cUartSendInterval_ms))
         {
             sendUartBytes(bytesToSend);
             i2cUartLastSend_ms = millis();

examples/Data_Logging/DataLoggingExample3_RXM_SFRBX_and_RAWX/DataLoggingExample3_RXM_SFRBX_and_RAWX.ino

@@ -210,7 +210,7 @@ void loop()
 
   // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
-  if (millis() > (lastPrint + 1000)) // Print the message count once per second
+  if ((millis() - lastPrint) > 1000) // Print the message count once per second
   {
     Serial.print(F("Number of message groups received: SFRBX: ")); // Print how many message groups have been received (see note above)
     Serial.print(numSFRBX);

examples/Data_Logging/DataLoggingExample4_RXM_without_Callbacks/DataLoggingExample4_RXM_without_Callbacks.ino

@@ -181,7 +181,7 @@ void loop()
 
   // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
-  if (millis() > (lastPrint + 1000)) // Print bytesWritten once per second
+  if ((millis() - lastPrint) > 1000) // Print bytesWritten once per second
   {
     Serial.print(F("The number of bytes written to SD card is ")); // Print how many bytes have been written to SD card
     Serial.println(bytesWritten);

examples/Data_Logging/DataLoggingExample5_Fast_RXM/DataLoggingExample5_Fast_RXM.ino

@@ -196,7 +196,7 @@ void loop()
 
   // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
-  if (millis() > (lastPrint + 1000)) // Print bytesWritten once per second
+  if ((millis() - lastPrint) > 1000) // Print bytesWritten once per second
   {
     Serial.print(F("The number of bytes written to SD card is: ")); // Print how many bytes have been written to SD card
     Serial.println(bytesWritten);

examples/Data_Logging/DataLoggingExample6_NMEA/DataLoggingExample6_NMEA.ino

@@ -178,7 +178,7 @@ void loop()
 
   // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
-  if (millis() > (lastPrint + 1000)) // Print bytesWritten once per second
+  if ((millis() - lastPrint) > 1000) // Print bytesWritten once per second
   {
     Serial.print(F("The number of bytes written to SD card is ")); // Print how many bytes have been written to SD card
     Serial.println(bytesWritten);

examples/Data_Logging/DataLoggingExample7_OpenLogESP32_SPI_SDIO/DataLoggingExample7_OpenLogESP32_SPI_SDIO.ino

@@ -279,7 +279,7 @@ void loop()
 
   // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
-  if (millis() > (lastPrint + 1000)) // Print the message count once per second
+  if ((millis() - lastPrint) > 1000) // Print the message count once per second
   {
     uint16_t maxBufferBytes = myGNSS.getMaxFileBufferAvail(); // Get how full the file buffer has been (not how full it is now)
     float bufferHigh = 100.0 * (float)maxBufferBytes / (float)fileBufferSize;

examples/Data_Logging/DataLoggingExample8_RTCM/DataLoggingExample8_RTCM.ino

@@ -183,7 +183,7 @@ void loop()
 
   // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
-  if (millis() > (lastPrint + 1000)) // Print bytesWritten once per second
+  if ((millis() - lastPrint) > 1000) // Print bytesWritten once per second
   {
     Serial.print(F("The number of bytes written to SD card is ")); // Print how many bytes have been written to SD card
     Serial.println(bytesWritten);

examples/Data_Logging/DataLoggingExample9_enableUBXlogging/DataLoggingExample9_enableUBXlogging.ino

@@ -194,7 +194,7 @@ void loop()
 
   // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
-  if (millis() > (lastPrint + 1000)) // Print bytesWritten once per second
+  if ((millis() - lastPrint) > 1000) // Print bytesWritten once per second
   {
     Serial.print(F("The number of bytes written to SD card is ")); // Print how many bytes have been written to SD card
     Serial.println(bytesWritten);

examples/NEO-F10N/Example1_NAV_SIG/Example1_NAV_SIG.ino

@@ -298,7 +298,7 @@ void loop()
 void printDot() // Print a dot every 200ms - without using delay
 {
   static unsigned long lastPrint = millis();
-  if (millis() > (lastPrint + 200))
+  if ((millis() - lastPrint) > 200)
   {
     Serial.print(".");
     lastPrint = millis();