From ac6989fbebcbc7406ac8ea1ed1dbc112cdef90b0 Mon Sep 17 00:00:00 2001
From: stac <stac>
Date: Wed, 15 Sep 2010 14:20:59 +0000
Subject: [PATCH] bmp085: fix configuration of EOC interrupt

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
---
 flight/OpenPilot/Modules/Altitude/altitude.c | 10 ++--------
 flight/OpenPilot/System/inc/pios_board.h     |  4 ++--
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/flight/OpenPilot/Modules/Altitude/altitude.c b/flight/OpenPilot/Modules/Altitude/altitude.c
index 6a5112863..a4fcdcbbb 100644
--- a/flight/OpenPilot/Modules/Altitude/altitude.c
+++ b/flight/OpenPilot/Modules/Altitude/altitude.c
@@ -80,22 +80,16 @@ static void altitudeTask(void* parameters)
 	{
 		// Update the temperature data
 		PIOS_BMP085_StartADC(TemperatureConv);
-#if 0
 		xSemaphoreTake(PIOS_BMP085_EOC, portMAX_DELAY);
-#else
-		vTaskDelay( 5 / portTICK_RATE_MS );
-#endif
+
 		PIOS_BMP085_ReadADC();
 		// Convert from 1/10ths of degC to degC
 		data.Temperature = PIOS_BMP085_GetTemperature() / 10.0;
 
 		// Update the pressure data
 		PIOS_BMP085_StartADC(PressureConv);
-#if 0
 		xSemaphoreTake(PIOS_BMP085_EOC, portMAX_DELAY);
-#else
-		vTaskDelay( 26 / portTICK_RATE_MS );
-#endif
+
 		PIOS_BMP085_ReadADC();
 		// Convert from Pa to kPa
 		data.Pressure = PIOS_BMP085_GetPressure() / 1000.0;
diff --git a/flight/OpenPilot/System/inc/pios_board.h b/flight/OpenPilot/System/inc/pios_board.h
index 1a3f7cb94..9725b0ea4 100644
--- a/flight/OpenPilot/System/inc/pios_board.h
+++ b/flight/OpenPilot/System/inc/pios_board.h
@@ -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_PIN		GPIO_Pin_15
-#define PIOS_BMP085_EOC_PORT_SOURCE		GPIO_PortSourceGPIOG
-#define PIOS_BMP085_EOC_PIN_SOURCE		GPIO_PinSource8
+#define PIOS_BMP085_EOC_PORT_SOURCE		GPIO_PortSourceGPIOC
+#define PIOS_BMP085_EOC_PIN_SOURCE		GPIO_PinSource15
 #define PIOS_BMP085_EOC_CLK			RCC_APB2Periph_GPIOC
 #define PIOS_BMP085_EOC_EXTI_LINE		EXTI_Line15
 #define PIOS_BMP085_EOC_IRQn			EXTI15_10_IRQn