Allow for negative values of antennaHeight and ARP

nseidle · nseidle · commit 29f531a867ef · 2022-09-13T20:32:35.000-06:00
diff --git a/Firmware/RTK_Surveyor/AP-Config/index.html b/Firmware/RTK_Surveyor/AP-Config/index.html
@@ -1081,7 +1081,7 @@ <h2>
                                 <label for="antennaHeight"
                                     class="box-margin40 col-sm-3 col-5 col-form-label">Antenna Height(mm):
                                     <span class="tt" data-bs-placement="right"
-                                    title="Distance from the base of the antenna to the mark on the ground. This is usually the total length of the prism pole and any extensions.">
+                                    title="Distance from the base of the antenna to the mark on the ground. This is usually the total length of the prism pole and any extensions. Amount is subtracted from HAE before starting fixed base.">
                                         <span class="icon-info-circle text-primary ms-2"></span>
                                     </span>
                                 </label>
@@ -1096,7 +1096,7 @@ <h2>
                                 <label for="antennaReferencePoint"
                                     class="box-margin40 col-5 col-form-label">Antenna Reference Point(mm):
                                     <span class="tt" data-bs-placement="right"
-                                    title="ARP is the distance from the base of the antenna to the antenna phase center. This is usually printed on the side of the antenna and is calculated during antenna calibration.">
+                                    title="ARP is the distance from the base of the antenna to the antenna phase center. This is usually printed on the side of the antenna and is calculated during antenna calibration. Amount is subtracted from HAE before starting fixed base.">
                                         <span class="icon-info-circle text-primary ms-2"></span>
                                     </span>
                                 </label>
diff --git a/Firmware/RTK_Surveyor/AP-Config/src/main.js b/Firmware/RTK_Surveyor/AP-Config/src/main.js
@@ -419,8 +419,8 @@ function validateFields() {
                 checkElementValue("fixedLong", -180, 180, "Must be -180 to 180", "collapseBaseConfig");
                 checkElementValue("fixedAltitude", -11034, 8849, "Must be -11034 to 8849", "collapseBaseConfig");
 
-                checkElementValue("antennaHeight", 0, 15000, "Must be 0 to 15000", "collapseBaseConfig");
-                checkElementValue("antennaReferencePoint", 0.0, 200.0, "Must be 0.0 to 200.0", "collapseBaseConfig");
+                checkElementValue("antennaHeight", -15000, 15000, "Must be -15000 to 15000", "collapseBaseConfig");
+                checkElementValue("antennaReferencePoint", -200.0, 200.0, "Must be -200.0 to 200.0", "collapseBaseConfig");
             }
         }
 
diff --git a/Firmware/RTK_Surveyor/form.h b/Firmware/RTK_Surveyor/form.h
@@ -442,8 +442,8 @@ function validateFields() {
                 checkElementValue("fixedLong", -180, 180, "Must be -180 to 180", "collapseBaseConfig");
                 checkElementValue("fixedAltitude", -11034, 8849, "Must be -11034 to 8849", "collapseBaseConfig");
 
-                checkElementValue("antennaHeight", 0, 15000, "Must be 0 to 15000", "collapseBaseConfig");
-                checkElementValue("antennaReferencePoint", 0.0, 200.0, "Must be 0.0 to 200.0", "collapseBaseConfig");
+                checkElementValue("antennaHeight", -15000, 15000, "Must be -15000 to 15000", "collapseBaseConfig");
+                checkElementValue("antennaReferencePoint", -200.0, 200.0, "Must be -200.0 to 200.0", "collapseBaseConfig");
             }
         }
 
@@ -2019,7 +2019,7 @@ static const char *index_html = R"=====(
                                 <label for="antennaHeight"
                                     class="box-margin40 col-sm-3 col-5 col-form-label">Antenna Height(mm):
                                     <span class="tt" data-bs-placement="right"
-                                    title="Distance from the base of the antenna to the mark on the ground. This is usually the total length of the prism pole and any extensions.">
+                                    title="Distance from the base of the antenna to the mark on the ground. This is usually the total length of the prism pole and any extensions. Amount is subtracted from HAE before starting fixed base.">
                                         <span class="icon-info-circle text-primary ms-2"></span>
                                     </span>
                                 </label>
@@ -2034,7 +2034,7 @@ static const char *index_html = R"=====(
                                 <label for="antennaReferencePoint"
                                     class="box-margin40 col-5 col-form-label">Antenna Reference Point(mm):
                                     <span class="tt" data-bs-placement="right"
-                                    title="ARP is the distance from the base of the antenna to the antenna phase center. This is usually printed on the side of the antenna and is calculated during antenna calibration.">
+                                    title="ARP is the distance from the base of the antenna to the antenna phase center. This is usually printed on the side of the antenna and is calculated during antenna calibration. Amount is subtracted from HAE before starting fixed base.">
                                         <span class="icon-info-circle text-primary ms-2"></span>
                                     </span>
                                 </label>
