Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/iNavFlight/inav-configurator.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcTn <ctndesigner@gmail.com>2014-08-09 21:38:46 +0400
committercTn <ctndesigner@gmail.com>2014-08-09 21:38:46 +0400
commit36f456d2e7f1472736d7980a27736510d94dd97b (patch)
treedd04b1653f69eb6eea2d018fb0d7b46372bd23d8 /js/serial.js
parent026f01434a4c3fe0e8b33628c21f87a9e738f831 (diff)
turning on strict mode for various js files
Diffstat (limited to 'js/serial.js')
-rw-r--r--js/serial.js86
1 files changed, 44 insertions, 42 deletions
diff --git a/js/serial.js b/js/serial.js
index 7b2e2c77..33157e16 100644
--- a/js/serial.js
+++ b/js/serial.js
@@ -1,3 +1,5 @@
+'use strict';
+
var serial = {
connectionId: -1,
bitrate: 0,
@@ -25,30 +27,30 @@ var serial = {
console.error(info);
googleAnalytics.sendException('Serial: ' + info.error, false);
- switch (info.error) {
- case 'system_error': // we might be able to recover from this one
- chrome.serial.setPaused(self.connectionId, false, get_status);
+ function get_status() {
+ self.getInfo(crunch_status);
+ }
- function get_status() {
- self.getInfo(crunch_status);
+ function crunch_status(info) {
+ if (!info.paused) {
+ console.log('SERIAL: Connection recovered from last onReceiveError');
+ googleAnalytics.sendException('Serial: onReceiveError - recovered', false);
+ } else {
+ console.log('SERIAL: Connection did not recover from last onReceiveError, disconnecting');
+ GUI.log('Unrecoverable <span style="color: red">failure</span> of serial connection, disconnecting...');
+ googleAnalytics.sendException('Serial: onReceiveError - unrecoverable', false);
+
+ if (GUI.connected_to || GUI.connecting_to) {
+ $('a.connect').click();
+ } else {
+ self.disconnect();
}
+ }
+ }
- function crunch_status(info) {
- if (!info.paused) {
- console.log('SERIAL: Connection recovered from last onReceiveError');
- googleAnalytics.sendException('Serial: onReceiveError - recovered', false);
- } else {
- console.log('SERIAL: Connection did not recover from last onReceiveError, disconnecting');
- GUI.log('Unrecoverable <span style="color: red">failure</span> of serial connection, disconnecting...');
- googleAnalytics.sendException('Serial: onReceiveError - unrecoverable', false);
-
- if (GUI.connected_to || GUI.connecting_to) {
- $('a.connect').click();
- } else {
- self.disconnect();
- }
- }
- }
+ switch (info.error) {
+ case 'system_error': // we might be able to recover from this one
+ chrome.serial.setPaused(self.connectionId, false, get_status);
break;
case 'timeout':
// TODO
@@ -125,32 +127,32 @@ var serial = {
var self = this;
self.output_buffer.push({'data': data, 'callback': callback});
- if (!self.transmitting) {
- self.transmitting = true;
+ function sending() {
+ // store inside separate variables in case array gets destroyed
+ var data = self.output_buffer[0].data;
+ var callback = self.output_buffer[0].callback;
- function sending() {
- // store inside separate variables in case array gets destroyed
- var data = self.output_buffer[0].data;
- var callback = self.output_buffer[0].callback;
+ chrome.serial.send(self.connectionId, data, function(sendInfo) {
+ callback(sendInfo);
+ self.output_buffer.shift();
- chrome.serial.send(self.connectionId, data, function(sendInfo) {
- callback(sendInfo);
- self.output_buffer.shift();
+ self.bytes_sent += sendInfo.bytesSent;
- self.bytes_sent += sendInfo.bytesSent;
+ if (self.output_buffer.length) {
+ // keep the buffer withing reasonable limits
+ while (self.output_buffer.length > 500) {
+ self.output_buffer.pop();
+ }
- if (self.output_buffer.length) {
- // keep the buffer withing reasonable limits
- while (self.output_buffer.length > 500) {
- self.output_buffer.pop();
- }
+ sending();
+ } else {
+ self.transmitting = false;
+ }
+ });
+ };
- sending();
- } else {
- self.transmitting = false;
- }
- });
- };
+ if (!self.transmitting) {
+ self.transmitting = true;
sending();
}