Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-26 01:35:41 +03:00
Code Issues Wiki Activity

Trim the conditions a bit after a better understanding of what's

Browse source 
possible and what isn't.

This also implies adding some things back to PWM mappings.
This commit is contained in:
Mitch Miers 2016-09-25 21:00:52 -04:00
parent 3dd085dc9e
commit 6a36fadc1b
2 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -244,10 +244,6 @@ pwmOutputConfiguration_t *pwmInit(drv_pwm_config_t *init)
if ((timerIndex == PWM13 || timerIndex == PWM14) && timerHardwarePtr->tim == TIM15) if ((timerIndex == PWM13 || timerIndex == PWM14) && timerHardwarePtr->tim == TIM15)
type = MAP_TO_SERVO_OUTPUT; type = MAP_TO_SERVO_OUTPUT;
} }
// skip UART3 ports when necessary - this board maps UART3 and PWM3,PWM4 to the same pins
if ((init->useUART3) && (timerIndex == PWM3 || timerIndex == PWM4))
continue;
#endif #endif
#if defined(SPRACINGF3MINI) || defined(OMNIBUS) #if defined(SPRACINGF3MINI) || defined(OMNIBUS)
@ -308,11 +304,8 @@ pwmOutputConfiguration_t *pwmInit(drv_pwm_config_t *init)
if (timerIndex >= PWM5 && timerIndex <= PWM8) if (timerIndex >= PWM5 && timerIndex <= PWM8)
type = MAP_TO_SERVO_OUTPUT; type = MAP_TO_SERVO_OUTPUT;
#elif defined(X_RACERSPI) #elif defined(X_RACERSPI)
// remap PWM3..6 as servos when used in extended servo mode ... except if using UART3 // remap PWM3..6 as servos when used in extended servo mode
if (!init->useUART3 && (timerIndex >= PWM3 && timerIndex <= PWM4)) if (timerIndex >= PWM3 && timerIndex <= PWM6)
type = MAP_TO_SERVO_OUTPUT;
// don't do this if softserial, but that's up above
if (timerIndex >= PWM5 && timerIndex <= PWM6)
type = MAP_TO_SERVO_OUTPUT; type = MAP_TO_SERVO_OUTPUT;
#endif #endif

6
src/main/target/X_RACERSPI/target.c
View file

@ -17,6 +17,8 @@ const uint16_t multiPPM[] = {
PWM12 | (MAP_TO_MOTOR_OUTPUT << 8), PWM12 | (MAP_TO_MOTOR_OUTPUT << 8),
PWM13 | (MAP_TO_MOTOR_OUTPUT << 8), PWM13 | (MAP_TO_MOTOR_OUTPUT << 8),
PWM14 | (MAP_TO_MOTOR_OUTPUT << 8), PWM14 | (MAP_TO_MOTOR_OUTPUT << 8),
PWM3 | (MAP_TO_MOTOR_OUTPUT << 8), // Swap to servo if needed
PWM4 | (MAP_TO_MOTOR_OUTPUT << 8), // Swap to servo if needed
PWM5 | (MAP_TO_MOTOR_OUTPUT << 8), // Swap to servo if needed PWM5 | (MAP_TO_MOTOR_OUTPUT << 8), // Swap to servo if needed
PWM6 | (MAP_TO_MOTOR_OUTPUT << 8), // Swap to servo if needed PWM6 | (MAP_TO_MOTOR_OUTPUT << 8), // Swap to servo if needed
0xFFFF 0xFFFF
@ -50,8 +52,10 @@ const uint16_t airPPM[] = {
PWM12 | (MAP_TO_SERVO_OUTPUT << 8), PWM12 | (MAP_TO_SERVO_OUTPUT << 8),
PWM13 | (MAP_TO_SERVO_OUTPUT << 8), PWM13 | (MAP_TO_SERVO_OUTPUT << 8),
PWM14 | (MAP_TO_SERVO_OUTPUT << 8), PWM14 | (MAP_TO_SERVO_OUTPUT << 8),
PWM3 | (MAP_TO_SERVO_OUTPUT << 8),
PWM4 | (MAP_TO_SERVO_OUTPUT << 8),
PWM5 | (MAP_TO_SERVO_OUTPUT << 8), PWM5 | (MAP_TO_SERVO_OUTPUT << 8),
PWM6 | (MAP_TO_SERVO_OUTPUT << 8), // servo #8 PWM6 | (MAP_TO_SERVO_OUTPUT << 8), // servo #10
0xFFFF 0xFFFF
}; };