mirror of
https://github.com/betaflight/betaflight.git
synced 2025-07-23 00:05:33 +03:00
Merge branch 'betaflight' into development
# Conflicts: # src/main/flight/pid.c # src/main/main.c # src/main/target/IRCFUSIONF3/target.h
This commit is contained in:
commit
9bdb4a9b25
23 changed files with 333 additions and 57 deletions
|
@ -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) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue