More cleaning in bootloader

This commit is contained in:
bsongis
2014-03-03 21:31:34 +01:00
parent b90cff13b4
commit 7435416422
7 changed files with 10 additions and 268 deletions
+1 -1
View File
@@ -708,8 +708,8 @@ ifeq ($(PCB), TARANIS)
endif
ifeq ($(BOOTLOADER), YES)
CPPDEFS += -DBOOTLOADER
CPPSRC += loadboot.cpp
CPPDEFS += -DBOOTLOADER
endif
endif
+3 -1
View File
@@ -1111,7 +1111,7 @@ template<class t> void swap(t & a, t & b) { t tmp = b; b = a; a = tmp; }
uint16_t isqrt32(uint32_t n);
#endif
#if defined(CPUARM)
#if defined(CPUARM) && !defined(BOOT)
#if !defined(SIMU)
extern "C" {
#include <CoOS.h>
@@ -1513,7 +1513,9 @@ enum AUDIO_SOUNDS {
#include "targets/gruvin9x/somo14d.h"
#endif
#if !defined(BOOT)
#include "translations.h"
#endif
#if defined(HAPTIC)
#include "haptic.h"
+1 -1
View File
@@ -10,7 +10,7 @@
******************************************************************************
*/
#include "../opentx.h"
#include "../../opentx.h"
#include "./STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/inc/stm32f2xx_gpio.h"
/**
+3 -1
View File
@@ -26,7 +26,7 @@
*/
/* Includes ------------------------------------------------------------------*/
#include "../opentx.h"
#include "../../opentx.h"
extern "C" {
#include "usbd_usr.h"
@@ -119,7 +119,9 @@ void USBD_USR_DeviceConnected (void)
*/
void USBD_USR_DeviceDisconnected (void)
{
#if !defined(BOOT)
NVIC_SystemReset();
#endif
}