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

Merge branch 'next' of ssh://git.openpilot.org:22/OpenPilot into next

Browse Source
This commit is contained in:
zedamota 2011-11-28 12:18:15 +00:00
commit bea6b18246
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
flight/CopterControl/System/coptercontrol.c
View File

@ -70,6 +70,12 @@ int main()
* */
PIOS_Board_Init();
#ifdef ERASE_FLASH
PIOS_Flash_W25X_EraseChip();
PIOS_LED_Off(LED1);
while (1) ;
#endif
/* Initialize modules */
MODULE_INITIALISE_ALL
@ -82,11 +88,11 @@ int main()
/* If all is well we will never reach here as the scheduler will now be running. */
/* Do some indication to user that something bad just happened */
PIOS_LED_Off(LED1); \
for(;;) { \
PIOS_LED_Toggle(LED1); \
PIOS_DELAY_WaitmS(100); \
};
PIOS_LED_Off(LED1);
while (1) {
PIOS_LED_Toggle(LED1);
PIOS_DELAY_WaitmS(100);
}
return 0;
}

2
flight/CopterControl/System/pios_board.c
View File

@ -1430,7 +1430,9 @@ void PIOS_Board_Init(void) {
#endif /* PIOS_INCLUDE_USB_HID */
PIOS_IAP_Init();
#ifndef ERASE_FLASH
PIOS_WDG_Init();
#endif
}
/**