Correcting some of the message timeouts

Author: PaulZC

src/SparkFun_u-blox_SARA-R5_Arduino_Library.cpp

@@ -569,7 +569,7 @@ String SARA_R5::getSubscriberNo(void)
     response = sara_r5_calloc_char(sizeof(idResponse) + 16);
 
     err = sendCommandWithResponse(SARA_R5_COMMAND_CNUM,
-                                  SARA_R5_RESPONSE_OK, response, SARA_R5_STANDARD_RESPONSE_TIMEOUT);
+                                  SARA_R5_RESPONSE_OK, response, SARA_R5_10_SEC_TIMEOUT);
     if (err == SARA_R5_ERROR_SUCCESS)
     {
         if (sscanf(response, "\r\n+CNUM: %s", idResponse) != 1)
@@ -741,7 +741,7 @@ SARA_R5_error_t SARA_R5::setUtimeMode(SARA_R5_utime_mode_t mode, SARA_R5_utime_s
     sprintf(command, "%s=%d,%d", SARA_R5_GNSS_REQUEST_TIME, mode, sensor);
 
   err = sendCommandWithResponse(command, SARA_R5_RESPONSE_OK,
-                                NULL, SARA_R5_STANDARD_RESPONSE_TIMEOUT);
+                                NULL, SARA_R5_10_SEC_TIMEOUT);
   free(command);
   return err;
 }
@@ -768,7 +768,7 @@ SARA_R5_error_t SARA_R5::getUtimeMode(SARA_R5_utime_mode_t *mode, SARA_R5_utime_
   }
 
   err = sendCommandWithResponse(command, SARA_R5_RESPONSE_OK,
-                                response, SARA_R5_STANDARD_RESPONSE_TIMEOUT);
+                                response, SARA_R5_10_SEC_TIMEOUT);
 
   // Response format: \r\n+UTIME: <mode>[,<sensor>]\r\n\r\nOK\r\n
   if (err == SARA_R5_ERROR_SUCCESS)
@@ -1498,7 +1498,7 @@ SARA_R5_error_t SARA_R5::sendSMS(String number, String message)
         sprintf(command, "%s=\"%s\"", SARA_R5_SEND_TEXT, numberCStr);
 
         err = sendCommandWithResponse(command, ">", NULL,
-                                      SARA_R5_STANDARD_RESPONSE_TIMEOUT);
+                                      SARA_R5_3_MIN_TIMEOUT);
         free(command);
         free(numberCStr);
         if (err != SARA_R5_ERROR_SUCCESS)
@@ -1573,7 +1573,7 @@ SARA_R5_error_t SARA_R5::setGpioMode(SARA_R5_gpio_t gpio,
     sprintf(command, "%s=%d,%d", SARA_R5_COMMAND_GPIO, gpio, mode);
 
     err = sendCommandWithResponse(command, SARA_R5_RESPONSE_OK,
-                                  NULL, SARA_R5_STANDARD_RESPONSE_TIMEOUT);
+                                  NULL, SARA_R5_10_SEC_TIMEOUT);
 
     free(command);
 
