Check coordinate types are the same in menuBase

Author: PaulZC

Firmware/RTK_Surveyor/Form.ino

@@ -1163,7 +1163,6 @@ void updateSettingWithValue(const char *settingName, const char *settingValueStr
     else if (strcmp(settingName, "fixedLongText") == 0)
     {
         // Lat defines the settings.coordinateInputType. Don't update it here
-        // TODO: We need to check that the lat and long types are the same... But where...?
         double newCoordinate = 0.0;
         if (coordinateIdentifyInputType((char *)settingValueStr, &newCoordinate) ==
             COORDINATE_INPUT_TYPE_INVALID_UNKNOWN)

Firmware/RTK_Surveyor/menuBase.ino

@@ -191,11 +191,11 @@ void menuBase()
                 if (getString(userEntry, sizeof(userEntry)) == INPUT_RESPONSE_VALID)
                 {
                     double fixedLat = 0.0;
+
                     // Identify which type of method they used
-                    if (coordinateIdentifyInputType(userEntry, &fixedLat) != COORDINATE_INPUT_TYPE_INVALID_UNKNOWN)
+                    CoordinateInputType latCoordinateInputType = coordinateIdentifyInputType(userEntry, &fixedLat);
+                    if (latCoordinateInputType != COORDINATE_INPUT_TYPE_INVALID_UNKNOWN)
                     {
-                        settings.fixedLat = fixedLat;
-
                         // Progress with additional prompts only if the user enters valid data
                         systemPrint("\r\nLongitude in degrees (ex: -105.184774720, -105 11.0864832, -105-11.0864832, "
                                     "-105 11 05.188992, etc): ");
@@ -204,17 +204,25 @@ void menuBase()
                             double fixedLong = 0.0;
 
                             // Identify which type of method they used
-                            if (coordinateIdentifyInputType(userEntry, &fixedLong) !=
-                                COORDINATE_INPUT_TYPE_INVALID_UNKNOWN)
+                            CoordinateInputType longCoordinateInputType = coordinateIdentifyInputType(userEntry, &fixedLong);
+                            if (longCoordinateInputType != COORDINATE_INPUT_TYPE_INVALID_UNKNOWN)
                             {
-                                settings.fixedLong = fixedLong;
-                                settings.coordinateInputType = coordinateIdentifyInputType(userEntry, &fixedLong);
-
-                                systemPrint("\nAltitude in meters (ex: 1560.2284): ");
-                                double fixedAltitude = getDouble();
-                                if (fixedAltitude != INPUT_RESPONSE_GETNUMBER_TIMEOUT &&
-                                    fixedAltitude != INPUT_RESPONSE_GETNUMBER_EXIT)
-                                    settings.fixedAltitude = fixedAltitude;
+                                if (latCoordinateInputType == longCoordinateInputType)
+                                {
+                                    settings.fixedLat = fixedLat;
+                                    settings.fixedLong = fixedLong;
+                                    settings.coordinateInputType = latCoordinateInputType;
+
+                                    systemPrint("\r\nAltitude in meters (ex: 1560.2284): ");
+                                    double fixedAltitude = getDouble();
+                                    if (fixedAltitude != INPUT_RESPONSE_GETNUMBER_TIMEOUT &&
+                                        fixedAltitude != INPUT_RESPONSE_GETNUMBER_EXIT)
+                                        settings.fixedAltitude = fixedAltitude;
+                                }
+                                else
+                                {
+                                    systemPrintln("\r\nCoordinate types must match!");
+                                }
                             } // idInput on fixedLong
                         }     // getString for fixedLong
                     }         // idInput on fixedLat