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

Changes to board specific files to support UAVObject on a specific LogFS instance

Browse Source
This commit is contained in:
Alessio Morale 2013-05-11 17:15:07 +02:00
parent aefda3b560
commit 687e75b2e2
5 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
flight/targets/boards/coptercontrol/firmware/pios_board.c
View File

@ -75,6 +75,8 @@ uint32_t pios_com_hkosd_id;
uint32_t pios_usb_rctx_id; uint32_t pios_usb_rctx_id;
uintptr_t pios_uavo_settings_fs_id;
/** /**
* Configuration for MPU6000 chip * Configuration for MPU6000 chip
*/ */
@ -168,13 +170,12 @@ void PIOS_Board_Init(void) {
#endif #endif
uintptr_t flash_id; uintptr_t flash_id;
uintptr_t fs_id;
switch(bdinfo->board_rev) { switch(bdinfo->board_rev) {
case BOARD_REVISION_CC: case BOARD_REVISION_CC:
if (PIOS_Flash_Jedec_Init(&flash_id, pios_spi_flash_accel_id, 1)) { if (PIOS_Flash_Jedec_Init(&flash_id, pios_spi_flash_accel_id, 1)) {
PIOS_DEBUG_Assert(0); PIOS_DEBUG_Assert(0);
} }
if (PIOS_FLASHFS_Logfs_Init(&fs_id, &flashfs_w25x_cfg, &pios_jedec_flash_driver, flash_id)) { if (PIOS_FLASHFS_Logfs_Init(&pios_uavo_settings_fs_id, &flashfs_w25x_cfg, &pios_jedec_flash_driver, flash_id)) {
PIOS_DEBUG_Assert(0); PIOS_DEBUG_Assert(0);
} }
break; break;
@ -182,7 +183,7 @@ void PIOS_Board_Init(void) {
if (PIOS_Flash_Jedec_Init(&flash_id, pios_spi_flash_accel_id, 0)) { if (PIOS_Flash_Jedec_Init(&flash_id, pios_spi_flash_accel_id, 0)) {
PIOS_DEBUG_Assert(0); PIOS_DEBUG_Assert(0);
} }
if (PIOS_FLASHFS_Logfs_Init(&fs_id, &flashfs_m25p_cfg, &pios_jedec_flash_driver, flash_id)) { if (PIOS_FLASHFS_Logfs_Init(&pios_uavo_settings_fs_id, &flashfs_m25p_cfg, &pios_jedec_flash_driver, flash_id)) {
PIOS_DEBUG_Assert(0); PIOS_DEBUG_Assert(0);
} }
break; break;
@ -204,7 +205,7 @@ void PIOS_Board_Init(void) {
PIOS_IAP_ReadBootCmd(1) == PIOS_IAP_CLEAR_FLASH_CMD_1 && PIOS_IAP_ReadBootCmd(1) == PIOS_IAP_CLEAR_FLASH_CMD_1 &&
PIOS_IAP_ReadBootCmd(2) == PIOS_IAP_CLEAR_FLASH_CMD_2) PIOS_IAP_ReadBootCmd(2) == PIOS_IAP_CLEAR_FLASH_CMD_2)
{ {
PIOS_FLASHFS_Format(fs_id); PIOS_FLASHFS_Format(pios_uavo_settings_fs_id);
PIOS_IAP_WriteBootCmd(0,0); PIOS_IAP_WriteBootCmd(0,0);
PIOS_IAP_WriteBootCmd(1,0); PIOS_IAP_WriteBootCmd(1,0);
PIOS_IAP_WriteBootCmd(2,0); PIOS_IAP_WriteBootCmd(2,0);

5
flight/targets/boards/osd/firmware/pios_board.c
View File

@ -104,6 +104,8 @@ uint32_t pios_com_gps_id;
uint32_t pios_com_telem_usb_id; uint32_t pios_com_telem_usb_id;
uint32_t pios_com_telem_rf_id; uint32_t pios_com_telem_rf_id;
uintptr_t pios_uavo_settings_fs_id;
/** /**
* TIM3 is triggered by the HSYNC signal into its ETR line and will divide the * TIM3 is triggered by the HSYNC signal into its ETR line and will divide the
* APB1_CLOCK to generate a pixel clock that is used by the SPI CLK lines. * APB1_CLOCK to generate a pixel clock that is used by the SPI CLK lines.
@ -163,9 +165,8 @@ void PIOS_Board_Init(void) {
#ifdef PIOS_INCLUDE_FLASH_SECTOR_SETTINGS #ifdef PIOS_INCLUDE_FLASH_SECTOR_SETTINGS
uintptr_t flash_id; uintptr_t flash_id;
uintptr_t fs_id;
PIOS_Flash_Internal_Init(&flash_id, &flash_internal_cfg); PIOS_Flash_Internal_Init(&flash_id, &flash_internal_cfg);
PIOS_FLASHFS_Logfs_Init(&fs_id, &flashfs_internal_cfg, &pios_internal_flash_driver, flash_id); PIOS_FLASHFS_Logfs_Init(&pios_uavo_settings_fs_id, &flashfs_internal_cfg, &pios_internal_flash_driver, flash_id);
#elif !defined(PIOS_USE_SETTINGS_ON_SDCARD) #elif !defined(PIOS_USE_SETTINGS_ON_SDCARD)
#error No setting storage specified. (define PIOS_USE_SETTINGS_ON_SDCARD or INCLUDE_FLASH_SECTOR_SETTINGS) #error No setting storage specified. (define PIOS_USE_SETTINGS_ON_SDCARD or INCLUDE_FLASH_SECTOR_SETTINGS)
#endif #endif

7
flight/targets/boards/revolution/firmware/pios_board.c
View File

@ -235,6 +235,8 @@ uint32_t pios_com_hkosd_id = 0;
uint32_t pios_rfm22b_id = 0; uint32_t pios_rfm22b_id = 0;
#endif #endif
uintptr_t pios_uavo_settings_fs_id;
/* /*
* Setup a com port based on the passed cfg, driver and buffer sizes. tx size of -1 make the port rx only * Setup a com port based on the passed cfg, driver and buffer sizes. tx size of -1 make the port rx only
*/ */
@ -352,8 +354,7 @@ void PIOS_Board_Init(void) {
PIOS_DEBUG_Assert(0); PIOS_DEBUG_Assert(0);
} }
uintptr_t fs_id; if (PIOS_FLASHFS_Logfs_Init(&pios_uavo_settings_fs_id, &flashfs_m25p_cfg, &pios_jedec_flash_driver, flash_id)) {
if (PIOS_FLASHFS_Logfs_Init(&fs_id, &flashfs_m25p_cfg, &pios_jedec_flash_driver, flash_id)) {
PIOS_DEBUG_Assert(0); PIOS_DEBUG_Assert(0);
} }
@ -369,7 +370,7 @@ void PIOS_Board_Init(void) {
PIOS_IAP_ReadBootCmd(1) == PIOS_IAP_CLEAR_FLASH_CMD_1 && PIOS_IAP_ReadBootCmd(1) == PIOS_IAP_CLEAR_FLASH_CMD_1 &&
PIOS_IAP_ReadBootCmd(2) == PIOS_IAP_CLEAR_FLASH_CMD_2) PIOS_IAP_ReadBootCmd(2) == PIOS_IAP_CLEAR_FLASH_CMD_2)
{ {
PIOS_FLASHFS_Format(fs_id); PIOS_FLASHFS_Format(pios_uavo_settings_fs_id);
PIOS_IAP_WriteBootCmd(0,0); PIOS_IAP_WriteBootCmd(0,0);
PIOS_IAP_WriteBootCmd(1,0); PIOS_IAP_WriteBootCmd(1,0);
PIOS_IAP_WriteBootCmd(2,0); PIOS_IAP_WriteBootCmd(2,0);

7
flight/targets/boards/revoproto/firmware/pios_board.c
View File

@ -305,6 +305,8 @@ uint32_t pios_com_bridge_id = 0;
uint32_t pios_com_overo_id = 0; uint32_t pios_com_overo_id = 0;
uint32_t pios_com_hkosd_id = 0; uint32_t pios_com_hkosd_id = 0;
uintptr_t pios_uavo_settings_fs_id;
/* /*
* Setup a com port based on the passed cfg, driver and buffer sizes. tx size of -1 make the port rx only * Setup a com port based on the passed cfg, driver and buffer sizes. tx size of -1 make the port rx only
*/ */
@ -402,8 +404,7 @@ void PIOS_Board_Init(void) {
PIOS_DEBUG_Assert(0); PIOS_DEBUG_Assert(0);
} }
#endif #endif
uintptr_t fs_id; if (PIOS_FLASHFS_Logfs_Init(&pios_uavo_settings_fs_id, &flashfs_m25p_cfg, &pios_jedec_flash_driver, flash_id)) {
if (PIOS_FLASHFS_Logfs_Init(&fs_id, &flashfs_m25p_cfg, &pios_jedec_flash_driver, flash_id)) {
PIOS_DEBUG_Assert(0); PIOS_DEBUG_Assert(0);
} }
@ -418,7 +419,7 @@ void PIOS_Board_Init(void) {
PIOS_IAP_ReadBootCmd(1) == PIOS_IAP_CLEAR_FLASH_CMD_1 && PIOS_IAP_ReadBootCmd(1) == PIOS_IAP_CLEAR_FLASH_CMD_1 &&
PIOS_IAP_ReadBootCmd(2) == PIOS_IAP_CLEAR_FLASH_CMD_2) PIOS_IAP_ReadBootCmd(2) == PIOS_IAP_CLEAR_FLASH_CMD_2)
{ {
PIOS_FLASHFS_Format(fs_id); PIOS_FLASHFS_Format(pios_uavo_settings_fs_id);
PIOS_IAP_WriteBootCmd(0,0); PIOS_IAP_WriteBootCmd(0,0);
PIOS_IAP_WriteBootCmd(1,0); PIOS_IAP_WriteBootCmd(1,0);
PIOS_IAP_WriteBootCmd(2,0); PIOS_IAP_WriteBootCmd(2,0);

2
flight/targets/boards/simposix/firmware/pios_board.c
View File

@ -73,6 +73,8 @@ uint32_t pios_com_telem_usb_id = 0;
uint32_t pios_com_telem_rf_id = 0; uint32_t pios_com_telem_rf_id = 0;
uint32_t pios_com_bridge_id = 0; uint32_t pios_com_bridge_id = 0;
uintptr_t pios_uavo_settings_fs_id;
/* /*
* Setup a com port based on the passed cfg, driver and buffer sizes. tx size of -1 make the port rx only * Setup a com port based on the passed cfg, driver and buffer sizes. tx size of -1 make the port rx only
*/ */