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

Remove usage of feature() from rx driver code so that driver code does 

not have a dependency on config.c.
This commit is contained in:
Dominic Clifton 2014-12-06 14:33:43 +00:00
parent 7356863939
commit 0b92f74b80
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/drivers/pwm_mapping.c
View File

@ -365,6 +365,11 @@ pwmOutputConfiguration_t *pwmInit(drv_pwm_config_t *init)
#endif #endif
if (type == MAP_TO_PPM_INPUT) { if (type == MAP_TO_PPM_INPUT) {
#ifdef CC3D
if (init->useOneshot) {
ppmAvoidPWMTimerClash(timerHardwarePtr, TIM4);
}
#endif
ppmInConfig(timerHardwarePtr); ppmInConfig(timerHardwarePtr);
} else if (type == MAP_TO_PWM_INPUT) { } else if (type == MAP_TO_PWM_INPUT) {
pwmInConfig(timerHardwarePtr, channelIndex); pwmInConfig(timerHardwarePtr, channelIndex);

13
src/main/drivers/pwm_rx.c
View File

@ -24,7 +24,6 @@
#include "build_config.h" #include "build_config.h"
#include "common/utils.h" #include "common/utils.h"
#include "config/config.h"
#include "system.h" #include "system.h"
@ -317,6 +316,13 @@ void pwmInConfig(const timerHardware_t *timerHardwarePtr, uint8_t channel)
#define UNUSED_PPM_TIMER_REFERENCE 0 #define UNUSED_PPM_TIMER_REFERENCE 0
#define FIRST_PWM_PORT 0 #define FIRST_PWM_PORT 0
void ppmAvoidPWMTimerClash(const timerHardware_t *timerHardwarePtr, TIM_TypeDef *sharedPwmTimer)
{
if (timerHardwarePtr->tim == sharedPwmTimer) {
ppmCountShift = 3; // Divide by 8 if the timer is running at 8 MHz
}
}
void ppmInConfig(const timerHardware_t *timerHardwarePtr) void ppmInConfig(const timerHardware_t *timerHardwarePtr)
{ {
ppmInit(); ppmInit();
@ -331,11 +337,6 @@ void ppmInConfig(const timerHardware_t *timerHardwarePtr)
timerConfigure(timerHardwarePtr, (uint16_t)PPM_TIMER_PERIOD, PWM_TIMER_MHZ); timerConfigure(timerHardwarePtr, (uint16_t)PPM_TIMER_PERIOD, PWM_TIMER_MHZ);
if((timerHardwarePtr->tim == TIM4) && (feature(FEATURE_ONESHOT125))){
ppmCountShift = 3; // Divide by 8 if the timer is running at 8 MHz
}
timerChCCHandlerInit(&self->edgeCb, ppmEdgeCallback); timerChCCHandlerInit(&self->edgeCb, ppmEdgeCallback);
timerChOvrHandlerInit(&self->overflowCb, ppmOverflowCallback); timerChOvrHandlerInit(&self->overflowCb, ppmOverflowCallback);
timerChConfigCallbacks(timerHardwarePtr, &self->edgeCb, &self->overflowCb); timerChConfigCallbacks(timerHardwarePtr, &self->edgeCb, &self->overflowCb);

3
src/main/drivers/pwm_rx.h
View File

@ -23,8 +23,9 @@ typedef enum {
} inputFilteringMode_e; } inputFilteringMode_e;
void ppmInConfig(const timerHardware_t *timerHardwarePtr); void ppmInConfig(const timerHardware_t *timerHardwarePtr);
void pwmInConfig(const timerHardware_t *timerHardwarePtr, uint8_t channel); void ppmAvoidPWMTimerClash(const timerHardware_t *timerHardwarePtr, TIM_TypeDef *sharedPwmTimer);
void pwmInConfig(const timerHardware_t *timerHardwarePtr, uint8_t channel);
uint16_t pwmRead(uint8_t channel); uint16_t pwmRead(uint8_t channel);
bool isPPMDataBeingReceived(void); bool isPPMDataBeingReceived(void);