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

Reverting 881e50898e.

10.3.x-maintenance
mikeller 2016-07-30 23:25:23 +12:00
parent 881e50898e
commit 0c26117c56
1 changed files with 42 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
js/msp.js
View File

@ -904,10 +904,15 @@ var MSP = {
offset += 2; offset += 2;
RX_CONFIG.rx_max_usec = data.getUint16(offset, 1); RX_CONFIG.rx_max_usec = data.getUint16(offset, 1);
offset += 2; offset += 2;
if (semver.gte(CONFIG.apiVersion, "1.20.0")) {
RX_CONFIG.rcSmoothing = data.getUint8(offset, 1); RX_CONFIG.rcSmoothing = data.getUint8(offset, 1);
RX_CONFIG.rcSmoothInterval = data.getUint8(offset, 1); RX_CONFIG.rcSmoothInterval = data.getUint8(offset, 1);
RX_CONFIG.airModeActivateThreshold = data.getUint16(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; break;
case MSP_codes.MSP_FAILSAFE_CONFIG: case MSP_codes.MSP_FAILSAFE_CONFIG:
@ -960,7 +965,7 @@ var MSP = {
break; break;
case MSP_codes.MSP_PID_ADVANCED: case MSP_codes.MSP_PID_ADVANCED:
if (semver.gte(CONFIG.flightControllerVersion, "2.8.2")) { if (semver.gte(CONFIG.apiVersion, "1.16.0")) {
var offset = 0; var offset = 0;
ADVANCED_TUNING.rollPitchItermIgnoreRate = data.getUint16(offset, 1); ADVANCED_TUNING.rollPitchItermIgnoreRate = data.getUint16(offset, 1);
offset += 2; offset += 2;
@ -970,6 +975,7 @@ var MSP = {
offset += 2; offset += 2;
ADVANCED_TUNING.deltaMethod = data.getUint8(offset++, 1); ADVANCED_TUNING.deltaMethod = data.getUint8(offset++, 1);
ADVANCED_TUNING.vbatPidCompensation = data.getUint8(offset++, 1); ADVANCED_TUNING.vbatPidCompensation = data.getUint8(offset++, 1);
if (semver.gte(CONFIG.apiVersion, "1.20.0")) {
ADVANCED_TUNING.ptermSetpointWeight = data.getUint8(offset++, 1); ADVANCED_TUNING.ptermSetpointWeight = data.getUint8(offset++, 1);
ADVANCED_TUNING.dtermSetpointWeight = data.getUint8(offset++, 1); ADVANCED_TUNING.dtermSetpointWeight = data.getUint8(offset++, 1);
ADVANCED_TUNING.toleranceBand = data.getUint8(offset++, 1); ADVANCED_TUNING.toleranceBand = data.getUint8(offset++, 1);
@ -978,7 +984,15 @@ var MSP = {
ADVANCED_TUNING.pidMaxVelocity = data.getUint16(offset, 1); ADVANCED_TUNING.pidMaxVelocity = data.getUint16(offset, 1);
offset += 2; offset += 2;
ADVANCED_TUNING.pidMaxVelocityYaw = data.getUint16(offset, 1); ADVANCED_TUNING.pidMaxVelocityYaw = data.getUint16(offset, 1);
offset += 2; } else {
ADVANCED_TUNING.ptermSetpointWeight = 0;
ADVANCED_TUNING.dtermSetpointWeight = 0;
ADVANCED_TUNING.toleranceBand = 0;
ADVANCED_TUNING.toleranceBandReduction = 0;
ADVANCED_TUNING.itermThrottleGain = 0;
ADVANCED_TUNING.pidMaxVelocity = 0;
ADVANCED_TUNING.pidMaxVelocityYaw = 0;
}
} }
break; break;
case MSP_codes.MSP_SENSOR_CONFIG: case MSP_codes.MSP_SENSOR_CONFIG:
@ -1639,12 +1653,13 @@ MSP.crunch = function (code) {
.push16(FILTER_CONFIG.yaw_lpf_hz); .push16(FILTER_CONFIG.yaw_lpf_hz);
break; break;
case MSP_codes.MSP_SET_PID_ADVANCED: case MSP_codes.MSP_SET_PID_ADVANCED:
if (semver.gte(CONFIG.flightControllerVersion, "2.8.2")) { if (semver.gte(CONFIG.apiVersion, "1.16.0")) {
buffer.push16(ADVANCED_TUNING.rollPitchItermIgnoreRate) buffer.push16(ADVANCED_TUNING.rollPitchItermIgnoreRate)
.push16(ADVANCED_TUNING.yawItermIgnoreRate) .push16(ADVANCED_TUNING.yawItermIgnoreRate)
.push16(ADVANCED_TUNING.yaw_p_limit) .push16(ADVANCED_TUNING.yaw_p_limit)
.push8(ADVANCED_TUNING.deltaMethod) .push8(ADVANCED_TUNING.deltaMethod);
.push8(ADVANCED_TUNING.vbatPidCompensation) if (semver.lt(CONFIG.apiVersion, "1.20.0")) {
buffer.push8(ADVANCED_TUNING.vbatPidCompensation)
.push8(ADVANCED_TUNING.ptermSetpointWeight) .push8(ADVANCED_TUNING.ptermSetpointWeight)
.push8(ADVANCED_TUNING.dtermSetpointWeight) .push8(ADVANCED_TUNING.dtermSetpointWeight)
.push8(ADVANCED_TUNING.toleranceBand) .push8(ADVANCED_TUNING.toleranceBand)
@ -1653,6 +1668,7 @@ MSP.crunch = function (code) {
.push16(ADVANCED_TUNING.pidMaxVelocity) .push16(ADVANCED_TUNING.pidMaxVelocity)
.push16(ADVANCED_TUNING.pidMaxVelocityYaw); .push16(ADVANCED_TUNING.pidMaxVelocityYaw);
} }
}
break; break;
case MSP_codes.MSP_SET_SENSOR_CONFIG: case MSP_codes.MSP_SET_SENSOR_CONFIG:
buffer.push(SENSOR_CONFIG.acc_hardware); buffer.push(SENSOR_CONFIG.acc_hardware);