Skip to content

Commit 926e849

Browse files
committed
Undid refresh connection hack and processing debugs. Set log to clip older-than-250 lines of message.
1 parent b2df83b commit 926e849

File tree

2 files changed

+12
-14
lines changed

2 files changed

+12
-14
lines changed

index.js

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -117,14 +117,13 @@ function log(text = "", type = mStat, socket = null, direction = 0) {
117117
//Send to Launcher log view
118118
let logView = $('log');
119119
//Note scroll position (to see if user has scrolled up), append message, then auto-scroll (down) if bottom was previously in view
120-
console.log(logView.scrollTop);
120+
// console.log(logView.scrollTop);
121121
let scrollTop = logView.scrollTop;
122122
let scroll = (scrollTop+1 >= logView.scrollHeight-logView.clientHeight);
123123
logLines.push(stamp(verboseLogging) + text + '<br>');
124-
if (logLines.length > 40) {logLines.shift()}
124+
if (logLines.length > 250) {logLines.shift()}
125125
logView.innerHTML = logLines.join('');
126-
if (scroll) {logView.scrollTo(0, logView.scrollHeight)} else {if (scrollTop !== logView.ScrollTop) {logView.scrollTo(0, scrollTop-(logView.scrollTop-scrollTop))}}
127-
logView.style.
126+
if (scroll) {logView.scrollTo(0, logView.scrollHeight)} //else {if (scrollTop !== logView.ScrollTop) {logView.scrollTo(0, scrollTop-(logView.scrollTop-scrollTop))}}
128127
}
129128
//Send to Launcher console window
130129
if (type & mdConsole) {console.log(stamp(true) + text)}
@@ -234,13 +233,12 @@ document.addEventListener('DOMContentLoaded', function() {
234233

235234
// TODO: re-write this to use onblur and/or onchange to auto-save.
236235
$('refresh-connection').onclick = function() {
237-
$('log').innerHTML = '';
238-
// disconnect();
239-
// closeServer();
240-
// if(chrome.storage) {
241-
// chrome.storage.sync.set({'s_port':$('bpc-port').value, 's_url':$('bpc-url').value}, function() {if (chrome.runtime.lastError) {storageError()}});
242-
// }
243-
// connect();
236+
disconnect();
237+
closeServer();
238+
if(chrome.storage) {
239+
chrome.storage.sync.set({'s_port':$('bpc-port').value, 's_url':$('bpc-url').value}, function() {if (chrome.runtime.lastError) {storageError()}});
240+
}
241+
connect();
244242
};
245243

246244
$('netmask').addEventListener("blur", function() {

loader.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ function loadPropeller(sock, portName, action, payload, debug) {
140140
updatePort(port, {mode: "programming", bSocket: sock});
141141
connect = function() {return Promise.resolve()};
142142
}
143-
let startTime = Date.now();
143+
// let startTime = Date.now();
144144
// Use connection to download application to the Propeller
145145
connect()
146146
.then(function() {listen(port, true)}) //Enable listener
@@ -169,9 +169,9 @@ function loadPropeller(sock, portName, action, payload, debug) {
169169
.catch(function(e) {log(e.message, mAll, sock, -1)})
170170
.then(function() {if (port.isWireless) return closePort(port, false)})
171171
.catch(function(e) {log(e.message, mAll, sock, -1)})
172-
.then(function() {let stopTime = Date.now(); log('Processing time: ' + (stopTime-startTime).toString().slice(-5));})
172+
// .then(function() {let stopTime = Date.now(); log('Processing time: ' + (stopTime-startTime).toString().slice(-5));})
173173
.then(function() {resumeTimedEvents()}) // Resume timed events that were halted earlier
174-
.catch(function() {let stopTime = Date.now(); log('Processing time: ' + (stopTime-startTime).toString().slice(-5));})
174+
// .catch(function() {let stopTime = Date.now(); log('Processing time: ' + (stopTime-startTime).toString().slice(-5));})
175175
.catch(function() {resumeTimedEvents()});
176176
} else {
177177
// Port not found

0 commit comments

Comments
 (0)