Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-26 17:55:24 +03:00
Code Issues Wiki Activity

Fix auto-connect

Browse source
This commit is contained in:
Mark Haslinghuis 2025-06-18 23:58:35 +02:00
parent b52b4fea66
commit 5001d839dd
2 changed files with 9 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/js/port_handler.js
View file

@ -207,16 +207,6 @@ PortHandler.selectActivePort = function (suggestedDevice = false) {
return selectedPort; return selectedPort;
} }
// If there is no connection, check for the last used device
// Check if the device is already connected
if (this.portPicker.selectedPort && this.portPicker.selectedPort !== DEFAULT_PORT) {
selectedPort = this.currentSerialPorts.find((device) => device.path === this.portPicker.selectedPort);
if (selectedPort) {
console.log(`${this.logHead} Using previously selected device: ${selectedPort.path}`);
return selectedPort.path;
}
}
// Return the suggested device (the new device that has been detected) // Return the suggested device (the new device that has been detected)
if (!selectedPort && suggestedDevice) { if (!selectedPort && suggestedDevice) {
selectedPort = suggestedDevice.path; selectedPort = suggestedDevice.path;

21
src/js/serial_backend.js
View file

@ -55,19 +55,12 @@ function disconnectHandler(event) {
export function initializeSerialBackend() { export function initializeSerialBackend() {
$("a.connection_button__link").on("click", connectDisconnect); $("a.connection_button__link").on("click", connectDisconnect);
EventBus.$on("port-handler:auto-select-serial-device", function (device) { const autoConnectEvents = [
if ( "port-handler:auto-select-webserial-device",
!GUI.connected_to && "port-handler:auto-select-webbluetooth-device",
!GUI.connecting_to && ];
GUI.active_tab !== "firmware_flasher" &&
((PortHandler.portPicker.autoConnect && !["manual", "virtual"].includes(device)) ||
Date.now() - rebootTimestamp < REBOOT_CONNECT_MAX_TIME_MS)
) {
connectDisconnect();
}
});
EventBus.$on("port-handler:auto-select-bluetooth-device", function (device) { const autoConnectHandler = function (device) {
if ( if (
!GUI.connected_to && !GUI.connected_to &&
!GUI.connecting_to && !GUI.connecting_to &&
@ -77,6 +70,10 @@ export function initializeSerialBackend() {
) { ) {
connectDisconnect(); connectDisconnect();
} }
};
autoConnectEvents.forEach((eventName) => {
EventBus.$on(eventName, autoConnectHandler);
}); });
// Using serial and bluetooth we don't know which event we need before we connect // Using serial and bluetooth we don't know which event we need before we connect