mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-02-20 10:54:14 +01:00
Updated some FreeRTOS specific issues and fixed a few typos.
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@292 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
parent
67075d73c4
commit
6764a34285
@ -3,7 +3,7 @@
|
||||
*
|
||||
* @file pios_board.h
|
||||
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
|
||||
* @brief Defines board hardware for the OpenPilot Version 0.1 hardware.
|
||||
* @brief Defines board hardware for the OpenPilot Version 1.1 hardware.
|
||||
* @see The GNU Public License (GPL) Version 3
|
||||
*
|
||||
*****************************************************************************/
|
||||
@ -117,7 +117,6 @@ TIM8 | Servo 5 | Servo 6 | Servo 7 | Servo 8
|
||||
//-------------------------
|
||||
// PIOS_USART2 (GPS)
|
||||
//-------------------------
|
||||
#define PIOS_USART1_NAME GPS
|
||||
#define PIOS_USART2_ENABLED 1
|
||||
#define PIOS_USART2_USART USART3
|
||||
#define PIOS_USART2_GPIO_PORT GPIOC
|
||||
|
@ -47,7 +47,6 @@
|
||||
#define PIOS_INCLUDE_COM
|
||||
#define PIOS_INCLUDE_SDCARD
|
||||
#define PIOS_INCLUDE_SETTINGS
|
||||
#define PIOS_INCLUDE_ESC_I2C
|
||||
|
||||
|
||||
/* Defaults for Logging */
|
||||
|
@ -34,7 +34,6 @@
|
||||
|
||||
|
||||
/* Global Variables */
|
||||
xSemaphoreHandle PIOS_HID_Buffer;
|
||||
|
||||
/* Local Variables */
|
||||
static int32_t (*receive_callback_func)(COMPortTypeDef port, char c);
|
||||
|
@ -38,6 +38,7 @@ extern SettingsTypeDef Settings;
|
||||
xSemaphoreHandle PIOS_USART1_Buffer;
|
||||
xSemaphoreHandle PIOS_USART2_Buffer;
|
||||
xSemaphoreHandle PIOS_USART3_Buffer;
|
||||
static portBASE_TYPE xHigherPriorityTaskWoken;
|
||||
|
||||
/* Local Variables */
|
||||
static uint8_t rx_buffer[PIOS_USART_NUM][PIOS_USART_RX_BUFFER_SIZE];
|
||||
@ -50,8 +51,6 @@ static volatile uint8_t tx_buffer_tail[PIOS_USART_NUM];
|
||||
static volatile uint8_t tx_buffer_head[PIOS_USART_NUM];
|
||||
static volatile uint8_t tx_buffer_size[PIOS_USART_NUM];
|
||||
|
||||
static portBASE_TYPE xHigherPriorityTaskWoken;
|
||||
|
||||
|
||||
/**
|
||||
* Initialise the GPS and TELEM onboard USARTs
|
||||
@ -539,7 +538,8 @@ int32_t PIOS_USART_TxBufferPut(USARTNumTypeDef usart, uint8_t b)
|
||||
return error;
|
||||
}
|
||||
|
||||
/* Interrupt handler for GPS USART */
|
||||
#if (PIOS_USART1_ENABLED)
|
||||
/* Interrupt handler for USART1 */
|
||||
PIOS_USART1_IRQHANDLER_FUNC
|
||||
{
|
||||
/* Check if RXNE flag is set */
|
||||
@ -567,8 +567,10 @@ PIOS_USART1_IRQHANDLER_FUNC
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Interrupt handler for TELEM USART */
|
||||
#if (PIOS_USART1_ENABLED)
|
||||
/* Interrupt handler for USART2 */
|
||||
PIOS_USART2_IRQHANDLER_FUNC
|
||||
{
|
||||
/* check if RXNE flag is set */
|
||||
@ -596,8 +598,10 @@ PIOS_USART2_IRQHANDLER_FUNC
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Interrupt handler for AUX USART */
|
||||
#if (PIOS_USART1_ENABLED)
|
||||
/* Interrupt handler for USART3 */
|
||||
PIOS_USART3_IRQHANDLER_FUNC
|
||||
{
|
||||
/* check if RXNE flag is set */
|
||||
@ -624,5 +628,6 @@ PIOS_USART3_IRQHANDLER_FUNC
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
@ -46,10 +46,11 @@ typedef enum _HID_REQUESTS {
|
||||
|
||||
/* Global Variables */
|
||||
xSemaphoreHandle PIOS_HID_Buffer;
|
||||
static portBASE_TYPE xHigherPriorityTaskWoken;
|
||||
|
||||
/* Local Variables */
|
||||
static uint32_t ProtocolValue;
|
||||
static portBASE_TYPE xHigherPriorityTaskWoken;
|
||||
|
||||
|
||||
/* Local Functions */
|
||||
static uint8_t *PIOS_USB_HID_GetHIDDescriptor(uint16_t Length);
|
||||
|
@ -58,7 +58,11 @@ typedef enum {
|
||||
} ConversionTypeTypeDef;
|
||||
|
||||
/* Global Variables */
|
||||
#if defined(PIOS_INCLUDE_FREERTOS)
|
||||
extern xSemaphoreHandle PIOS_BMP085_EOC;
|
||||
#else
|
||||
extern int32_t PIOS_BMP085_EOC;
|
||||
#endif
|
||||
|
||||
/* Public Functions */
|
||||
extern void PIOS_BMP085_Init(void);
|
||||
|
@ -32,11 +32,13 @@
|
||||
#include "pios_config.h"
|
||||
#include "pios_board.h"
|
||||
|
||||
#if defined(PIOS_INCLUDE_FREERTOS)
|
||||
/* FreeRTOS Includes */
|
||||
#include "FreeRTOS.h"
|
||||
#include "task.h"
|
||||
#include "queue.h"
|
||||
#include "semphr.h"
|
||||
#endif
|
||||
|
||||
/* C Lib Includes */
|
||||
#include <stdio.h>
|
||||
@ -80,7 +82,9 @@
|
||||
#include <pios_settings.h>
|
||||
#include <pios_sdcard.h>
|
||||
#include <pios_com.h>
|
||||
#if defined(PIOS_INCLUDE_BMP085)
|
||||
#include <pios_bmp085.h>
|
||||
#endif
|
||||
|
||||
#if defined(PIOS_INCLUDE_USB)
|
||||
/* USB Libs */
|
||||
|
Loading…
x
Reference in New Issue
Block a user