Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-23 16:25:16 +03:00
Code Issues Wiki Activity

Compilation fixes

Browse source
This commit is contained in:
Bertrand Songis 2019-08-29 09:34:27 +02:00
parent ff78e71d11
commit 284a9d1f5e
No known key found for this signature in database
GPG key ID: F189F79290FEC50F
6 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
radio/src/cli.cpp
View file

@ -347,7 +347,7 @@ int cliTestNew()
return 0; return 0;
} }
#if defined(COLORLCD) #if 0 // TODO later defined(COLORLCD)
extern bool perMainEnabled; extern bool perMainEnabled;
typedef void (*timedTestFunc_t)(void); typedef void (*timedTestFunc_t)(void);
@ -664,7 +664,7 @@ int cliTest(const char ** argv)
else if (!strcmp(argv[1], "std::exception")) { else if (!strcmp(argv[1], "std::exception")) {
serialPrint("Not implemented"); serialPrint("Not implemented");
} }
#if defined(COLORLCD) #if 0 // TODO later defined(COLORLCD)
else if (!strcmp(argv[1], "graphics")) { else if (!strcmp(argv[1], "graphics")) {
return cliTestGraphics(); return cliTestGraphics();
} }

2
radio/src/gui/colorlcd/draw_functions.h
View file

@ -65,7 +65,7 @@ inline void drawChn(BitmapBuffer * dc, coord_t x, coord_t y, uint8_t idx, LcdFla
// Screen templates // Screen templates
void drawSplash(); void drawSplash();
void drawSleepBitmap(); 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 // Main view standard widgets
void drawMainPots(); void drawMainPots();

2
radio/src/strhelpers.cpp
View file

@ -583,6 +583,7 @@ char * strAppendDate(char * str, bool time)
} }
#endif #endif
#if !defined(BOOT)
static char tmpHelpersString[32]; static char tmpHelpersString[32];
char * getSwitchWarningString(swsrc_t idx) char * getSwitchWarningString(swsrc_t idx)
@ -609,3 +610,4 @@ char * getSwitchPositionName(swsrc_t idx)
{ {
return getSwitchPositionName(tmpHelpersString, idx); return getSwitchPositionName(tmpHelpersString, idx);
} }
#endif

6
radio/src/targets/common/arm/stm32/aux_serial_driver.cpp
View file

@ -29,8 +29,6 @@ AuxSerialRxFifo auxSerialRxFifo __DMA (AUX_SERIAL_DMA_Stream_RX);
AuxSerialRxFifo auxSerialRxFifo; AuxSerialRxFifo auxSerialRxFifo;
#endif #endif
DMAFifo<32> auxSerialRxFifo __DMA (AUX_SERIAL_DMA_Stream_RX);
void auxSerialSetup(unsigned int baudrate, bool dma) void auxSerialSetup(unsigned int baudrate, bool dma)
{ {
USART_InitTypeDef USART_InitStructure; 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_FIFOThreshold = DMA_FIFOThreshold_Full;
DMA_InitStructure.DMA_MemoryBurst = DMA_MemoryBurst_Single; DMA_InitStructure.DMA_MemoryBurst = DMA_MemoryBurst_Single;
DMA_InitStructure.DMA_PeripheralBurst = DMA_PeripheralBurst_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_DMACmd(AUX_SERIAL_USART, USART_DMAReq_Rx, ENABLE);
USART_Cmd(AUX_SERIAL_USART, ENABLE); USART_Cmd(AUX_SERIAL_USART, ENABLE);
DMA_Cmd(AUX_SERIAL_DMA_Channel_RX, ENABLE); DMA_Cmd(AUX_SERIAL_DMA_Stream_RX, ENABLE);
return; return;
} }
#endif #endif

1
radio/src/targets/horus/CMakeLists.txt
View file

@ -112,7 +112,6 @@ if(INTERNAL_GPS)
message("Horus: Internal GPS enabled") message("Horus: Internal GPS enabled")
endif() endif()
set(AUX_SERIAL_DRIVER ../common/arm/stm32/aux_serial_driver.cpp)
set(GVAR_SCREEN model_gvars.cpp) set(GVAR_SCREEN model_gvars.cpp)
set(TARGET_SRC set(TARGET_SRC

6
radio/src/targets/horus/hal.h
View file

@ -591,8 +591,12 @@
#define INTMODULE_BOOTCMD_GPIO_PIN GPIO_Pin_9 // PI.09 #define INTMODULE_BOOTCMD_GPIO_PIN GPIO_Pin_9 // PI.09
#endif #endif
#if defined(PCBX10) || PCBREV >= 13 #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_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 #else
#define INTMODULE_RCC_APB1Periph 0 #define INTMODULE_RCC_APB1Periph 0
#define INTMODULE_RCC_APB2Periph (RCC_APB2Periph_TIM1 | RCC_APB2Periph_USART1) #define INTMODULE_RCC_APB2Periph (RCC_APB2Periph_TIM1 | RCC_APB2Periph_USART1)