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

Added D setpoint adjustment ranges.

Browse source
This commit is contained in:
Michael Keller 2016-12-02 20:31:27 +13:00 • committed by mikeller
parent c165fca463
commit 8210a6b9ea
3 changed files with 57 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

7
_locales/en/messages.json
View file

@ -1138,7 +1138,12 @@
"adjustmentsFunction21": { "adjustmentsFunction21": {
"message": "RC Rate Yaw" "message": "RC Rate Yaw"
}, },
"adjustmentsFunction22": {
"message": "D Setpoint"
},
"adjustmentsFunction23": {
"message": "D Setpoint Transition"
},
"adjustmentsSave": { "adjustmentsSave": {
"message": "Save" "message": "Save"
}, },

54
tabs/adjustments.html
View file

@ -67,34 +67,36 @@
</div> </div>
</td> </td>
<td class="functionSelection"><select class="function"> <td class="functionSelection"><select class="function">
<option value="0" i18n="adjustmentsFunction0"></option> <option value="0" i18n="adjustmentsFunction0"></option>
<option value="1" i18n="adjustmentsFunction1"></option> <option value="1" i18n="adjustmentsFunction1"></option>
<option value="2" i18n="adjustmentsFunction2"></option> <option value="2" i18n="adjustmentsFunction2"></option>
<option value="3" i18n="adjustmentsFunction3"></option> <option value="3" i18n="adjustmentsFunction3"></option>
<option value="4" i18n="adjustmentsFunction4"></option> <option value="4" i18n="adjustmentsFunction4"></option>
<option value="5" i18n="adjustmentsFunction5"></option> <option value="5" i18n="adjustmentsFunction5"></option>
<option value="6" i18n="adjustmentsFunction6"></option> <option value="6" i18n="adjustmentsFunction6"></option>
<option value="7" i18n="adjustmentsFunction7"></option> <option value="7" i18n="adjustmentsFunction7"></option>
<option value="8" i18n="adjustmentsFunction8"></option> <option value="8" i18n="adjustmentsFunction8"></option>
<option value="9" i18n="adjustmentsFunction9"></option> <option value="9" i18n="adjustmentsFunction9"></option>
<option value="10" i18n="adjustmentsFunction10"></option> <option value="10" i18n="adjustmentsFunction10"></option>
<option value="11" i18n="adjustmentsFunction11"></option> <option value="11" i18n="adjustmentsFunction11"></option>
<option value="12" i18n="adjustmentsFunction12"></option> <option value="12" i18n="adjustmentsFunction12"></option>
<option value="13" i18n="adjustmentsFunction13"></option> <option value="13" i18n="adjustmentsFunction13"></option>
<option value="14" i18n="adjustmentsFunction14"></option> <option value="14" i18n="adjustmentsFunction14"></option>
<option value="15" i18n="adjustmentsFunction15"></option> <option value="15" i18n="adjustmentsFunction15"></option>
<option value="16" i18n="adjustmentsFunction16"></option> <option value="16" i18n="adjustmentsFunction16"></option>
<option value="17" i18n="adjustmentsFunction17"></option> <option value="17" i18n="adjustmentsFunction17"></option>
<option value="18" i18n="adjustmentsFunction18"></option> <option value="18" i18n="adjustmentsFunction18"></option>
<option value="19" i18n="adjustmentsFunction19"></option> <option value="19" i18n="adjustmentsFunction19"></option>
<option value="20" i18n="adjustmentsFunction20"></option> <option value="20" i18n="adjustmentsFunction20"></option>
<option value="21" i18n="adjustmentsFunction21"></option> <option value="21" i18n="adjustmentsFunction21"></option>
<option value="22" i18n="adjustmentsFunction22"></option>
<option value="23" i18n="adjustmentsFunction23"></option>
</select></td> </select></td>
<td class="adjustmentSlot"><select class="slot"> <td class="adjustmentSlot"><select class="slot">
<option value="0" i18n="adjustmentsSlot0"></option> <option value="0" i18n="adjustmentsSlot0"></option>
<option value="1" i18n="adjustmentsSlot1"></option> <option value="1" i18n="adjustmentsSlot1"></option>
<option value="2" i18n="adjustmentsSlot2"></option> <option value="2" i18n="adjustmentsSlot2"></option>
<option value="3" i18n="adjustmentsSlot3"></option> <option value="3" i18n="adjustmentsSlot3"></option>
</select></td> </select></td>
<td class="functionSwitchChannel"><select class="channel"> <td class="functionSwitchChannel"><select class="channel">
<option value=""></option> <option value=""></option>

43
tabs/adjustments.js
View file

