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

Change lexical scope adjustments

Browse source
This commit is contained in:
Mark Haslinghuis 2020-12-08 19:11:16 +01:00
parent 317f937fd5
commit 79f9cd52bb
1 changed files with 43 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

86
src/js/tabs/adjustments.js
View file

@ -3,7 +3,7 @@
TABS.adjustments = {}; TABS.adjustments = {};
TABS.adjustments.initialize = function (callback) { TABS.adjustments.initialize = function (callback) {
var self = this; const self = this;
GUI.active_tab_ref = this; GUI.active_tab_ref = this;
GUI.active_tab = 'adjustments'; GUI.active_tab = 'adjustments';
@ -12,10 +12,10 @@ TABS.adjustments.initialize = function (callback) {
} }
function get_box_ids() { function get_box_ids() {
MSP.send_message(MSPCodes.MSP_BOXIDS, false, false, get_rc_data); MSP.send_message(MSPCodes.MSP_BOXIDS, false, false, getRcData);
} }
function get_rc_data() { function getRcData() {
MSP.send_message(MSPCodes.MSP_RC, false, false, load_html); MSP.send_message(MSPCodes.MSP_RC, false, false, load_html);
} }
@ -27,8 +27,8 @@ TABS.adjustments.initialize = function (callback) {
function addAdjustment(adjustmentIndex, adjustmentRange, auxChannelCount) { function addAdjustment(adjustmentIndex, adjustmentRange, auxChannelCount) {
var template = $('#tab-adjustments-templates .adjustments .adjustment'); const template = $('#tab-adjustments-templates .adjustments .adjustment');
var newAdjustment = template.clone(); const newAdjustment = template.clone();
$(newAdjustment).attr('id', 'adjustment-' + adjustmentIndex); $(newAdjustment).attr('id', 'adjustment-' + adjustmentIndex);
$(newAdjustment).data('index', adjustmentIndex); $(newAdjustment).data('index', adjustmentIndex);
@ -38,7 +38,7 @@ TABS.adjustments.initialize = function (callback) {
// //
if (semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_42)) { if (semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_42)) {
var adjustmentList = $(newAdjustment).find('.adjustmentSlot .slot'); const adjustmentList = $(newAdjustment).find('.adjustmentSlot .slot');
adjustmentList.val(adjustmentRange.slotIndex); adjustmentList.val(adjustmentRange.slotIndex);
} }
@ -46,11 +46,11 @@ TABS.adjustments.initialize = function (callback) {
// populate source channel select box // populate source channel select box
// //
var channelList = $(newAdjustment).find('.channelInfo .channel'); const channelList = $(newAdjustment).find('.channelInfo .channel');
var channelOptionTemplate = $(channelList).find('option'); const channelOptionTemplate = $(channelList).find('option');
channelOptionTemplate.remove(); channelOptionTemplate.remove();
for (var channelIndex = 0; channelIndex < auxChannelCount; channelIndex++) { for (let channelIndex = 0; channelIndex < auxChannelCount; channelIndex++) {
var channelOption = channelOptionTemplate.clone(); const channelOption = channelOptionTemplate.clone();
channelOption.text('AUX ' + (channelIndex + 1)); channelOption.text('AUX ' + (channelIndex + 1));
channelOption.val(channelIndex); channelOption.val(channelIndex);
channelList.append(channelOption); channelList.append(channelOption);
@ -61,7 +61,7 @@ TABS.adjustments.initialize = function (callback) {
// update selected function // update selected function
// //
var functionList = $(newAdjustment).find('.functionSelection .function'); const functionList = $(newAdjustment).find('.functionSelection .function');
// update list of selected functions // update list of selected functions
functionList.val(adjustmentRange.adjustmentFunction); functionList.val(adjustmentRange.adjustmentFunction);
@ -70,11 +70,11 @@ TABS.adjustments.initialize = function (callback) {
// populate function channel select box // populate function channel select box
// //
var switchList = $(newAdjustment).find('.functionSwitchChannel .channel'); const switchList = $(newAdjustment).find('.functionSwitchChannel .channel');
var switchOptionTemplate = $(switchList).find('option'); const switchOptionTemplate = $(switchList).find('option');
switchOptionTemplate.remove(); switchOptionTemplate.remove();
var switchOption; let switchOption;
for (var switchIndex = 0; switchIndex < auxChannelCount; switchIndex++) { for (let switchIndex = 0; switchIndex < auxChannelCount; switchIndex++) {
switchOption = switchOptionTemplate.clone(); switchOption = switchOptionTemplate.clone();
switchOption.text('AUX ' + (switchIndex + 1)); switchOption.text('AUX ' + (switchIndex + 1));
switchOption.val(switchIndex); switchOption.val(switchIndex);
@ -86,17 +86,17 @@ TABS.adjustments.initialize = function (callback) {
// configure range // configure range
// //
var channel_range = { const channel_range = {
'min': [ 900 ], 'min': [ 900 ],
'max': [ 2100 ] 'max': [ 2100 ]
}; };
var rangeValues = [1300, 1700]; let rangeValues = [1300, 1700];
if (adjustmentRange.range != undefined) { if (adjustmentRange.range != undefined) {
rangeValues = [adjustmentRange.range.start, adjustmentRange.range.end]; rangeValues = [adjustmentRange.range.start, adjustmentRange.range.end];
} }
var rangeElement = $(newAdjustment).find('.range'); let rangeElement = $(newAdjustment).find('.range');
$(rangeElement).find('.channel-slider').noUiSlider({ $(rangeElement).find('.channel-slider').noUiSlider({
start: rangeValues, start: rangeValues,
@ -124,17 +124,17 @@ TABS.adjustments.initialize = function (callback) {
// add the enable/disable behavior // add the enable/disable behavior
// //
var enableElement = $(newAdjustment).find('.enable'); const enableElement = $(newAdjustment).find('.enable');
$(enableElement).data('adjustmentElement', newAdjustment); $(enableElement).data('adjustmentElement', newAdjustment);
$(enableElement).change(function() { $(enableElement).change(function() {
var adjustmentElement = $(this).data('adjustmentElement'); const adjustmentElement = $(this).data('adjustmentElement');
if ($(this).prop("checked")) { if ($(this).prop("checked")) {
$(adjustmentElement).find(':input').prop("disabled", false); $(adjustmentElement).find(':input').prop("disabled", false);
$(adjustmentElement).find('.channel-slider').removeAttr("disabled"); $(adjustmentElement).find('.channel-slider').removeAttr("disabled");
var rangeElement = $(adjustmentElement).find('.range .channel-slider'); rangeElement = $(adjustmentElement).find('.range .channel-slider');
var range = $(rangeElement).val(); const range = $(rangeElement).val();
if (range[0] == range[1]) { if (range[0] == range[1]) {
var defaultRangeValues = [1300, 1700]; const defaultRangeValues = [1300, 1700];
$(rangeElement).val(defaultRangeValues); $(rangeElement).val(defaultRangeValues);
} }
} else { } else {
@ -146,7 +146,7 @@ TABS.adjustments.initialize = function (callback) {
$(this).prop("disabled", false); $(this).prop("disabled", false);
}); });
var isEnabled = (adjustmentRange.range.start != adjustmentRange.range.end); const isEnabled = (adjustmentRange?.range?.start !== adjustmentRange?.range?.end);
$(enableElement).prop("checked", isEnabled).change(); $(enableElement).prop("checked", isEnabled).change();
return newAdjustment; return newAdjustment;
@ -156,11 +156,11 @@ TABS.adjustments.initialize = function (callback) {
self.adjust_template(); self.adjust_template();
var auxChannelCount = FC.RC.active_channels - 4; let auxChannelCount = FC.RC.active_channels - 4;
var modeTableBodyElement = $('.tab-adjustments .adjustments tbody'); const modeTableBodyElement = $('.tab-adjustments .adjustments tbody');
for (var adjustmentIndex = 0; adjustmentIndex < FC.ADJUSTMENT_RANGES.length; adjustmentIndex++) { for (let adjustmentIndex = 0; adjustmentIndex < FC.ADJUSTMENT_RANGES.length; adjustmentIndex++) {
var newAdjustment = addAdjustment(adjustmentIndex, FC.ADJUSTMENT_RANGES[adjustmentIndex], auxChannelCount); const newAdjustment = addAdjustment(adjustmentIndex, FC.ADJUSTMENT_RANGES[adjustmentIndex], auxChannelCount);
modeTableBodyElement.append(newAdjustment); modeTableBodyElement.append(newAdjustment);
} }
@ -178,11 +178,11 @@ TABS.adjustments.initialize = function (callback) {
$('a.save').click(function () { $('a.save').click(function () {
// update internal data structures based on current UI elements // update internal data structures based on current UI elements
var requiredAdjustmentRangeCount = FC.ADJUSTMENT_RANGES.length; const requiredAdjustmentRangeCount = FC.ADJUSTMENT_RANGES.length;
FC.ADJUSTMENT_RANGES = []; FC.ADJUSTMENT_RANGES = [];
var defaultAdjustmentRange = { const defaultAdjustmentRange = {
slotIndex: 0, slotIndex: 0,
auxChannelIndex: 0, auxChannelIndex: 0,
range: { range: {
@ -194,16 +194,16 @@ TABS.adjustments.initialize = function (callback) {
}; };
$('.tab-adjustments .adjustments .adjustment').each(function () { $('.tab-adjustments .adjustments .adjustment').each(function () {
var adjustmentElement = $(this); const adjustmentElement = $(this);
if ($(adjustmentElement).find('.enable').prop("checked")) { if ($(adjustmentElement).find('.enable').prop("checked")) {
var rangeValues = $(this).find('.range .channel-slider').val(); const rangeValues = $(this).find('.range .channel-slider').val();
var slotIndex = 0; let slotIndex = 0;
if (semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_42)) { if (semver.lt(FC.CONFIG.apiVersion, API_VERSION_1_42)) {
slotIndex = parseInt($(this).find('.adjustmentSlot .slot').val()); slotIndex = parseInt($(this).find('.adjustmentSlot .slot').val());
} }
var adjustmentRange = { const adjustmentRange = {
slotIndex: slotIndex, slotIndex: slotIndex,
auxChannelIndex: parseInt($(this).find('.channelInfo .channel').val()), auxChannelIndex: parseInt($(this).find('.channelInfo .channel').val()),
range: { range: {
@ -219,7 +219,7 @@ TABS.adjustments.initialize = function (callback) {
} }
}); });
for (var adjustmentRangeIndex = FC.ADJUSTMENT_RANGES.length; adjustmentRangeIndex < requiredAdjustmentRangeCount; adjustmentRangeIndex++) { for (let adjustmentRangeIndex = FC.ADJUSTMENT_RANGES.length; adjustmentRangeIndex < requiredAdjustmentRangeCount; adjustmentRangeIndex++) {
FC.ADJUSTMENT_RANGES.push(defaultAdjustmentRange); FC.ADJUSTMENT_RANGES.push(defaultAdjustmentRange);
} }
@ -242,10 +242,10 @@ TABS.adjustments.initialize = function (callback) {
} else if (channelPosition > 2100) { } else if (channelPosition > 2100) {
channelPosition = 2100; channelPosition = 2100;
} }
var percentage = (channelPosition - 900) / (2100-900) * 100; const percentage = (channelPosition - 900) / (2100-900) * 100;
$('.adjustments .adjustment').each( function () { $('.adjustments .adjustment').each( function () {
var auxChannelCandidateIndex = $(this).find('.channel').val(); const auxChannelCandidateIndex = $(this).find('.channel').val();
if (auxChannelCandidateIndex != auxChannelIndex) { if (auxChannelCandidateIndex != auxChannelIndex) {
return; return;
} }
@ -260,9 +260,9 @@ TABS.adjustments.initialize = function (callback) {
} }
function update_ui() { function update_ui() {
var auxChannelCount = FC.RC.active_channels - 4; auxChannelCount = FC.RC.active_channels - 4;
for (var auxChannelIndex = 0; auxChannelIndex < auxChannelCount; auxChannelIndex++) { for (let auxChannelIndex = 0; auxChannelIndex < auxChannelCount; auxChannelIndex++) {
update_marker(auxChannelIndex, FC.RC.channels[auxChannelIndex + 4]); update_marker(auxChannelIndex, FC.RC.channels[auxChannelIndex + 4]);
} }
} }
@ -288,8 +288,8 @@ TABS.adjustments.cleanup = function (callback) {
TABS.adjustments.adjust_template = function () { TABS.adjustments.adjust_template = function () {
var selectFunction = $('#functionSelectionSelect'); const selectFunction = $('#functionSelectionSelect');
var elementsNumber; let elementsNumber;
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_41)) { if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_41)) {
elementsNumber = 31; // OSD Profile Select & LED Profile Select elementsNumber = 31; // OSD Profile Select & LED Profile Select
@ -310,8 +310,8 @@ TABS.adjustments.adjust_template = function () {
// For 1.40, the D Setpoint has been replaced, so we replace it with the correct values // For 1.40, the D Setpoint has been replaced, so we replace it with the correct values
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_40)) { if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_40)) {
var element22 = selectFunction.find("option[value='22']"); const element22 = selectFunction.find("option[value='22']");
var element23 = selectFunction.find("option[value='23']"); const element23 = selectFunction.find("option[value='23']");
// Change the "text" // Change the "text"
element22.text(i18n.getMessage('adjustmentsFunction22_2')); element22.text(i18n.getMessage('adjustmentsFunction22_2'));