piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes #1740 - not tested on hardware

Browse Source
This commit is contained in:
bsongis
2014-09-21 10:46:46 +02:00
parent 8032d6ee66
commit 37e6819a57
2 changed files with 29 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/targets/simu/simpgmspace.cpp
+5 -14
View File
@@ -54,22 +54,13 @@ const char *eepromFile = NULL;
FILE *fp = NULL;
#if defined(PCBTARANIS)
uint32_t Peri1_frequency ;
uint32_t Peri2_frequency ;
GPIO_TypeDef gpioa;
GPIO_TypeDef gpiob;
GPIO_TypeDef gpioc;
GPIO_TypeDef gpiod;
GPIO_TypeDef gpioe;
TIM_TypeDef tim1;
TIM_TypeDef tim3;
TIM_TypeDef tim4;
TIM_TypeDef tim8;
TIM_TypeDef tim10;
uint32_t Peri1_frequency, Peri2_frequency;
GPIO_TypeDef gpioa, gpiob, gpioc, gpiod, gpioe;
TIM_TypeDef tim1, tim2, tim3, tim4, tim8, tim10;
RCC_TypeDef rcc;
DMA_Stream_TypeDef dma2_stream2;
DMA_Stream_TypeDef dma2_stream6;
DMA_Stream_TypeDef dma2_stream2, dma2_stream6;
DMA_TypeDef dma2;
USART_TypeDef Usart0, Usart1, Usart2, Usart3, Usart4;
#elif defined(PCBSKY9X)
Pio Pioa, Piob, Pioc;
Pwm pwm;
radio/src/targets/simu/simpgmspace.h
+24 -18
View File
@@ -99,26 +99,22 @@ typedef const int16_t pm_int16_t;
typedef const int8_t pm_int8_t;
#if defined(PCBTARANIS)
extern GPIO_TypeDef gpioa;
extern GPIO_TypeDef gpioa, gpiob, gpioc, gpiod, gpioe;
extern TIM_TypeDef tim1, tim3, tim4, tim8, tim10;
extern USART_TypeDef Usart0, Usart1, Usart2, Usart3, Usart4;
extern RCC_TypeDef rcc;
extern DMA_Stream_TypeDef dma2_stream2, dma2_stream6;
extern DMA_TypeDef dma2;
#undef GPIOA
#define GPIOA (&gpioa)
extern GPIO_TypeDef gpiob;
#undef GPIOB
#define GPIOB (&gpiob)
extern GPIO_TypeDef gpioc;
#undef GPIOC
#define GPIOC (&gpioc)
extern GPIO_TypeDef gpiod;
#undef GPIOD
#define GPIOD (&gpiod)
extern GPIO_TypeDef gpioe;
#undef GPIOE
#define GPIOA (&gpioa)
#define GPIOB (&gpiob)
#define GPIOC (&gpioc)
#define GPIOD (&gpiod)
#define GPIOE (&gpioe)
extern TIM_TypeDef tim1;
extern TIM_TypeDef tim3;
extern TIM_TypeDef tim4;
extern TIM_TypeDef tim8;
extern TIM_TypeDef tim10;
#undef TIM1
#undef TIM3
#undef TIM4
@@ -129,18 +125,22 @@ extern TIM_TypeDef tim10;
#define TIM4 (&tim4)
#define TIM8 (&tim8)
#define TIM10 (&tim10)
extern RCC_TypeDef rcc;
#undef USART0
#undef USART1
#undef USART2
#undef USART3
#define USART0 (&Usart0)
#define USART1 (&Usart1)
#define USART2 (&Usart2)
#define USART3 (&Usart3)
#undef RCC
#define RCC (&rcc)
#undef DMA2_Stream2
#undef DMA2_Stream6
#define DMA2_Stream2 (&dma2_stream2)
#define DMA2_Stream6 (&dma2_stream6)
extern DMA_Stream_TypeDef dma2_stream2;
extern DMA_Stream_TypeDef dma2_stream6;
#undef DMA2
#define DMA2 (&dma2)
extern DMA_TypeDef dma2;
#elif defined(PCBSKY9X)
extern Pio Pioa, Piob, Pioc;
extern Twi Twio;
@@ -151,6 +151,12 @@ extern Adc Adc0;
#define ADC (&Adc0)
#undef USART0
#define USART0 (&Usart0)
#undef USART1
#define USART1 (&Usart0)
#undef USART2
#define USART2 (&Usart0)
#undef USART3
#define USART3 (&Usart0)
#undef PIOA
#define PIOA (&Pioa)
#undef PIOB