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

Merge branch 'PWM_mapping' of https://github.com/MJ666/cleanflight into MJ666-PWM_mapping

Browse source 
Conflicts:
	src/main/main.c
This commit is contained in:
Dominic Clifton 2014-12-26 18:51:40 +00:00
commit abe4fbbaae
3 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -297,7 +297,7 @@ pwmOutputConfiguration_t *pwmInit(drv_pwm_config_t *init)
// this is pretty hacky shit, but it will do for now. array of 4 config maps, [ multiPWM multiPPM airPWM airPPM ]
if (init->airplane)
i = 2; // switch to air hardware config
if (init->usePPM)
if (init->usePPM || init->useSerialRx)
i++; // next index is for PPM
setup = hardwareMaps[i];