diff options
author | cTn <ctndesigner@gmail.com> | 2014-10-07 19:40:52 +0400 |
---|---|---|
committer | cTn <ctndesigner@gmail.com> | 2014-10-07 19:40:52 +0400 |
commit | 437fbe2cd065ef0b4ef3530097c19103dfae5e99 (patch) | |
tree | 4dd92a611c2538b7bb92c1996810a5ef7770ad30 | |
parent | 719b47ab489ea1939f88a640f3e0a62e9f244c31 (diff) |
cleanup eventPage, small optimizations and stricter rules for msp send callbacks
-rw-r--r-- | eventPage.js | 8 | ||||
-rw-r--r-- | js/msp.js | 8 |
2 files changed, 7 insertions, 9 deletions
diff --git a/eventPage.js b/eventPage.js index cc8643af..6dcba9ca 100644 --- a/eventPage.js +++ b/eventPage.js @@ -12,7 +12,7 @@ */ 'use strict'; -function start_app() { +function startApplication() { var applicationStartTime = new Date().getTime(); chrome.app.window.create('main.html', { @@ -73,9 +73,7 @@ function start_app() { }); } -chrome.app.runtime.onLaunched.addListener(function () { - start_app(); -}); +chrome.app.runtime.onLaunched.addListener(startApplication); chrome.runtime.onInstalled.addListener(function (details) { if (details.reason == 'update') { @@ -107,6 +105,6 @@ chrome.runtime.onInstalled.addListener(function (details) { chrome.notifications.onButtonClicked.addListener(function (notificationId, buttonIndex) { if (notificationId == 'baseflight_update') { - start_app(); + startApplication(); } });
\ No newline at end of file @@ -540,16 +540,16 @@ var MSP = { } var obj = {'code': code, 'callback': (callback_msp) ? callback_msp : false}; - obj.timer = setInterval(function() { + obj.timer = setInterval(function () { console.log('MSP data request timed-out: ' + code); - serial.send(bufferOut, function(sendInfo) {}); + serial.send(bufferOut, false); }, 1000); // we should be able to define timeout in the future MSP.callbacks.push(obj); - serial.send(bufferOut, function(sendInfo) { - if (sendInfo.bytesSent > 0) { + serial.send(bufferOut, function (sendInfo) { + if (sendInfo.bytesSent == bufferOut.length) { if (callback_sent) callback_sent(); } }); |