\
+ for (let i = 0; i < 8; i++) {
+ motorsWrapper.append(`\
+
\
\
\
\
@@ -492,7 +496,7 @@ TABS.motors.initialize = function (callback) {
\
\
\
- ');
+ `);
servos_wrapper.append('\
\
@@ -524,7 +528,7 @@ TABS.motors.initialize = function (callback) {
function setSlidersEnabled(isEnabled) {
if (isEnabled && !self.armed) {
- $('div.sliders input').slice(0, number_of_valid_outputs).prop('disabled', false);
+ $('div.sliders input').slice(0, numberOfValidOutputs).prop('disabled', false);
// unlock master slider
$('div.sliders input:last').prop('disabled', false);
@@ -541,7 +545,7 @@ TABS.motors.initialize = function (callback) {
setSlidersDefault();
$('#motorsEnableTestMode').change(function () {
- var enabled = $(this).is(':checked');
+ const enabled = $(this).is(':checked');
setSlidersEnabled(enabled);
@@ -550,70 +554,70 @@ TABS.motors.initialize = function (callback) {
mspHelper.setArmingEnabled(enabled, enabled);
}).change();
- var buffering_set_motor = [],
+ let bufferingSetMotor = [],
buffer_delay = false;
$('div.sliders input:not(.master)').on('input', function () {
- var index = $(this).index(),
- buffer = [];
+ const index = $(this).index();
+ let buffer = [];
$('div.values li').eq(index).text($(this).val());
- for (var i = 0; i < 8; i++) {
- var val = parseInt($('div.sliders input').eq(i).val());
+ for (let i = 0; i < 8; i++) {
+ const val = parseInt($('div.sliders input').eq(i).val());
buffer.push16(val);
}
- buffering_set_motor.push(buffer);
+ bufferingSetMotor.push(buffer);
if (!buffer_delay) {
buffer_delay = setTimeout(function () {
- buffer = buffering_set_motor.pop();
+ buffer = bufferingSetMotor.pop();
MSP.send_message(MSPCodes.MSP_SET_MOTOR, buffer);
- buffering_set_motor = [];
+ bufferingSetMotor = [];
buffer_delay = false;
}, 10);
}
});
$('div.sliders input.master').on('input', function () {
- var val = $(this).val();
+ const val = $(this).val();
$('div.sliders input:not(:disabled, :last)').val(val);
- $('div.values li:not(:last)').slice(0, number_of_valid_outputs).text(val);
+ $('div.values li:not(:last)').slice(0, numberOfValidOutputs).text(val);
$('div.sliders input:not(:last):first').trigger('input');
});
// check if motors are already spinning
- var motors_running = false;
+ let motorsRunning = false;
- for (var i = 0; i < number_of_valid_outputs; i++) {
+ for (let i = 0; i < numberOfValidOutputs; i++) {
if (!self.feature3DEnabled) {
if (FC.MOTOR_DATA[i] > rangeMin) {
- motors_running = true;
+ motorsRunning = true;
}
} else {
if ((FC.MOTOR_DATA[i] < FC.MOTOR_3D_CONFIG.deadband3d_low) || (FC.MOTOR_DATA[i] > FC.MOTOR_3D_CONFIG.deadband3d_high)) {
- motors_running = true;
+ motorsRunning = true;
}
}
}
- if (motors_running) {
+ if (motorsRunning) {
$('#motorsEnableTestMode').prop('checked', true).change();
// motors are running adjust sliders to current values
- var sliders = $('div.sliders input:not(.master)');
+ const sliders = $('div.sliders input:not(.master)');
- var master_value = FC.MOTOR_DATA[0];
- for (var i = 0; i < FC.MOTOR_DATA.length; i++) {
+ let masterValue = FC.MOTOR_DATA[0];
+ for (let i = 0; i < FC.MOTOR_DATA.length; i++) {
if (FC.MOTOR_DATA[i] > 0) {
sliders.eq(i).val(FC.MOTOR_DATA[i]);
- if (master_value != FC.MOTOR_DATA[i]) {
- master_value = false;
+ if (masterValue !== FC.MOTOR_DATA[i]) {
+ masterValue = false;
}
}
}
@@ -622,8 +626,8 @@ TABS.motors.initialize = function (callback) {
sliders.trigger('input');
// slide master slider if condition is valid
- if (master_value) {
- $('div.sliders input.master').val(master_value)
+ if (masterValue) {
+ $('div.sliders input.master').val(masterValue)
.trigger('input');
}
}
@@ -651,24 +655,24 @@ TABS.motors.initialize = function (callback) {
MSP.send_message(MSPCodes.MSP_SERVO, false, false, update_ui);
}
- var full_block_scale = rangeMax - rangeMin;
+ const fullBlockScale = rangeMax - rangeMin;
function update_ui() {
- var previousArmState = self.armed;
- var block_height = $('div.m-block:first').height();
+ const previousArmState = self.armed;
+ const blockHeight = $('div.m-block:first').height();
- for (var i = 0; i < FC.MOTOR_DATA.length; i++) {
- var motorValue = FC.MOTOR_DATA[i];
- var barHeight = motorValue - rangeMin,
- margin_top = block_height - (barHeight * (block_height / full_block_scale)).clamp(0, block_height),
- height = (barHeight * (block_height / full_block_scale)).clamp(0, block_height),
+ for (let i = 0; i < FC.MOTOR_DATA.length; i++) {
+ const motorValue = FC.MOTOR_DATA[i];
+ const barHeight = motorValue - rangeMin,
+ marginTop = blockHeight - (barHeight * (blockHeight / fullBlockScale)).clamp(0, blockHeight),
+ height = (barHeight * (blockHeight / fullBlockScale)).clamp(0, blockHeight),
color = parseInt(barHeight * 0.009);
- $('.motor-' + i + ' .label', motors_wrapper).text(motorValue);
- $('.motor-' + i + ' .indicator', motors_wrapper).css({
- 'margin-top' : margin_top + 'px',
- 'height' : height + 'px',
- 'background-color' : 'rgba(255,187,0,1.'+ color +')'
+ $(`.motor-${i} .label`, motorsWrapper).text(motorValue);
+ $(`.motor-${i} .indicator`, motorsWrapper).css({
+ 'margin-top' : `${marginTop}px`,
+ 'height' : `${height}px`,
+ 'background-color' : `rgba(255,187,0,1.${color})`,
});
if (i < FC.MOTOR_CONFIG.motor_count && (FC.MOTOR_CONFIG.use_dshot_telemetry || FC.MOTOR_CONFIG.use_esc_sensor)) {
@@ -715,14 +719,18 @@ TABS.motors.initialize = function (callback) {
}
// servo indicators are still using old (not flexible block scale), it will be changed in the future accordingly
- for (var i = 0; i < FC.SERVO_DATA.length; i++) {
- var data = FC.SERVO_DATA[i] - 1000,
- margin_top = block_height - (data * (block_height / 1000)).clamp(0, block_height),
- height = (data * (block_height / 1000)).clamp(0, block_height),
+ for (let i = 0; i < FC.SERVO_DATA.length; i++) {
+ const data = FC.SERVO_DATA[i] - 1000,
+ marginTop = blockHeight - (data * (blockHeight / 1000)).clamp(0, blockHeight),
+ height = (data * (blockHeight / 1000)).clamp(0, blockHeight),
color = parseInt(data * 0.009);
- $('.servo-' + i + ' .label', servos_wrapper).text(FC.SERVO_DATA[i]);
- $('.servo-' + i + ' .indicator', servos_wrapper).css({'margin-top' : margin_top + 'px', 'height' : height + 'px', 'background-color' : 'rgba(255,187,0,1'+ color +')'});
+ $(`.servo-${i} .label`, servos_wrapper).text(FC.SERVO_DATA[i]);
+ $(`.servo-${i} .indicator`, servos_wrapper).css({
+ 'margin-top' : `${marginTop}px`,
+ 'height' : `${height}px`,
+ 'background-color' : `rgba(255,187,0,1${color})`,
+ });
}
//keep the following here so at least we get a visual cue of our motor setup
update_arm_status();
diff --git a/src/js/tabs/sensors.js b/src/js/tabs/sensors.js
index 4e5bcdd9..1853434b 100644
--- a/src/js/tabs/sensors.js
+++ b/src/js/tabs/sensors.js
@@ -2,14 +2,13 @@
TABS.sensors = {};
TABS.sensors.initialize = function (callback) {
- var self = this;
if (GUI.active_tab != 'sensors') {
GUI.active_tab = 'sensors';
}
function initSensorData(){
- for (var i = 0; i < 3; i++) {
+ for (let i = 0; i < 3; i++) {
FC.SENSOR_DATA.accelerometer[i] = 0;
FC.SENSOR_DATA.gyroscope[i] = 0;
FC.SENSOR_DATA.magnetometer[i] = 0;
@@ -20,8 +19,8 @@ TABS.sensors.initialize = function (callback) {
}
function initDataArray(length) {
- var data = new Array(length);
- for (var i = 0; i < length; i++) {
+ const data = new Array(length);
+ for (let i = 0; i < length; i++) {
data[i] = new Array();
data[i].min = -1;
data[i].max = 1;
@@ -30,8 +29,8 @@ TABS.sensors.initialize = function (callback) {
}
function addSampleToData(data, sampleNumber, sensorData) {
- for (var i = 0; i < data.length; i++) {
- var dataPoint = sensorData[i];
+ for (let i = 0; i < data.length; i++) {
+ const dataPoint = sensorData[i];
data[i].push([sampleNumber, dataPoint]);
if (dataPoint < data[i].min) {
data[i].min = dataPoint;
@@ -41,14 +40,14 @@ TABS.sensors.initialize = function (callback) {
}
}
while (data[0].length > 300) {
- for (i = 0; i < data.length; i++) {
+ for (let i = 0; i < data.length; i++) {
data[i].shift();
}
}
return sampleNumber + 1;
}
- var margin = {top: 20, right: 10, bottom: 10, left: 40};
+ const margin = {top: 20, right: 10, bottom: 10, left: 40};
function updateGraphHelperSize(helpers) {
helpers.width = helpers.targetElement.width() - margin.left - margin.right;
helpers.height = helpers.targetElement.height() - margin.top - margin.bottom;
@@ -61,7 +60,7 @@ TABS.sensors.initialize = function (callback) {
}
function initGraphHelpers(selector, sampleNumber, heightDomain) {
- var helpers = {selector: selector, targetElement: $(selector), dynamicHeightDomain: !heightDomain};
+ const helpers = {selector: selector, targetElement: $(selector), dynamicHeightDomain: !heightDomain};
helpers.widthScale = d3.scale.linear()
.clamp(true)
@@ -108,10 +107,10 @@ TABS.sensors.initialize = function (callback) {
}
function drawGraph(graphHelpers, data, sampleNumber) {
- var svg = d3.select(graphHelpers.selector);
+ const svg = d3.select(graphHelpers.selector);
if (graphHelpers.dynamicHeightDomain) {
- var limits = [];
+ const limits = [];
$.each(data, function (idx, datum) {
limits.push(datum.min);
limits.push(datum.max);
@@ -125,9 +124,9 @@ TABS.sensors.initialize = function (callback) {
svg.select(".x.axis").call(graphHelpers.xAxis);
svg.select(".y.axis").call(graphHelpers.yAxis);
- var group = svg.select("g.data");
- var lines = group.selectAll("path").data(data, function (d, i) {return i;});
- var newLines = lines.enter().append("path").attr("class", "line");
+ const group = svg.select("g.data");
+ const lines = group.selectAll("path").data(data, function (d, i) {return i;});
+ lines.enter().append("path").attr("class", "line");
lines.attr('d', graphHelpers.line);
}
@@ -184,7 +183,7 @@ TABS.sensors.initialize = function (callback) {
i18n.localizePage();
// disable graphs for sensors that are missing
- var checkboxes = $('.tab-sensors .info .checkboxes input');
+ let checkboxes = $('.tab-sensors .info .checkboxes input');
checkboxes.parent().show();
if (FC.CONFIG.boardType == 0 || FC.CONFIG.boardType == 2) {
@@ -201,15 +200,15 @@ TABS.sensors.initialize = function (callback) {
checkboxes.eq(4).prop('disabled', true);
}
} else {
- for (var i = 0; i <= 4; i++) {
+ for (let i = 0; i <= 4; i++) {
checkboxes.eq(i).prop('disabled', true);
checkboxes.eq(i).parent().hide();
}
}
$('.tab-sensors .info .checkboxes input').change(function () {
- var enable = $(this).prop('checked');
- var index = $(this).parent().index();
+ const enable = $(this).prop('checked');
+ const index = $(this).parent().index();
switch (index) {
case 0:
@@ -232,14 +231,14 @@ TABS.sensors.initialize = function (callback) {
break;
}
- var checkboxes = [];
+ const _checkboxes = [];
$('.tab-sensors .info .checkboxes input').each(function () {
- checkboxes.push($(this).prop('checked'));
+ _checkboxes.push($(this).prop('checked'));
});
$('.tab-sensors .rate select:first').change();
- ConfigStorage.set({'graphs_enabled': checkboxes});
+ ConfigStorage.set({'graphs_enabled': _checkboxes});
});
let altitudeHint_e = $('.tab-sensors #sensorsAltitudeHint');
@@ -251,13 +250,13 @@ TABS.sensors.initialize = function (callback) {
initSensorData();
// Setup variables
- var samples_gyro_i = 0,
+ let samples_gyro_i = 0,
samples_accel_i = 0,
samples_mag_i = 0,
samples_altitude_i = 0,
samples_sonar_i = 0,
- samples_debug_i = 0,
- gyro_data = initDataArray(3),
+ samples_debug_i = 0;
+ const gyro_data = initDataArray(3),
accel_data = initDataArray(3),
mag_data = initDataArray(3),
altitude_data = initDataArray(1),
@@ -269,25 +268,25 @@ TABS.sensors.initialize = function (callback) {
initDataArray(1)
];
- var gyroHelpers = initGraphHelpers('#gyro', samples_gyro_i, [-2000, 2000]);
- var accelHelpers = initGraphHelpers('#accel', samples_accel_i, [-2, 2]);
- var magHelpers = initGraphHelpers('#mag', samples_mag_i, [-1, 1]);
- var altitudeHelpers = initGraphHelpers('#altitude', samples_altitude_i);
- var sonarHelpers = initGraphHelpers('#sonar', samples_sonar_i);
- var debugHelpers = [
+ let gyroHelpers = initGraphHelpers('#gyro', samples_gyro_i, [-2000, 2000]);
+ let accelHelpers = initGraphHelpers('#accel', samples_accel_i, [-2, 2]);
+ let magHelpers = initGraphHelpers('#mag', samples_mag_i, [-1, 1]);
+ const altitudeHelpers = initGraphHelpers('#altitude', samples_altitude_i);
+ const sonarHelpers = initGraphHelpers('#sonar', samples_sonar_i);
+ const debugHelpers = [
initGraphHelpers('#debug1', samples_debug_i),
initGraphHelpers('#debug2', samples_debug_i),
initGraphHelpers('#debug3', samples_debug_i),
initGraphHelpers('#debug4', samples_debug_i)
];
- var raw_data_text_ements = {
+ const raw_data_text_ements = {
x: [],
y: [],
z: []
};
$('.plot_control .x, .plot_control .y, .plot_control .z').each(function () {
- var el = $(this);
+ const el = $(this);
if (el.hasClass('x')) {
raw_data_text_ements.x.push(el);
} else if (el.hasClass('y')) {
@@ -300,7 +299,7 @@ TABS.sensors.initialize = function (callback) {
$('.tab-sensors .rate select, .tab-sensors .scale select').change(function () {
// if any of the select fields change value, all of the select values are grabbed
// and timers are re-initialized with the new settings
- var rates = {
+ const rates = {
'gyro': parseInt($('.tab-sensors select[name="gyro_refresh_rate"]').val(), 10),
'accel': parseInt($('.tab-sensors select[name="accel_refresh_rate"]').val(), 10),
'mag': parseInt($('.tab-sensors select[name="mag_refresh_rate"]').val(), 10),
@@ -309,7 +308,7 @@ TABS.sensors.initialize = function (callback) {
'debug': parseInt($('.tab-sensors select[name="debug_refresh_rate"]').val(), 10)
};
- var scales = {
+ const scales = {
'gyro': parseFloat($('.tab-sensors select[name="gyro_scale"]').val()),
'accel': parseFloat($('.tab-sensors select[name="accel_scale"]').val()),
'mag': parseFloat($('.tab-sensors select[name="mag_scale"]').val())
@@ -319,7 +318,7 @@ TABS.sensors.initialize = function (callback) {
// this means that setting a slower refresh rate on any of the attributes would have no effect
// what we will do instead is = determinate the fastest refresh rate for those 3 attributes, use that as a "polling rate"
// and use the "slower" refresh rates only for re-drawing the graphs (to save resources/computing power)
- var fastest = d3.min([rates.gyro, rates.accel, rates.mag]);
+ const fastest = d3.min([rates.gyro, rates.accel, rates.mag]);
// store current/latest refresh rates in the storage
ConfigStorage.set({'sensor_settings': {'rates': rates, 'scales': scales}});
@@ -330,7 +329,7 @@ TABS.sensors.initialize = function (callback) {
magHelpers = initGraphHelpers('#mag', samples_mag_i, [-scales.mag, scales.mag]);
// fetch currently enabled plots
- var checkboxes = [];
+ checkboxes = [];
$('.tab-sensors .info .checkboxes input').each(function () {
checkboxes.push($(this).prop('checked'));
});
@@ -418,7 +417,7 @@ TABS.sensors.initialize = function (callback) {
}
function update_debug_graphs() {
- for (var i = 0; i < 4; i++) {
+ for (let i = 0; i < 4; i++) {
updateGraphHelperSize(debugHelpers[i]);
addSampleToData(debug_data[i], samples_debug_i, [FC.SENSOR_DATA.debug[i]]);
@@ -454,9 +453,9 @@ TABS.sensors.initialize = function (callback) {
}
ConfigStorage.get('graphs_enabled', function (resultGraphs) {
if (resultGraphs.graphs_enabled) {
- var checkboxes = $('.tab-sensors .info .checkboxes input');
- for (var i = 0; i < resultGraphs.graphs_enabled.length; i++) {
- checkboxes.eq(i).not(':disabled').prop('checked', resultGraphs.graphs_enabled[i]).change();
+ const _checkboxes = $('.tab-sensors .info .checkboxes input');
+ for (let i = 0; i < resultGraphs.graphs_enabled.length; i++) {
+ _checkboxes.eq(i).not(':disabled').prop('checked', resultGraphs.graphs_enabled[i]).change();
}
} else {
$('.tab-sensors .info input:lt(4):not(:disabled)').prop('checked', true).change();