Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-24 08:45:36 +03:00
Code Issues Wiki Activity

Merge branch 'betaflight' into development

Browse source 
# Conflicts:
#	src/main/flight/pid.c
#	src/main/main.c
#	src/main/target/IRCFUSIONF3/target.h
This commit is contained in:
blckmn 2016-08-27 08:34:23 +10:00
commit 9bdb4a9b25
23 changed files with 333 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/main/drivers/pwm_mapping.c
View file

@ -235,6 +235,13 @@ pwmOutputConfiguration_t *pwmInit(drv_pwm_config_t *init)
type = MAP_TO_SERVO_OUTPUT;
#endif
#if defined(RCEXPLORERF3)
if (timerIndex == PWM2)
{
type = MAP_TO_SERVO_OUTPUT;
}
#endif
#if (defined(STM32F3DISCOVERY) && !defined(CHEBUZZF3))
// remap PWM 5+6 or 9+10 as servos - softserial pin pairs require timer ports that use the same timer
if (init->useSoftSerial) {