Merge pull request #383 from LeeLeahy2/getUserInputString

Bug Fix: NTRIP Server menu call getUserInputString with 50 instead of 0

Author: nseidle

Firmware/RTK_Everywhere/menuBase.ino

@@ -284,7 +284,7 @@ void menuBase()
             {
                 systemPrintf("Enter Caster Address for Server %d: ", serverNumber + 1);
                 if (getUserInputString(&settings.ntripServer_CasterHost[serverNumber][0],
-                                       sizeof(settings.ntripServer_CasterHost[serverNumber]) == INPUT_RESPONSE_VALID))
+                                       NTRIP_SERVER_STRING_SIZE) == INPUT_RESPONSE_VALID)
                     restartBase = true;
             }
             else if (incoming == 1)
@@ -308,7 +308,7 @@ void menuBase()
                     systemPrintf("Enter Caster User for Server %d: ", serverNumber + 1);
 
                 if (getUserInputString(&settings.ntripServer_CasterUser[serverNumber][0],
-                                       sizeof(settings.ntripServer_CasterUser[serverNumber])) == INPUT_RESPONSE_VALID)
+                                       NTRIP_SERVER_STRING_SIZE) == INPUT_RESPONSE_VALID)
                     restartBase = true;
             }
             else if (incoming == 3)
@@ -319,7 +319,7 @@ void menuBase()
                     systemPrintf("Enter password for Caster User for Server %d: ", serverNumber + 1);
 
                 if (getUserInputString(&settings.ntripServer_CasterUserPW[serverNumber][0],
-                                       sizeof(settings.ntripServer_CasterUserPW[serverNumber])) == INPUT_RESPONSE_VALID)
+                                       NTRIP_SERVER_STRING_SIZE) == INPUT_RESPONSE_VALID)
                     restartBase = true;
             }
             else if (incoming == 4)
@@ -330,7 +330,7 @@ void menuBase()
                     systemPrintf("Enter Mount Point for Server %d: ", serverNumber + 1);
 
                 if (getUserInputString(&settings.ntripServer_MountPoint[serverNumber][0],
-                                       sizeof(settings.ntripServer_MountPoint[serverNumber])) == INPUT_RESPONSE_VALID)
+                                       NTRIP_SERVER_STRING_SIZE) == INPUT_RESPONSE_VALID)
                     restartBase = true;
             }
             else if (incoming == 5)
@@ -341,7 +341,7 @@ void menuBase()
                     systemPrintf("Enter password for Mount Point for Server %d: ", serverNumber + 1);
 
                 if (getUserInputString(&settings.ntripServer_MountPointPW[serverNumber][0],
-                                       sizeof(settings.ntripServer_MountPointPW[serverNumber])) == INPUT_RESPONSE_VALID)
+                                       NTRIP_SERVER_STRING_SIZE) == INPUT_RESPONSE_VALID)
                     restartBase = true;
             }
         }

Firmware/RTK_Everywhere/settings.h

@@ -1007,6 +1007,8 @@ const Regional_Information Regional_Information_Table[] =
 };
 const int numRegionalAreas = sizeof(Regional_Information_Table) / sizeof(Regional_Information_Table[0]);
 
+#define NTRIP_SERVER_STRING_SIZE        50
+
 // This is all the settings that can be set on RTK Product. It's recorded to NVM and the config file.
 // Avoid reordering. The order of these variables is mimicked in NVM/record/parse/create/update/get
 struct Settings
@@ -1135,7 +1137,7 @@ struct Settings
     bool debugNtripServerState = false;
     bool enableNtripServer = false;
     bool enableRtcmMessageChecking = false;
-    char ntripServer_CasterHost[NTRIP_SERVER_MAX][50] = // It's free...
+    char ntripServer_CasterHost[NTRIP_SERVER_MAX][NTRIP_SERVER_STRING_SIZE] = // It's free...
     {
         "rtk2go.com",
         "",
@@ -1149,28 +1151,28 @@ struct Settings
         2101,
         2101,
     };
-    char ntripServer_CasterUser[NTRIP_SERVER_MAX][50] =
+    char ntripServer_CasterUser[NTRIP_SERVER_MAX][NTRIP_SERVER_STRING_SIZE] =
     {
         "[email protected]" // Some free casters require auth. User must provide their own email address to use RTK2Go
         "",
         "",
         "",
     };
-    char ntripServer_CasterUserPW[NTRIP_SERVER_MAX][50] =
+    char ntripServer_CasterUserPW[NTRIP_SERVER_MAX][NTRIP_SERVER_STRING_SIZE] =
     {
         "",
         "",
         "",
         "",
     };
-    char ntripServer_MountPoint[NTRIP_SERVER_MAX][50] =
+    char ntripServer_MountPoint[NTRIP_SERVER_MAX][NTRIP_SERVER_STRING_SIZE] =
     {
         "bldr_dwntwn2", // NTRIP Server
         "",
         "",
         "",
     };
-    char ntripServer_MountPointPW[NTRIP_SERVER_MAX][50] =
+    char ntripServer_MountPointPW[NTRIP_SERVER_MAX][NTRIP_SERVER_STRING_SIZE] =
     {
         "WR5wRo4H",
         "",