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

Change lexical scope setup

Browse source
This commit is contained in:
Mark Haslinghuis 2020-12-08 22:21:00 +01:00
parent 317f937fd5
commit 2f98306544
1 changed files with 38 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

75
src/js/tabs/setup.js
View file

@ -5,7 +5,7 @@ TABS.setup = {
}; };
TABS.setup.initialize = function (callback) { TABS.setup.initialize = function (callback) {
var self = this; const self = this;
if (GUI.active_tab != 'setup') { if (GUI.active_tab != 'setup') {
GUI.active_tab = 'setup'; GUI.active_tab = 'setup';
@ -69,7 +69,7 @@ TABS.setup.initialize = function (callback) {
} }
$('a.rebootBootloader').click(function () { $('a.rebootBootloader').click(function () {
var buffer = []; const buffer = [];
buffer.push(mspHelper.REBOOT_TYPES.BOOTLOADER); buffer.push(mspHelper.REBOOT_TYPES.BOOTLOADER);
MSP.send_message(MSPCodes.MSP_SET_REBOOT, buffer, false); MSP.send_message(MSPCodes.MSP_SET_REBOOT, buffer, false);
}); });
@ -79,10 +79,10 @@ TABS.setup.initialize = function (callback) {
// UI Hooks // UI Hooks
$('a.calibrateAccel').click(function () { $('a.calibrateAccel').click(function () {
var self = $(this); const _self = $(this);
if (!self.hasClass('calibrating')) { if (!_self.hasClass('calibrating')) {
self.addClass('calibrating'); _self.addClass('calibrating');
// During this period MCU won't be able to process any serial commands because its locked in a for/while loop // During this period MCU won't be able to process any serial commands because its locked in a for/while loop
// until this operation finishes, sending more commands through data_poll() will result in serial buffer overflow // until this operation finishes, sending more commands through data_poll() will result in serial buffer overflow
@ -97,7 +97,7 @@ TABS.setup.initialize = function (callback) {
GUI.interval_resume('setup_data_pull'); GUI.interval_resume('setup_data_pull');
GUI.log(i18n.getMessage('initialSetupAccelCalibEnded')); GUI.log(i18n.getMessage('initialSetupAccelCalibEnded'));
self.removeClass('calibrating'); _self.removeClass('calibrating');
$('#accel_calib_running').hide(); $('#accel_calib_running').hide();
$('#accel_calib_rest').show(); $('#accel_calib_rest').show();
}, 2000); }, 2000);
@ -105,10 +105,10 @@ TABS.setup.initialize = function (callback) {
}); });
$('a.calibrateMag').click(function () { $('a.calibrateMag').click(function () {
var self = $(this); const _self = $(this);
if (!self.hasClass('calibrating') && !self.hasClass('disabled')) { if (!_self.hasClass('calibrating') && !_self.hasClass('disabled')) {
self.addClass('calibrating'); _self.addClass('calibrating');
MSP.send_message(MSPCodes.MSP_MAG_CALIBRATION, false, false, function () { MSP.send_message(MSPCodes.MSP_MAG_CALIBRATION, false, false, function () {
GUI.log(i18n.getMessage('initialSetupMagCalibStarted')); GUI.log(i18n.getMessage('initialSetupMagCalibStarted'));
@ -118,14 +118,14 @@ TABS.setup.initialize = function (callback) {
GUI.timeout_add('button_reset', function () { GUI.timeout_add('button_reset', function () {
GUI.log(i18n.getMessage('initialSetupMagCalibEnded')); GUI.log(i18n.getMessage('initialSetupMagCalibEnded'));
self.removeClass('calibrating'); _self.removeClass('calibrating');
$('#mag_calib_running').hide(); $('#mag_calib_running').hide();
$('#mag_calib_rest').show(); $('#mag_calib_rest').show();
}, 30000); }, 30000);
} }
}); });
var dialogConfirmReset = $('.dialogConfirmReset')[0]; const dialogConfirmReset = $('.dialogConfirmReset')[0];
$('a.resetSettings').click(function () { $('a.resetSettings').click(function () {
dialogConfirmReset.showModal(); dialogConfirmReset.showModal();
@ -154,7 +154,7 @@ TABS.setup.initialize = function (callback) {
self.yaw_fix = FC.SENSOR_DATA.kinematics[2] * - 1.0; self.yaw_fix = FC.SENSOR_DATA.kinematics[2] * - 1.0;
$(this).text(i18n.getMessage('initialSetupButtonResetZaxisValue', [self.yaw_fix])); $(this).text(i18n.getMessage('initialSetupButtonResetZaxisValue', [self.yaw_fix]));
console.log('YAW reset to 0 deg, fix: ' + self.yaw_fix + ' deg'); console.log(`YAW reset to 0 deg, fix: ${self.yaw_fix} deg`);
}); });
$('#content .backup').click(function () { $('#content .backup').click(function () {
@ -181,7 +181,7 @@ TABS.setup.initialize = function (callback) {
}); });
// cached elements // cached elements
var bat_voltage_e = $('.bat-voltage'), const bat_voltage_e = $('.bat-voltage'),
bat_mah_drawn_e = $('.bat-mah-drawn'), bat_mah_drawn_e = $('.bat-mah-drawn'),
bat_mah_drawing_e = $('.bat-mah-drawing'), bat_mah_drawing_e = $('.bat-mah-drawing'),
rssi_e = $('.rssi'), rssi_e = $('.rssi'),
@ -200,25 +200,26 @@ TABS.setup.initialize = function (callback) {
// DISARM FLAGS // DISARM FLAGS
// We add all the arming/disarming flags available, and show/hide them if needed. // We add all the arming/disarming flags available, and show/hide them if needed.
var prepareDisarmFlags = function() { const prepareDisarmFlags = function() {
var disarmFlagElements = ['NO_GYRO', let disarmFlagElements = [
'FAILSAFE', 'NO_GYRO',
'RX_FAILSAFE', 'FAILSAFE',
'BAD_RX_RECOVERY', 'RX_FAILSAFE',
'BOXFAILSAFE', 'BAD_RX_RECOVERY',
'THROTTLE', 'BOXFAILSAFE',
'ANGLE', 'THROTTLE',
'BOOT_GRACE_TIME', 'ANGLE',
'NOPREARM', 'BOOT_GRACE_TIME',
'LOAD', 'NOPREARM',
'CALIBRATING', 'LOAD',
'CLI', 'CALIBRATING',
'CMS_MENU', 'CLI',
'OSD_MENU', 'CMS_MENU',
'BST', 'OSD_MENU',
'MSP', 'BST',
]; 'MSP',
];
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_38)) { if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_38)) {
disarmFlagElements.splice(disarmFlagElements.indexOf('THROTTLE'), 0, 'RUNAWAY_TAKEOFF'); disarmFlagElements.splice(disarmFlagElements.indexOf('THROTTLE'), 0, 'RUNAWAY_TAKEOFF');
@ -250,7 +251,7 @@ TABS.setup.initialize = function (callback) {
arming_disable_flags_e.append('<span id="initialSetupArmingAllowed" i18n="initialSetupArmingAllowed" style="display: none;"></span>'); arming_disable_flags_e.append('<span id="initialSetupArmingAllowed" i18n="initialSetupArmingAllowed" style="display: none;"></span>');
// Arming disabled flags // Arming disabled flags
for (var i = 0; i < FC.CONFIG.armingDisableCount; i++) { for (let i = 0; i < FC.CONFIG.armingDisableCount; i++) {
// All the known elements but the ARM_SWITCH (it must be always the last element) // All the known elements but the ARM_SWITCH (it must be always the last element)
if (i < disarmFlagElements.length - 1) { if (i < disarmFlagElements.length - 1) {
@ -275,7 +276,7 @@ TABS.setup.initialize = function (callback) {
$('#initialSetupArmingAllowed').toggle(FC.CONFIG.armingDisableFlags == 0); $('#initialSetupArmingAllowed').toggle(FC.CONFIG.armingDisableFlags == 0);
for (var i = 0; i < FC.CONFIG.armingDisableCount; i++) { for (let i = 0; i < FC.CONFIG.armingDisableCount; i++) {
$('#initialSetupArmingDisableFlags'+i).css('display',(FC.CONFIG.armingDisableFlags & (1 << i)) == 0 ? 'none':'inline-block'); $('#initialSetupArmingDisableFlags'+i).css('display',(FC.CONFIG.armingDisableFlags & (1 << i)) == 0 ? 'none':'inline-block');
} }
@ -317,9 +318,9 @@ TABS.setup.initialize = function (callback) {
}; };
TABS.setup.initializeInstruments = function() { TABS.setup.initializeInstruments = function() {
var options = {size:90, showBox : false, img_directory: 'images/flightindicators/'}; const options = {size:90, showBox : false, img_directory: 'images/flightindicators/'};
var attitude = $.flightIndicator('#attitude', 'attitude', options); const attitude = $.flightIndicator('#attitude', 'attitude', options);
var heading = $.flightIndicator('#heading', 'heading', options); const heading = $.flightIndicator('#heading', 'heading', options);
this.updateInstruments = function() { this.updateInstruments = function() {
attitude.setRoll(FC.SENSOR_DATA.kinematics[0]); attitude.setRoll(FC.SENSOR_DATA.kinematics[0]);
@ -335,7 +336,7 @@ TABS.setup.initModel = function () {
}; };
TABS.setup.renderModel = function () { TABS.setup.renderModel = function () {
var x = (FC.SENSOR_DATA.kinematics[1] * -1.0) * 0.017453292519943295, const x = (FC.SENSOR_DATA.kinematics[1] * -1.0) * 0.017453292519943295,
y = ((FC.SENSOR_DATA.kinematics[2] * -1.0) - this.yaw_fix) * 0.017453292519943295, y = ((FC.SENSOR_DATA.kinematics[2] * -1.0) - this.yaw_fix) * 0.017453292519943295,
z = (FC.SENSOR_DATA.kinematics[0] * -1.0) * 0.017453292519943295; z = (FC.SENSOR_DATA.kinematics[0] * -1.0) * 0.017453292519943295;