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

Merge pull request #159 from Pierre-A/cc3d-updates-pa

Browse source 
RSSI monitoring on CC3D
This commit is contained in:
Dominic Clifton 2014-11-22 01:11:30 +00:00
commit 249b09abce
4 changed files with 29 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -305,16 +305,21 @@ pwmOutputConfiguration_t *pwmInit(drv_pwm_config_t *init)
#endif
#ifdef CC3D
if (init->useVbat && timerIndex == PWM5) {
if (init->useVbat && timerIndex == Vbat_TIMER) {
continue;
}
#endif
#ifdef CC3D
if (init->useCurrentMeterADC && timerIndex == CurrentMeter_TIMER) {
continue;
}
#endif
#ifdef CC3D
if (init->useRSSIADC && timerIndex == RSSI_TIMER) {
continue;
}
#endif
#ifdef CC3D
if (init->useCurrentMeterADC && timerIndex == PWM6) {
continue;
}
#endif
// hacks to allow current functionality
if (type == MAP_TO_PWM_INPUT && !init->useParallelPWM)
type = 0;