rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-29 14:52:12 +01:00
Code Issues Releases Activity

No reason for the data read flag in pios_bmp085.c to be a semaphore

Browse Source
This commit is contained in:
James Cotton 2011-11-14 10:07:19 -06:00
parent 3e2558bec6
commit 2eb89e9b81
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
flight/PiOS/STM32F4xx/pios_bmp085.c
View File

@ -38,11 +38,7 @@
/* Glocal Variables */
ConversionTypeTypeDef CurrentRead;
#if defined(PIOS_INCLUDE_FREERTOS)
xSemaphoreHandle PIOS_BMP085_EOC;
#else
int32_t PIOS_BMP085_EOC;
#endif
int32_t pios_bmp085_eoc;
/* Local Variables */
static BMP085CalibDataTypeDef CalibData;
@ -67,7 +63,7 @@ static const struct pios_bmp085_cfg * dev_cfg;
*/
void PIOS_BMP085_Init(const struct pios_bmp085_cfg * cfg)
{
PIOS_BMP085_EOC = 0;
pios_bmp085_eoc = 0;
oversampling = cfg->oversampling;
dev_cfg = cfg; // Store cfg before enabling interrupt
@ -122,7 +118,7 @@ void PIOS_BMP085_Init(const struct pios_bmp085_cfg * cfg)
*/
int32_t PIOS_BMP085_StartADC(ConversionTypeTypeDef Type)
{
if(PIOS_BMP085_EOC)
if(pios_bmp085_eoc)
return -1;
/* Start the conversion */
@ -151,10 +147,10 @@ int32_t PIOS_BMP085_ReadADC(void)
Data[1] = 0;
Data[2] = 0;
if(!PIOS_BMP085_EOC)
if(!pios_bmp085_eoc)
return -1;
PIOS_BMP085_EOC = 0;
pios_bmp085_eoc = 0;
/* Read and store the 16bit result */
if (CurrentRead == TemperatureConv) {
@ -300,11 +296,14 @@ int32_t PIOS_BMP085_Test()
/**
* Handle external line 2 interrupt requests
*/
uint32_t bmp085_irqs = 0;
void EXTI2_IRQHandler(void)
{
if (EXTI_GetITStatus(dev_cfg->eoc_exti.init.EXTI_Line) != RESET) {
bmp085_irqs++;
/* Read the ADC Value */
PIOS_BMP085_EOC=1;
pios_bmp085_eoc=1;
/* Clear the EXTI line pending bit */
EXTI_ClearITPendingBit(dev_cfg->eoc_exti.init.EXTI_Line);
}