sundowndev
/
betaflight-configurator
mirror of https://github.com/sundowndev/betaflight-configurator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

primary backend upgrade

10.3.x-maintenance
cTn 2014-01-18 12:14:33 +01:00
parent fd576711a9
commit e45d1e69a9
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
js/serial_backend.js
View File

@ -1,4 +1,3 @@
var connectionId = -1;
var configuration_received = false; var configuration_received = false;
var CLI_active = false; var CLI_active = false;
@ -121,7 +120,7 @@ $(document).ready(function() {
$('div#port-picker #port, div#port-picker #baud, div#port-picker #delay').prop('disabled', true); $('div#port-picker #port, div#port-picker #baud, div#port-picker #delay').prop('disabled', true);
$('div#port-picker a.connect').text('Connecting'); $('div#port-picker a.connect').text('Connecting');
chrome.serial.open(selected_port, {bitrate: selected_baud}, onOpen); serial.connect(selected_port, {bitrate: selected_baud}, onOpen);
} else { } else {
// Disable any active "data pulling" timer // Disable any active "data pulling" timer
GUI.interval_kill_all(['port-update']); GUI.interval_kill_all(['port-update']);
@ -129,7 +128,12 @@ $(document).ready(function() {
GUI.tab_switch_cleanup(); GUI.tab_switch_cleanup();
GUI.timeout_remove('connecting'); GUI.timeout_remove('connecting');
chrome.serial.close(connectionId, onClosed); // remove listeners
serial.onReceive.listeners_.forEach(function(listener) {
serial.onReceive.removeListener(listener.callback);
});
serial.disconnect(onClosed);
GUI.connected_to = false; GUI.connected_to = false;
@ -203,15 +207,13 @@ $(document).ready(function() {
function onOpen(openInfo) { function onOpen(openInfo) {
if (openInfo.connectionId > 0) { if (openInfo.connectionId > 0) {
connectionId = openInfo.connectionId;
// update connected_to // update connected_to
GUI.connected_to = GUI.connecting_to; GUI.connected_to = GUI.connecting_to;
// reset connecting_to // reset connecting_to
GUI.connecting_to = false; GUI.connecting_to = false;
console.log('Connection was opened with ID: ' + connectionId); console.log('Connection was opened with ID: ' + openInfo.connectionId);
// save selected port with chrome.storage if the port differs // save selected port with chrome.storage if the port differs
chrome.storage.local.get('last_used_port', function(result) { chrome.storage.local.get('last_used_port', function(result) {
@ -232,8 +234,7 @@ function onOpen(openInfo) {
} }
}); });
// start polling serial.onReceive.addListener(read_serial);
GUI.interval_add('serial_read', readPoll, 10);
GUI.interval_add('port_usage', port_usage, 1000); GUI.interval_add('port_usage', port_usage, 1000);
// disconnect after 10 seconds with error if we don't get IDENT data // disconnect after 10 seconds with error if we don't get IDENT data
@ -274,8 +275,6 @@ function onOpen(openInfo) {
} }
function onClosed(result) { function onClosed(result) {
connectionId = -1; // reset connection id
if (result) { // All went as expected if (result) { // All went as expected
sensor_status(sensors_detected = 0); // reset active sensor indicators sensor_status(sensors_detected = 0); // reset active sensor indicators
$('#tabs > ul li').removeClass('active'); // de-select any selected tabs $('#tabs > ul li').removeClass('active'); // de-select any selected tabs
@ -288,8 +287,8 @@ function onClosed(result) {
} }
} }
function readPoll() { function read_serial(info) {
chrome.serial.read(connectionId, 128, MSP_char_read); MSP_char_read(info);
} }
function port_usage() { function port_usage() {
@ -304,7 +303,7 @@ function update_ports() {
var initial_ports = false; var initial_ports = false;
GUI.interval_add('port-update', function() { GUI.interval_add('port-update', function() {
chrome.serial.getPorts(function(current_ports) { serial.getDevices(function(current_ports) {
if (initial_ports.length > current_ports.length || !initial_ports) { if (initial_ports.length > current_ports.length || !initial_ports) {
// port got removed or initial_ports wasn't initialized yet // port got removed or initial_ports wasn't initialized yet
var removed_ports = array_difference(initial_ports, current_ports); var removed_ports = array_difference(initial_ports, current_ports);