Mirror/inav-configurator
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-14 20:10:11 +03:00
Code Wiki Activity

utilize latest changes in serial lib

Browse source
This commit is contained in:
cTn 2014-02-03 10:07:54 +01:00
parent 4b2d5c4a48
commit e3ec48452c
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
js/serial_backend.js
View file

@ -106,7 +106,7 @@ $(document).ready(function() {
}); });
function onOpen(openInfo) { function onOpen(openInfo) {
if (openInfo.connectionId > 0) { if (openInfo) {
// update connected_to // update connected_to
GUI.connected_to = GUI.connecting_to; GUI.connected_to = GUI.connecting_to;

12
js/stm32.js
View file

@ -84,7 +84,7 @@ STM32_protocol.prototype.connect = function(hex) {
if (!$('input.updating').is(':checked')) { if (!$('input.updating').is(':checked')) {
serial.connect(selected_port, {bitrate: baud}, function(openInfo) { serial.connect(selected_port, {bitrate: baud}, function(openInfo) {
if (openInfo.connectionId > 0) { if (openInfo) {
console.log('Sending ascii "R" to reboot'); console.log('Sending ascii "R" to reboot');
// we are connected, disabling connect button in the UI // we are connected, disabling connect button in the UI
@ -99,8 +99,10 @@ STM32_protocol.prototype.connect = function(hex) {
serial.disconnect(function(result) { serial.disconnect(function(result) {
if (result) { if (result) {
serial.connect(selected_port, {bitrate: flashing_bitrate, parityBit: 'even', stopBits: 'one'}, function(openInfo) { serial.connect(selected_port, {bitrate: flashing_bitrate, parityBit: 'even', stopBits: 'one'}, function(openInfo) {
if (openInfo.connectionId > 0) { if (openInfo) {
self.initialize(); self.initialize();
} else {
GUI.log('<span style="color: red">Failed</span> to open serial port');
} }
}); });
} else { } else {
@ -108,15 +110,19 @@ STM32_protocol.prototype.connect = function(hex) {
} }
}); });
}); });
} else {
GUI.log('<span style="color: red">Failed</span> to open serial port');
} }
}); });
} else { } else {
serial.connect(selected_port, {bitrate: flashing_bitrate, parityBit: 'even', stopBits: 'one'}, function(openInfo) { serial.connect(selected_port, {bitrate: flashing_bitrate, parityBit: 'even', stopBits: 'one'}, function(openInfo) {
if (openInfo.connectionId > 0) { if (openInfo) {
// we are connected, disabling connect button in the UI // we are connected, disabling connect button in the UI
GUI.connect_lock = true; GUI.connect_lock = true;
self.initialize(); self.initialize();
} else {
GUI.log('<span style="color: red">Failed</span> to open serial port');
} }
}); });
} }