@@ -1743,7 +1743,7 @@ SARA_R5_error_t SARA_R5::socketWrite(int socket, const char *str)
     sprintf(command, "%s=%d,%d", SARA_R5_WRITE_SOCKET, socket, strlen(str));
 
     err = sendCommandWithResponse(command, "@", response,
-                                  SARA_R5_STANDARD_RESPONSE_TIMEOUT);
+                                  SARA_R5_2_MIN_TIMEOUT);
 
     if (err == SARA_R5_ERROR_SUCCESS)
     {
@@ -1786,7 +1786,7 @@ SARA_R5_error_t SARA_R5::socketWriteUDP(int socket, const char *address, int por
 
 	sprintf(command, "%s=%d,\"%s\",%d,%d", SARA_R5_WRITE_UDP_SOCKET,
 										socket, address, port, dataLen);
-	err = sendCommandWithResponse(command, "@", response, SARA_R5_STANDARD_RESPONSE_TIMEOUT);
+	err = sendCommandWithResponse(command, "@", response, SARA_R5_IP_CONNECT_TIMEOUT);
 
 	if (err == SARA_R5_ERROR_SUCCESS)
   {
@@ -1986,7 +1986,7 @@ boolean SARA_R5::isGPSon(void)
     }
 
     err = sendCommandWithResponse(command, SARA_R5_RESPONSE_OK, response,
-                                  SARA_R5_STANDARD_RESPONSE_TIMEOUT);
+                                  SARA_R5_10_SEC_TIMEOUT);
 
     if (err == SARA_R5_ERROR_SUCCESS)
     {
@@ -2115,7 +2115,7 @@ SARA_R5_error_t SARA_R5::gpsEnableRmc(boolean enable)
         return SARA_R5_ERROR_OUT_OF_MEMORY;
     sprintf(command, "%s=%d", SARA_R5_GNSS_GPRMC, enable ? 1 : 0);
 
-    err = sendCommandWithResponse(command, SARA_R5_RESPONSE_OK, NULL, 10000);
+    err = sendCommandWithResponse(command, SARA_R5_RESPONSE_OK, NULL, SARA_R5_10_SEC_TIMEOUT);
 
     free(command);
     return err;
@@ -2141,7 +2141,7 @@ SARA_R5_error_t SARA_R5::gpsGetRmc(struct PositionData *pos, struct SpeedData *s
         return SARA_R5_ERROR_OUT_OF_MEMORY;
     }
 
-    err = sendCommandWithResponse(command, SARA_R5_RESPONSE_OK, response, 10000);
+    err = sendCommandWithResponse(command, SARA_R5_RESPONSE_OK, response, SARA_R5_10_SEC_TIMEOUT);
     if (err == SARA_R5_ERROR_SUCCESS)
     {
         // Fast-forward response string to $GPRMC starter
@@ -2199,7 +2199,7 @@ SARA_R5_error_t SARA_R5::gpsRequest(unsigned int timeout, uint32_t accuracy,
     sprintf(command, "%s=2,3,%d,%d,%d", SARA_R5_GNSS_REQUEST_LOCATION,
             detailed ? 1 : 0, timeout, accuracy);
 
-    err = sendCommandWithResponse(command, SARA_R5_RESPONSE_OK, NULL, 10000);
+    err = sendCommandWithResponse(command, SARA_R5_RESPONSE_OK, NULL, SARA_R5_10_SEC_TIMEOUT);
 
     free(command);
     return err;

src/SparkFun_u-blox_SARA-R5_Arduino_Library.h

@@ -50,11 +50,13 @@
 
 // Timing
 #define SARA_R5_STANDARD_RESPONSE_TIMEOUT 1000
+#define SARA_R5_10_SEC_TIMEOUT 10000
+#define SARA_R5_2_MIN_TIMEOUT 120000
 #define SARA_R5_3_MIN_TIMEOUT 180000
 #define SARA_R5_SET_BAUD_TIMEOUT 500
 #define SARA_R5_POWER_PULSE_PERIOD 3200
 #define SARA_R5_RESET_PULSE_PERIOD 10000
-#define SARA_R5_IP_CONNECT_TIMEOUT 60000
+#define SARA_R5_IP_CONNECT_TIMEOUT 130000
 #define SARA_R5_POLL_DELAY 1
 #define SARA_R5_SOCKET_WRITE_TIMEOUT 10000
 
@@ -471,7 +473,7 @@ class SARA_R5 : public Print
 
     // IP Transport Layer
     int socketOpen(SARA_R5_socket_protocol_t protocol, unsigned int localPort = 0);
-    SARA_R5_error_t socketClose(int socket, int timeout = 1000);
+    SARA_R5_error_t socketClose(int socket, int timeout = SARA_R5_2_MIN_TIMEOUT);
     SARA_R5_error_t socketConnect(int socket, const char *address, unsigned int port);
     SARA_R5_error_t socketWrite(int socket, const char *str);
     SARA_R5_error_t socketWrite(int socket, String str);