rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Conflicts:
	src/main/main.c
This commit is contained in:
Dominic Clifton 2014-12-26 18:51:40 +00:00
parent 7f84f37607 64c5cda1f7
commit abe4fbbaae
3 changed files with 3 additions and 1 deletions
Show Stats 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 ] // this is pretty hacky shit, but it will do for now. array of 4 config maps, [ multiPWM multiPPM airPWM airPPM ]
if (init->airplane) if (init->airplane)
i = 2; // switch to air hardware config i = 2; // switch to air hardware config
if (init->usePPM) if (init->usePPM || init->useSerialRx)
i++; // next index is for PPM i++; // next index is for PPM
setup = hardwareMaps[i]; setup = hardwareMaps[i];

1
src/main/drivers/pwm_mapping.h
View File

@ -39,6 +39,7 @@
typedef struct drv_pwm_config_t { typedef struct drv_pwm_config_t {
bool useParallelPWM; bool useParallelPWM;
bool usePPM; bool usePPM;
bool useSerialRx;
bool useRSSIADC; bool useRSSIADC;
bool useCurrentMeterADC; bool useCurrentMeterADC;
#ifdef STM32F10X #ifdef STM32F10X

1
src/main/main.c
View File

@ -290,6 +290,7 @@ void init(void)
pwm_params.useLEDStrip = feature(FEATURE_LED_STRIP); pwm_params.useLEDStrip = feature(FEATURE_LED_STRIP);
pwm_params.usePPM = feature(FEATURE_RX_PPM); pwm_params.usePPM = feature(FEATURE_RX_PPM);
pwm_params.useOneshot = feature(FEATURE_ONESHOT125); pwm_params.useOneshot = feature(FEATURE_ONESHOT125);
pwm_params.useSerialRx = feature(FEATURE_RX_SERIAL);
pwm_params.useServos = isMixerUsingServos(); pwm_params.useServos = isMixerUsingServos();
pwm_params.extraServos = currentProfile->gimbalConfig.gimbal_flags & GIMBAL_FORWARDAUX; pwm_params.extraServos = currentProfile->gimbalConfig.gimbal_flags & GIMBAL_FORWARDAUX;
pwm_params.motorPwmRate = masterConfig.motor_pwm_rate; pwm_params.motorPwmRate = masterConfig.motor_pwm_rate;