Mirror/inav-configurator
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-24 16:55:22 +03:00
Code Wiki Activity

Make firmware flasher more robust

Browse source 
Check for DFU/serial port regularly during 10 seconds instead of
waiting 1s and trying once. Also, make sure that we don't mistake
DFU devices with serial ones, since the serial port might appear
briefly while the FC is rebooting.
This commit is contained in:
Alberto García Hierro 2019-04-26 18:46:30 +01:00 • committed by Pawel Spychalski (DzikuVx)
parent c20fff75b2
commit 9e81e6dbb1
1 changed files with 37 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

54
js/protocols/stm32.js
View file

@ -100,25 +100,45 @@ STM32_protocol.prototype.connect = function (port, baud, hex, options, callback)
serial.send(bufferOut, function () { serial.send(bufferOut, function () {
serial.disconnect(function (result) { serial.disconnect(function (result) {
if (result) { if (result) {
// delay to allow board to boot in bootloader mode var intervalMs = 200;
// required to detect if a DFU device appears var retries = 0;
setTimeout(function() { var maxRetries = 50; // timeout after intervalMs * 50
// refresh device list var interval = setInterval(function() {
PortHandler.check_usb_devices(function(dfu_available) { var tryFailed = function() {
if(dfu_available) { retries++;
STM32DFU.connect(usbDevices.STM32DFU, hex, options); if (retries > maxRetries) {
} else { clearInterval(interval);
serial.connect(port, {bitrate: self.baud, parityBit: 'even', stopBits: 'one'}, function (openInfo) { GUI.log('<span style="color: red">Failed</span> to flash ' + port);
if (openInfo) {
self.initialize();
} else {
GUI.connect_lock = false;
GUI.log('<span style="color: red">Failed</span> to open serial port');
}
});
} }
}
// Check for DFU devices
PortHandler.check_usb_devices(function(dfu_available) {
if (dfu_available) {
clearInterval(interval);
STM32DFU.connect(usbDevices.STM32DFU, hex, options);
return;
}
// Check for the serial port
serial.getDevices(function(devices) {
if (devices && devices.includes(port)) {
// Serial port might briefly reappear on DFU devices while
// the FC is rebooting, so we don't clear the interval
// until we succesfully connect.
serial.connect(port, {bitrate: self.baud, parityBit: 'even', stopBits: 'one'}, function (openInfo) {
if (openInfo) {
clearInterval(interval);
self.initialize();
} else {
GUI.connect_lock = false;
tryFailed();
}
});
return;
}
tryFailed();
});
}); });
}, 1000); }, intervalMs);
} else { } else {
GUI.connect_lock = false; GUI.connect_lock = false;
} }