Compilation options updated

This commit is contained in:
Bertrand Songis
2019-05-15 15:56:52 +02:00
parent 5b54df8140
commit 4bdd76a214
15 changed files with 77 additions and 38 deletions
@@ -146,6 +146,7 @@ uint8_t serial2TracesEnabled()
#endif
}
#if !defined(SIMU)
extern "C" void SERIAL_USART_IRQHandler(void)
{
DEBUG_INTERRUPT(INT_SER2);
@@ -179,3 +180,4 @@ extern "C" void SERIAL_USART_IRQHandler(void)
}
#endif
}
#endif
-1
View File
@@ -15,7 +15,6 @@ set(SIMU_SRC
simueeprom.cpp
simufatfs.cpp
simudisk.cpp
)
if(SIMU_DISKIO)
+8 -3
View File
@@ -1,6 +1,7 @@
option(SHUTDOWN_CONFIRMATION "Shutdown confirmation" OFF)
option(LCD_DUAL_BUFFER "Dual LCD Buffer" OFF)
option(TARANIS_INTERNAL_PPM "Taranis internal module hack to output PPM" OFF)
option(INTERNAL_MODULE_PPM "Taranis internal module hack to output PPM" OFF)
option(INTERNAL_MODULE_PXX1 "Taranis internal module hack to output PXX1" OFF)
option(USEHORUSBT "X9E BT module replaced by Horus BT module" OFF)
option(PXX1 "PXX1 protocol support" ON)
option(PXX2 "PXX2 protocol support" ON)
@@ -269,8 +270,12 @@ if(LCD_DUAL_BUFFER)
add_definitions(-DLCD_DUAL_BUFFER)
endif()
if(TARANIS_INTERNAL_PPM)
add_definitions(-DTARANIS_INTERNAL_PPM)
if(INTERNAL_MODULE_PPM)
add_definitions(-DINTERNAL_MODULE_PPM)
endif()
if(INTERNAL_MODULE_PXX1)
add_definitions(-DINTERNAL_MODULE_PXX1)
endif()
if(USEHORUSBT)
+1 -1
View File
@@ -198,7 +198,7 @@ void disable_serial(uint8_t module);
void intmoduleStop();
void intmodulePxxStart();
void intmoduleSerialStart(uint32_t baudrate, uint8_t rxEnable);
#if defined(TARANIS_INTERNAL_PPM)
#if defined(INTERNAL_MODULE_PPM)
void intmodulePpmStart(void);
#endif
void intmoduleSendBuffer(const uint8_t * data, uint8_t size);
+2 -2
View File
@@ -702,8 +702,8 @@
// Internal Module
#define HARDWARE_INTERNAL_MODULE
#if defined(PCBXLITES) || defined(PCBX9LITE)
#define INTMODULE_NO_PXX1
#if !(defined(PCBXLITES) && !defined(PCBX9LITE))
#define INTERNAL_MODULE_PXX1
#endif
#if defined(PCBXLITE) || defined(PCBX9LITE)
#define INTMODULE_RCC_APB1Periph RCC_APB1Periph_TIM3
@@ -47,7 +47,7 @@ void intmoduleSendNextFrame()
break;
#endif
#if defined(TARANIS_INTERNAL_PPM)
#if defined(INTERNAL_MODULE_PPM)
case PROTOCOL_CHANNELS_PPM:
INTMODULE_TIMER->CCR3 = GET_MODULE_PPM_DELAY(INTERNAL_MODULE) * 2;
INTMODULE_TIMER->CCER = TIM_CCER_CC3E | (GET_MODULE_PPM_POLARITY(INTERNAL_MODULE) ? 0 : TIM_CCER_CC3P);
@@ -107,7 +107,7 @@ void intmodulePxxStart()
NVIC_SetPriority(INTMODULE_TIMER_CC_IRQn, 7);
}
#if defined(TARANIS_INTERNAL_PPM)
#if defined(INTERNAL_MODULE_PPM)
void intmodulePpmStart()
{
INTERNAL_MODULE_ON();
@@ -139,7 +139,7 @@ void intmodulePpmStart()
NVIC_EnableIRQ(INTMODULE_TIMER_CC_IRQn);
NVIC_SetPriority(INTMODULE_TIMER_CC_IRQn, 7);
}
#endif // defined(TARANIS_INTERNAL_PPM)
#endif // defined(INTERNAL_MODULE_PPM)
extern "C" void INTMODULE_DMA_STREAM_IRQHandler()
{
+2 -2
View File
@@ -86,7 +86,7 @@ void init_ppm(uint8_t module)
if (module == EXTERNAL_MODULE) {
extmodulePpmStart();
}
#if defined(TARANIS_INTERNAL_PPM)
#if defined(INTERNAL_MODULE_PPM)
else {
intmodulePpmStart();
}
@@ -98,7 +98,7 @@ void disable_ppm(uint8_t module)
if (module == EXTERNAL_MODULE) {
extmoduleStop();
}
#if defined(TARANIS_INTERNAL_PPM)
#if defined(INTERNAL_MODULE_PPM)
else {
intmoduleStop();
}