@ -38,8 +38,8 @@ TABS.adjustments.initialize = function (callback) {
// update selected slot // update selected slot
// //
var channelList = $(newAdjustment).find('.adjustmentSlot .slot'); var adjustmentList = $(newAdjustment).find('.adjustmentSlot .slot');
channelList.val(adjustmentRange.slotIndex); adjustmentList.val(adjustmentRange.slotIndex);
// //
// populate source channel select box // populate source channel select box
@ -69,16 +69,17 @@ TABS.adjustments.initialize = function (callback) {
// populate function channel select box // populate function channel select box
// //
var channelList = $(newAdjustment).find('.functionSwitchChannel .channel'); var switchList = $(newAdjustment).find('.functionSwitchChannel .channel');
var channelOptionTemplate = $(channelList).find('option'); var switchOptionTemplate = $(switchList).find('option');
channelOptionTemplate.remove(); switchOptionTemplate.remove();
for (var channelIndex = 0; channelIndex < auxChannelCount; channelIndex++) { var switchOption;
var channelOption = channelOptionTemplate.clone(); for (var switchIndex = 0; switchIndex < auxChannelCount; switchIndex++) {
channelOption.text('AUX ' + (channelIndex + 1)); switchOption = switchOptionTemplate.clone();
channelOption.val(channelIndex); switchOption.text('AUX ' + (switchIndex + 1));
channelList.append(channelOption); switchOption.val(switchIndex);
switchList.append(switchOption);
} }
channelList.val(adjustmentRange.auxSwitchChannelIndex); switchList.val(adjustmentRange.auxSwitchChannelIndex);
// //
// configure range // configure range
@ -89,8 +90,7 @@ TABS.adjustments.initialize = function (callback) {
'max': [ 2100 ] 'max': [ 2100 ]
}; };
var defaultRangeValues = [1300, 1700]; var rangeValues = [1300, 1700];
var rangeValues = defaultRangeValues;
if (adjustmentRange.range != undefined) { if (adjustmentRange.range != undefined) {
rangeValues = [adjustmentRange.range.start, adjustmentRange.range.end]; rangeValues = [adjustmentRange.range.start, adjustmentRange.range.end];
} }
@ -105,11 +105,10 @@ TABS.adjustments.initialize = function (callback) {
connect: true, connect: true,
range: channel_range, range: channel_range,
format: wNumb({ format: wNumb({
decimals: 0, decimals: 0
}) })
}); });
var elementName = '#adjustment-' + adjustmentIndex;
$(newAdjustment).find('.channel-slider').Link('lower').to($(newAdjustment).find('.lowerLimitValue')); $(newAdjustment).find('.channel-slider').Link('lower').to($(newAdjustment).find('.lowerLimitValue'));
$(newAdjustment).find('.channel-slider').Link('upper').to($(newAdjustment).find('.upperLimitValue')); $(newAdjustment).find('.channel-slider').Link('upper').to($(newAdjustment).find('.upperLimitValue'));
@ -156,7 +155,7 @@ TABS.adjustments.initialize = function (callback) {
var auxChannelCount = RC.active_channels - 4; var auxChannelCount = RC.active_channels - 4;
var modeTableBodyElement = $('.tab-adjustments .adjustments tbody') var modeTableBodyElement = $('.tab-adjustments .adjustments tbody');
for (var adjustmentIndex = 0; adjustmentIndex < ADJUSTMENT_RANGES.length; adjustmentIndex++) { for (var adjustmentIndex = 0; adjustmentIndex < ADJUSTMENT_RANGES.length; adjustmentIndex++) {
var newAdjustment = addAdjustment(adjustmentIndex, ADJUSTMENT_RANGES[adjustmentIndex], auxChannelCount); var newAdjustment = addAdjustment(adjustmentIndex, ADJUSTMENT_RANGES[adjustmentIndex], auxChannelCount);
modeTableBodyElement.append(newAdjustment); modeTableBodyElement.append(newAdjustment);
@ -197,7 +196,7 @@ TABS.adjustments.initialize = function (callback) {
end: rangeValues[1] end: rangeValues[1]
}, },
adjustmentFunction: parseInt($(this).find('.functionSelection .function').val()), adjustmentFunction: parseInt($(this).find('.functionSelection .function').val()),
auxSwitchChannelIndex: parseInt($(this).find('.functionSwitchChannel .channel').val()), auxSwitchChannelIndex: parseInt($(this).find('.functionSwitchChannel .channel').val())
}; };
ADJUSTMENT_RANGES.push(adjustmentRange); ADJUSTMENT_RANGES.push(adjustmentRange);
} else { } else {
@ -273,12 +272,14 @@ TABS.adjustments.cleanup = function (callback) {
}; };
TABS.adjustments.adjust_template = function () { TABS.adjustments.adjust_template = function () {
var availableFunctionCount = 21; // Available in betaflight 2.9 var availableFunctionCount;
if (semver.gte(CONFIG.flightControllerVersion, '3.1.0')) { if (semver.lt(CONFIG.flightControllerVersion, '3.1.0')) {
availableFunctionCount += 1; // RC rate Yaw added to 3.1.0 availableFunctionCount = 21; // Available in betaflight 2.9
} else {
availableFunctionCount = 24; // RC rate Yaw / D setpoint / D setpoint transition added to 3.1.0
} }
var template = $('#tab-adjustments-templates .adjustments .adjustment'); var template = $('#tab-adjustments-templates .adjustments .adjustment');
var functionList = $(template).find('.functionSelection .function'); var functionList = $(template).find('.functionSelection .function');
var functionListOptions = $(functionList).find('option').slice(0,availableFunctionCount);; var functionListOptions = $(functionList).find('option').slice(0,availableFunctionCount);
functionList.empty().append(functionListOptions); functionList.empty().append(functionListOptions);
}; };