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

Switch the order of the SET_RC pins for flash and rfm22b

Browse Source
This commit is contained in:
James Cotton 2012-08-25 17:49:15 -05:00
parent b95a78cde5
commit ad7a9b9cc3
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
flight/RevoMini/System/pios_board.c
View File

@ -307,9 +307,11 @@ void PIOS_Board_Init(void) {
PIOS_DEBUG_Assert(0); PIOS_DEBUG_Assert(0);
} }
#if defined(PIOS_INCLUDE_FLASH)
/* Connect flash to the approrpiate interface and configure it */ /* Connect flash to the approrpiate interface and configure it */
PIOS_Flash_Jedec_Init(pios_spi_telem_flash_id, 0, &flash_m25p_cfg); PIOS_Flash_Jedec_Init(pios_spi_telem_flash_id, 1, &flash_m25p_cfg);
PIOS_FLASHFS_Init(&flashfs_m25p_cfg); PIOS_FLASHFS_Init(&flashfs_m25p_cfg);
#endif
/* Initialize UAVObject libraries */ /* Initialize UAVObject libraries */
EventDispatcherInitialize(); EventDispatcherInitialize();

15
flight/board_hw_defs/revomini/board_hw_defs.c
View File

@ -285,20 +285,21 @@ static const struct pios_spi_cfg pios_spi_telem_flash_cfg = {
.GPIO_PuPd = GPIO_PuPd_NOPULL .GPIO_PuPd = GPIO_PuPd_NOPULL
}, },
}, },
.slave_count = 1, .slave_count = 2,
.ssel = { { // Flash .ssel = {
.gpio = GPIOB, { // RFM22b
.gpio = GPIOA,
.init = { .init = {
.GPIO_Pin = GPIO_Pin_3, .GPIO_Pin = GPIO_Pin_15,
.GPIO_Speed = GPIO_Speed_50MHz, .GPIO_Speed = GPIO_Speed_50MHz,
.GPIO_Mode = GPIO_Mode_OUT, .GPIO_Mode = GPIO_Mode_OUT,
.GPIO_OType = GPIO_OType_PP, .GPIO_OType = GPIO_OType_PP,
.GPIO_PuPd = GPIO_PuPd_UP .GPIO_PuPd = GPIO_PuPd_UP
} }, } },
{ // RFM22b { // Flash
.gpio = GPIOA, .gpio = GPIOB,
.init = { .init = {
.GPIO_Pin = GPIO_Pin_15, .GPIO_Pin = GPIO_Pin_3,
.GPIO_Speed = GPIO_Speed_50MHz, .GPIO_Speed = GPIO_Speed_50MHz,
.GPIO_Mode = GPIO_Mode_OUT, .GPIO_Mode = GPIO_Mode_OUT,
.GPIO_OType = GPIO_OType_PP, .GPIO_OType = GPIO_OType_PP,