Skip to content

Commit a13a0e8

Browse files
nseidlenseidle
committed
Only validate platform compatible portions of AP page
1 parent 29a9ce7 commit a13a0e8

File tree

2 files changed

+166
-142
lines changed

2 files changed

+166
-142
lines changed

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

Lines changed: 83 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -305,82 +305,91 @@ function validateFields() {
305305
checkMessageValue("UBX_RTCM_4072_0");
306306
checkMessageValue("UBX_RTCM_4072_1");
307307

308-
checkMessageValue("UBX_ESF_MEAS");
309-
checkMessageValue("UBX_ESF_RAW");
310-
checkMessageValue("UBX_ESF_STATUS");
311-
checkMessageValue("UBX_ESF_ALG");
312-
checkMessageValue("UBX_ESF_INS");
308+
if(platformPrefix == "Express Plus")
309+
{
310+
checkMessageValue("UBX_ESF_MEAS");
311+
checkMessageValue("UBX_ESF_RAW");
312+
checkMessageValue("UBX_ESF_STATUS");
313+
checkMessageValue("UBX_ESF_ALG");
314+
checkMessageValue("UBX_ESF_INS");
315+
}
313316

314317
//Base Config
315-
if (ge("baseTypeSurveyIn").checked) {
316-
checkElementValue("observationSeconds", 60, 600, "Must be between 60 to 600", "collapseBaseConfig");
317-
checkElementValue("observationPositionAccuracy", 1, 5.1, "Must be between 1.0 to 5.0", "collapseBaseConfig");
318-
319-
clearElement("fixedEcefX", -1280206.568);
320-
clearElement("fixedEcefY", -4716804.403);
321-
clearElement("fixedEcefZ", 4086665.484);
322-
clearElement("fixedLat", 40.09029479);
323-
clearElement("fixedLong", -105.18505761);
324-
clearElement("fixedAltitude", 1560.089);
325-
}
326-
else {
327-
clearElement("observationSeconds", 60);
328-
clearElement("observationPositionAccuracy", 5.0);
318+
if(platformPrefix != "Express Plus")
319+
{
320+
if (ge("baseTypeSurveyIn").checked) {
321+
checkElementValue("observationSeconds", 60, 600, "Must be between 60 to 600", "collapseBaseConfig");
322+
checkElementValue("observationPositionAccuracy", 1, 5.1, "Must be between 1.0 to 5.0", "collapseBaseConfig");
329323

330-
if (ge("fixedBaseCoordinateTypeECEF").checked) {
324+
clearElement("fixedEcefX", -1280206.568);
325+
clearElement("fixedEcefY", -4716804.403);
326+
clearElement("fixedEcefZ", 4086665.484);
331327
clearElement("fixedLat", 40.09029479);
332328
clearElement("fixedLong", -105.18505761);
333329
clearElement("fixedAltitude", 1560.089);
334-
335-
checkElementValue("fixedEcefX", -7000000, 7000000, "Must be -7000000 to 7000000", "collapseBaseConfig");
336-
checkElementValue("fixedEcefY", -7000000, 7000000, "Must be -7000000 to 7000000", "collapseBaseConfig");
337-
checkElementValue("fixedEcefZ", -7000000, 7000000, "Must be -7000000 to 7000000", "collapseBaseConfig");
338330
}
339-
else{
340-
clearElement("fixedEcefX", -1280206.568);
341-
clearElement("fixedEcefY", -4716804.403);
342-
clearElement("fixedEcefZ", 4086665.484);
331+
else {
332+
clearElement("observationSeconds", 60);
333+
clearElement("observationPositionAccuracy", 5.0);
334+
335+
if (ge("fixedBaseCoordinateTypeECEF").checked) {
336+
clearElement("fixedLat", 40.09029479);
337+
clearElement("fixedLong", -105.18505761);
338+
clearElement("fixedAltitude", 1560.089);
343339

344-
checkElementValue("fixedLat", -180, 180, "Must be -180 to 180", "collapseBaseConfig");
345-
checkElementValue("fixedLong", -180, 180, "Must be -180 to 180", "collapseBaseConfig");
346-
checkElementValue("fixedAltitude", -11034, 8849, "Must be -11034 to 8849", "collapseBaseConfig");
340+
checkElementValue("fixedEcefX", -7000000, 7000000, "Must be -7000000 to 7000000", "collapseBaseConfig");
341+
checkElementValue("fixedEcefY", -7000000, 7000000, "Must be -7000000 to 7000000", "collapseBaseConfig");
342+
checkElementValue("fixedEcefZ", -7000000, 7000000, "Must be -7000000 to 7000000", "collapseBaseConfig");
343+
}
344+
else{
345+
clearElement("fixedEcefX", -1280206.568);
346+
clearElement("fixedEcefY", -4716804.403);
347+
clearElement("fixedEcefZ", 4086665.484);
348+
349+
checkElementValue("fixedLat", -180, 180, "Must be -180 to 180", "collapseBaseConfig");
350+
checkElementValue("fixedLong", -180, 180, "Must be -180 to 180", "collapseBaseConfig");
351+
checkElementValue("fixedAltitude", -11034, 8849, "Must be -11034 to 8849", "collapseBaseConfig");
352+
}
347353
}
348-
}
349354

350-
if(ge("enableNtripServer").checked == true) {
351-
checkElementString("ntripServer_wifiSSID", 1, 30, "Must be 1 to 30 characters", "collapseBaseConfig");
352-
checkElementString("ntripServer_wifiPW", 0, 30, "Must be 0 to 30 characters", "collapseBaseConfig");
353-
checkElementString("ntripServer_CasterHost", 1, 30, "Must be 1 to 30 characters", "collapseBaseConfig");
354-
checkElementValue("ntripServer_CasterPort", 1, 99999, "Must be 1 to 99999", "collapseBaseConfig");
355-
checkElementString("ntripServer_MountPoint", 1, 30, "Must be 1 to 30 characters", "collapseBaseConfig");
356-
checkElementString("ntripServer_MountPointPW", 1, 30, "Must be 1 to 30 characters", "collapseBaseConfig");
357-
}
358-
else {
359-
clearElement("ntripServer_wifiSSID", "TRex");
360-
clearElement("ntripServer_wifiPW", "parachutes");
361-
clearElement("ntripServer_CasterHost", "rtk2go.com");
362-
clearElement("ntripServer_CasterPort", 2101);
363-
clearElement("ntripServer_CasterUser", "");
364-
clearElement("ntripServer_CasterUserPW", "");
365-
clearElement("ntripServer_MountPoint", "bldr_dwntwn2");
366-
clearElement("ntripServer_MountPointPW", "WR5wRo4H");
355+
if(ge("enableNtripServer").checked == true) {
356+
checkElementString("ntripServer_wifiSSID", 1, 30, "Must be 1 to 30 characters", "collapseBaseConfig");
357+
checkElementString("ntripServer_wifiPW", 0, 30, "Must be 0 to 30 characters", "collapseBaseConfig");
358+
checkElementString("ntripServer_CasterHost", 1, 30, "Must be 1 to 30 characters", "collapseBaseConfig");
359+
checkElementValue("ntripServer_CasterPort", 1, 99999, "Must be 1 to 99999", "collapseBaseConfig");
360+
checkElementString("ntripServer_MountPoint", 1, 30, "Must be 1 to 30 characters", "collapseBaseConfig");
361+
checkElementString("ntripServer_MountPointPW", 1, 30, "Must be 1 to 30 characters", "collapseBaseConfig");
362+
}
363+
else {
364+
clearElement("ntripServer_wifiSSID", "TRex");
365+
clearElement("ntripServer_wifiPW", "parachutes");
366+
clearElement("ntripServer_CasterHost", "rtk2go.com");
367+
clearElement("ntripServer_CasterPort", 2101);
368+
clearElement("ntripServer_CasterUser", "");
369+
clearElement("ntripServer_CasterUserPW", "");
370+
clearElement("ntripServer_MountPoint", "bldr_dwntwn2");
371+
clearElement("ntripServer_MountPointPW", "WR5wRo4H");
372+
}
367373
}
368374

369375
//L-Band Config
370-
if(ge("enablePointPerfectCorrections").checked == true) {
371-
checkElementString("home_wifiSSID", 1, 30, "Must be 1 to 30 characters", "collapsePPConfig");
372-
checkElementString("home_wifiPW", 0, 30, "Must be 0 to 30 characters", "collapsePPConfig");
373-
374-
value = ge("pointPerfectDeviceProfileToken").value;
375-
console.log(value);
376-
if (value.length > 0)
377-
checkElementString("pointPerfectDeviceProfileToken", 36, 36, "Must be 36 characters", "collapsePPConfig");
378-
}
379-
else {
380-
clearElement("home_wifiSSID", "");
381-
clearElement("home_wifiPW", "");
382-
clearElement("pointPerfectDeviceProfileToken", "");
383-
ge("autoKeyRenewal").checked = true;
376+
if(platformPrefix == "Facet L-Band")
377+
{
378+
if(ge("enablePointPerfectCorrections").checked == true) {
379+
checkElementString("home_wifiSSID", 1, 30, "Must be 1 to 30 characters", "collapsePPConfig");
380+
checkElementString("home_wifiPW", 0, 30, "Must be 0 to 30 characters", "collapsePPConfig");
381+
382+
value = ge("pointPerfectDeviceProfileToken").value;
383+
console.log(value);
384+
if (value.length > 0)
385+
checkElementString("pointPerfectDeviceProfileToken", 36, 36, "Must be 36 characters", "collapsePPConfig");
386+
}
387+
else {
388+
clearElement("home_wifiSSID", "");
389+
clearElement("home_wifiPW", "");
390+
clearElement("pointPerfectDeviceProfileToken", "");
391+
ge("autoKeyRenewal").checked = true;
392+
}
384393
}
385394

386395
//System Config
@@ -394,14 +403,17 @@ function validateFields() {
394403
}
395404

396405
//Port Config
397-
if(ge("enableExternalPulse").checked) {
398-
checkElementValue("externalPulseTimeBetweenPulse_us", 1, 65000000, "Must be 1 to 65,000,000", "collapsePortsConfig");
399-
checkElementValue("externalPulseLength_us", 1, 65000000, "Must be 1 to 65,000,000", "collapsePortsConfig");
400-
}
401-
else {
402-
clearElement("externalPulseTimeBetweenPulse_us", 100000);
403-
clearElement("externalPulseLength_us", 900000);
404-
ge("externalPulsePolarity").value = 0;
406+
if(platformPrefix != "Surveyor")
407+
{
408+
if(ge("enableExternalPulse").checked) {
409+
checkElementValue("externalPulseTimeBetweenPulse_us", 1, 65000000, "Must be 1 to 65,000,000", "collapsePortsConfig");
410+
checkElementValue("externalPulseLength_us", 1, 65000000, "Must be 1 to 65,000,000", "collapsePortsConfig");
411+
}
412+
else {
413+
clearElement("externalPulseTimeBetweenPulse_us", 100000);
414+
clearElement("externalPulseLength_us", 900000);
415+
ge("externalPulsePolarity").value = 0;
416+
}
405417
}
406418

407419
if (errorCount == 1) {

‎Firmware/RTK_Surveyor/form.h‎

Lines changed: 83 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -328,82 +328,91 @@ function validateFields() {
328328
checkMessageValue("UBX_RTCM_4072_0");
329329
checkMessageValue("UBX_RTCM_4072_1");
330330

331-
checkMessageValue("UBX_ESF_MEAS");
332-
checkMessageValue("UBX_ESF_RAW");
333-
checkMessageValue("UBX_ESF_STATUS");
334-
checkMessageValue("UBX_ESF_ALG");
335-
checkMessageValue("UBX_ESF_INS");
331+
if(platformPrefix == "Express Plus")
332+
{
333+
checkMessageValue("UBX_ESF_MEAS");
334+
checkMessageValue("UBX_ESF_RAW");
335+
checkMessageValue("UBX_ESF_STATUS");
336+
checkMessageValue("UBX_ESF_ALG");
337+
checkMessageValue("UBX_ESF_INS");
338+
}
336339

337340
//Base Config
338-
if (ge("baseTypeSurveyIn").checked) {
339-
checkElementValue("observationSeconds", 60, 600, "Must be between 60 to 600", "collapseBaseConfig");
340-
checkElementValue("observationPositionAccuracy", 1, 5.1, "Must be between 1.0 to 5.0", "collapseBaseConfig");
341-
342-
clearElement("fixedEcefX", -1280206.568);
343-
clearElement("fixedEcefY", -4716804.403);
344-
clearElement("fixedEcefZ", 4086665.484);
345-
clearElement("fixedLat", 40.09029479);
346-
clearElement("fixedLong", -105.18505761);
347-
clearElement("fixedAltitude", 1560.089);
348-
}
349-
else {
350-
clearElement("observationSeconds", 60);
351-
clearElement("observationPositionAccuracy", 5.0);
341+
if(platformPrefix != "Express Plus")
342+
{
343+
if (ge("baseTypeSurveyIn").checked) {
344+
checkElementValue("observationSeconds", 60, 600, "Must be between 60 to 600", "collapseBaseConfig");
345+
checkElementValue("observationPositionAccuracy", 1, 5.1, "Must be between 1.0 to 5.0", "collapseBaseConfig");
352346

353-
if (ge("fixedBaseCoordinateTypeECEF").checked) {
347+
clearElement("fixedEcefX", -1280206.568);
348+
clearElement("fixedEcefY", -4716804.403);
349+
clearElement("fixedEcefZ", 4086665.484);
354350
clearElement("fixedLat", 40.09029479);
355351
clearElement("fixedLong", -105.18505761);
356352
clearElement("fixedAltitude", 1560.089);
357-
358-
checkElementValue("fixedEcefX", -7000000, 7000000, "Must be -7000000 to 7000000", "collapseBaseConfig");
359-
checkElementValue("fixedEcefY", -7000000, 7000000, "Must be -7000000 to 7000000", "collapseBaseConfig");
360-
checkElementValue("fixedEcefZ", -7000000, 7000000, "Must be -7000000 to 7000000", "collapseBaseConfig");
361353
}
362-
else{
363-
clearElement("fixedEcefX", -1280206.568);
364-
clearElement("fixedEcefY", -4716804.403);
365-
clearElement("fixedEcefZ", 4086665.484);
354+
else {
355+
clearElement("observationSeconds", 60);
356+
clearElement("observationPositionAccuracy", 5.0);
366357

367-
checkElementValue("fixedLat", -180, 180, "Must be -180 to 180", "collapseBaseConfig");
368-
checkElementValue("fixedLong", -180, 180, "Must be -180 to 180", "collapseBaseConfig");
369-
checkElementValue("fixedAltitude", -11034, 8849, "Must be -11034 to 8849", "collapseBaseConfig");
358+
if (ge("fixedBaseCoordinateTypeECEF").checked) {
359+
clearElement("fixedLat", 40.09029479);
360+
clearElement("fixedLong", -105.18505761);
361+
clearElement("fixedAltitude", 1560.089);
362+
363+
checkElementValue("fixedEcefX", -7000000, 7000000, "Must be -7000000 to 7000000", "collapseBaseConfig");
364+
checkElementValue("fixedEcefY", -7000000, 7000000, "Must be -7000000 to 7000000", "collapseBaseConfig");
365+
checkElementValue("fixedEcefZ", -7000000, 7000000, "Must be -7000000 to 7000000", "collapseBaseConfig");
366+
}
367+
else{
368+
clearElement("fixedEcefX", -1280206.568);
369+
clearElement("fixedEcefY", -4716804.403);
370+
clearElement("fixedEcefZ", 4086665.484);
371+
372+
checkElementValue("fixedLat", -180, 180, "Must be -180 to 180", "collapseBaseConfig");
373+
checkElementValue("fixedLong", -180, 180, "Must be -180 to 180", "collapseBaseConfig");
374+
checkElementValue("fixedAltitude", -11034, 8849, "Must be -11034 to 8849", "collapseBaseConfig");
375+
}
370376
}
371-
}
372377

373-
if(ge("enableNtripServer").checked == true) {
374-
checkElementString("ntripServer_wifiSSID", 1, 30, "Must be 1 to 30 characters", "collapseBaseConfig");
375-
checkElementString("ntripServer_wifiPW", 0, 30, "Must be 0 to 30 characters", "collapseBaseConfig");
376-
checkElementString("ntripServer_CasterHost", 1, 30, "Must be 1 to 30 characters", "collapseBaseConfig");
377-
checkElementValue("ntripServer_CasterPort", 1, 99999, "Must be 1 to 99999", "collapseBaseConfig");
378-
checkElementString("ntripServer_MountPoint", 1, 30, "Must be 1 to 30 characters", "collapseBaseConfig");
379-
checkElementString("ntripServer_MountPointPW", 1, 30, "Must be 1 to 30 characters", "collapseBaseConfig");
380-
}
381-
else {
382-
clearElement("ntripServer_wifiSSID", "TRex");
383-
clearElement("ntripServer_wifiPW", "parachutes");
384-
clearElement("ntripServer_CasterHost", "rtk2go.com");
385-
clearElement("ntripServer_CasterPort", 2101);
386-
clearElement("ntripServer_CasterUser", "");
387-
clearElement("ntripServer_CasterUserPW", "");
388-
clearElement("ntripServer_MountPoint", "bldr_dwntwn2");
389-
clearElement("ntripServer_MountPointPW", "WR5wRo4H");
378+
if(ge("enableNtripServer").checked == true) {
379+
checkElementString("ntripServer_wifiSSID", 1, 30, "Must be 1 to 30 characters", "collapseBaseConfig");
380+
checkElementString("ntripServer_wifiPW", 0, 30, "Must be 0 to 30 characters", "collapseBaseConfig");
381+
checkElementString("ntripServer_CasterHost", 1, 30, "Must be 1 to 30 characters", "collapseBaseConfig");
382+
checkElementValue("ntripServer_CasterPort", 1, 99999, "Must be 1 to 99999", "collapseBaseConfig");
383+
checkElementString("ntripServer_MountPoint", 1, 30, "Must be 1 to 30 characters", "collapseBaseConfig");
384+
checkElementString("ntripServer_MountPointPW", 1, 30, "Must be 1 to 30 characters", "collapseBaseConfig");
385+
}
386+
else {
387+
clearElement("ntripServer_wifiSSID", "TRex");
388+
clearElement("ntripServer_wifiPW", "parachutes");
389+
clearElement("ntripServer_CasterHost", "rtk2go.com");
390+
clearElement("ntripServer_CasterPort", 2101);
391+
clearElement("ntripServer_CasterUser", "");
392+
clearElement("ntripServer_CasterUserPW", "");
393+
clearElement("ntripServer_MountPoint", "bldr_dwntwn2");
394+
clearElement("ntripServer_MountPointPW", "WR5wRo4H");
395+
}
390396
}
391397

392398
//L-Band Config
393-
if(ge("enablePointPerfectCorrections").checked == true) {
394-
checkElementString("home_wifiSSID", 1, 30, "Must be 1 to 30 characters", "collapsePPConfig");
395-
checkElementString("home_wifiPW", 0, 30, "Must be 0 to 30 characters", "collapsePPConfig");
396-
397-
value = ge("pointPerfectDeviceProfileToken").value;
398-
console.log(value);
399-
if (value.length > 0)
400-
checkElementString("pointPerfectDeviceProfileToken", 36, 36, "Must be 36 characters", "collapsePPConfig");
401-
}
402-
else {
403-
clearElement("home_wifiSSID", "");
404-
clearElement("home_wifiPW", "");
405-
clearElement("pointPerfectDeviceProfileToken", "");
406-
ge("autoKeyRenewal").checked = true;
399+
if(platformPrefix == "Facet L-Band")
400+
{
401+
if(ge("enablePointPerfectCorrections").checked == true) {
402+
checkElementString("home_wifiSSID", 1, 30, "Must be 1 to 30 characters", "collapsePPConfig");
403+
checkElementString("home_wifiPW", 0, 30, "Must be 0 to 30 characters", "collapsePPConfig");
404+
405+
value = ge("pointPerfectDeviceProfileToken").value;
406+
console.log(value);
407+
if (value.length > 0)
408+
checkElementString("pointPerfectDeviceProfileToken", 36, 36, "Must be 36 characters", "collapsePPConfig");
409+
}
410+
else {
411+
clearElement("home_wifiSSID", "");
412+
clearElement("home_wifiPW", "");
413+
clearElement("pointPerfectDeviceProfileToken", "");
414+
ge("autoKeyRenewal").checked = true;
415+
}
407416
}
408417

409418
//System Config
@@ -417,14 +426,17 @@ function validateFields() {
417426
}
418427

419428
//Port Config
420-
if(ge("enableExternalPulse").checked) {
421-
checkElementValue("externalPulseTimeBetweenPulse_us", 1, 65000000, "Must be 1 to 65,000,000", "collapsePortsConfig");
422-
checkElementValue("externalPulseLength_us", 1, 65000000, "Must be 1 to 65,000,000", "collapsePortsConfig");
423-
}
424-
else {
425-
clearElement("externalPulseTimeBetweenPulse_us", 100000);
426-
clearElement("externalPulseLength_us", 900000);
427-
ge("externalPulsePolarity").value = 0;
429+
if(platformPrefix != "Surveyor")
430+
{
431+
if(ge("enableExternalPulse").checked) {
432+
checkElementValue("externalPulseTimeBetweenPulse_us", 1, 65000000, "Must be 1 to 65,000,000", "collapsePortsConfig");
433+
checkElementValue("externalPulseLength_us", 1, 65000000, "Must be 1 to 65,000,000", "collapsePortsConfig");
434+
}
435+
else {
436+
clearElement("externalPulseTimeBetweenPulse_us", 100000);
437+
clearElement("externalPulseLength_us", 900000);
438+
ge("externalPulsePolarity").value = 0;
439+
}
428440
}
429441

430442
if (errorCount == 1) {

0 commit comments

Comments
 (0)