diff --git a/Firmware/RTK_Surveyor/menuBase.ino b/Firmware/RTK_Surveyor/menuBase.ino
@@ -156,18 +156,18 @@ void menuBase()
     }
     else if (settings.fixedBase == true && settings.fixedBaseCoordinateType == COORD_TYPE_GEODETIC && incoming == 4)
     {
-      Serial.print("Enter the antenna height (a.k.a. pole length) in millimeters (0 to 15000mm): ");
+      Serial.print("Enter the antenna height (a.k.a. pole length) in millimeters (-15000 to 15000mm): ");
       int antennaHeight = getDouble(menuTimeout); //Timeout after x seconds
-      if (antennaHeight < 0 || antennaHeight > 15000) //Arbitrary 15m max
+      if (antennaHeight < -15000 || antennaHeight > 15000) //Arbitrary 15m max
         Serial.println("Error: Antenna Height out of range");
       else
         settings.antennaHeight = antennaHeight; //Recorded to NVM and file at main menu exit
     }
     else if (settings.fixedBase == true && settings.fixedBaseCoordinateType == COORD_TYPE_GEODETIC && incoming == 5)
     {
-      Serial.print("Enter the antenna reference point (a.k.a. ARP) in millimeters (0.0 to 200.0mm): ");
+      Serial.print("Enter the antenna reference point (a.k.a. ARP) in millimeters (-200.0 to 200.0mm): ");
       int antennaReferencePoint = getDouble(menuTimeout); //Timeout after x seconds
-      if (antennaReferencePoint < 0 || antennaReferencePoint > 200) //Arbitrary 200mm max
+      if (antennaReferencePoint < -200 || antennaReferencePoint > 200) //Arbitrary 200mm max
         Serial.println("Error: Antenna Reference Point out of range");
       else
         settings.antennaReferencePoint = antennaReferencePoint; //Recorded to NVM and file at main menu exit

Original file line number	Diff line number	Diff line change
`@@ -419,8 +419,8 @@ function validateFields() {`
`419`	`419`	`checkElementValue("fixedLong", -180, 180, "Must be -180 to 180", "collapseBaseConfig");`
`420`	`420`	`checkElementValue("fixedAltitude", -11034, 8849, "Must be -11034 to 8849", "collapseBaseConfig");`
`421`	`421`
`422`		`- checkElementValue("antennaHeight", 0, 15000, "Must be 0 to 15000", "collapseBaseConfig");`
`423`		`- checkElementValue("antennaReferencePoint", 0.0, 200.0, "Must be 0.0 to 200.0", "collapseBaseConfig");`
	`422`	`+ checkElementValue("antennaHeight", -15000, 15000, "Must be -15000 to 15000", "collapseBaseConfig");`
	`423`	`+ checkElementValue("antennaReferencePoint", -200.0, 200.0, "Must be -200.0 to 200.0", "collapseBaseConfig");`
`424`	`424`	`}`
`425`	`425`	`}`
`426`	`426`
Original file line number	Diff line number	Diff line change
`@@ -156,18 +156,18 @@ void menuBase()`
`156`	`156`	`}`
`157`	`157`	`else if (settings.fixedBase == true && settings.fixedBaseCoordinateType == COORD_TYPE_GEODETIC && incoming == 4)`
`158`	`158`	`{`
`159`		`- Serial.print("Enter the antenna height (a.k.a. pole length) in millimeters (0 to 15000mm): ");`
	`159`	`+ Serial.print("Enter the antenna height (a.k.a. pole length) in millimeters (-15000 to 15000mm): ");`
`160`	`160`	`int antennaHeight = getDouble(menuTimeout); //Timeout after x seconds`
`161`		`- if (antennaHeight < 0 \|\| antennaHeight > 15000) //Arbitrary 15m max`
	`161`	`+ if (antennaHeight < -15000 \|\| antennaHeight > 15000) //Arbitrary 15m max`
`162`	`162`	`Serial.println("Error: Antenna Height out of range");`
`163`	`163`	`else`
`164`	`164`	`settings.antennaHeight = antennaHeight; //Recorded to NVM and file at main menu exit`
`165`	`165`	`}`
`166`	`166`	`else if (settings.fixedBase == true && settings.fixedBaseCoordinateType == COORD_TYPE_GEODETIC && incoming == 5)`
`167`	`167`	`{`
`168`		`- Serial.print("Enter the antenna reference point (a.k.a. ARP) in millimeters (0.0 to 200.0mm): ");`
	`168`	`+ Serial.print("Enter the antenna reference point (a.k.a. ARP) in millimeters (-200.0 to 200.0mm): ");`
`169`	`169`	`int antennaReferencePoint = getDouble(menuTimeout); //Timeout after x seconds`
`170`		`- if (antennaReferencePoint < 0 \|\| antennaReferencePoint > 200) //Arbitrary 200mm max`
	`170`	`+ if (antennaReferencePoint < -200 \|\| antennaReferencePoint > 200) //Arbitrary 200mm max`
`171`	`171`	`Serial.println("Error: Antenna Reference Point out of range");`
`172`	`172`	`else`
`173`	`173`	`settings.antennaReferencePoint = antennaReferencePoint; //Recorded to NVM and file at main menu exit`