From 9aa57eb6b0faf9aefec0e67da51c25eb7de05a13 Mon Sep 17 00:00:00 2001 From: borisbstyle Date: Sun, 7 Aug 2016 01:33:21 +0200 Subject: [PATCH] Fix rebase error --- src/main/flight/pid_betaflight.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/flight/pid_betaflight.c b/src/main/flight/pid_betaflight.c index a2dc204d9..39616552e 100644 --- a/src/main/flight/pid_betaflight.c +++ b/src/main/flight/pid_betaflight.c @@ -126,8 +126,8 @@ void pidBetaflight(const pidProfile_t *pidProfile, uint16_t max_angle_inclinatio Kd[axis] = DTERM_SCALE * pidProfile->D8[axis]; b[axis] = pidProfile->ptermSetpointWeight / 100.0f; c[axis] = pidProfile->dtermSetpointWeight / 100.0f; - yawMaxVelocity = pidProfile->pidMaxVelocityYaw * 1000 * getdT(); - rollPitchMaxVelocity = pidProfile->pidMaxVelocityRollPitch * 1000 * getdT(); + yawMaxVelocity = pidProfile->yawRateAccelLimit * 1000 * getdT(); + rollPitchMaxVelocity = pidProfile->rateAccelLimit * 1000 * getdT(); configP[axis] = pidProfile->P8[axis]; configI[axis] = pidProfile->I8[axis];