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

Pick the first unused channel aux when adding a range to a mode.

Browse source
This commit is contained in:
Dominic Clifton 2014-10-11 23:58:19 +01:00
parent 2d6143b403
commit e4ecb7838c
1 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

30
tabs/auxiliary_configuration.js
View file

@ -57,7 +57,7 @@ TABS.auxiliary_configuration.initialize = function (callback) {
channelList.select(0);
}
function addRangeToMode(modeElement) {
function addRangeToMode(modeElement, auxChannelIndex) {
var modeIndex = $(modeElement).data('index');
@ -100,6 +100,8 @@ TABS.auxiliary_configuration.initialize = function (callback) {
var rangeElement = $(this).data('rangeElement');
rangeElement.remove();
});
$(range).find('.channel').val(auxChannelIndex);
}
@ -108,12 +110,9 @@ TABS.auxiliary_configuration.initialize = function (callback) {
$('.boxes').hide();
var auxChannelCount = RC.active_channels - 4;
configureRangeTemplate(auxChannelCount);
var modeTableBodyElement = $('.tab-auxiliary_configuration .modes tbody')
for (var modeIndex = 0; modeIndex < AUX_CONFIG.length; modeIndex++) {
@ -125,9 +124,28 @@ TABS.auxiliary_configuration.initialize = function (callback) {
}
}
function findFirstUnusedChannel(modeElement) {
var auxChannelIndexCandidates = [];
for (var auxChannelIndex = 0; auxChannelIndex < auxChannelCount; auxChannelIndex++) {
auxChannelIndexCandidates.push(auxChannelIndex);
}
$(modeElement).find('.channel').each( function() {
var valueToRemove = $(this).val();
auxChannelIndexCandidates = auxChannelIndexCandidates.filter(function(item) {
return item != valueToRemove;
});
});
return auxChannelIndexCandidates[0];
}
$('a.addRange').click(function () {
var modeElement = $(this).data('modeElement');
addRangeToMode(modeElement);
var firstUnusedChannel = findFirstUnusedChannel(modeElement);
addRangeToMode(modeElement, firstUnusedChannel);
});
// generate heads according to RC count