Fixed a few typos in PIOS_I2C.

Started work on BMP085 driver. Need more information from Bosch to continue.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@61 ebee16cc-31ac-478f-84a7-5cbb03baadba

flight/Makefile

@@ -100,6 +100,7 @@ SRC += $(PIOSSTM32F10X)/pios_i2c.c
 ## PIOS Hardware (Common)
 SRC += $(PIOSCOMMON)/pios_settings.c
 SRC += $(PIOSCOMMON)/pios_com.c
+SRC += $(PIOSCOMMON)/pios_bmp085.c
 SRC += $(PIOSCOMMON)/printf-stdarg.c
 
 ## CMSIS for STM32

flight/PiOS/Common/pios_bmp085.c

@@ -0,0 +1,151 @@
+/**
+ ******************************************************************************
+ *
+ * @file       pios_bmp085.c  
+ * @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2009.   
+ * @brief      IRQ Enable/Disable routines
+ * @see        The GNU Public License (GPL) Version 3
+ * @defgroup   PIOS_BMP085 Bosch BMP085 Barometric Pressure Sensor Functions
+ * @{
+ * 
+ *****************************************************************************/
+/* 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License as published by 
+ * the Free Software Foundation; either version 3 of the License, or 
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 
+ * for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along 
+ * with this program; if not, write to the Free Software Foundation, Inc., 
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+
+/* Project Includes */
+#include "pios.h"
+
+
+/* Local Variables */
+static BMP085CalibDataTypeDef CalibData;
+
+/**
+* Initialise the BMP085 sensor
+*/
+void PIOS_BMP085_Init(void)
+{
+	/* Read the calibration data on the BMP085 sensor */
+	PIOS_BMP085_Read(BMP085_CALIB_ADDR, (uint8_t *) &CalibData.AC1, 2);
+	PIOS_BMP085_Read(BMP085_CALIB_ADDR + 2, (uint8_t *) &CalibData.AC2, 2);
+	PIOS_BMP085_Read(BMP085_CALIB_ADDR + 4, (uint8_t *) &CalibData.AC3, 2);
+	PIOS_BMP085_Read(BMP085_CALIB_ADDR + 6, (uint8_t *) &CalibData.AC4, 2);
+	PIOS_BMP085_Read(BMP085_CALIB_ADDR + 8, (uint8_t *) &CalibData.AC5, 2);
+	PIOS_BMP085_Read(BMP085_CALIB_ADDR + 10, (uint8_t *) &CalibData.AC6, 2);
+	PIOS_BMP085_Read(BMP085_CALIB_ADDR + 12, (uint8_t *) &CalibData.B1, 2);
+	PIOS_BMP085_Read(BMP085_CALIB_ADDR + 14, (uint8_t *) &CalibData.B2, 2);
+	PIOS_BMP085_Read(BMP085_CALIB_ADDR + 16, (uint8_t *) &CalibData.MB, 2);
+	PIOS_BMP085_Read(BMP085_CALIB_ADDR + 18, (uint8_t *) &CalibData.MC, 2);
+	PIOS_BMP085_Read(BMP085_CALIB_ADDR + 20, (uint8_t *) &CalibData.MD, 2);
+}
+
+/**
+* Start the ADC conversion
+* \param[in] PresOrTemp BMP085_PRES_ADDR or BMP085_TEMP_ADDR
+* \return Raw ADC value
+*/
+void PIOS_BMP085_StartADC(uint16_t *PresOrTemp)
+{
+	/* Start the conversion */
+	PIOS_BMP085_Write(BMP085_CTRL_ADDR, (uint8_t *)PresOrTemp, 2);
+}
+
+/**
+* Reads one or more bytes into a buffer
+* \param[in] address BMP085 register address (depends on size)
+* \param[out] buffer destination buffer
+* \param[in] len number of bytes which should be read (1..64)
+* \return 0 if operation was successful
+* \return -1 if error during I2C transfer
+* \return -2 if BMP085 blocked by another task (retry it!)
+* \return -4 if invalid length
+*/
+int32_t PIOS_BMP085_Read(uint16_t address, uint8_t *buffer, uint8_t len)
+{
+	/* Try to get the IIC peripheral */
+	if(PIOS_I2C_TransferBegin(I2C_Non_Blocking) < 0) {
+		/* Request a retry */
+		return -2;
+	}
+
+	/* Send I2C address and EEPROM address */
+	/* To avoid issues with litte/big endian: copy address into temporary buffer */
+	uint8_t addr_buffer[2] = {(uint8_t)(address>>8), (uint8_t)address};
+	int32_t error = PIOS_I2C_Transfer(I2C_Write_WithoutStop, BMP085_ADDR_WRITE, addr_buffer, 2);
+
+	if(!error) {
+		error = PIOS_I2C_TransferWait();
+	}
+
+	/* Now receive byte(s) */
+	if(!error) {
+		error = PIOS_I2C_Transfer(I2C_Read, BMP085_ADDR_READ, buffer, len);
+	}
+	if(!error) {
+		error = PIOS_I2C_TransferWait();
+	}
+
+	/* Release I2C peripheral */
+	PIOS_I2C_TransferFinished();
+	
+	/* Return error status */
+	return error < 0 ? -1 : 0;
+}
+
+
+/**
+* Writes one or more bytes to the BMP085
+* \param[in] address BankStick address (depends on size)
+* \param[in] buffer source buffer
+* \param[in] len number of bytes which should be written (1..64)
+* \return 0 if operation was successful
+* \return -1 if error during IIC transfer
+* \return -2 if BankStick blocked by another task (retry it!)
+* \return -4 if invalid length
+* \note Use \ref PIOS_I2C_BS_CheckWriteFinished to check when the write operation
+* has been finished - this can take up to 5 mS!
+*/
+int32_t PIOS_BMP085_Write(uint16_t address, uint8_t *buffer, uint8_t len)
+{
+	/* Try to get the IIC peripheral */
+	if(PIOS_I2C_TransferBegin(I2C_Non_Blocking) < 0) {
+		/* Request a retry */
+		return -2;
+	}
+
+	/* Send I2C address and EEPROM address */
+	/* To avoid issues with litte/big endian: copy address into temporary buffer */
+	uint8_t addr_buffer[2] = {(uint8_t)(address>>8), (uint8_t)address};
+	int32_t error = PIOS_I2C_Transfer(I2C_Write_WithoutStop, BMP085_ADDR_WRITE, addr_buffer, 2);
+
+	if(!error) {
+		error = PIOS_I2C_TransferWait();
+	}
+
+	/* Release I2C peripheral */
+	PIOS_I2C_TransferFinished();
+	
+	/* Return error status */
+	return error < 0 ? -1 : 0;
+}
+
+
+/* Read the values from the sensor
+* \param[out] Pressure Pointer to the pressure variable
+* \param[out] Altitude Pointer to the altitude variable
+* \param[out] Temperature Pointer to the temperature variable
+
+void PIOS_BMP085_ReadADC(uint16_t *Pressure, uint16_t *Altitude, uint16_t *Temperature)*/

