mirror of
https://github.com/opentx/opentx.git
synced 2025-07-23 00:05:17 +03:00
Compilation fixes
This commit is contained in:
parent
ff78e71d11
commit
284a9d1f5e
6 changed files with 12 additions and 9 deletions
|
@ -347,7 +347,7 @@ int cliTestNew()
|
|||
return 0;
|
||||
}
|
||||
|
||||
#if defined(COLORLCD)
|
||||
#if 0 // TODO later defined(COLORLCD)
|
||||
|
||||
extern bool perMainEnabled;
|
||||
typedef void (*timedTestFunc_t)(void);
|
||||
|
@ -664,7 +664,7 @@ int cliTest(const char ** argv)
|
|||
else if (!strcmp(argv[1], "std::exception")) {
|
||||
serialPrint("Not implemented");
|
||||
}
|
||||
#if defined(COLORLCD)
|
||||
#if 0 // TODO later defined(COLORLCD)
|
||||
else if (!strcmp(argv[1], "graphics")) {
|
||||
return cliTestGraphics();
|
||||
}
|
||||
|
|
|
@ -65,7 +65,7 @@ inline void drawChn(BitmapBuffer * dc, coord_t x, coord_t y, uint8_t idx, LcdFla
|
|||
// Screen templates
|
||||
void drawSplash();
|
||||
void drawSleepBitmap();
|
||||
void drawShutdownAnimation(uint32_t index, const char * message);
|
||||
void drawShutdownAnimation(uint32_t duration, uint32_t totalDuration, const char * message);
|
||||
|
||||
// Main view standard widgets
|
||||
void drawMainPots();
|
||||
|
|
|
@ -583,6 +583,7 @@ char * strAppendDate(char * str, bool time)
|
|||
}
|
||||
#endif
|
||||
|
||||
#if !defined(BOOT)
|
||||
static char tmpHelpersString[32];
|
||||
|
||||
char * getSwitchWarningString(swsrc_t idx)
|
||||
|
@ -609,3 +610,4 @@ char * getSwitchPositionName(swsrc_t idx)
|
|||
{
|
||||
return getSwitchPositionName(tmpHelpersString, idx);
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -29,8 +29,6 @@ AuxSerialRxFifo auxSerialRxFifo __DMA (AUX_SERIAL_DMA_Stream_RX);
|
|||
AuxSerialRxFifo auxSerialRxFifo;
|
||||
#endif
|
||||
|
||||
DMAFifo<32> auxSerialRxFifo __DMA (AUX_SERIAL_DMA_Stream_RX);
|
||||
|
||||
void auxSerialSetup(unsigned int baudrate, bool dma)
|
||||
{
|
||||
USART_InitTypeDef USART_InitStructure;
|
||||
|
@ -89,10 +87,10 @@ void auxSerialSetup(unsigned int baudrate, bool dma)
|
|||
DMA_InitStructure.DMA_FIFOThreshold = DMA_FIFOThreshold_Full;
|
||||
DMA_InitStructure.DMA_MemoryBurst = DMA_MemoryBurst_Single;
|
||||
DMA_InitStructure.DMA_PeripheralBurst = DMA_PeripheralBurst_Single;
|
||||
DMA_Init(AUX_SERIAL_DMA_Channel_RX, &DMA_InitStructure);
|
||||
DMA_Init(AUX_SERIAL_DMA_Stream_RX, &DMA_InitStructure);
|
||||
USART_DMACmd(AUX_SERIAL_USART, USART_DMAReq_Rx, ENABLE);
|
||||
USART_Cmd(AUX_SERIAL_USART, ENABLE);
|
||||
DMA_Cmd(AUX_SERIAL_DMA_Channel_RX, ENABLE);
|
||||
DMA_Cmd(AUX_SERIAL_DMA_Stream_RX, ENABLE);
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -112,7 +112,6 @@ if(INTERNAL_GPS)
|
|||
message("Horus: Internal GPS enabled")
|
||||
endif()
|
||||
|
||||
set(AUX_SERIAL_DRIVER ../common/arm/stm32/aux_serial_driver.cpp)
|
||||
set(GVAR_SCREEN model_gvars.cpp)
|
||||
|
||||
set(TARGET_SRC
|
||||
|
|
|
@ -591,8 +591,12 @@
|
|||
#define INTMODULE_BOOTCMD_GPIO_PIN GPIO_Pin_9 // PI.09
|
||||
#endif
|
||||
#if defined(PCBX10) || PCBREV >= 13
|
||||
#define INTMODULE_RCC_APB1Periph 0
|
||||
#define INTMODULE_RCC_APB1Periph RCC_APB1Periph_TIM2
|
||||
#define INTMODULE_RCC_APB2Periph RCC_APB2Periph_USART1
|
||||
#define INTMODULE_TIMER TIM2
|
||||
#define INTMODULE_TIMER_IRQn TIM2_IRQn
|
||||
#define INTMODULE_TIMER_IRQHandler TIM2_IRQHandler
|
||||
#define INTMODULE_TIMER_FREQ (PERI1_FREQUENCY * TIMER_MULT_APB1)
|
||||
#else
|
||||
#define INTMODULE_RCC_APB1Periph 0
|
||||
#define INTMODULE_RCC_APB2Periph (RCC_APB2Periph_TIM1 | RCC_APB2Periph_USART1)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue