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

Merge branch 'master' into feature/2.9-compat

Browse source
This commit is contained in:
nathan 2016-07-30 09:50:47 -07:00
commit 28f425b041
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
js/msp.js
View file

@ -906,11 +906,14 @@ var MSP = {
offset += 2;
RX_CONFIG.rx_max_usec = data.getUint16(offset, 1);
offset += 2;
if (semver.gte(CONFIG.flightControllerVersion, "3.0.0")) {
if (semver.gte(CONFIG.apiVersion, "1.20.0")) {
RX_CONFIG.rcSmoothing = data.getUint8(offset, 1);
RX_CONFIG.rcSmoothInterval = data.getUint8(offset, 1);
RX_CONFIG.airModeActivateThreshold = data.getUint16(offset, 1);
offset += 2;
} else {
RX_CONFIG.rcSmoothing = 0;
RX_CONFIG.rcSmoothInterval = 0;
RX_CONFIG.airModeActivateThreshold = 0;
}
break;
@ -1546,7 +1549,7 @@ MSP.crunch = function (code) {
buffer.push(highByte(RX_CONFIG.rx_min_usec));
buffer.push(lowByte(RX_CONFIG.rx_max_usec));
buffer.push(highByte(RX_CONFIG.rx_max_usec));
if (semver.lt(CONFIG.apiVersion, "1.20.0")) {
if (semver.gte(CONFIG.apiVersion, "1.20.0")) {
buffer.push(RX_CONFIG.rcSmoothing);
buffer.push(RX_CONFIG.rcSmoothInterval);
buffer.push(lowByte(RX_CONFIG.airModeActivateThreshold));