rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-22 12:54:14 +01:00
Code Issues Releases Activity

OP-21: Made bootloader startup faster and more reliable.

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@301 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
gussy 2010-03-13 20:02:06 +00:00 committed by gussy
parent a0a92d5a59
commit 9b1e548550
5 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
flight/Bootloaders/OpenPilot/Makefile
View File

@ -203,11 +203,6 @@ CDEFS = -DSTM32F10X_$(MODEL)
CDEFS += -DUSE_STDPERIPH_DRIVER CDEFS += -DUSE_STDPERIPH_DRIVER
CDEFS += -DUSE_$(BOARD) CDEFS += -DUSE_$(BOARD)
ifeq ($(ENABLE_DEBUG_PINS),YES)
CDEFS += -DPIOS_ENABLE_DEBUG_PINS
endif
# Place project-specific -D and/or -U options for # Place project-specific -D and/or -U options for
# Assembler with preprocessor here. # Assembler with preprocessor here.
#ADEFS = -DUSE_IRQ_ASM_WRAPPER #ADEFS = -DUSE_IRQ_ASM_WRAPPER

3
flight/Bootloaders/OpenPilot/bootloader.c
View File

@ -79,6 +79,9 @@ void StartBootloader(void)
if(PIOS_COM_ReceiveBufferUsed(OPBL_COM_PORT) > 0) { if(PIOS_COM_ReceiveBufferUsed(OPBL_COM_PORT) > 0) {
key = PIOS_COM_ReceiveBuffer(OPBL_COM_PORT); key = PIOS_COM_ReceiveBuffer(OPBL_COM_PORT);
if(key == 0x31) { if(key == 0x31) {
/* Flash unlock */
FLASH_Unlock();
/* Download user application in the Flash */ /* Download user application in the Flash */
SerialDownload(); SerialDownload();
return; return;

2
flight/Bootloaders/OpenPilot/inc/bootloader.h
View File

@ -31,7 +31,7 @@ typedef void (*pFunction)(void);
/* Global Defines */ /* Global Defines */
#define CMD_STRING_SIZE 128 #define CMD_STRING_SIZE 128
#define ApplicationAddress 0x8008000 #define ApplicationAddress (0x8008000)
#define PAGE_SIZE (0x800) #define PAGE_SIZE (0x800)
#define FLASH_SIZE (0x80000) /* 512K */ #define FLASH_SIZE (0x80000) /* 512K */

2
flight/Bootloaders/OpenPilot/inc/openpilot_bl.h
View File

@ -27,7 +27,7 @@
#ifndef OPENPILOT_BL_H #ifndef OPENPILOT_BL_H
#define OPENPILOT_BL_H #define OPENPILOT_BL_H
#define OPBL_MAGIC_TIMEOUT 2000 #define OPBL_MAGIC_TIMEOUT 200
#define OPBL_COM_PORT COM_DEBUG_USART #define OPBL_COM_PORT COM_DEBUG_USART
/* PIOS Includes */ /* PIOS Includes */

17
flight/Bootloaders/OpenPilot/openpilot_bl.c
View File

@ -31,9 +31,6 @@
static pFunction Jump_To_Application; static pFunction Jump_To_Application;
static uint32_t JumpAddress; static uint32_t JumpAddress;
/* Local Variables */
/* Function Prototypes */
/** /**
* OpenPilot Bootloader Main function * OpenPilot Bootloader Main function
@ -43,25 +40,23 @@ int main()
/* Brings up System using CMSIS functions, enables the LEDs. */ /* Brings up System using CMSIS functions, enables the LEDs. */
PIOS_SYS_Init(); PIOS_SYS_Init();
/* Initialise LED's */
PIOS_LED_Off(LED1);
PIOS_LED_Off(LED2);
/* Only go into bootloader when the USB cable is connected */ /* Only go into bootloader when the USB cable is connected */
if(PIOS_USB_CableConnected()) { if(PIOS_USB_CableConnected()) {
/* Delay system */ /* Delay system */
PIOS_DELAY_Init(); PIOS_DELAY_Init();
if(PIOS_USB_IsInitialized()) {
/* Initialise the USB system */ /* Initialise the USB system */
PIOS_USB_Init(0); PIOS_USB_Init(0);
}
/* Initialise COM Ports */ /* Initialise COM Ports */
PIOS_COM_Init(); PIOS_COM_Init();
/* Initialise LED's */
PIOS_LED_Init();
PIOS_LED_Off(LED1);
PIOS_LED_Off(LED2);
/* Flash unlock */
FLASH_Unlock();
/* Execute the IAP driver in order to re-program the Flash */ /* Execute the IAP driver in order to re-program the Flash */
StartBootloader(); StartBootloader();
} }