Skip to content

Commit d280829

Browse files
committed
Negative altitude over WiFi config - fix issue #97
1 parent e93a20e commit d280829

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,10 +288,10 @@ function validateFields() {
288288
checkElementValue("fixedEcefX", -5000000, 5000000, "Must be -5000000 to 5000000", "collapseBaseConfig");
289289
checkElementValue("fixedEcefY", -5000000, 5000000, "Must be -5000000 to 5000000", "collapseBaseConfig");
290290
if (ge("fixedEcefZ").value == 0.0) ge("fixedEcefZ").value = 4084500;
291-
checkElementValue("fixedEcefZ", 4084500, 5000000, "Must be 4084500 to 5000000", "collapseBaseConfig");
291+
checkElementValue("fixedEcefZ", 4073466, 5000000, "Must be 4073466 to 5000000", "collapseBaseConfig");
292292
checkElementValue("fixedLat", -180, 180, "Must be -180 to 180", "collapseBaseConfig");
293293
checkElementValue("fixedLong", -180, 180, "Must be -180 to 180", "collapseBaseConfig");
294-
checkElementValue("fixedAltitude", 0, 8849, "Must be 0 to 8849", "collapseBaseConfig");
294+
checkElementValue("fixedAltitude", -11034, 8849, "Must be -11034 to 8849", "collapseBaseConfig");
295295

296296
checkElementString("ntripServer_wifiSSID", 1, 30, "Must be 1 to 30 characters", "collapseBaseConfig");
297297
checkElementString("ntripServer_wifiPW", 0, 30, "Must be 0 to 30 characters", "collapseBaseConfig");

Firmware/RTK_Surveyor/form.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,10 +311,10 @@ function validateFields() {
311311
checkElementValue("fixedEcefX", -5000000, 5000000, "Must be -5000000 to 5000000", "collapseBaseConfig");
312312
checkElementValue("fixedEcefY", -5000000, 5000000, "Must be -5000000 to 5000000", "collapseBaseConfig");
313313
if (ge("fixedEcefZ").value == 0.0) ge("fixedEcefZ").value = 4084500;
314-
checkElementValue("fixedEcefZ", 4084500, 5000000, "Must be 4084500 to 5000000", "collapseBaseConfig");
314+
checkElementValue("fixedEcefZ", 4073466, 5000000, "Must be 4073466 to 5000000", "collapseBaseConfig");
315315
checkElementValue("fixedLat", -180, 180, "Must be -180 to 180", "collapseBaseConfig");
316316
checkElementValue("fixedLong", -180, 180, "Must be -180 to 180", "collapseBaseConfig");
317-
checkElementValue("fixedAltitude", 0, 8849, "Must be 0 to 8849", "collapseBaseConfig");
317+
checkElementValue("fixedAltitude", -11034, 8849, "Must be -11034 to 8849", "collapseBaseConfig");
318318

319319
checkElementString("ntripServer_wifiSSID", 1, 30, "Must be 1 to 30 characters", "collapseBaseConfig");
320320
checkElementString("ntripServer_wifiPW", 0, 30, "Must be 0 to 30 characters", "collapseBaseConfig");

Firmware/RTK_Surveyor/settings.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ typedef enum
3434
STATE_PROFILE_2,
3535
STATE_PROFILE_3,
3636
STATE_PROFILE_4,
37-
STATE_SHUTDOWN,
37+
STATE_SHUTDOWN,
3838
} SystemState;
3939
volatile SystemState systemState = STATE_ROVER_NOT_STARTED;
4040
SystemState lastSystemState = STATE_ROVER_NOT_STARTED;
@@ -304,7 +304,7 @@ typedef struct struct_settings {
304304
};
305305

306306
//Constellations monitored/used for fix
307-
ubxConstellation ubxConstellations[MAX_CONSTELLATIONS] =
307+
ubxConstellation ubxConstellations[MAX_CONSTELLATIONS] =
308308
{
309309
{UBLOX_CFG_SIGNAL_GPS_ENA, SFE_UBLOX_GNSS_ID_GPS, true, "GPS"},
310310
{UBLOX_CFG_SIGNAL_SBAS_ENA, SFE_UBLOX_GNSS_ID_SBAS, true, "SBAS"},
@@ -328,7 +328,7 @@ typedef struct struct_settings {
328328
char ntripServer_MountPointPW[50] = "WR5wRo4H";
329329
char ntripServer_wifiSSID[50] = "TRex"; //NTRIP Server Wifi
330330
char ntripServer_wifiPW[50] = "parachutes";
331-
331+
332332
//NTRIP Client
333333
bool enableNtripClient = false;
334334
char ntripClient_CasterHost[50] = "rtk2go.com"; //It's free...

0 commit comments

Comments
 (0)