Skip to content

Commit 9a03468

Browse files
committed
Fix min/max ECEF coordinate checking
1 parent 59b2061 commit 9a03468

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

Firmware/RTK_Surveyor/AP-Config/src/main.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -285,10 +285,9 @@ function validateFields() {
285285
//Base Config
286286
checkElementValue("observationSeconds", 60, 600, "Must be between 60 to 600", "collapseBaseConfig");
287287
checkElementValue("observationPositionAccuracy", 1, 5.1, "Must be between 1.0 to 5.0", "collapseBaseConfig");
288-
checkElementValue("fixedEcefX", -5000000, 5000000, "Must be -5000000 to 5000000", "collapseBaseConfig");
289-
checkElementValue("fixedEcefY", -5000000, 5000000, "Must be -5000000 to 5000000", "collapseBaseConfig");
290-
if (ge("fixedEcefZ").value == 0.0) ge("fixedEcefZ").value = 4084500;
291-
checkElementValue("fixedEcefZ", 3300000, 5000000, "Must be 3300000 to 5000000", "collapseBaseConfig");
288+
checkElementValue("fixedEcefX", -7000000, 7000000, "Must be -7000000 to 7000000", "collapseBaseConfig");
289+
checkElementValue("fixedEcefY", -7000000, 7000000, "Must be -7000000 to 7000000", "collapseBaseConfig");
290+
checkElementValue("fixedEcefZ", -7000000, 7000000, "Must be -7000000 to 7000000", "collapseBaseConfig");
292291
checkElementValue("fixedLat", -180, 180, "Must be -180 to 180", "collapseBaseConfig");
293292
checkElementValue("fixedLong", -180, 180, "Must be -180 to 180", "collapseBaseConfig");
294293
checkElementValue("fixedAltitude", -11034, 8849, "Must be -11034 to 8849", "collapseBaseConfig");

Firmware/RTK_Surveyor/form.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -308,10 +308,9 @@ function validateFields() {
308308
//Base Config
309309
checkElementValue("observationSeconds", 60, 600, "Must be between 60 to 600", "collapseBaseConfig");
310310
checkElementValue("observationPositionAccuracy", 1, 5.1, "Must be between 1.0 to 5.0", "collapseBaseConfig");
311-
checkElementValue("fixedEcefX", -5000000, 5000000, "Must be -5000000 to 5000000", "collapseBaseConfig");
312-
checkElementValue("fixedEcefY", -5000000, 5000000, "Must be -5000000 to 5000000", "collapseBaseConfig");
313-
if (ge("fixedEcefZ").value == 0.0) ge("fixedEcefZ").value = 4084500;
314-
checkElementValue("fixedEcefZ", 3300000, 5000000, "Must be 3300000 to 5000000", "collapseBaseConfig");
311+
checkElementValue("fixedEcefX", -7000000, 7000000, "Must be -7000000 to 7000000", "collapseBaseConfig");
312+
checkElementValue("fixedEcefY", -7000000, 7000000, "Must be -7000000 to 7000000", "collapseBaseConfig");
313+
checkElementValue("fixedEcefZ", -7000000, 7000000, "Must be -7000000 to 7000000", "collapseBaseConfig");
315314
checkElementValue("fixedLat", -180, 180, "Must be -180 to 180", "collapseBaseConfig");
316315
checkElementValue("fixedLong", -180, 180, "Must be -180 to 180", "collapseBaseConfig");
317316
checkElementValue("fixedAltitude", -11034, 8849, "Must be -11034 to 8849", "collapseBaseConfig");

0 commit comments

Comments
 (0)