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

Add manual connection option (#3703)

Browse source 
* Hide manual connection and refactor port_handler

* Rebased
This commit is contained in:
Mark Haslinghuis 2024-05-08 20:01:44 +02:00 • committed by GitHub
parent d354567129
commit 6105210e9e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 129 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

102
src/js/serial_backend.js
View file

@ -55,18 +55,9 @@ export function initializeSerialBackend() {
}
const selected_port = $('#port').val();
if (selected_port === 'manual') {
$('#port-override-option').show();
}
else {
$('#port-override-option').hide();
}
if (selected_port === 'virtual') {
$('#firmware-virtual-option').show();
}
else {
$('#firmware-virtual-option').hide();
}
$('#port-override-option').toggle(selected_port === 'manual');
$('#firmware-virtual-option').toggle(selected_port === 'virtual');
$('#auto-connect-and-baud').toggle(selected_port !== 'DFU');
};
@ -97,7 +88,7 @@ export function initializeSerialBackend() {
portName = String($('div#port-picker #port').val());
}
if (!GUI.connect_lock) {
if (!GUI.connect_lock && selectedPort !== 'none') {
// GUI control overrides the user control
GUI.configuration_loaded = false;
@ -107,58 +98,55 @@ export function initializeSerialBackend() {
if (selectedPort === 'DFU') {
$('select#baud').hide();
} else if (portName !== '0') {
if (!isConnected) {
console.log(`Connecting to: ${portName}`);
GUI.connecting_to = portName;
return;
}
// lock port select & baud while we are connecting / connected
$('div#port-picker #port, div#port-picker #baud, div#port-picker #delay').prop('disabled', true);
$('div.connect_controls div.connect_state').text(i18n.getMessage('connecting'));
if (!isConnected) {
console.log(`Connecting to: ${portName}`);
GUI.connecting_to = portName;
const baudRate = parseInt($('#baud').val());
if (selectedPort === 'virtual') {
CONFIGURATOR.virtualMode = true;
CONFIGURATOR.virtualApiVersion = $('#firmware-version-dropdown').val();
// lock port select & baud while we are connecting / connected
$('div#port-picker #port, div#port-picker #baud, div#port-picker #delay').prop('disabled', true);
$('div.connect_controls div.connect_state').text(i18n.getMessage('connecting'));
// Hack to get virtual working on the web
serial = serialShim();
serial.connect('virtual', {}, onOpenVirtual);
} else if (isWeb()) {
CONFIGURATOR.virtualMode = false;
serial = serialShim();
// Explicitly disconnect the event listeners before attaching the new ones.
serial.removeEventListener('connect', connectHandler);
serial.addEventListener('connect', connectHandler);
const baudRate = parseInt($('#baud').val());
if (selectedPort === 'virtual') {
CONFIGURATOR.virtualMode = true;
CONFIGURATOR.virtualApiVersion = $('#firmware-version-dropdown').val();
serial.removeEventListener('disconnect', disconnectHandler);
serial.addEventListener('disconnect', disconnectHandler);
// Hack to get virtual working on the web
serial = serialShim();
serial.connect('virtual', {}, onOpenVirtual);
} else if (isWeb()) {
CONFIGURATOR.virtualMode = false;
serial = serialShim();
// Explicitly disconnect the event listeners before attaching the new ones.
serial.removeEventListener('connect', connectHandler);
serial.addEventListener('connect', connectHandler);
serial.connect({ baudRate });
} else {
serial.connect(
portName,
{ bitrate: selected_baud },
onOpen,
);
toggleStatus();
}
serial.removeEventListener('disconnect', disconnectHandler);
serial.addEventListener('disconnect', disconnectHandler);
serial.connect({ baudRate });
} else {
if ($('div#flashbutton a.flash_state').hasClass('active') && $('div#flashbutton a.flash').hasClass('active')) {
$('div#flashbutton a.flash_state').removeClass('active');
$('div#flashbutton a.flash').removeClass('active');
}
GUI.timeout_kill_all();
GUI.interval_kill_all();
GUI.tab_switch_cleanup(() => GUI.tab_switch_in_progress = false);
function onFinishCallback() {
finishClose(toggleStatus);
}
mspHelper?.setArmingEnabled(true, false, onFinishCallback);
serial.connect(portName, { bitrate: selected_baud }, onOpen);
toggleStatus();
}
} else {
if ($('div#flashbutton a.flash_state').hasClass('active') && $('div#flashbutton a.flash').hasClass('active')) {
$('div#flashbutton a.flash_state').removeClass('active');
$('div#flashbutton a.flash').removeClass('active');
}
GUI.timeout_kill_all();
GUI.interval_kill_all();
GUI.tab_switch_cleanup(() => GUI.tab_switch_in_progress = false);
function onFinishCallback() {
finishClose(toggleStatus);
}
mspHelper?.setArmingEnabled(true, false, onFinishCallback);
}
}
});