Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-23 08:15:26 +03:00
Code Issues Wiki Activity

Split escAndServoConfig into motor and servo parts, as per betaflight

Browse source
This commit is contained in:
Martin Budden 2016-10-01 18:02:33 +01:00
parent b3eff8d832
commit f57c22f2a2
30 changed files with 157 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/fc/rc_controls.c
View file

@ -42,7 +42,7 @@
#include "io/gps.h"
#include "io/beeper.h"
#include "io/escservo.h"
#include "io/motors.h"
#include "fc/rc_controls.h"
#include "fc/rc_curves.h"
@ -63,7 +63,7 @@
#define AIRMODE_DEADBAND 25
static escAndServoConfig_t *escAndServoConfig;
static motorConfig_t *motorConfig;
static pidProfile_t *pidProfile;
// true if arming is done via the sticks (as opposed to a switch)
@ -518,7 +518,7 @@ void applyStepAdjustment(controlRateConfig_t *controlRateConfig, uint8_t adjustm
case ADJUSTMENT_THROTTLE_EXPO:
newValue = constrain((int)controlRateConfig->thrExpo8 + delta, 0, 100); // FIXME magic numbers repeated in serial_cli.c
controlRateConfig->thrExpo8 = newValue;
generateThrottleCurve(controlRateConfig, escAndServoConfig);
generateThrottleCurve(controlRateConfig, motorConfig);
blackboxLogInflightAdjustmentEvent(ADJUSTMENT_THROTTLE_EXPO, newValue);
break;
case ADJUSTMENT_PITCH_ROLL_RATE:
@ -705,9 +705,9 @@ int32_t getRcStickDeflection(int32_t axis, uint16_t midrc) {
return MIN(ABS(rcData[axis] - midrc), 500);
}
void useRcControlsConfig(modeActivationCondition_t *modeActivationConditions, escAndServoConfig_t *escAndServoConfigToUse, pidProfile_t *pidProfileToUse)
void useRcControlsConfig(modeActivationCondition_t *modeActivationConditions, motorConfig_t *motorConfigToUse, pidProfile_t *pidProfileToUse)
{
escAndServoConfig = escAndServoConfigToUse;
motorConfig = motorConfigToUse;
pidProfile = pidProfileToUse;
isUsingSticksToArm = !isModeActivationConditionPresent(modeActivationConditions, BOXARM);