1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00

Switch the order of the SET_RC pins for flash and rfm22b

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

View File

@ -307,9 +307,11 @@ void PIOS_Board_Init(void) {
PIOS_DEBUG_Assert(0);
}
#if defined(PIOS_INCLUDE_FLASH)
/* 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);
#endif
/* Initialize UAVObject libraries */
EventDispatcherInitialize();

View File

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