Starting to constrain logView to limited number of lines. Problems with log scrolling when trimming leading lines.

Author: PropGit

index.js

@@ -84,6 +84,7 @@ const mDbug     = mcStatus              +              mdLog + mdConsole;
 const mDeep     = mcVerbose             +                      mdConsole;
 const mAll      = mcUser                +  mdDisplay + mdLog + mdConsole;
 
+let logLines = [];
 //TODO determine if more messages should be converted to mUser - instead of manually socket.send()'ing them
 //TODO allow this to be further filtered with includes/excludes set by app options at runtime
 //TODO provide mechanism for this to be a downloadable date-stamped file.
@@ -116,9 +117,14 @@ function log(text = "", type = mStat, socket = null, direction = 0) {
             //Send to Launcher log view
             let logView = $('log');
             //Note scroll position (to see if user has scrolled up), append message, then auto-scroll (down) if bottom was previously in view
-            let scroll = (logView.scrollTop+1 >= logView.scrollHeight-logView.clientHeight);
-            logView.innerHTML += stamp(verboseLogging) + text + '<br>';
-            if (scroll) {logView.scrollTo(0, logView.scrollHeight)}
+            console.log(logView.scrollTop);
+            let scrollTop = logView.scrollTop;
+            let scroll = (scrollTop+1 >= logView.scrollHeight-logView.clientHeight);
+            logLines.push(stamp(verboseLogging) + text + '<br>');
+            if (logLines.length > 40) {logLines.shift()}
+            logView.innerHTML = logLines.join('');
+            if (scroll) {logView.scrollTo(0, logView.scrollHeight)} else {if (scrollTop !== logView.ScrollTop) {logView.scrollTo(0, scrollTop-(logView.scrollTop-scrollTop))}}
+            logView.style.
         }
         //Send to Launcher console window
         if (type & mdConsole) {console.log(stamp(true) + text)}
@@ -228,12 +234,13 @@ document.addEventListener('DOMContentLoaded', function() {
 
     // TODO: re-write this to use onblur and/or onchange to auto-save.
     $('refresh-connection').onclick = function() {
-        disconnect();
-        closeServer();
-        if(chrome.storage) {
-            chrome.storage.sync.set({'s_port':$('bpc-port').value, 's_url':$('bpc-url').value}, function() {if (chrome.runtime.lastError) {storageError()}});
-        }
-        connect();
+        $('log').innerHTML = '';
+//        disconnect();
+//        closeServer();
+//        if(chrome.storage) {
+//            chrome.storage.sync.set({'s_port':$('bpc-port').value, 's_url':$('bpc-url').value}, function() {if (chrome.runtime.lastError) {storageError()}});
+//        }
+//        connect();
     };
 
     $('netmask').addEventListener("blur", function() {

loader.js

@@ -140,6 +140,7 @@ function loadPropeller(sock, portName, action, payload, debug) {
             updatePort(port, {mode: "programming", bSocket: sock});
             connect = function() {return Promise.resolve()};
         }
+        let startTime = Date.now();
         // Use connection to download application to the Propeller
         connect()
             .then(function() {listen(port, true)})                                                                  //Enable listener
@@ -168,7 +169,9 @@ function loadPropeller(sock, portName, action, payload, debug) {
             .catch(function(e) {log(e.message, mAll, sock, -1)})
             .then(function() {if (port.isWireless) return closePort(port, false)})
             .catch(function(e) {log(e.message, mAll, sock, -1)})
+            .then(function() {let stopTime = Date.now(); log('Processing time: ' + (stopTime-startTime).toString().slice(-5));})
             .then(function() {resumeTimedEvents()})                                                                 // Resume timed events that were halted earlier
+            .catch(function() {let stopTime = Date.now(); log('Processing time: ' + (stopTime-startTime).toString().slice(-5));})
             .catch(function() {resumeTimedEvents()});
     } else {
         // Port not found