alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-09-14 14:14:55 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

interfaces: Removed isConfigured() from IModuleStaus

Browse Source 
Signed-off-by: Henry Bruce <henry.bruce@intel.com>
Signed-off-by: Abhishek Malik <abhishek.malik@intel.com>
This commit is contained in:
Henry Bruce
2016-01-21 16:25:49 -08:00
committed by Abhishek Malik
parent f268437cd5
commit 9bc3d2ded0
23 changed files with 132 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/bme280/bme280.cxx
View File

@@ -71,7 +71,7 @@ BME280::BME280 (int bus, int devAddr) {
* Bus Write
* Bus read
* Chip id
*-------------------------------------------------------------------------*/
*-------------------------------------------------------------------------*/
bme280_init(&bme280);
}
}
@@ -80,18 +80,6 @@ BME280::~BME280() {
delete m_i2c;
}
bool
BME280::isAvailable() {
return true;
}
bool
BME280::isConfigured() {
return true;
}
/* This function is an example for reading sensor temperature
* \param: None
* \return: compensated temperature
@@ -224,7 +212,7 @@ return v_data_uncomp_tem_int32;
/* This function is an example for reading sensor pressure
* \param: None
* \return: uncompensated pressure
* \return: uncompensated pressure
*/
int32_t BME280::getPressureRawInternal(void)
@@ -248,7 +236,7 @@ int32_t BME280::getPressureRawInternal(void)
* In the code automated reading and writing of "BME280_CTRLHUM_REG_OSRSH"
* register first set the "BME280_CTRLHUM_REG_OSRSH" and then read and write
* the "BME280_CTRLMEAS_REG" register in the function*/
/* set the pressure oversampling*/
bme280_set_oversamp_pressure(BME280_OVERSAMP_2X);
@@ -379,14 +367,14 @@ int32_t BME280::i2c_write_string(uint8_t dev_addr,uint8_t* ptr, uint8_t cnt)
{
mraa::Result ret;
m_i2c->address(dev_addr);
if((ret = m_i2c->write((const uint8_t*) (ptr), cnt)) != 0)
{
UPM_THROW("I2C write error");
}
}
}
/* \Brief: The function is used as I2C bus write
* \Return : Status of the I2C write
@@ -403,7 +391,7 @@ int8_t BME280::BME280_I2C_bus_write(uint8_t dev_addr, uint8_t reg_addr, uint8_t
int32_t iError = BME280_INIT_VALUE;
static uint8_t array[I2C_BUFFER_LEN];
for (int i=0; i<I2C_BUFFER_LEN; i++) array[i]=0;
uint8_t stringpos = BME280_INIT_VALUE;
array[BME280_INIT_VALUE] = reg_addr;
for (stringpos = BME280_INIT_VALUE; stringpos < cnt; stringpos++) {
@@ -418,7 +406,7 @@ int32_t BME280::i2c_write_read_string(uint8_t dev_addr,uint8_t reg_addr , uint8_
mraa::Result ret;
m_i2c->address(dev_addr);
if( m_i2c->readBytesReg(reg_addr, ptr, cnt) != cnt)
{
UPM_THROW("bme280 register read failed");
@@ -453,7 +441,7 @@ int8_t BME280::BME280_I2C_bus_read(uint8_t dev_addr, uint8_t reg_addr, uint8_t *
void BME280::BME280_delay_msek(uint16_t mseconds)
{
struct timespec sleepTime;
sleepTime.tv_sec = mseconds / 1000; // Number of seconds
sleepTime.tv_nsec = ( mseconds % 1000 ) * 1000000; // Convert fractional seconds to nanoseconds
@@ -472,7 +460,7 @@ uint16_t BME280::getTemperatureRaw (){ return BME280::getTemperatureRawInternal(
/**
* Get temperature measurement.
*/
int BME280::getTemperatureCelcius (){ return (BME280::getTemperatureInternal() + 50) /100; }
int BME280::getTemperatureCelcius (){ return (BME280::getTemperatureInternal() + 50) /100; }
/**
* Get relative humidity measurement.
*/

39
src/bme280/bme280.h
View File

@@ -6,7 +6,7 @@
#define __BME280_H__
//#define BME280_MDELAY_DATA_TYPE uint32_t
//#define BME280_MDELAY_DATA_TYPE uint32_t
/****************************************************/
/**\name I2C ADDRESS DEFINITIONS */
@@ -31,9 +31,7 @@ class BME280 : public ITemperatureSensor, public IHumiditySensor, public IPressu
* @param devAddr address of used i2c device
* @param mode BME280 mode
*/
BME280();
//BME280 (int bus, int devAddr= 0x77 , uint8_t mode = 0x03 );
BME280 (int bus, int devAddr = BME280_I2C_ADDRESS1);
BME280 (int bus, int devAddr = BME280_I2C_ADDRESS1);
/**
* BME280 object destructor, basicaly it close i2c connection.
@@ -72,48 +70,39 @@ class BME280 : public ITemperatureSensor, public IHumiditySensor, public IPressu
/**
* Return calculated pressure (Pa)
*/
*/
int getPressurePa();
/**
* Return temperature
*/
int32_t getTemperatureInternal(void);
int32_t getTemperatureInternal(void);
/**
* Return pressure
*/
int32_t getPressureInternal(void);
/**
int32_t getPressureInternal(void);
/**
* Return humidity
*/
int32_t getHumidityInternal(void);
int32_t getHumidityInternal(void);
/**
/**
* Return temperature
*/
int32_t getTemperatureRawInternal(void);
int32_t getTemperatureRawInternal(void);
/**
* Return pressure
*/
int32_t getPressureRawInternal(void);
/**
int32_t getPressureRawInternal(void);
/**
* Return humidity
*/
int32_t getHumidityRawInternal(void);
//int32_t getTemperatureRaw(void);
/**
* Returns whether the sensor is configured.
*/
bool isConfigured();
int32_t getHumidityRawInternal(void);
/**
* Returns whether the correct chip is present at the given address.