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

PIOS_SPI now non-application specific.

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@207 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
gussy 2010-02-28 08:34:44 +00:00 committed by gussy
parent fcf47bf1f6
commit 792cfef50b
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
flight/OpenPilot/System/inc/pios_board.h
View File

@ -84,7 +84,7 @@
//-------------------------
// PIOS_USART1 (TELEM)
//-------------------------
#define PIOS_USART1_ENABLED
#define PIOS_USART1_ENABLED 1
#define PIOS_USART1_USART USART2
#define PIOS_USART1_GPIO_PORT GPIOA
#define PIOS_USART1_RX_PIN GPIO_Pin_3
@ -99,7 +99,7 @@
//-------------------------
// PIOS_USART2 (GPS)
//-------------------------
#define PIOS_USART2_ENABLED
#define PIOS_USART2_ENABLED 1
#define PIOS_USART2_USART USART3
#define PIOS_USART2_GPIO_PORT GPIOC
#define PIOS_USART2_RX_PIN GPIO_Pin_11
@ -114,7 +114,7 @@
//-------------------------
// PIOS_USART3 (AUX) (RX5/RX6)
//-------------------------
//#define PIOS_USART3_ENABLED
#define PIOS_USART3_ENABLED 0
#define PIOS_USART3_USART USART1
#define PIOS_USART3_GPIO_PORT GPIOA
#define PIOS_USART3_RX_PIN GPIO_Pin_10
@ -137,7 +137,9 @@
//-------------------------
// SPI
//-------------------------
#define PIOS_IRQ_SPI_DMA_PRIORITY IRQ_PRIO_HIGH
#define PIOS_SPI_IRQ_DMA_PRIORITY IRQ_PRIO_HIGH
#define PIOS_SPI_NUM 2
#define PIOS_SPI0_ENABLED 1
#define PIOS_SPI0_PTR SPI1
#define PIOS_SPI0_DMA_RX_PTR DMA1_Channel2
#define PIOS_SPI0_DMA_TX_PTR DMA1_Channel3
@ -152,6 +154,7 @@
#define PIOS_SPI0_MISO_PIN GPIO_Pin_6
#define PIOS_SPI0_MOSI_PORT GPIOA
#define PIOS_SPI0_MOSI_PIN GPIO_Pin_7
#define PIOS_SPI1_ENABLED 1
#define PIOS_SPI1_PTR SPI2
#define PIOS_SPI1_DMA_RX_PTR DMA1_Channel4
#define PIOS_SPI1_DMA_TX_PTR DMA1_Channel5
@ -168,7 +171,7 @@
#define PIOS_SPI1_MOSI_PIN GPIO_Pin_15
//-------------------------
// SDCard
// PIOS_SDCARD
//-------------------------
#define PIOS_SDCARD_SPI 0

10
flight/PiOS/STM32F10x/pios_spi.c
View File

@ -43,7 +43,7 @@
/* Local variables */
static void (*spi_callback[2])(void);
static void (*spi_callback[PIOS_SPI_NUM])(void);
static uint8_t tx_dummy_byte;
static uint8_t rx_dummy_byte;
@ -59,6 +59,7 @@ int32_t PIOS_SPI_Init(void)
DMA_StructInit(&DMA_InitStructure);
NVIC_InitTypeDef NVIC_InitStructure;
#if (PIOS_SPI0_ENABLED)
/* SPI0 */
/* Disable callback function */
spi_callback[0] = NULL;
@ -110,11 +111,13 @@ int32_t PIOS_SPI_Init(void)
/* Configure DMA interrupt */
NVIC_InitStructure.NVIC_IRQChannel = PIOS_SPI0_DMA_IRQ_CHANNEL;
NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = PIOS_IRQ_SPI_DMA_PRIORITY;
NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = PIOS_SPI_IRQ_DMA_PRIORITY;
NVIC_InitStructure.NVIC_IRQChannelSubPriority = 0;
NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE;
NVIC_Init(&NVIC_InitStructure);
#endif
#if (PIOS_SPI1_ENABLED)
/* SPI1 */
/* Disable callback function */
spi_callback[1] = NULL;
@ -166,10 +169,11 @@ int32_t PIOS_SPI_Init(void)
/* Configure DMA interrupt */
NVIC_InitStructure.NVIC_IRQChannel = PIOS_SPI1_DMA_IRQ_CHANNEL;
NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = PIOS_IRQ_SPI_DMA_PRIORITY; /* defined in PIOS_irq.h */
NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = PIOS_SPI_IRQ_DMA_PRIORITY; /* defined in PIOS_irq.h */
NVIC_InitStructure.NVIC_IRQChannelSubPriority = 0;
NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE;
NVIC_Init(&NVIC_InitStructure);
#endif
/* No error */
return 0;

6
flight/PiOS/STM32F10x/pios_usart.c
View File

@ -79,7 +79,7 @@ void PIOS_USART_Init(void)
NVIC_InitStructure.NVIC_IRQChannelSubPriority = 0;
NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE;
#ifdef PIOS_USART1_ENABLED
#if (PIOS_USART1_ENABLED)
/* Enable the USART Pins Software Remapping */
PIOS_USART1_REMAP_FUNC;
@ -111,7 +111,7 @@ void PIOS_USART_Init(void)
USART_Cmd(PIOS_USART1_USART, ENABLE);
#endif
#ifdef PIOS_USART2_ENABLED
#if (PIOS_USART2_ENABLED)
/* Enable the USART Pins Software Remapping */
PIOS_USART2_REMAP_FUNC;
@ -143,7 +143,7 @@ void PIOS_USART_Init(void)
USART_Cmd(PIOS_USART2_USART, ENABLE);
#endif
#ifdef PIOS_USART3_ENABLED
#if (PIOS_USART3_ENABLED)
/* Enable the USART Pins Software Remapping */
PIOS_USART3_REMAP_FUNC;