Compilation fix

This commit is contained in:
Bertrand Songis
2019-06-04 17:09:21 +02:00
parent c9581630ff
commit 7f81acd138
4 changed files with 11 additions and 11 deletions
+1 -1
View File
@@ -256,7 +256,7 @@ ModulePanel::~ModulePanel()
bool ModulePanel::moduleHasFailsafes() bool ModulePanel::moduleHasFailsafes()
{ {
return (((PulsesProtocol)module.protocol == PulsesProtocol::PULSES_PXX_XJT_X16 || (PulsesProtocol)module.protocol == PulsesProtocol::PULSES_PXX_R9M) return (((PulsesProtocol)module.protocol == PulsesProtocol::PULSES_PXX_XJT_X16 || (PulsesProtocol)module.protocol == PulsesProtocol::PULSES_PXX_R9M)
&& firmware->getCapability(HasFailsafe));; && firmware->getCapability(HasFailsafe));
} }
void ModulePanel::setupFailsafes() void ModulePanel::setupFailsafes()
+1 -7
View File
@@ -189,13 +189,6 @@ else()
) )
endif() endif()
if(NOT PCB STREQUAL XLITE)
set(TARGET_SRC
${TARGET_SRC}
trainer_driver.cpp
)
endif()
if(PCB STREQUAL X9E OR (PCB STREQUAL X7 AND NOT (PCBREV STREQUAL T12)) OR PCB STREQUAL X9LITE) if(PCB STREQUAL X9E OR (PCB STREQUAL X7 AND NOT (PCBREV STREQUAL T12)) OR PCB STREQUAL X9LITE)
set(TARGET_SRC set(TARGET_SRC
${TARGET_SRC} ${TARGET_SRC}
@@ -258,6 +251,7 @@ set(TARGET_SRC
${LED_DRIVER} ${LED_DRIVER}
backlight_driver.cpp backlight_driver.cpp
extmodule_driver.cpp extmodule_driver.cpp
trainer_driver.cpp
../common/arm/stm32/audio_dac_driver.cpp ../common/arm/stm32/audio_dac_driver.cpp
../common/arm/stm32/adc_driver.cpp ../common/arm/stm32/adc_driver.cpp
) )
+2 -1
View File
@@ -1040,8 +1040,9 @@
#define TRAINER_CCER_POLARYTY TIM_CCER_CC1P #define TRAINER_CCER_POLARYTY TIM_CCER_CC1P
#define TRAINER_IN_CCER TIM_CCER_CC2E #define TRAINER_IN_CCER TIM_CCER_CC2E
#elif defined(PCBXLITE) #elif defined(PCBXLITE)
#define TRAINER_TIMER TIM4
#define TRAINER_RCC_AHB1Periph 0 #define TRAINER_RCC_AHB1Periph 0
#define TRAINER_RCC_APB1Periph 0 #define TRAINER_RCC_APB1Periph RCC_APB1Periph_TIM4
#else #else
#define TRAINER_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_DMA1) #define TRAINER_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_DMA1)
#define TRAINER_RCC_APB1Periph RCC_APB1Periph_TIM3 #define TRAINER_RCC_APB1Periph RCC_APB1Periph_TIM3
+7 -2
View File
@@ -26,6 +26,7 @@ DMAFifo<32> heartbeatFifo __DMA (TRAINER_MODULE_SBUS_DMA_Stream);
void trainerSendNextFrame(); void trainerSendNextFrame();
#if defined(TRAINER_GPIO)
void init_trainer_ppm() void init_trainer_ppm()
{ {
GPIO_PinAFConfig(TRAINER_GPIO, TRAINER_OUT_GPIO_PinSource, TRAINER_GPIO_AF); GPIO_PinAFConfig(TRAINER_GPIO, TRAINER_OUT_GPIO_PinSource, TRAINER_GPIO_AF);
@@ -131,6 +132,7 @@ void trainerSendNextFrame()
TRAINER_TIMER->DIER |= TIM_DIER_UIE; // Enable this interrupt TRAINER_TIMER->DIER |= TIM_DIER_UIE; // Enable this interrupt
#endif #endif
} }
#endif
#if defined(TRAINER_DMA_STREAM) #if defined(TRAINER_DMA_STREAM)
extern "C" void TRAINER_DMA_IRQHandler() extern "C" void TRAINER_DMA_IRQHandler()
@@ -152,6 +154,7 @@ extern "C" void TRAINER_TIMER_IRQHandler()
uint16_t capture = 0; uint16_t capture = 0;
bool doCapture = false; bool doCapture = false;
#if defined(TRAINER_GPIO)
// What mode? in or out? // What mode? in or out?
if ((TRAINER_TIMER->DIER & TRAINER_IN_INTERRUPT_ENABLE) && (TRAINER_TIMER->SR & TRAINER_IN_INTERRUPT_FLAG)) { if ((TRAINER_TIMER->DIER & TRAINER_IN_INTERRUPT_ENABLE) && (TRAINER_TIMER->SR & TRAINER_IN_INTERRUPT_FLAG)) {
// capture mode on trainer jack // capture mode on trainer jack
@@ -160,6 +163,7 @@ extern "C" void TRAINER_TIMER_IRQHandler()
doCapture = true; doCapture = true;
} }
} }
#endif
#if defined(TRAINER_MODULE_CPPM) #if defined(TRAINER_MODULE_CPPM)
if ((TRAINER_TIMER->DIER & TIM_DIER_CC2IE) && (TRAINER_TIMER->SR & TIM_SR_CC2IF)) { if ((TRAINER_TIMER->DIER & TIM_DIER_CC2IE) && (TRAINER_TIMER->SR & TIM_SR_CC2IF)) {
@@ -175,6 +179,7 @@ extern "C" void TRAINER_TIMER_IRQHandler()
captureTrainerPulses(capture); captureTrainerPulses(capture);
} }
#if defined(TRAINER_GPIO)
// PPM out compare interrupt // PPM out compare interrupt
if ((TRAINER_TIMER->DIER & TRAINER_OUT_INTERRUPT_ENABLE) && (TRAINER_TIMER->SR & TRAINER_OUT_INTERRUPT_FLAG)) { if ((TRAINER_TIMER->DIER & TRAINER_OUT_INTERRUPT_ENABLE) && (TRAINER_TIMER->SR & TRAINER_OUT_INTERRUPT_FLAG)) {
// compare interrupt // compare interrupt
@@ -183,9 +188,9 @@ extern "C" void TRAINER_TIMER_IRQHandler()
setupPulsesPPMTrainer(); setupPulsesPPMTrainer();
trainerSendNextFrame(); trainerSendNextFrame();
} }
#endif
#if !defined(TRAINER_DMA_STREAM) #if defined(TRAINER_GPIO) && !defined(TRAINER_DMA_STREAM) // PPM out update interrupt
// PPM out update interrupt
if ((TRAINER_TIMER->DIER & TIM_DIER_UIE) && (TRAINER_TIMER->SR & TIM_SR_UIF)) { if ((TRAINER_TIMER->DIER & TIM_DIER_UIE) && (TRAINER_TIMER->SR & TIM_SR_UIF)) {
TRAINER_TIMER->SR &= ~TIM_SR_UIF; // Clear flag TRAINER_TIMER->SR &= ~TIM_SR_UIF; // Clear flag
TRAINER_TIMER->ARR = *trainerPulsesData.ppm.ptr++; TRAINER_TIMER->ARR = *trainerPulsesData.ppm.ptr++;