Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 01:35:21 +03:00
Code Issues Wiki Activity

Simulator segfault

Browse source
This commit is contained in:
Bertrand Songis 2016-03-19 18:49:04 +01:00
parent defef14018
commit bffa99d98f
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
radio/src/targets/simu/simpgmspace.cpp
View file

@ -57,7 +57,7 @@ uint32_t Peri1_frequency, Peri2_frequency;
GPIO_TypeDef gpioa, gpiob, gpioc, gpiod, gpioe, gpiof, gpiog, gpioh, gpioi, gpioj; GPIO_TypeDef gpioa, gpiob, gpioc, gpiod, gpioe, gpiof, gpiog, gpioh, gpioi, gpioj;
TIM_TypeDef tim1, tim2, tim3, tim4, tim5, tim6, tim7, tim8, tim9, tim10; TIM_TypeDef tim1, tim2, tim3, tim4, tim5, tim6, tim7, tim8, tim9, tim10;
RCC_TypeDef rcc; RCC_TypeDef rcc;
DMA_Stream_TypeDef dma2_stream2, dma2_stream6; DMA_Stream_TypeDef dma2_stream2, dma2_stream6, dma1_stream5;
DMA_TypeDef dma2; DMA_TypeDef dma2;
USART_TypeDef Usart0, Usart1, Usart2, Usart3, Usart4; USART_TypeDef Usart0, Usart1, Usart2, Usart3, Usart4;
#elif defined(CPUARM) #elif defined(CPUARM)

4
radio/src/targets/simu/simpgmspace.h
View file

@ -93,7 +93,7 @@ extern GPIO_TypeDef gpioa, gpiob, gpioc, gpiod, gpioe, gpiof, gpiog, gpioh, gpio
extern TIM_TypeDef tim1, tim2, tim3, tim4, tim5, tim6, tim7, tim8, tim9, tim10; extern TIM_TypeDef tim1, tim2, tim3, tim4, tim5, tim6, tim7, tim8, tim9, tim10;
extern USART_TypeDef Usart0, Usart1, Usart2, Usart3, Usart4; extern USART_TypeDef Usart0, Usart1, Usart2, Usart3, Usart4;
extern RCC_TypeDef rcc; extern RCC_TypeDef rcc;
extern DMA_Stream_TypeDef dma2_stream2, dma2_stream6; extern DMA_Stream_TypeDef dma2_stream2, dma2_stream6, dma1_stream5;
extern DMA_TypeDef dma2; extern DMA_TypeDef dma2;
#undef GPIOA #undef GPIOA
#undef GPIOB #undef GPIOB
@ -145,8 +145,10 @@ extern DMA_TypeDef dma2;
#define USART3 (&Usart3) #define USART3 (&Usart3)
#undef RCC #undef RCC
#define RCC (&rcc) #define RCC (&rcc)
#undef DMA1_Stream5
#undef DMA2_Stream2 #undef DMA2_Stream2
#undef DMA2_Stream6 #undef DMA2_Stream6
#define DMA1_Stream5 (&dma1_stream5)
#define DMA2_Stream2 (&dma2_stream2) #define DMA2_Stream2 (&dma2_stream2)
#define DMA2_Stream6 (&dma2_stream6) #define DMA2_Stream6 (&dma2_stream6)
#undef DMA2 #undef DMA2