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

bmp085: fix configuration of EOC interrupt

Browse Source 
The EOC EXTI interrupt configuration was incorrectly
pointing at GPIOG pin 8 rather than GPIOC pin 15.
This was preventing the EOC interrupt from working
properly.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1626 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
stac 2010-09-15 14:20:59 +00:00 committed by stac
parent 88e73906d0
commit ac6989fbeb
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
flight/OpenPilot/Modules/Altitude/altitude.c
View File

@ -80,22 +80,16 @@ static void altitudeTask(void* parameters)
{ {
// Update the temperature data // Update the temperature data
PIOS_BMP085_StartADC(TemperatureConv); PIOS_BMP085_StartADC(TemperatureConv);
#if 0
xSemaphoreTake(PIOS_BMP085_EOC, portMAX_DELAY); xSemaphoreTake(PIOS_BMP085_EOC, portMAX_DELAY);
#else
vTaskDelay( 5 / portTICK_RATE_MS );
#endif
PIOS_BMP085_ReadADC(); PIOS_BMP085_ReadADC();
// Convert from 1/10ths of degC to degC // Convert from 1/10ths of degC to degC
data.Temperature = PIOS_BMP085_GetTemperature() / 10.0; data.Temperature = PIOS_BMP085_GetTemperature() / 10.0;
// Update the pressure data // Update the pressure data
PIOS_BMP085_StartADC(PressureConv); PIOS_BMP085_StartADC(PressureConv);
#if 0
xSemaphoreTake(PIOS_BMP085_EOC, portMAX_DELAY); xSemaphoreTake(PIOS_BMP085_EOC, portMAX_DELAY);
#else
vTaskDelay( 26 / portTICK_RATE_MS );
#endif
PIOS_BMP085_ReadADC(); PIOS_BMP085_ReadADC();
// Convert from Pa to kPa // Convert from Pa to kPa
data.Pressure = PIOS_BMP085_GetPressure() / 1000.0; data.Pressure = PIOS_BMP085_GetPressure() / 1000.0;

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

@ -90,8 +90,8 @@ TIM8 | Servo 5 | Servo 6 | Servo 7 | Servo 8
//------------------------ //------------------------
#define PIOS_BMP085_EOC_GPIO_PORT GPIOC #define PIOS_BMP085_EOC_GPIO_PORT GPIOC
#define PIOS_BMP085_EOC_GPIO_PIN GPIO_Pin_15 #define PIOS_BMP085_EOC_GPIO_PIN GPIO_Pin_15
#define PIOS_BMP085_EOC_PORT_SOURCE GPIO_PortSourceGPIOG #define PIOS_BMP085_EOC_PORT_SOURCE GPIO_PortSourceGPIOC
#define PIOS_BMP085_EOC_PIN_SOURCE GPIO_PinSource8 #define PIOS_BMP085_EOC_PIN_SOURCE GPIO_PinSource15
#define PIOS_BMP085_EOC_CLK RCC_APB2Periph_GPIOC #define PIOS_BMP085_EOC_CLK RCC_APB2Periph_GPIOC
#define PIOS_BMP085_EOC_EXTI_LINE EXTI_Line15 #define PIOS_BMP085_EOC_EXTI_LINE EXTI_Line15
#define PIOS_BMP085_EOC_IRQn EXTI15_10_IRQn #define PIOS_BMP085_EOC_IRQn EXTI15_10_IRQn