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

Added dependency checking, just in case.

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@371 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
gussy 2010-03-22 02:09:56 +00:00 committed by gussy
parent 6826706cb7
commit 362163d48b
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
flight/PiOS/Common/pios_bmp085.c
View File

@ -29,7 +29,9 @@
#include "pios.h"
#if defined(PIOS_INCLUDE_BMP085)
#if !defined(PIOS_INCLUDE_EXTI)
#error PIOS_EXTI Must be included in the project!
#endif
/* Glocal Variables */
ConversionTypeTypeDef CurrentRead;
@ -151,8 +153,6 @@ void PIOS_BMP085_ReadADC(void)
B6 = B5 - 4000;
X1 = (CalibData.B2 * (B6 * B6 >> 12)) >> 11;
Pressure = X1;
/*
X2 = CalibData.AC2 * B6 >> 11;
X3 = X1 + X2;
B3 = ((((int32_t)CalibData.AC1 * 4 + X3) << BMP085_OVERSAMPLING) + 2) >> 2;
@ -166,7 +166,7 @@ void PIOS_BMP085_ReadADC(void)
X1 = (P >> 8) * (P >> 8);
X1 = (X1 * 3038) >> 16;
X2 = (-7357 * P) >> 16;
Pressure = P + ((X1 + X2 + 3791) >> 4);*/
Pressure = P + ((X1 + X2 + 3791) >> 4);
}
}
@ -203,13 +203,11 @@ int32_t PIOS_BMP085_Read(uint8_t address, uint8_t *buffer, uint8_t len)
uint8_t addr_buffer[1] = {(uint8_t)address};
int32_t error = PIOS_I2C_Transfer(I2C_Write_WithoutStop, BMP085_I2C_ADDR, addr_buffer, 1);
/* Now receive byte(s) */
if(!error) {
error = PIOS_I2C_Transfer(I2C_Read, BMP085_I2C_ADDR, buffer, len);
}
/* Release I2C peripheral */
PIOS_I2C_UnlockDevice();