flight/PiOS/STM32F10x/pios_i2c.c

@@ -5,7 +5,7 @@
  * @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2009.   
  * @brief      I2C Enable/Disable routines
  * @see        The GNU Public License (GPL) Version 3
- * @defgroup   PIOS_I2C I2C Communication Functions
+ * @defgroup   PIOS_I2C I2C Functions
  * @{
  * 
  *****************************************************************************/
@@ -146,7 +146,6 @@ static void PIOS_I2C_InitPeripheral(void)
 	i2cx->transfer_state.ALL = 0;
 	i2cx->transfer_error = 0;
 
-
 	/* Configure I2C peripheral */
 	I2C_Init(i2cx->base, &I2C_InitStructure);
 }

flight/PiOS/inc/pios_bmp085.h

@@ -0,0 +1,61 @@
+/**
+ ******************************************************************************
+ *
+ * @file       pios_bmp085.h  
+ * @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2009.   
+ * @brief      BMP085 functions header.
+ * @see        The GNU Public License (GPL) Version 3
+ *
+ *****************************************************************************/
+/* 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License as published by 
+ * the Free Software Foundation; either version 3 of the License, or 
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 
+ * for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along 
+ * with this program; if not, write to the Free Software Foundation, Inc., 
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef PIOS_BMP085_H
+#define PIOS_BMP085_H
+
+/* BMP085 Addresses */
+#define BMP085_ADDR_READ	0xEF
+#define BMP085_ADDR_WRITE	0xEE
+#define BMP085_CALIB_ADDR	0xAA
+#define BMP085_CTRL_ADDR	0xF4
+#define BMP085_OVERSAMPLING	0
+#define BMP085_PRES_ADDR	(0x34 + (BMP085_OVERSAMPLING << 6))
+#define BMP085_TEMP_ADDR	0x2E
+#define BMP085_ADC_MSB		0xF6
+#define BMP085_ADC_LSB		0xF7
+
+/* Local Types */
+typedef struct {
+	uint16_t AC1;
+	uint16_t AC2;
+	uint16_t AC3;
+	uint16_t AC4;
+	uint16_t AC5;
+	uint16_t AC6;
+	uint16_t B1;
+	uint16_t B2;
+	uint16_t MB;
+	uint16_t MC;
+	uint16_t MD;
+} BMP085CalibDataTypeDef;
+
+/* Public Functions */
+void PIOS_BMP085_Init(void);
+void PIOS_BMP085_StartADC(uint16_t *PresOrTemp);
+int32_t PIOS_BMP085_Read(u16 address, uint8_t *buffer, uint8_t len);
+int32_t PIOS_BMP085_Write(uint16_t address, uint8_t *buffer, uint8_t len);
+
+#endif /* PIOS_BMP085_H */

flight/PiOS/pios.h

@@ -62,6 +62,7 @@
 /* PIOS Hardware Includes (Common) */
 #include "pios_settings.h"
 #include "pios_com.h"
+#include "pios_bmp085.h"
 
 /* More added here as they get written */