mirror of
https://github.com/eclipse/upm.git
synced 2025-03-14 20:47:30 +03:00
bosch bme280: Remove old driver in favor of new driver to be added soon
This driver, based on bosch code is being removed in favor of a new driver to be added soon that is more fully functional and includes SPI support. The new driver will be included along with a BMP280 implementation in a new bmp280 library. Signed-off-by: Jon Trulson <jtrulson@ics.com> Signed-off-by: Noel Eck <noel.eck@intel.com>
This commit is contained in:
Jon Trulson
Noel Eck
parent
dd2bca97b9
commit
84144d0c8f
@ -859,10 +859,10 @@ EXCLUDE_SYMLINKS = NO
|
||||
# Note that the wildcards are matched against the file with absolute path, so to
|
||||
# exclude all test directories for example use the pattern */test/*
|
||||
|
||||
# bme280driver code is provided by bosch. This source contains tags which are
|
||||
# picked up by doxygen (namely \mainpage) and incorrectly get added to docs.
|
||||
EXCLUDE_PATTERNS = bosch_* \
|
||||
*bme280driver*
|
||||
# bmi160 driver contains code provided by bosch. This source contains
|
||||
# tags which are picked up by doxygen (namely \mainpage) and
|
||||
# incorrectly get added to docs.
|
||||
EXCLUDE_PATTERNS = bosch_*
|
||||
|
||||
# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
|
||||
# (namespaces, classes, functions, etc.) that should be excluded from the
|
||||
|
||||
@ -241,7 +241,6 @@ add_example (rhusb)
|
||||
add_example (apds9930)
|
||||
add_example (kxcjk1013)
|
||||
add_example (ssd1351)
|
||||
add_example (bme280)
|
||||
add_example (ds1808lc)
|
||||
add_example (hlg150h)
|
||||
add_example (lp8860)
|
||||
|
||||
@ -1,51 +0,0 @@
|
||||
/*
|
||||
* Author: Henry Bruce <henry.bruce@intel.com>
|
||||
* Copyright (c) 2015 Intel Corporation.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining
|
||||
* a copy of this software and associated documentation files (the
|
||||
* "Software"), to deal in the Software without restriction, including
|
||||
* without limitation the rights to use, copy, modify, merge, publish,
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be
|
||||
* included in all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <unistd.h>
|
||||
#include <iostream>
|
||||
#include "bme280.hpp"
|
||||
|
||||
#define FT4222_I2C_BUS 0
|
||||
|
||||
int main ()
|
||||
{
|
||||
try {
|
||||
upm::BME280* bme280 = new upm::BME280 (mraa_get_sub_platform_id(FT4222_I2C_BUS));
|
||||
while (true) {
|
||||
int temperature = bme280->getTemperatureCelcius();
|
||||
int humidity = bme280->getHumidityRelative();
|
||||
int pressure = bme280->getPressurePa();
|
||||
std::cout << "Temperature = " << temperature << "C" << std::endl;
|
||||
std::cout << "Humidity = " << humidity << "%" << std::endl;
|
||||
std::cout << "Pressure = " << pressure << "Pa" << std::endl;
|
||||
sleep(1);
|
||||
}
|
||||
delete bme280;
|
||||
} catch (std::exception& e) {
|
||||
std::cerr << e.what() << std::endl;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
//! [Interesting]
|
||||
@ -25,7 +25,6 @@
|
||||
#include <unistd.h>
|
||||
#include <iostream>
|
||||
#include "si7005.hpp"
|
||||
#include "bme280.hpp"
|
||||
|
||||
#define EDISON_I2C_BUS 1
|
||||
#define FT4222_I2C_BUS 0
|
||||
@ -41,13 +40,6 @@
|
||||
upm::IHumiditySensor* getHumiditySensor()
|
||||
{
|
||||
upm::IHumiditySensor* humiditySensor = NULL;
|
||||
try {
|
||||
humiditySensor = new upm::BME280 (mraa_get_sub_platform_id(FT4222_I2C_BUS));
|
||||
return humiditySensor ;
|
||||
} catch (std::exception& e)
|
||||
{
|
||||
std::cerr <<"BME280: "<<e.what() << std::endl;
|
||||
}
|
||||
|
||||
try {
|
||||
humiditySensor = new upm::SI7005(EDISON_I2C_BUS, EDISON_GPIO_SI7005_CS);
|
||||
|
||||
@ -40,13 +40,6 @@
|
||||
upm::IPressureSensor* getPressureSensor()
|
||||
{
|
||||
upm::IPressureSensor* pressureSensor = NULL;
|
||||
try {
|
||||
pressureSensor = new upm::BME280 (mraa_get_sub_platform_id(FT4222_I2C_BUS));
|
||||
return pressureSensor ;
|
||||
} catch (std::exception& e)
|
||||
{
|
||||
std::cerr <<"BME280: "<<e.what() << std::endl;
|
||||
}
|
||||
|
||||
try {
|
||||
pressureSensor = new upm::BMPX8X(EDISON_I2C_BUS);
|
||||
|
||||
@ -42,14 +42,6 @@
|
||||
upm::ITemperatureSensor* getTemperatureSensor()
|
||||
{
|
||||
upm::ITemperatureSensor* temperatureSensor = NULL;
|
||||
try {
|
||||
temperatureSensor = new upm::BME280 (mraa_get_sub_platform_id(FT4222_I2C_BUS));
|
||||
return temperatureSensor;
|
||||
} catch (std::exception& e)
|
||||
{
|
||||
std::cerr <<"BME280: "<<e.what() << std::endl;
|
||||
}
|
||||
|
||||
|
||||
try {
|
||||
temperatureSensor = new upm::SI7005(EDISON_I2C_BUS, EDISON_GPIO_SI7005_CS);
|
||||
|
||||
@ -1,51 +0,0 @@
|
||||
/*jslint node:true, vars:true, bitwise:true, unparam:true */
|
||||
/*jshint unused:true */
|
||||
|
||||
/*
|
||||
* Author: Henry Bruce <henry.bruce@intel.com>
|
||||
* Copyright (c) 2016 Intel Corporation.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining
|
||||
* a copy of this software and associated documentation files (the
|
||||
* "Software"), to deal in the Software without restriction, including
|
||||
* without limitation the rights to use, copy, modify, merge, publish,
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be
|
||||
* included in all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
var bme280pkg = require('jsupm_bme280');
|
||||
|
||||
// Instantiate a BME280 Sensor on I2C sub-platform bus 0
|
||||
var bme280 = new bme280pkg.BME280(512);
|
||||
|
||||
// update every second and print the values
|
||||
var myInterval = setInterval(function()
|
||||
{
|
||||
// print detected value
|
||||
console.log("Temperature: " + bme280.getTemperatureCelcius() + "C");
|
||||
console.log("Humidity: " + bme280.getHumidityRelative() + "%");
|
||||
console.log("Pressure: " + bme280.getPressurePa() + "Pa");
|
||||
}, 1000);
|
||||
|
||||
|
||||
// When exiting: clear interval and print message
|
||||
process.on('SIGINT', function()
|
||||
{
|
||||
clearInterval(myInterval);
|
||||
bme280 = null
|
||||
bme280pkg = null;
|
||||
console.log("Exiting");
|
||||
process.exit(0);
|
||||
});
|
||||
@ -1,6 +0,0 @@
|
||||
include_directories(..)
|
||||
set (libname "bme280")
|
||||
set (libdescription "upm bme280 temperature humidity pressure sensor module")
|
||||
set (module_src ${libname}.cxx bme280driver.cxx)
|
||||
set (module_hpp ${libname}.hpp bme280driver.h)
|
||||
upm_module_init()
|
||||
@ -1,483 +0,0 @@
|
||||
/*
|
||||
* Author: Aditya Nagal <adityax.nagal@intel.com>
|
||||
* Copyright (c) 2014 Intel Corporation.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining
|
||||
* a copy of this software and associated documentation files (the
|
||||
* "Software"), to deal in the Software without restriction, including
|
||||
* without limitation the rights to use, copy, modify, merge, publish,
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be
|
||||
* included in all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <iostream>
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
#include <math.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include "bme280.hpp"
|
||||
#include "bme280driver.h"
|
||||
/************** I2C buffer length ******/
|
||||
#define I2C_BUFFER_LEN 26
|
||||
|
||||
|
||||
|
||||
using namespace upm;
|
||||
|
||||
|
||||
|
||||
|
||||
/*----------------------------------------------------------------------------*
|
||||
* struct bme280_t parameters can be accessed by using bme280
|
||||
* bme280_t having the following parameters
|
||||
* Bus write function pointer: BME280_WR_FUNC_PTR
|
||||
Bus read function pointer: BME280_RD_FUNC_PTR
|
||||
* Delay function pointer: delay_msec
|
||||
* I2C address: dev_addr
|
||||
* Chip id of the sensor: chip_id
|
||||
*---------------------------------------------------------------------------*/
|
||||
|
||||
struct bme280_t bme280;
|
||||
|
||||
static struct bme280_t *p_bme280; /**< pointer to BME280 */
|
||||
mraa::I2c* BME280::m_i2c = NULL;
|
||||
int BME280::m_bus = 0;
|
||||
|
||||
BME280::BME280 (int bus, int devAddr) {
|
||||
m_bus = bus;
|
||||
if( m_i2c == NULL)
|
||||
{
|
||||
m_i2c = new mraa::I2c(m_bus);
|
||||
m_i2c->address(BME280_I2C_ADDRESS1);
|
||||
//Based on the requirement, configure I2C interface.
|
||||
I2C_routine();
|
||||
/*--------------------------------------------------------------------------*
|
||||
* This function used to assign the value/reference of
|
||||
* the following parameters
|
||||
* I2C address
|
||||
* Bus Write
|
||||
* Bus read
|
||||
* Chip id
|
||||
*-------------------------------------------------------------------------*/
|
||||
bme280_init(&bme280);
|
||||
}
|
||||
}
|
||||
|
||||
BME280::~BME280() {
|
||||
delete m_i2c;
|
||||
}
|
||||
|
||||
/* This function is an example for reading sensor temperature
|
||||
* \param: None
|
||||
* \return: compensated temperature
|
||||
*/
|
||||
|
||||
int32_t BME280::getTemperatureInternal(void)
|
||||
{
|
||||
/* The variable used to read uncompensated temperature*/
|
||||
int32_t v_data_uncomp_tem_int32 = getTemperatureRawInternal();
|
||||
|
||||
/*------------------------------------------------------------------*
|
||||
************ START READ TRUE PRESSURE, TEMPERATURE AND HUMIDITY DATA ********
|
||||
*---------------------------------------------------------------------*/
|
||||
/* API is used to read the true temperature*/
|
||||
/* Input value as uncompensated temperature and output format*/
|
||||
int32_t v_actual_temp_int32 = bme280_compensate_temperature_int32(v_data_uncomp_tem_int32);
|
||||
/*--------------------------------------------------------------------*
|
||||
************ END READ TRUE TEMPERATURE ********
|
||||
*-------------------------------------------------------------------------*/
|
||||
|
||||
return v_actual_temp_int32;
|
||||
}
|
||||
|
||||
/* This function is an example for reading sensor pressure
|
||||
* \param: None
|
||||
* \return: compensated pressure
|
||||
*/
|
||||
|
||||
int32_t BME280::getPressureInternal(void)
|
||||
{
|
||||
/* The variable used to read uncompensated pressure*/
|
||||
int32_t v_data_uncomp_pres_int32 = getPressureRawInternal();
|
||||
|
||||
|
||||
/*------------------------------------------------------------------*
|
||||
************ START READ TRUE PRESSURE DATA ********
|
||||
*---------------------------------------------------------------------*/
|
||||
/* API is used to read the true pressure*/
|
||||
/* Input value as uncompensated pressure */
|
||||
uint32_t v_actual_press_uint32 = bme280_compensate_pressure_int32(v_data_uncomp_pres_int32);
|
||||
|
||||
/*--------------------------------------------------------------------*
|
||||
************ END READ TRUE PRESSURE ********
|
||||
*-------------------------------------------------------------------------*/
|
||||
|
||||
return v_actual_press_uint32;
|
||||
}
|
||||
|
||||
|
||||
/* This function is an example for reading sensor humidity
|
||||
* \param: None
|
||||
* \return: compensated humidity
|
||||
*/
|
||||
|
||||
int32_t BME280::getHumidityInternal(void)
|
||||
{
|
||||
/* The variable used to read uncompensated pressure*/
|
||||
int32_t v_data_uncomp_hum_int32 = getHumidityRawInternal();
|
||||
|
||||
/*------------------------------------------------------------------*
|
||||
************ START READ TRUE HUMIDITY DATA ********
|
||||
*---------------------------------------------------------------------*/
|
||||
/* API is used to read the true humidity*/
|
||||
/* Input value as uncompensated humidity and output format*/
|
||||
uint32_t v_actual_humity_uint32 = bme280_compensate_humidity_int32(v_data_uncomp_hum_int32);
|
||||
|
||||
/*--------------------------------------------------------------------*
|
||||
************ END READ TRUE HUMIDITY ********
|
||||
*-------------------------------------------------------------------------*/
|
||||
|
||||
return v_actual_humity_uint32;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* This function is an example for reading sensor temperature
|
||||
* \param: None
|
||||
* \return: uncompensated temperature
|
||||
*/
|
||||
|
||||
int32_t BME280::getTemperatureRawInternal(void)
|
||||
{
|
||||
/* The variable used to read uncompensated temperature*/
|
||||
int32_t v_data_uncomp_tem_int32 = BME280_INIT_VALUE;
|
||||
|
||||
/* For initialization it is required to set the mode of
|
||||
* the sensor as "NORMAL"
|
||||
* data acquisition/read/write is possible in this mode
|
||||
* by using the below API able to set the power mode as NORMAL*/
|
||||
/* Set the power mode as NORMAL*/
|
||||
bme280_set_power_mode(BME280_NORMAL_MODE);
|
||||
/* For reading the temperature data it is required to
|
||||
* set the OSS setting of temperature
|
||||
* 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 temperature oversampling*/
|
||||
bme280_set_oversamp_temperature(BME280_OVERSAMP_4X);
|
||||
|
||||
/************************* END INITIALIZATION *************************/
|
||||
|
||||
/*------------------------------------------------------------------*
|
||||
************ START READ UNCOMPENSATED TEMPERATURE DATA ********
|
||||
*---------------------------------------------------------------------*/
|
||||
/* API is used to read the uncompensated temperature*/
|
||||
bme280_read_uncomp_temperature(&v_data_uncomp_tem_int32);
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------*
|
||||
************ END READ UNCOMPENSATED TEMPERATURE ********
|
||||
*-------------------------------------------------------------------------*/
|
||||
|
||||
/*-----------------------------------------------------------------------*
|
||||
************************* START DE-INITIALIZATION ***********************
|
||||
*-------------------------------------------------------------------------*/
|
||||
/* For de-initialization it is required to set the mode of
|
||||
* the sensor as "SLEEP"
|
||||
* the device reaches the lowest power consumption only
|
||||
* In SLEEP mode no measurements are performed
|
||||
* All registers are accessible
|
||||
* by using the below API able to set the power mode as SLEEP*/
|
||||
/* Set the power mode as SLEEP*/
|
||||
bme280_set_power_mode(BME280_SLEEP_MODE);
|
||||
/*---------------------------------------------------------------------*
|
||||
************************* END DE-INITIALIZATION **********************
|
||||
*---------------------------------------------------------------------*/
|
||||
return v_data_uncomp_tem_int32;
|
||||
}
|
||||
|
||||
/* This function is an example for reading sensor pressure
|
||||
* \param: None
|
||||
* \return: uncompensated pressure
|
||||
*/
|
||||
|
||||
int32_t BME280::getPressureRawInternal(void)
|
||||
{
|
||||
/* The variable used to read uncompensated pressure*/
|
||||
int32_t v_data_uncomp_pres_int32 = BME280_INIT_VALUE;
|
||||
|
||||
|
||||
/* For initialization it is required to set the mode of
|
||||
* the sensor as "NORMAL"
|
||||
* data acquisition/read/write is possible in this mode
|
||||
* by using the below API able to set the power mode as NORMAL*/
|
||||
/* Set the power mode as NORMAL*/
|
||||
bme280_set_power_mode(BME280_NORMAL_MODE);
|
||||
/* For reading the pressure data it is required to
|
||||
* set the OSS setting of humidity, pressure and temperature
|
||||
* The "BME280_CTRLHUM_REG_OSRSH" register sets the humidity
|
||||
* data acquisition options of the device.
|
||||
* changes to this registers only become effective after a write operation to
|
||||
* "BME280_CTRLMEAS_REG" register.
|
||||
* 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);
|
||||
|
||||
/************************* END INITIALIZATION *************************/
|
||||
|
||||
/*------------------------------------------------------------------*
|
||||
************ START READ UNCOMPENSATED PRESSURE DATA ********
|
||||
*---------------------------------------------------------------------*/
|
||||
|
||||
/* API is used to read the uncompensated pressure*/
|
||||
bme280_read_uncomp_pressure(&v_data_uncomp_pres_int32);
|
||||
|
||||
/*--------------------------------------------------------------------*
|
||||
************ END READ UNCOMPENSATED PRESSURE ********
|
||||
*-------------------------------------------------------------------------*/
|
||||
|
||||
|
||||
/*-----------------------------------------------------------------------*
|
||||
************************* START DE-INITIALIZATION ***********************
|
||||
*-------------------------------------------------------------------------*/
|
||||
/* For de-initialization it is required to set the mode of
|
||||
* the sensor as "SLEEP"
|
||||
* the device reaches the lowest power consumption only
|
||||
* In SLEEP mode no measurements are performed
|
||||
* All registers are accessible
|
||||
* by using the below API able to set the power mode as SLEEP*/
|
||||
/* Set the power mode as SLEEP*/
|
||||
bme280_set_power_mode(BME280_SLEEP_MODE);
|
||||
/*---------------------------------------------------------------------*
|
||||
************************* END DE-INITIALIZATION **********************
|
||||
*---------------------------------------------------------------------*/
|
||||
return v_data_uncomp_pres_int32;
|
||||
}
|
||||
|
||||
|
||||
/* This function is an example for reading sensor humidity
|
||||
* \param: None
|
||||
* \return: uncompensated humidity
|
||||
*/
|
||||
|
||||
int32_t BME280::getHumidityRawInternal(void)
|
||||
{
|
||||
/* The variable used to read uncompensated pressure*/
|
||||
int32_t v_data_uncomp_hum_int32 = BME280_INIT_VALUE;
|
||||
|
||||
/* For initialization it is required to set the mode of
|
||||
* the sensor as "NORMAL"
|
||||
* data acquisition/read/write is possible in this mode
|
||||
* by using the below API able to set the power mode as NORMAL*/
|
||||
/* Set the power mode as NORMAL*/
|
||||
bme280_set_power_mode(BME280_NORMAL_MODE);
|
||||
/* For reading humidity data it is required to
|
||||
* set the OSS setting of humidity
|
||||
* The "BME280_CTRLHUM_REG_OSRSH" register sets the humidity
|
||||
* data acquisition options of the device.
|
||||
* changes to this registers only become effective after a write operation to
|
||||
* "BME280_CTRLMEAS_REG" register.
|
||||
* 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*/
|
||||
bme280_set_oversamp_humidity(BME280_OVERSAMP_1X);
|
||||
|
||||
|
||||
/************************* END INITIALIZATION *************************/
|
||||
|
||||
/*------------------------------------------------------------------*
|
||||
************ START READ HUMIDITY DATA ********
|
||||
*---------------------------------------------------------------------*/
|
||||
/* API is used to read the uncompensated humidity*/
|
||||
bme280_read_uncomp_humidity(&v_data_uncomp_hum_int32);
|
||||
|
||||
/*--------------------------------------------------------------------*
|
||||
************ END READ UNCOMPENSATED PRESSURE AND TEMPERATURE********
|
||||
*-------------------------------------------------------------------------*/
|
||||
|
||||
|
||||
/*-----------------------------------------------------------------------*
|
||||
************************* START DE-INITIALIZATION ***********************
|
||||
*-------------------------------------------------------------------------*/
|
||||
/* For de-initialization it is required to set the mode of
|
||||
* the sensor as "SLEEP"
|
||||
* the device reaches the lowest power consumption only
|
||||
* In SLEEP mode no measurements are performed
|
||||
* All registers are accessible
|
||||
* by using the below API able to set the power mode as SLEEP*/
|
||||
/* Set the power mode as SLEEP*/
|
||||
bme280_set_power_mode(BME280_SLEEP_MODE);
|
||||
/*---------------------------------------------------------------------*
|
||||
************************* END DE-INITIALIZATION **********************
|
||||
*---------------------------------------------------------------------*/
|
||||
return v_data_uncomp_hum_int32;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------------*
|
||||
* The following function is used to map the I2C bus read, write, delay and
|
||||
* device address with global structure bme280
|
||||
*-------------------------------------------------------------------------*/
|
||||
int8_t BME280::I2C_routine()
|
||||
{
|
||||
/*--------------------------------------------------------------------------*
|
||||
* By using bme280 the following structure parameter can be accessed
|
||||
* Bus write function pointer: BME280_WR_FUNC_PTR
|
||||
* Bus read function pointer: BME280_RD_FUNC_PTR
|
||||
* Delay function pointer: delay_msec
|
||||
* I2C address: dev_addr
|
||||
*--------------------------------------------------------------------------*/
|
||||
// bme280.bus_write = &BME280::BME280_I2C_bus_write;
|
||||
bme280.bus_write = BME280_I2C_bus_write;
|
||||
|
||||
//bme280.bus_write = BME280_I2C_bus_write_dummy;
|
||||
bme280.bus_read = BME280_I2C_bus_read;
|
||||
bme280.dev_addr = BME280_I2C_ADDRESS1;
|
||||
bme280.delay_msec = BME280_delay_msek;
|
||||
|
||||
return BME280_INIT_VALUE;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*-------------------------------------------------------------------*
|
||||
* The device address defined in the bme280.hpp file
|
||||
*-----------------------------------------------------------------------*/
|
||||
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");
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* \Brief: The function is used as I2C bus write
|
||||
* \Return : Status of the I2C write
|
||||
* \param dev_addr : The device address of the sensor
|
||||
* \param reg_addr : Address of the first register, will data is going to be written
|
||||
* \param reg_data : It is a value hold in the array,
|
||||
* will be used for write the value into the register
|
||||
* \param cnt : The no of byte of data to be write
|
||||
*/
|
||||
|
||||
int8_t BME280::BME280_I2C_bus_write(uint8_t dev_addr, uint8_t reg_addr, uint8_t *reg_data, uint8_t cnt)
|
||||
|
||||
{
|
||||
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++) {
|
||||
array[stringpos + BME280_ONE_U8X] = *(reg_data + stringpos);
|
||||
}
|
||||
iError = i2c_write_string(dev_addr,array, cnt+1);
|
||||
return (int8_t)iError;
|
||||
}
|
||||
|
||||
int32_t BME280::i2c_write_read_string(uint8_t dev_addr,uint8_t reg_addr , uint8_t * ptr, uint8_t cnt)
|
||||
{
|
||||
mraa::Result ret;
|
||||
|
||||
m_i2c->address(dev_addr);
|
||||
|
||||
if( m_i2c->readBytesReg(reg_addr, ptr, cnt) != cnt)
|
||||
{
|
||||
UPM_THROW("bme280 register read failed");
|
||||
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* \Brief: The function is used as I2C bus read
|
||||
* \Return : Status of the I2C read
|
||||
* \param dev_addr : The device address of the sensor
|
||||
* \param reg_addr : Address of the first register, will data is going to be read
|
||||
* \param reg_data : This data read from the sensor, which is hold in an array
|
||||
* \param cnt : The no of data byte of to be read
|
||||
*/
|
||||
int8_t BME280::BME280_I2C_bus_read(uint8_t dev_addr, uint8_t reg_addr, uint8_t *reg_data, uint8_t cnt)
|
||||
{
|
||||
int32_t iError = BME280_INIT_VALUE;
|
||||
uint8_t array[I2C_BUFFER_LEN] = {BME280_INIT_VALUE};
|
||||
uint8_t stringpos = BME280_INIT_VALUE;
|
||||
array[BME280_INIT_VALUE] = reg_addr;
|
||||
i2c_write_read_string(dev_addr,reg_addr,array,cnt);
|
||||
for (stringpos = BME280_INIT_VALUE; stringpos < cnt; stringpos++) {
|
||||
*(reg_data + stringpos) = array[stringpos];
|
||||
}
|
||||
return (int8_t)iError;
|
||||
}
|
||||
|
||||
/* Brief : The delay routine
|
||||
* \param : delay in ms
|
||||
*/
|
||||
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
|
||||
|
||||
// Iterate nanosleep in a loop until the total sleep time is the original
|
||||
// value of the seconds parameter
|
||||
while ( ( nanosleep( &sleepTime, &sleepTime ) != 0 ) && ( errno == EINTR ) );
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get temperature measurement.
|
||||
*/
|
||||
uint16_t BME280::getTemperatureRaw (){ return BME280::getTemperatureRawInternal(); }
|
||||
|
||||
/**
|
||||
* Get temperature measurement.
|
||||
*/
|
||||
int BME280::getTemperatureCelcius (){ return (BME280::getTemperatureInternal() + 50) /100; }
|
||||
/**
|
||||
* Get relative humidity measurement.
|
||||
*/
|
||||
uint16_t BME280::getHumidityRaw (){ return BME280::getHumidityRawInternal(); }
|
||||
|
||||
/**
|
||||
* Get relative humidity measurement.
|
||||
*/
|
||||
int BME280::getHumidityRelative (){ return (BME280::getHumidityInternal() + 500) / 1000; }
|
||||
|
||||
/**
|
||||
* Return pressure
|
||||
*/
|
||||
uint32_t BME280::getPressureRaw(){ return BME280::getPressureRawInternal(); }
|
||||
|
||||
/**
|
||||
* Return calculated pressure (Pa)
|
||||
*/
|
||||
int BME280::getPressurePa(){ return BME280::getPressureInternal(); }
|
||||
|
||||
|
||||
|
||||
@ -1,141 +0,0 @@
|
||||
#include <mraa/i2c.hpp>
|
||||
#include "upm/iPressureSensor.hpp"
|
||||
#include "upm/iTemperatureSensor.hpp"
|
||||
#include "upm/iHumiditySensor.hpp"
|
||||
#ifndef __BME280_H__
|
||||
#define __BME280_H__
|
||||
|
||||
|
||||
//#define BME280_MDELAY_DATA_TYPE uint32_t
|
||||
|
||||
/****************************************************/
|
||||
/**\name I2C ADDRESS DEFINITIONS */
|
||||
/***************************************************/
|
||||
#define BME280_I2C_ADDRESS1 (0x76)
|
||||
#define BME280_I2C_ADDRESS2 (0x77)
|
||||
#define BME280_ONE_U8X (1)
|
||||
|
||||
namespace upm {
|
||||
|
||||
|
||||
|
||||
class BME280 : public ITemperatureSensor, public IHumiditySensor, public IPressureSensor {
|
||||
public:
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Instanciates a BME280 object
|
||||
*
|
||||
* @param bus number of used bus
|
||||
* @param devAddr address of used i2c device
|
||||
* @param mode BME280 mode
|
||||
*/
|
||||
BME280 (int bus, int devAddr = BME280_I2C_ADDRESS1);
|
||||
|
||||
/**
|
||||
* BME280 object destructor, basicaly it close i2c connection.
|
||||
*/
|
||||
~BME280 ();
|
||||
|
||||
/**
|
||||
* Get temperature measurement.
|
||||
*/
|
||||
uint16_t getTemperatureRaw ();
|
||||
|
||||
/**
|
||||
* Get temperature measurement.
|
||||
*/
|
||||
int getTemperatureCelcius ();
|
||||
|
||||
/**
|
||||
* Get relative humidity measurement.
|
||||
*/
|
||||
uint16_t getHumidityRaw ();
|
||||
|
||||
/**
|
||||
* Get relative humidity measurement.
|
||||
*/
|
||||
int getHumidityRelative ();
|
||||
|
||||
/**
|
||||
* Returns sensor module name
|
||||
*/
|
||||
const char* getModuleName() { return "BME280"; }
|
||||
|
||||
/**
|
||||
* Return pressure
|
||||
*/
|
||||
uint32_t getPressureRaw();
|
||||
|
||||
/**
|
||||
* Return calculated pressure (Pa)
|
||||
*/
|
||||
int getPressurePa();
|
||||
|
||||
|
||||
/**
|
||||
* Return temperature
|
||||
*/
|
||||
int32_t getTemperatureInternal(void);
|
||||
|
||||
/**
|
||||
* Return pressure
|
||||
*/
|
||||
int32_t getPressureInternal(void);
|
||||
|
||||
/**
|
||||
* Return humidity
|
||||
*/
|
||||
int32_t getHumidityInternal(void);
|
||||
|
||||
/**
|
||||
* Return temperature
|
||||
*/
|
||||
int32_t getTemperatureRawInternal(void);
|
||||
|
||||
/**
|
||||
* Return pressure
|
||||
*/
|
||||
int32_t getPressureRawInternal(void);
|
||||
|
||||
/**
|
||||
* Return humidity
|
||||
*/
|
||||
int32_t getHumidityRawInternal(void);
|
||||
|
||||
/**
|
||||
* Returns whether the correct chip is present at the given address.
|
||||
*/
|
||||
bool isAvailable();
|
||||
|
||||
|
||||
private:
|
||||
/**************************************************************/
|
||||
/**\name STRUCTURE DEFINITIONS */
|
||||
/**************************************************************/
|
||||
/*!
|
||||
* @brief This structure holds all device specific calibration parameters
|
||||
*/
|
||||
|
||||
static mraa::I2c* m_i2c;
|
||||
static int m_bus;
|
||||
|
||||
static int32_t i2c_write_string(uint8_t dev_addr,uint8_t* ptr, uint8_t cnt);
|
||||
static int32_t i2c_write_read_string(uint8_t dev_addr,uint8_t reg_addr , uint8_t * ptr, uint8_t cnt);
|
||||
static int8_t I2C_routine();
|
||||
static int8_t BME280_I2C_bus_write(uint8_t dev_addr, uint8_t reg_addr, uint8_t *reg_data, uint8_t cnt);
|
||||
static void BME280_delay_msek(uint16_t msek);
|
||||
static int8_t BME280_I2C_bus_read(uint8_t dev_addr, uint8_t reg_addr, uint8_t *reg_data, uint8_t cnt);
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,23 +0,0 @@
|
||||
%module javaupm_bme280
|
||||
%include "../upm.i"
|
||||
%include "arrays_java.i";
|
||||
%include "../java_buffer.i"
|
||||
%include "cpointer.i"
|
||||
%include "typemaps.i"
|
||||
|
||||
%{
|
||||
#include "bme280.hpp"
|
||||
%}
|
||||
|
||||
%include "bme280.hpp"
|
||||
|
||||
%pragma(java) jniclasscode=%{
|
||||
static {
|
||||
try {
|
||||
System.loadLibrary("javaupm_bme280");
|
||||
} catch (UnsatisfiedLinkError e) {
|
||||
System.err.println("Native code library failed to load. \n" + e);
|
||||
System.exit(1);
|
||||
}
|
||||
}
|
||||
%}
|
||||
@ -1,8 +0,0 @@
|
||||
%module jsupm_bme280
|
||||
%include "../upm.i"
|
||||
|
||||
%{
|
||||
#include "bme280.hpp"
|
||||
%}
|
||||
|
||||
%include "bme280.hpp"
|
||||
@ -1,10 +0,0 @@
|
||||
%module pyupm_bme280
|
||||
%include "../upm.i"
|
||||
|
||||
%include "stdint.i"
|
||||
|
||||
%include "bme280.hpp"
|
||||
%{
|
||||
#include "bme280.hpp"
|
||||
%}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user