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

IMPROVEMENT: As per suggestion, one RX protocol, and one Telem protocol (#3161)

Browse source
This commit is contained in:
J Blackman 2022-12-26 14:48:05 +11:00 • committed by GitHub
parent 23b74d9998
commit 072be2eaaf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
locales/en/messages.json
View file

@ -6826,10 +6826,10 @@
"message": "Other Options" "message": "Other Options"
}, },
"firmwareFlasherBuildRadioProtocols": { "firmwareFlasherBuildRadioProtocols": {
"message": "Radio Protocols" "message": "Radio Protocol"
}, },
"firmwareFlasherBuildTelemetryProtocols": { "firmwareFlasherBuildTelemetryProtocols": {
"message": "Telemetry Protocols" "message": "Telemetry Protocol"
}, },
"firmwareFlasherBuildMotorProtocols": { "firmwareFlasherBuildMotorProtocols": {
"message": "Motor Protocols" "message": "Motor Protocols"

2
src/css/tabs/firmware_flasher.less
View file

@ -226,7 +226,7 @@
} }
} }
} }
#branchInfo { #branchInfo, #radioProtocolInfo, #telemetryProtocolInfo {
.select2-selection__rendered { .select2-selection__rendered {
line-height: 30px !important; line-height: 30px !important;
} }

9
src/js/tabs/firmware_flasher.js
View file

@ -777,9 +777,6 @@ firmware_flasher.initialize = function (callback) {
let request = { let request = {
target: summary.target, target: summary.target,
release: summary.release, release: summary.release,
radioProtocols: [],
telemetryProtocols: [],
motorProtocols: [],
options: [], options: [],
classicBuild: false, classicBuild: false,
}; };
@ -787,11 +784,11 @@ firmware_flasher.initialize = function (callback) {
request.classicBuild = !summary.cloudBuild || $('input[name="classicBuildModeCheckbox"]').is(':checked'); request.classicBuild = !summary.cloudBuild || $('input[name="classicBuildModeCheckbox"]').is(':checked');
if (!request.classicBuild) { if (!request.classicBuild) {
$('select[name="radioProtocols"] option:selected').each(function () { $('select[name="radioProtocols"] option:selected').each(function () {
request.radioProtocols.push($(this).val()); request.options.push($(this).val());
}); });
$('select[name="telemetryProtocols"] option:selected').each(function () { $('select[name="telemetryProtocols"] option:selected').each(function () {
request.telemetryProtocols.push($(this).val()); request.options.push($(this).val());
}); });
$('select[name="options"] option:selected').each(function () { $('select[name="options"] option:selected').each(function () {
@ -799,7 +796,7 @@ firmware_flasher.initialize = function (callback) {
}); });
$('select[name="motorProtocols"] option:selected').each(function () { $('select[name="motorProtocols"] option:selected').each(function () {
request.motorProtocols.push($(this).val()); request.options.push($(this).val());
}); });
if ($('input[name="expertModeCheckbox"]').is(':checked')) { if ($('input[name="expertModeCheckbox"]').is(':checked')) {

4
src/tabs/firmware_flasher.html
View file

@ -162,7 +162,7 @@
<div style="width: 49%; float: left;"> <div style="width: 49%; float: left;">
<strong i18n="firmwareFlasherBuildRadioProtocols"></strong> <strong i18n="firmwareFlasherBuildRadioProtocols"></strong>
<div id="radioProtocolInfo" class="build-options-wrapper"> <div id="radioProtocolInfo" class="build-options-wrapper">
<select id="radioProtocols" name="radioProtocols" multiple="multiple" class="select2"> <select id="radioProtocols" name="radioProtocols" class="select2">
</select> </select>
<div class="helpicon cf_tip_wide" i18n_title="firmwareFlasherRadioProtocolDescription"></div> <div class="helpicon cf_tip_wide" i18n_title="firmwareFlasherRadioProtocolDescription"></div>
</div> </div>
@ -170,7 +170,7 @@
<div style="width: 49%; float: right;"> <div style="width: 49%; float: right;">
<strong i18n="firmwareFlasherBuildTelemetryProtocols"></strong> <strong i18n="firmwareFlasherBuildTelemetryProtocols"></strong>
<div id="telemetryProtocolInfo" class="build-options-wrapper"> <div id="telemetryProtocolInfo" class="build-options-wrapper">
<select id="telemetryProtocols" name="telemetryProtocols" multiple="multiple" class="select2"> <select id="telemetryProtocols" name="telemetryProtocols" class="select2">
</select> </select>
<div class="helpicon cf_tip_wide" i18n_title="firmwareFlasherTelemetryProtocolDescription"></div> <div class="helpicon cf_tip_wide" i18n_title="firmwareFlasherTelemetryProtocolDescription"></div>
</div> </div>