sundowndev
/
betaflight-configurator
mirror of https://github.com/sundowndev/betaflight-configurator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed adjustment range slots from the UI. (#1483) 

Removed adjustment range slots from the UI.
10.7.0-preview
Michael Keller 2019-06-12 13:18:08 +12:00 committed by GitHub
parent 5694ac62a8 3e1f961deb
commit 6b2cf6d666
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
locales/en/messages.json
View File

@ -1840,16 +1840,19 @@
"message": "AND"
},
"adjustmentsHelp": {
"message": "Configure adjustment switches. See the 'in-flight adjustments' section of the manual for details. The changes that adjustment functions make are not saved automatically. There are 4 slots. Each switch used to concurrently make adjustments requires exclusive use of a slot."
"message": "Configure adjustment switches. See the 'in-flight adjustments' section of the manual for details. The changes that adjustment functions make are not saved automatically."
},
"adjustmentSlotsHelp": {
"message": "There are 4 slots. Each switch used to concurrently make adjustments requires exclusive use of a slot."
},
"adjustmentsExamples": {
"message": "Examples"
"message": "Examples:"
},
"adjustmentsExample1": {
"message": "Use Slot 1 and a 3POS switch on AUX1 to select between Pitch/Roll P, I and D and another 3POS switch on AUX2 to increase or decrease the value when held up or down."
"message": "Use a three position switch on AUX1 to select between Pitch/Roll P, I and D and another three position switch on AUX2 to increase or decrease the value when held up or down."
},
"adjustmentsExample2": {
"message": "Use Slot 2 and a 3POS switch on AUX4 to select enable Rate Profile Selection via the same 3POS switch on the same channel."
"message": "Use a three position switch on AUX4 to select enable Rate Profile Selection via the same three position switch on the same channel."
},
"adjustmentsColumnEnable": {
"message": "If enabled"

20
src/js/tabs/adjustments.js
View File

@ -37,8 +37,10 @@ TABS.adjustments.initialize = function (callback) {
// update selected slot
//
var adjustmentList = $(newAdjustment).find('.adjustmentSlot .slot');
adjustmentList.val(adjustmentRange.slotIndex);
if (semver.lt(CONFIG.apiVersion, "1.42.0")) {
var adjustmentList = $(newAdjustment).find('.adjustmentSlot .slot');
adjustmentList.val(adjustmentRange.slotIndex);
}
//
// populate source channel select box
@ -162,6 +164,13 @@ TABS.adjustments.initialize = function (callback) {
modeTableBodyElement.append(newAdjustment);
}
if (semver.gte(CONFIG.apiVersion, "1.42.0")) {
$('.tab-adjustments .adjustmentSlotsHelp').hide();
$('.tab-adjustments .adjustmentSlotHeader').hide();
$('.tab-adjustments .adjustmentSlot').hide();
}
// translate to user-selected language
i18n.localizePage();
@ -189,8 +198,13 @@ TABS.adjustments.initialize = function (callback) {
if ($(adjustmentElement).find('.enable').prop("checked")) {
var rangeValues = $(this).find('.range .channel-slider').val();
var slotIndex = 0;
if (semver.lt(CONFIG.apiVersion, "1.42.0")) {
slotIndex = parseInt($(this).find('.adjustmentSlot .slot').val());
}
var adjustmentRange = {
slotIndex: parseInt($(this).find('.adjustmentSlot .slot').val()),
slotIndex: slotIndex,
auxChannelIndex: parseInt($(this).find('.channelInfo .channel').val()),
range: {
start: rangeValues[0],

5
src/tabs/adjustments.html
View File

@ -7,7 +7,8 @@
<div class="note spacebottom">
<div class="note_spacer">
<p i18n="adjustmentsHelp"></p>
<p i18n="adjustmentsExamples"></p>
<p class="adjustmentSlotsHelp" i18n="adjustmentSlotsHelp"></p>
<b><p i18n="adjustmentsExamples"></p></b>
<ul>
<li i18n="adjustmentsExample1"></li>
<li i18n="adjustmentsExample2"></li>
@ -22,7 +23,7 @@
<td i18n="adjustmentsColumnWhenChannel"></td>
<td i18n="adjustmentsColumnIsInRange"></td>
<td i18n="adjustmentsColumnThenApplyFunction"></td>
<td i18n="adjustmentsColumnUsingSlot"></td>
<td class="adjustmentSlotHeader" i18n="adjustmentsColumnUsingSlot"></td>
<td i18n="adjustmentsColumnViaChannel"></td>
</tr>
</thead>