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

Make virtual mode an option using msp backup and restore

Browse source
This commit is contained in:
Mark Haslinghuis 2022-01-10 01:22:24 +01:00
parent c9b7ed8fd7
commit bad27d3d15
6 changed files with 69 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
locales/en/messages.json
View file

@ -109,6 +109,10 @@
"message": "Show all serial devices (for manufacturers or development)",
"description": "Do not filter serial devices using VID/PID values (for manufacturers or development)"
},
"showVirtualMode": {
"message": "Enable virtual connection mode",
"description": "Text for the option to enable or disable the virtual FC"
},
"cordovaForceComputerUI": {
"message": "Use computers interface instead of phones interface"
},

30
src/js/port_handler.js
View file

@ -13,6 +13,8 @@ const PortHandler = new function () {
this.port_removed_callbacks = [];
this.dfu_available = false;
this.port_available = false;
this.showAllSerialDevices = false;
this.showVirtualMode = false;
};
PortHandler.initialize = function () {
@ -31,6 +33,9 @@ PortHandler.initialize = function () {
PortHandler.check = function () {
const self = this;
ConfigStorage.get('showVirtualMode', res => self.showVirtualMode = res.showVirtualMode);
ConfigStorage.get('showAllSerialDevices', res => self.showAllSerialDevices = res.showAllSerialDevices);
self.check_usb_devices();
self.check_serial_devices();
@ -79,17 +84,20 @@ PortHandler.check_usb_devices = function (callback) {
data: {isDFU: true},
}));
self.portPickerElement.append($('<option/>', {
value: 'virtual',
text: i18n.getMessage('portsSelectVirtual'),
data: {isVirtual: true},
}));
if (self.showVirtualMode) {
self.portPickerElement.append($('<option/>', {
value: 'virtual',
text: i18n.getMessage('portsSelectVirtual'),
data: {isVirtual: true},
}));
}
self.portPickerElement.append($('<option/>', {
value: 'manual',
text: i18n.getMessage('portsSelectManual'),
data: {isManual: true},
}));
self.portPickerElement.val('DFU').change();
self.setPortsInputWidth();
}
@ -241,11 +249,13 @@ PortHandler.updatePortSelect = function (ports) {
}));
}
this.portPickerElement.append($("<option/>", {
value: 'virtual',
text: i18n.getMessage('portsSelectVirtual'),
data: {isVirtual: true},
}));
if (this.showVirtualMode) {
this.portPickerElement.append($("<option/>", {
value: 'virtual',
text: i18n.getMessage('portsSelectVirtual'),
data: {isVirtual: true},
}));
}
this.portPickerElement.append($("<option/>", {
value: 'manual',

4
src/js/serial.js
View file

@ -270,13 +270,11 @@ const serial = {
chrome.serial.getDevices(function (devices_array) {
const devices = [];
let showAllSerialDevices = false;
devices_array.forEach(function (device) {
ConfigStorage.get('showAllSerialDevices', res => showAllSerialDevices = res.showAllSerialDevices);
const isKnownSerialDevice = self.serialDevices.some(el => el.vendorId === device.vendorId) && self.serialDevices.some(el => el.productId === device.productId);
if (isKnownSerialDevice || showAllSerialDevices) {
if (isKnownSerialDevice || PortHandler.showAllSerialDevices) {
devices.push({
path: device.path,
displayName: device.displayName,

13
src/js/tabs/options.js
View file

@ -16,6 +16,7 @@ options.initialize = function (callback) {
TABS.options.initCliAutoComplete();
TABS.options.initAutoConnectConnectionTimeout();
TABS.options.initShowAllSerialDevices();
TABS.options.initShowVirtualMode();
TABS.options.initCordovaForceComputerUI();
TABS.options.initDarkTheme();
@ -142,7 +143,19 @@ options.initShowAllSerialDevices = function() {
.on('change', () => ConfigStorage.set({ showAllSerialDevices: showAllSerialDevicesElement.is(':checked') }))
.trigger('change');
});
};
options.initShowVirtualMode = function() {
const showVirtualModeElement = $('div.showVirtualMode input');
ConfigStorage.get('showVirtualMode', result => {
showVirtualModeElement
.prop('checked', !!result.showVirtualMode)
.on('change', () => {
ConfigStorage.set({ showVirtualMode: showVirtualModeElement.is(':checked') });
PortHandler.initialPorts = false;
})
.trigger('change');
});
};
options.initCordovaForceComputerUI = function () {

50
src/js/tabs/setup.js
View file

@ -29,34 +29,34 @@ TABS.setup.initialize = function (callback) {
// translate to user-selected language
i18n.localizePage();
if (CONFIGURATOR.virtualMode || semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_44)) {
const backupButton = $('#content .backup');
const backupButton = $('#content .backup');
const restoreButton = $('#content .restore');
if (semver.lt(FC.CONFIG.apiVersion, CONFIGURATOR.API_VERSION_MIN_SUPPORTED_BACKUP_RESTORE)) {
backupButton.addClass('disabled');
$('#content .restore').addClass('disabled');
backupButton.on('click', () => configuration_backup(() => GUI.log(i18n.getMessage('initialSetupBackupSuccess'))));
GUI.log(i18n.getMessage('initialSetupBackupAndRestoreApiVersion', [FC.CONFIG.apiVersion, CONFIGURATOR.API_VERSION_MIN_SUPPORTED_BACKUP_RESTORE]));
restoreButton.on('click', () => configuration_restore(() => {
// get latest settings
TABS.setup.initialize();
GUI.log(i18n.getMessage('initialSetupRestoreSuccess'));
}));
if (semver.lt(FC.CONFIG.apiVersion, CONFIGURATOR.API_VERSION_MIN_SUPPORTED_BACKUP_RESTORE)) {
backupButton.addClass('disabled');
restoreButton.addClass('disabled');
GUI.log(i18n.getMessage('initialSetupBackupAndRestoreApiVersion', [FC.CONFIG.apiVersion, CONFIGURATOR.API_VERSION_MIN_SUPPORTED_BACKUP_RESTORE]));
}
if (CONFIGURATOR.virtualMode) {
// saving and uploading an imaginary config to hardware is a bad idea
backupButton.addClass('disabled');
} else if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_44)) {
restoreButton.addClass('disabled');
if (!PortHandler.showVirtualMode) {
$('.backupRestore').hide();
}
if (CONFIGURATOR.virtualMode) {
// saving and uploading an imaginary config to hardware is a bad idea
backupButton.addClass('disabled');
}
backupButton.on('click', () => configuration_backup(() => GUI.log(i18n.getMessage('initialSetupBackupSuccess'))));
$('#content .restore').on('click', () => {
configuration_restore(() => {
// get latest settings
TABS.setup.initialize();
GUI.log(i18n.getMessage('initialSetupRestoreSuccess'));
});
});
} else {
$('.backupRestore').hide();
}
// initialize 3D Model

6
src/tabs/options.html
View file

@ -52,6 +52,12 @@
</div>
<span class="freelabel" i18n="showAllSerialDevices"></span>
</div>
<div class="showVirtualMode margin-bottom">
<div>
<input type="checkbox" class="toggle" />
</div>
<span class="freelabel" i18n="showVirtualMode"></span>
</div>
<div class="cordovaForceComputerUI margin-bottom">
<div>
<input type="checkbox" class="toggle" />