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

Add rcsmoothing auto smoothness to UI

Browse source
This commit is contained in:
IvoFPV 2019-08-25 16:34:43 +02:00
parent e3e79f6e81
commit 70464f5ff2
5 changed files with 77 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/js/fc.js
View file

@ -461,6 +461,8 @@ var FC = {
rcSmoothingDerivativeCutoff: 0,
rcSmoothingInputType: 0,
rcSmoothingDerivativeType: 0,
rcSmoothingAutoSmoothness: 0,
usbCdcHidType: 0,
};
FAILSAFE_CONFIG = {

8
src/js/msp/MSPHelper.js
View file

@ -896,6 +896,10 @@ MspHelper.prototype.process_data = function(dataHandler) {
RX_CONFIG.rcSmoothingDerivativeCutoff = data.readU8();
RX_CONFIG.rcSmoothingInputType = data.readU8();
RX_CONFIG.rcSmoothingDerivativeType = data.readU8();
if (semver.gte(CONFIG.apiVersion, "1.42.0")) {
RX_CONFIG.usbCdcHidType = data.readU8();
RX_CONFIG.rcSmoothingAutoSmoothness = data.readU8();
}
}
} else {
RX_CONFIG.rxSpiProtocol = 0;
@ -1687,6 +1691,10 @@ MspHelper.prototype.crunch = function(code) {
.push8(RX_CONFIG.rcSmoothingDerivativeCutoff)
.push8(RX_CONFIG.rcSmoothingInputType)
.push8(RX_CONFIG.rcSmoothingDerivativeType);
if (semver.gte(CONFIG.apiVersion, "1.42.0")) {
buffer.push8(RX_CONFIG.usbCdcHidType)
.push8(RX_CONFIG.rcSmoothingAutoSmoothness);
}
}
}
}

48
src/js/tabs/receiver.js
View file

@ -233,7 +233,9 @@ TABS.receiver.initialize = function (callback) {
// UI Hooks
$('a.refresh').click(function () {
// Todo: refresh data here
tab.refresh(function () {
GUI.log(i18n.getMessage('receiverDataRefreshed'));
});
});
$('a.update').click(function () {
@ -333,7 +335,7 @@ TABS.receiver.initialize = function (callback) {
var rcSmoothingnNumberElement = $('input[name="rcSmoothingInputHz-number"]');
var rcSmoothingnDerivativeNumberElement = $('input[name="rcSmoothingDerivativeCutoff-number"]');
$('.tab-receiver .rcSmoothing-input-cutoff').show();
$('select[name="rcSmoothing-input-manual-select"]').val("1");
$('.tab-receiver .rc-smoothing-input-blank').hide();
@ -371,7 +373,7 @@ TABS.receiver.initialize = function (callback) {
rcSmoothingnDerivativeNumberElement.val(RX_CONFIG.rcSmoothingDerivativeCutoff);
}
});
rcSmoothingnNumberElement.change(function () {
RX_CONFIG.rcSmoothingInputCutoff = $(this).val();
});
@ -397,6 +399,25 @@ TABS.receiver.initialize = function (callback) {
});
rc_smoothing_input_type.val(RX_CONFIG.rcSmoothingInputType);
if (semver.gte(CONFIG.apiVersion, "1.42.0")) {
$('select[name="rcSmoothing-input-manual-select"], select[name="rcSmoothing-input-derivative-select"]').change(function() {
if ($('select[name="rcSmoothing-input-manual-select"]').val() == 0 || $('select[name="rcSmoothing-input-derivative-select"]').val() == 0) {
$('.tab-receiver .rcSmoothing-auto-smoothness').show();
} else {
$('.tab-receiver .rcSmoothing-auto-smoothness').hide();
}
});
$('select[name="rcSmoothing-input-manual-select"]').change();
var rc_smoothing_auto_smoothness = $('input[name="rcSmoothingAutoSmoothness-number"]');
rc_smoothing_auto_smoothness.change(function() {
RX_CONFIG.rcSmoothingAutoSmoothness = $(this).val();
});
rc_smoothing_auto_smoothness.val(RX_CONFIG.rcSmoothingAutoSmoothness);
} else {
$('.tab-receiver .rcSmoothing-auto-smoothness').hide();
}
updateInterpolationView();
} else {
$('.tab-receiver .rcInterpolation').show();
@ -407,6 +428,7 @@ TABS.receiver.initialize = function (callback) {
$('.tab-receiver .rcSmoothing-derivative-manual').hide();
$('.tab-receiver .rcSmoothing-input-manual').hide();
$('.tab-receiver .rc-smoothing-type').hide();
$('.tab-receiver .rcSmoothing-auto-smoothness').hide();
}
// Only show the MSP control sticks if the MSP Rx feature is enabled
@ -455,7 +477,7 @@ TABS.receiver.initialize = function (callback) {
}
// Remove old data from array
while (RX_plot_data.length > 300) {
while (RX_plot_data[0].length > 300) {
for (var i = 0; i < RX_plot_data.length; i++) {
RX_plot_data[i].shift();
}
@ -594,6 +616,18 @@ TABS.receiver.cleanup = function (callback) {
if (callback) callback();
};
TABS.receiver.refresh = function (callback) {
var self = this;
GUI.tab_switch_cleanup(function () {
self.initialize();
if (callback) {
callback();
}
});
};
TABS.receiver.updateRcInterpolationParameters = function () {
if (semver.gte(CONFIG.apiVersion, "1.20.0")) {
if ($('select[name="rcInterpolation-select"]').val() === '3') {
@ -612,6 +646,11 @@ function updateInterpolationView() {
$('.tab-receiver .rcSmoothing-input-type').show();
$('.tab-receiver .rcSmoothing-derivative-manual').show();
$('.tab-receiver .rcSmoothing-input-manual').show();
if (semver.gte(CONFIG.apiVersion, "1.42.0")) {
if (parseInt(RX_CONFIG.rcSmoothingDerivativeCutoff) === 0 || parseInt(RX_CONFIG.rcSmoothingInputCutoff) === 0) {
$('.tab-receiver .rcSmoothing-auto-smoothness').show();
}
}
if (parseInt(RX_CONFIG.rcSmoothingType) === 0) {
$('.tab-receiver .rcInterpolation').show();
@ -621,6 +660,7 @@ function updateInterpolationView() {
$('.tab-receiver .rcSmoothing-input-type').hide();
$('.tab-receiver .rcSmoothing-derivative-manual').hide();
$('.tab-receiver .rcSmoothing-input-manual').hide();
$('.tab-receiver .rcSmoothing-auto-smoothness').hide();
}
if (parseInt(RX_CONFIG.rcSmoothingDerivativeCutoff) === 0) {
$('.tab-receiver .rcSmoothing-derivative-cutoff').hide();