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

Merge pull request #3107 from martinbudden/bf_servo_build_fix

Browse source 
Fix servo build
This commit is contained in:
Martin Budden 2017-05-17 07:04:27 +01:00 • committed by GitHub
commit a452b21a59
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/flight/servos.c
View file

@ -412,7 +412,7 @@ STATIC_UNIT_TESTED void servoMixer(void)
} }
// mix servos according to rules // mix servos according to rules
for (i = 0; i < servoRuleCount; i++) { for (int i = 0; i < servoRuleCount; i++) {
// consider rule if no box assigned or box is active // consider rule if no box assigned or box is active
if (currentServoMixer[i].box == 0 || IS_RC_MODE_ACTIVE(BOXSERVO1 + currentServoMixer[i].box - 1)) { if (currentServoMixer[i].box == 0 || IS_RC_MODE_ACTIVE(BOXSERVO1 + currentServoMixer[i].box - 1)) {
uint8_t target = currentServoMixer[i].targetChannel; uint8_t target = currentServoMixer[i].targetChannel;
@ -436,7 +436,7 @@ STATIC_UNIT_TESTED void servoMixer(void)
} }
} }
for (i = 0; i < MAX_SUPPORTED_SERVOS; i++) { for (int i = 0; i < MAX_SUPPORTED_SERVOS; i++) {
servo[i] = ((int32_t)servoParams(i)->rate * servo[i]) / 100L; servo[i] = ((int32_t)servoParams(i)->rate * servo[i]) / 100L;
servo[i] += determineServoMiddleOrForwardFromChannel(i); servo[i] += determineServoMiddleOrForwardFromChannel(i);
} }