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

Cosmetics

Browse source
This commit is contained in:
bsongis 2014-03-19 09:21:52 +01:00
parent 4df95fb61e
commit afa8a7991e
4 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
companion/src/firmwares/opentx/opentxTaranisSimulator.cpp
View file

@ -73,7 +73,6 @@ inline int geteepromsize() {
#include "radio/src/protocols/ppm_arm.cpp" #include "radio/src/protocols/ppm_arm.cpp"
#include "radio/src/protocols/pxx_arm.cpp" #include "radio/src/protocols/pxx_arm.cpp"
#include "radio/src/protocols/dsm2_arm.cpp" #include "radio/src/protocols/dsm2_arm.cpp"
#include "radio/src/targets/taranis/pwr_driver.c"
#include "radio/src/eeprom_common.cpp" #include "radio/src/eeprom_common.cpp"
#include "radio/src/eeprom_conversions.cpp" #include "radio/src/eeprom_conversions.cpp"
#include "radio/src/eeprom_rlc.cpp" #include "radio/src/eeprom_rlc.cpp"

23
radio/src/loadboot.cpp
View file

@ -45,15 +45,15 @@
* *
****************************************************************************/ ****************************************************************************/
#if !defined(SIMU)
#include <stdint.h> #include <stdint.h>
#ifdef PCBSKY #if defined(PCBSKY9X)
#include "AT91SAM3S4.h" #include "AT91SAM3S4.h"
#endif #elif defined(PCBTARANIS)
#include "stm32f2xx.h"
#ifdef PCBTARANIS #include "stm32f2xx_gpio.h"
#include "stm32f2xx.h"
#include "stm32f2xx_gpio.h"
#endif #endif
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
@ -61,9 +61,6 @@ void bwdt_reset()
{ {
IWDG->KR = 0xAAAA; // reload IWDG->KR = 0xAAAA; // reload
} }
#endif
#if defined(PCBTARANIS)
__attribute__ ((section(".bootrodata"), used)) __attribute__ ((section(".bootrodata"), used))
void _bootStart(void); void _bootStart(void);
@ -71,13 +68,10 @@ void _bootStart(void);
__attribute__ ((section(".isr_boot_vector"), used)) __attribute__ ((section(".isr_boot_vector"), used))
const uint32_t BootVectors[] = { (uint32_t) &_estack, const uint32_t BootVectors[] = { (uint32_t) &_estack,
(uint32_t) (void (*)(void)) ((unsigned long) &_bootStart) }; (uint32_t) (void (*)(void)) ((unsigned long) &_bootStart) };
#endif
#if defined(PCBTARANIS)
__attribute__ ((section(".bootrodata.*"), used)) __attribute__ ((section(".bootrodata.*"), used))
#endif
#ifdef PCBSKY #elif defined(PCBSKY9X)
__attribute__ ((section(".bootrodata"), used)) __attribute__ ((section(".bootrodata"), used))
#endif #endif
@ -154,3 +148,4 @@ void _bootStart()
} }
#endif #endif
#endif

4
radio/src/simpgmspace.cpp
View file

@ -637,6 +637,9 @@ void lcdRefresh()
} }
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
void pwrInit() { }
uint32_t pwrCheck() { return true; }
void pwrOff() { }
void usbStart() { } void usbStart() { }
int usbPlugged() { return false; } int usbPlugged() { return false; }
void USART_DeInit(USART_TypeDef* ) { } void USART_DeInit(USART_TypeDef* ) { }
@ -668,3 +671,4 @@ void RCC_LSEConfig(uint8_t RCC_LSE) { }
FlagStatus RCC_GetFlagStatus(uint8_t RCC_FLAG) { return RESET; } FlagStatus RCC_GetFlagStatus(uint8_t RCC_FLAG) { return RESET; }
ErrorStatus RTC_WaitForSynchro(void) { return SUCCESS; } ErrorStatus RTC_WaitForSynchro(void) { return SUCCESS; }
#endif #endif

2
radio/src/targets/taranis/board_taranis.h
View file

@ -37,6 +37,8 @@
#ifndef board_taranis_h #ifndef board_taranis_h
#define board_taranis_h #define board_taranis_h
#include "stddef.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif