@@ -12,7 +12,7 @@ function ge(e) {
1212var platformPrefix = "Surveyor" ;
1313
1414function parseIncoming ( msg ) {
15- console . log ( "incoming message: " + msg ) ;
15+ // console.log("incoming message: " + msg);
1616
1717 var data = msg . split ( ',' ) ;
1818 for ( let x = 0 ; x < data . length - 1 ; x += 2 ) {
@@ -83,24 +83,27 @@ function parseIncoming(msg) {
8383 ) {
8484 ge ( id ) . innerHTML = val ;
8585 }
86- else if ( id . includes ( "firmwareFileName" ) ) {
87- show ( "firmwareAvailable" ) ; //Turn on firmware area
88-
89- ge ( id ) . innerHTML = val ;
90- if ( id . includes ( "0" ) ) show ( "firmwareFile0" ) ;
91- if ( id . includes ( "1" ) ) show ( "firmwareFile1" ) ;
92- if ( id . includes ( "2" ) ) show ( "firmwareFile2" ) ;
93- if ( id . includes ( "3" ) ) show ( "firmwareFile3" ) ;
94- if ( id . includes ( "4" ) ) show ( "firmwareFile4" ) ;
95- if ( id . includes ( "5" ) ) show ( "firmwareFile5" ) ;
86+ else if ( id . includes ( "firmwareUploadComplete" ) ) {
87+ firmwareUploadComplete ( ) ;
88+ }
89+ else if ( id . includes ( "firmwareUploadStatus" ) ) {
90+ firmwareUploadStatus ( val ) ;
9691 }
9792
9893 //Check boxes / radio buttons
9994 else if ( val == "true" ) {
100- ge ( id ) . checked = true ;
95+ try {
96+ ge ( id ) . checked = true ;
97+ } catch ( error ) {
98+ console . log ( "Issue with ID: " + id )
99+ }
101100 }
102101 else if ( val == "false" ) {
103- ge ( id ) . checked = false ;
102+ try {
103+ ge ( id ) . checked = false ;
104+ } catch ( error ) {
105+ console . log ( "Issue with ID: " + id )
106+ }
104107 }
105108
106109 //All regular input boxes and values
@@ -153,22 +156,6 @@ function sendData() {
153156 ws . send ( settingCSV ) ;
154157}
155158
156- function sendFirmwareFile ( ) {
157- var firmwareFileName = "firmwareFileName," ;
158-
159- //ID the firmware file radio
160- if ( ge ( "file0" ) . checked ) firmwareFileName += ge ( "firmwareFileName0" ) . innerHTML ;
161- else if ( ge ( "file1" ) . checked ) firmwareFileName += ge ( "firmwareFileName1" ) . innerHTML ;
162- else if ( ge ( "file2" ) . checked ) firmwareFileName += ge ( "firmwareFileName2" ) . innerHTML ;
163- else if ( ge ( "file3" ) . checked ) firmwareFileName += ge ( "firmwareFileName3" ) . innerHTML ;
164- else if ( ge ( "file4" ) . checked ) firmwareFileName += ge ( "firmwareFileName4" ) . innerHTML ;
165- else if ( ge ( "file5" ) . checked ) firmwareFileName += ge ( "firmwareFileName5" ) . innerHTML ;
166-
167- firmwareFileName += ","
168- ws . send ( firmwareFileName ) ;
169- ge ( "firmwareUpdateMsg" ) . innerHTML = 'Updating, please wait for system reset...' ;
170- }
171-
172159function showError ( id , errorText ) {
173160 ge ( id + 'Error' ) . innerHTML = '<br>Error: ' + errorText ;
174161}
@@ -310,8 +297,8 @@ function validateFields() {
310297 checkElementString ( "wifiPW" , 0 , 30 , "Must be 0 to 30 characters" , "collapseBaseConfig" ) ;
311298 checkElementString ( "casterHost" , 1 , 30 , "Must be 1 to 30 characters" , "collapseBaseConfig" ) ;
312299 checkElementValue ( "casterPort" , 1 , 99999 , "Must be 1 to 99999" , "collapseBaseConfig" ) ;
313- checkElementString ( "mountPoint " , 1 , 30 , "Must be 1 to 30 characters" , "collapseBaseConfig" ) ;
314- checkElementString ( "mountPointPW " , 1 , 30 , "Must be 1 to 30 characters" , "collapseBaseConfig" ) ;
300+ checkElementString ( "mountPointUpload " , 1 , 30 , "Must be 1 to 30 characters" , "collapseBaseConfig" ) ;
301+ checkElementString ( "mountPointUploadPW " , 1 , 30 , "Must be 1 to 30 characters" , "collapseBaseConfig" ) ;
315302
316303 //System Config
317304 checkElementValue ( "maxLogTime_minutes" , 1 , 2880 , "Must be 1 to 2880" , "collapseSystemConfig" ) ;
@@ -491,11 +478,20 @@ function resetToLoggingDefaults() {
491478function exitConfig ( ) {
492479 show ( "exitPage" ) ;
493480 hide ( "mainPage" ) ;
494- ws . send ( "exitToRoverMode ,1," ) ;
481+ ws . send ( "exitAndReset ,1," ) ;
495482}
496483
497484function firmwareUploadWait ( ) {
498- ge ( "firmwareUploadMsg" ) . innerHTML = "<br>Uploading, please wait...." ;
485+ ge ( "firmwareUploadMsg" ) . innerHTML = "<br>Uploading, please wait..." ;
486+ }
487+
488+ function firmwareUploadStatus ( val ) {
489+ ge ( "firmwareUploadMsg" ) . innerHTML = val ;
490+ }
491+
492+ function firmwareUploadComplete ( ) {
493+ show ( "firmwareUploadComplete" ) ;
494+ hide ( "mainPage" ) ;
499495}
500496
501497document . addEventListener ( "DOMContentLoaded" , ( event ) => {
@@ -544,7 +540,7 @@ document.addEventListener("DOMContentLoaded", (event) => {
544540 ge ( "fixedEcefX" ) . disabled = false ;
545541 ge ( "fixedEcefY" ) . disabled = false ;
546542 ge ( "fixedEcefZ" ) . disabled = false ;
547- //Disable Geographic inputs
543+ //Disable Geodetic inputs
548544 ge ( "fixedLat" ) . disabled = true ;
549545 ge ( "fixedLong" ) . disabled = true ;
550546 ge ( "fixedAltitude" ) . disabled = true ;
@@ -554,7 +550,7 @@ document.addEventListener("DOMContentLoaded", (event) => {
554550 ge ( "fixedEcefX" ) . disabled = true ;
555551 ge ( "fixedEcefY" ) . disabled = true ;
556552 ge ( "fixedEcefZ" ) . disabled = true ;
557- //Disable Geographic inputs
553+ //Disable Geodetic inputs
558554 ge ( "fixedLat" ) . disabled = false ;
559555 ge ( "fixedLong" ) . disabled = false ;
560556 ge ( "fixedAltitude" ) . disabled = false ;
@@ -569,7 +565,7 @@ document.addEventListener("DOMContentLoaded", (event) => {
569565 ge ( "fixedEcefX" ) . disabled = false ;
570566 ge ( "fixedEcefY" ) . disabled = false ;
571567 ge ( "fixedEcefZ" ) . disabled = false ;
572- //Disable Geographic inputs
568+ //Disable Geodetic inputs
573569 ge ( "fixedLat" ) . disabled = true ;
574570 ge ( "fixedLong" ) . disabled = true ;
575571 ge ( "fixedAltitude" ) . disabled = true ;
@@ -579,7 +575,7 @@ document.addEventListener("DOMContentLoaded", (event) => {
579575 ge ( "fixedEcefX" ) . disabled = true ;
580576 ge ( "fixedEcefY" ) . disabled = true ;
581577 ge ( "fixedEcefZ" ) . disabled = true ;
582- //Disable Geographic inputs
578+ //Enable Geodetic inputs
583579 ge ( "fixedLat" ) . disabled = false ;
584580 ge ( "fixedLong" ) . disabled = false ;
585581 ge ( "fixedAltitude" ) . disabled = false ;
@@ -593,7 +589,7 @@ document.addEventListener("DOMContentLoaded", (event) => {
593589 ge ( "fixedEcefX" ) . disabled = true ;
594590 ge ( "fixedEcefY" ) . disabled = true ;
595591 ge ( "fixedEcefZ" ) . disabled = true ;
596- //Disable Geographic inputs
592+ //Enable Geodetic inputs
597593 ge ( "fixedLat" ) . disabled = false ;
598594 ge ( "fixedLong" ) . disabled = false ;
599595 ge ( "fixedAltitude" ) . disabled = false ;
@@ -603,7 +599,7 @@ document.addEventListener("DOMContentLoaded", (event) => {
603599 ge ( "fixedEcefX" ) . disabled = false ;
604600 ge ( "fixedEcefY" ) . disabled = false ;
605601 ge ( "fixedEcefZ" ) . disabled = false ;
606- //Disable Geographic inputs
602+ //Disable Geodetic inputs
607603 ge ( "fixedLat" ) . disabled = true ;
608604 ge ( "fixedLong" ) . disabled = true ;
609605 ge ( "fixedAltitude" ) . disabled = true ;
@@ -617,17 +613,17 @@ document.addEventListener("DOMContentLoaded", (event) => {
617613 ge ( "wifiPW" ) . disabled = false ;
618614 ge ( "casterHost" ) . disabled = false ;
619615 ge ( "casterPort" ) . disabled = false ;
620- ge ( "mountPoint " ) . disabled = false ;
621- ge ( "mountPointPW " ) . disabled = false ;
616+ ge ( "mountPointUpload " ) . disabled = false ;
617+ ge ( "mountPointUploadPW " ) . disabled = false ;
622618 }
623619 else {
624620 //Disable NTRIP inputs
625621 ge ( "wifiSSID" ) . disabled = true ;
626622 ge ( "wifiPW" ) . disabled = true ;
627623 ge ( "casterHost" ) . disabled = true ;
628624 ge ( "casterPort" ) . disabled = true ;
629- ge ( "mountPoint " ) . disabled = true ;
630- ge ( "mountPointPW " ) . disabled = true ;
625+ ge ( "mountPointUpload " ) . disabled = true ;
626+ ge ( "mountPointUploadPW " ) . disabled = true ;
631627 }
632628 } ) ;
633629
@@ -653,25 +649,6 @@ document.addEventListener("DOMContentLoaded", (event) => {
653649 }
654650 } ) ;
655651
656- //Enable the check box
657- ge ( "firmwareFile0" ) . addEventListener ( "change" , function ( ) { ge ( "enableFirmwareUpdate" ) . disabled = false ; } ) ;
658- ge ( "firmwareFile1" ) . addEventListener ( "change" , function ( ) { ge ( "enableFirmwareUpdate" ) . disabled = false ; } ) ;
659- ge ( "firmwareFile2" ) . addEventListener ( "change" , function ( ) { ge ( "enableFirmwareUpdate" ) . disabled = false ; } ) ;
660- ge ( "firmwareFile3" ) . addEventListener ( "change" , function ( ) { ge ( "enableFirmwareUpdate" ) . disabled = false ; } ) ;
661- ge ( "firmwareFile4" ) . addEventListener ( "change" , function ( ) { ge ( "enableFirmwareUpdate" ) . disabled = false ; } ) ;
662- ge ( "firmwareFile5" ) . addEventListener ( "change" , function ( ) { ge ( "enableFirmwareUpdate" ) . disabled = false ; } ) ;
663-
664- ge ( "enableFirmwareUpdate" ) . addEventListener ( "change" , function ( ) {
665- if ( ge ( "enableFirmwareUpdate" ) . checked ) {
666- //Enable button
667- ge ( "firmwareUpdate" ) . disabled = false ;
668- }
669- else {
670- //Disable button
671- ge ( "firmwareUpdate" ) . disabled = true ;
672- }
673- } ) ;
674-
675652 ge ( "dataPortChannel" ) . addEventListener ( "change" , function ( ) {
676653 if ( ge ( "dataPortChannel" ) . value == 0 ) {
677654 show ( "dataPortBaudDropdown" ) ;
0 commit comments