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

Fix serialportconfig (#3084)

Browse source
This commit is contained in:
haslinghuis 2022-11-15 02:00:56 +01:00 • committed by GitHub
parent 46f0bb3885
commit 6b78f369fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/js/serial_backend.js
View file

@ -860,7 +860,9 @@ function reinitializeConnection(callback) {
clearInterval(reconnect); clearInterval(reconnect);
getStatus(); getStatus();
GUI.log(i18n.getMessage('deviceReady')); GUI.log(i18n.getMessage('deviceReady'));
callback?.(); if (callback === typeof('function')) {
callback();
}
} else { } else {
attempts++; attempts++;
if (attempts > 100) { if (attempts > 100) {

37
src/js/tabs/ports.js
View file

@ -432,14 +432,37 @@ ports.initialize = function (callback) {
}); });
// enable / disable features based on port configuration // enable / disable features based on port configuration
const func = serialPortConfig.functions; let enableRxSerial = false;
const featureConfig = FC.FEATURE_CONFIG.features; let enableTelemetry = false;
let enableBlackbox = false;
let enableEsc = false;
let enableGps = false;
const enableRxSerial = func.includes('RX_SERIAL'); for (const port of FC.SERIAL_CONFIG.ports) {
const enableTelemetry = func.some(e => e.startsWith("TELEMETRY")); const func = port.functions;
const enableBlackbox = func.includes('BLACKBOX');
const enableEsc = func.includes('ESC_SENSOR'); if (func.includes('RX_SERIAL')) {
const enableGps = func.includes('GPS'); enableRxSerial = true;
}
if (func.some(e => e.startsWith("TELEMETRY"))) {
enableTelemetry = true;
}
if (func.includes('BLACKBOX')) {
enableBlackbox = true;
}
if (func.includes('ESC_SENSOR')) {
enableEsc = true;
}
if (func.includes('GPS')) {
enableGps = true;
}
}
const featureConfig = FC.FEATURE_CONFIG.features;
if (enableRxSerial) { if (enableRxSerial) {
featureConfig.enable('RX_SERIAL'); featureConfig.enable('RX_SERIAL');