sundowndev
/
betaflight-configurator
mirror of https://github.com/sundowndev/betaflight-configurator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updating UI for interpolation / fixing alignment

10.4.x-maintenance
Sean M 2018-08-09 22:47:29 -04:00
parent 763b279f8f
commit 9025430bee
5 changed files with 33 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
locales/en/messages.json
View File

@ -1333,6 +1333,9 @@
"receiverRcInterpolationOff": {
"message": "Off"
},
"receiverRcSmoothingType": {
"message": "Smoothing Type"
},
"receiverRcInterpolationDefault": {
"message": "Preset"
},

4
src/css/tabs/receiver.css
View File

@ -410,6 +410,10 @@
margin-right: 10px;
}
.tab-receiver .rcInterpolation-label {
border-right: none;
}
.tab-receiver .throttle_curve {
margin: 0 0px 0px 0;
width: 200px;

14
src/js/msp/MSPHelper.js
View File

@ -764,9 +764,6 @@ MspHelper.prototype.process_data = function(dataHandler) {
RX_CONFIG.spektrum_sat_bind = data.readU8();
RX_CONFIG.rx_min_usec = data.readU16();
RX_CONFIG.rx_max_usec = data.readU16();
RX_CONFIG.rcInterpolation = 0;
RX_CONFIG.rcInterpolationInterval = 0;
RX_CONFIG.airModeActivateThreshold = 0;
if (semver.gte(CONFIG.apiVersion, "1.20.0")) {
RX_CONFIG.rcInterpolation = data.readU8();
RX_CONFIG.rcInterpolationInterval = data.readU8();
@ -784,8 +781,19 @@ MspHelper.prototype.process_data = function(dataHandler) {
RX_CONFIG.rcSmoothingInputType = data.readU8();
RX_CONFIG.rcSmoothingDerivativeType = data.readU8();
}
} else {
RX_CONFIG.rxSpiProtocol = 0;
RX_CONFIG.rxSpiId = 0;
RX_CONFIG.rxSpiRfChannelCount = 0;
RX_CONFIG.fpvCamAngleDegrees = 0;
}
} else {
RX_CONFIG.rcInterpolation = 0;
RX_CONFIG.rcInterpolationInterval = 0;
RX_CONFIG.airModeActivateThreshold = 0;
}
break;
case MSPCodes.MSP_FAILSAFE_CONFIG:

10
src/js/tabs/receiver.js
View File

@ -325,7 +325,6 @@ TABS.receiver.initialize = function (callback) {
});
// RC Smoothing
$('.tab-receiver .rcSmoothing').hide();
if (semver.gte(CONFIG.apiVersion, "1.40.0")) {
$('.tab-receiver .rcSmoothing').show();
@ -403,6 +402,15 @@ TABS.receiver.initialize = function (callback) {
rc_smoothing_input_type.val(RX_CONFIG.rcSmoothingInputType);
updateInterpolationView();
} else {
$('.tab-receiver .rcInterpolation').show();
$('.tab-receiver .rcSmoothing-derivative-cutoff').hide();
$('.tab-receiver .rcSmoothing-input-cutoff').hide();
$('.tab-receiver .rcSmoothing-derivative-type').hide();
$('.tab-receiver .rcSmoothing-input-type').hide();
$('.tab-receiver .rcSmoothing-derivative-manual').hide();
$('.tab-receiver .rcSmoothing-input-manual').hide();
$('.tab-receiver .rc-smoothing-type').hide();
}
// Only show the MSP control sticks if the MSP Rx feature is enabled

48
src/tabs/receiver.html
View File

@ -78,42 +78,6 @@
</tr>
</table>
</div>
<!-- <div class="gui_box grey tunings topspacer rcInterpolation">
<table class="rcInterpolation">
<tr>
<th colspan="2" i18n="receiverRcInterpolation"></th>
</tr>
<tr class="rcInterpolation">
<td>
<select name="rcInterpolation-select">
<option value="0" i18n="receiverRcInterpolationOff"/>
<option value="1" i18n="receiverRcInterpolationDefault"/>
<option value="2" i18n="receiverRcInterpolationAuto"/>
<option value="3" i18n="receiverRcInterpolationManual"/>
</select>
</td>
<td>
<div>
<label>
<span i18n="receiverRcInterpolation"></span>
</label>
<div class="helpicon cf_tip" i18n_title="receiverRcInterpolationHelp" style="margin-top:0px;"></div>
</div>
</td>
</tr>
<tr class="rcInterpolationInterval">
<td><input type="number" class="nonProfile" name="rcInterpolationInterval-number" step="1" min="1" max="50"/></td>
<td>
<div>
<label>
<span i18n="receiverRcInterpolationInterval"></span>
</label>
<div class="helpicon cf_tip" i18n_title="receiverRcInterpolationIntervalHelp"></div>
</div>
</td>
</tr>
</table>
</div> -->
<div class="gui_box grey tunings topspacer rcSmoothing">
<table class="rcSmoothing-table">
<tr>
@ -129,7 +93,7 @@
<td style="border-right: none">
<div>
<label>
<span i18n="receiverRcInterpolation"></span>
<span i18n="receiverRcSmoothingType"></span>
</label>
</div>
</td>
@ -173,8 +137,8 @@
<td style="border-right: none">
<div class="helpicon cf_tip" i18n_title="receiverRcSmoothingInputManual" style="margin-top:0px;"></div>
</td>
<td class="rcSmoothing-input-cutoff" style="border-right: none"><input type="number" name="rcSmoothingInputHz-number" step="1" min="1" max="255" style="width: 90%"/></td>
<td class="rcSmoothing-input-cutoff" colspan="2">
<td class="rcSmoothing-input-cutoff" style="border-right: none !important;"><input type="number" name="rcSmoothingInputHz-number" step="1" min="1" max="255" style="width: 90%; margin-left: 5px"/></td>
<td class="rcSmoothing-input-cutoff" style="border-right: none !important;" colspan="2">
<div>
<label>
<span i18n="receiverRcSmoothingInputHz"></span>
@ -201,8 +165,8 @@
<td style="border-right: none">
<div class="helpicon cf_tip" i18n_title="receiverRcSmoothingDerivativeManual" style="margin-top:0px;"></div>
</td>
<td class="rcSmoothing-derivative-cutoff" style="border-right: none"><input type="number" name="rcSmoothingDerivativeCutoff-number" step="1" min="1" max="255" style="width: 90%"/></td>
<td colspan="2" class="rcSmoothing-derivative-cutoff">
<td class="rcSmoothing-derivative-cutoff" style="border-right: none"><input type="number" name="rcSmoothingDerivativeCutoff-number" step="1" min="1" max="255" style="width: 90%; margin-left: 5px"/></td>
<td colspan="2" class="rcSmoothing-derivative-cutoff" style="border-right: none !important;">
<div>
<label>
<span i18n="receiverRcSmoothingDerivativeCutoff"></span>
@ -230,7 +194,7 @@
<div class="helpicon cf_tip" i18n_title="rcSmoothingInputTypeHelp" style="margin-top:0px;"></div>
</td>
<td style="width: 15%; border-right: none">
<select name="rcSmoothingDerivativeType-select" style="width: 90%">
<select name="rcSmoothingDerivativeType-select" style="width: 90%; margin-left: 5px">
<option value="0" i18n="receiverRcSmoothingDerivativeTypeOff"/>
<option value="1" i18n="receiverRcSmoothingInputTypePt1"/>
<option value="2" i18n="receiverRcSmoothingInputTypeBiquad"/>