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

Updated some FreeRTOS specific issues and fixed a few typos.

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@292 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
gussy 2010-03-12 16:22:56 +00:00 committed by gussy
parent 67075d73c4
commit 6764a34285
7 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

1
flight/OpenPilot/System/inc/pios_config.h
View File

@ -47,7 +47,6 @@
#define PIOS_INCLUDE_COM
#define PIOS_INCLUDE_SDCARD
#define PIOS_INCLUDE_SETTINGS
#define PIOS_INCLUDE_ESC_I2C
/* Defaults for Logging */

1
flight/PiOS/Common/pios_com.c
View File

@ -34,7 +34,6 @@
/* Global Variables */
xSemaphoreHandle PIOS_HID_Buffer;
/* Local Variables */
static int32_t (*receive_callback_func)(COMPortTypeDef port, char c);

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

@ -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

3
flight/PiOS/STM32F10x/pios_usb_hid.c
View File

@ -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);

4
flight/PiOS/inc/pios_bmp085.h
View File

@ -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);

4
flight/PiOS/pios.h
View File

@ -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 */