mirror of
https://github.com/eclipse/upm.git
synced 2025-03-15 04:57:30 +03:00
bmp180/bmpx0x: Remove old bmp180 driver
This commit removes the old bmp180 driver that was erroneously re-added when the interface examples and headers were introduced. It then switches the users of bmp180 to the existing bmpx8x driver, which already supports the bmp180. 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
cf74a260a3
commit
dd2bca97b9
@ -285,9 +285,9 @@ add_custom_example (ak8975-example ak8975.cxx mpu9150)
|
|||||||
add_custom_example (mpu9250-example mpu9250.cxx mpu9150)
|
add_custom_example (mpu9250-example mpu9250.cxx mpu9150)
|
||||||
add_custom_example (groveledbar-example groveledbar.cxx my9221)
|
add_custom_example (groveledbar-example groveledbar.cxx my9221)
|
||||||
add_custom_example (grovecircularled-example grovecircularled.cxx my9221)
|
add_custom_example (grovecircularled-example grovecircularled.cxx my9221)
|
||||||
add_custom_example (temperature-sensor-example temperature-sensor.cxx "si7005;bmp180;bme280")
|
add_custom_example (temperature-sensor-example temperature-sensor.cxx "si7005;bmpx8x;bme280")
|
||||||
add_custom_example (humidity-sensor-example humidity-sensor.cxx "si7005;bme280")
|
add_custom_example (humidity-sensor-example humidity-sensor.cxx "si7005;bme280")
|
||||||
add_custom_example (pressure-sensor-example pressure-sensor.cxx "bmp180;bme280")
|
add_custom_example (pressure-sensor-example pressure-sensor.cxx "bmpx8x;bme280")
|
||||||
add_custom_example (co2-sensor-example co2-sensor.cxx "t6713")
|
add_custom_example (co2-sensor-example co2-sensor.cxx "t6713")
|
||||||
add_custom_example (adc-example adc-sensor.cxx "ads1x15")
|
add_custom_example (adc-example adc-sensor.cxx "ads1x15")
|
||||||
add_custom_example (light-sensor-example light-sensor.cxx "si1132;max44009")
|
add_custom_example (light-sensor-example light-sensor.cxx "si1132;max44009")
|
||||||
|
|||||||
@ -24,7 +24,7 @@
|
|||||||
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include "bmp180.hpp"
|
#include "bmpx8x.hpp"
|
||||||
#include "bme280.hpp"
|
#include "bme280.hpp"
|
||||||
|
|
||||||
|
|
||||||
@ -49,10 +49,10 @@ upm::IPressureSensor* getPressureSensor()
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
pressureSensor = new upm::BMP180(EDISON_I2C_BUS);
|
pressureSensor = new upm::BMPX8X(EDISON_I2C_BUS);
|
||||||
return pressureSensor;
|
return pressureSensor;
|
||||||
} catch (std::exception& e) {
|
} catch (std::exception& e) {
|
||||||
std::cerr << "BMP180: " << e.what() << std::endl;
|
std::cerr << "BMPX8X: " << e.what() << std::endl;
|
||||||
}
|
}
|
||||||
return pressureSensor;
|
return pressureSensor;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -25,7 +25,7 @@
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include "si7005.hpp"
|
#include "si7005.hpp"
|
||||||
#include "bmp180.hpp"
|
#include "bmpx8x.hpp"
|
||||||
#include "bme280.hpp"
|
#include "bme280.hpp"
|
||||||
|
|
||||||
#define EDISON_I2C_BUS 1
|
#define EDISON_I2C_BUS 1
|
||||||
@ -58,10 +58,10 @@ upm::ITemperatureSensor* getTemperatureSensor()
|
|||||||
std::cerr << "SI7005: " << e.what() << std::endl;
|
std::cerr << "SI7005: " << e.what() << std::endl;
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
temperatureSensor = new upm::BMP180(EDISON_I2C_BUS);
|
temperatureSensor = new upm::BMPX8X(EDISON_I2C_BUS);
|
||||||
return temperatureSensor;
|
return temperatureSensor;
|
||||||
} catch (std::exception& e) {
|
} catch (std::exception& e) {
|
||||||
std::cerr << "BMP180: " << e.what() << std::endl;
|
std::cerr << "BMPX8X: " << e.what() << std::endl;
|
||||||
}
|
}
|
||||||
return temperatureSensor;
|
return temperatureSensor;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +0,0 @@
|
|||||||
include_directories(..)
|
|
||||||
set (libname "bmp180")
|
|
||||||
set (libdescription "upm BMP180")
|
|
||||||
set (module_src ${libname}.cxx)
|
|
||||||
set (module_hpp ${libname}.hpp)
|
|
||||||
upm_module_init()
|
|
||||||
@ -1,286 +0,0 @@
|
|||||||
/*
|
|
||||||
* Author: Yevgeniy Kiveisha <yevgeniy.kiveisha@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 "bmp180.hpp"
|
|
||||||
|
|
||||||
/* CALIBRATION */
|
|
||||||
#define BMP180_PROM_START_ADDR (0xAA)
|
|
||||||
#define BMP180_PROM_DATA_LEN (22)
|
|
||||||
|
|
||||||
#define BMP180_CALIB_DATA_SIZE (22)
|
|
||||||
#define BMP180_CALIB_PARAM_AC1_MSB (0)
|
|
||||||
#define BMP180_CALIB_PARAM_AC1_LSB (1)
|
|
||||||
#define BMP180_CALIB_PARAM_AC2_MSB (2)
|
|
||||||
#define BMP180_CALIB_PARAM_AC2_LSB (3)
|
|
||||||
#define BMP180_CALIB_PARAM_AC3_MSB (4)
|
|
||||||
#define BMP180_CALIB_PARAM_AC3_LSB (5)
|
|
||||||
#define BMP180_CALIB_PARAM_AC4_MSB (6)
|
|
||||||
#define BMP180_CALIB_PARAM_AC4_LSB (7)
|
|
||||||
#define BMP180_CALIB_PARAM_AC5_MSB (8)
|
|
||||||
#define BMP180_CALIB_PARAM_AC5_LSB (9)
|
|
||||||
#define BMP180_CALIB_PARAM_AC6_MSB (10)
|
|
||||||
#define BMP180_CALIB_PARAM_AC6_LSB (11)
|
|
||||||
#define BMP180_CALIB_PARAM_B1_MSB (12)
|
|
||||||
#define BMP180_CALIB_PARAM_B1_LSB (13)
|
|
||||||
#define BMP180_CALIB_PARAM_B2_MSB (14)
|
|
||||||
#define BMP180_CALIB_PARAM_B2_LSB (15)
|
|
||||||
#define BMP180_CALIB_PARAM_MB_MSB (16)
|
|
||||||
#define BMP180_CALIB_PARAM_MB_LSB (17)
|
|
||||||
#define BMP180_CALIB_PARAM_MC_MSB (18)
|
|
||||||
#define BMP180_CALIB_PARAM_MC_LSB (19)
|
|
||||||
#define BMP180_CALIB_PARAM_MD_MSB (20)
|
|
||||||
#define BMP180_CALIB_PARAM_MD_LSB (21)
|
|
||||||
|
|
||||||
/* REGISTERS */
|
|
||||||
#define BMP180_TEMPERATURE_DATA_LENGTH ((uint8_t)2)
|
|
||||||
#define BMP180_PRESSURE_DATA_LENGTH ((uint8_t)3)
|
|
||||||
|
|
||||||
#define BMP180_CHIP_ID_REG (0xD0)
|
|
||||||
#define BMP180_VERSION_REG (0xD1)
|
|
||||||
|
|
||||||
#define BMP180_CTRL_MEAS_REG (0xF4)
|
|
||||||
#define BMP180_ADC_OUT_MSB_REG (0xF6)
|
|
||||||
#define BMP180_ADC_OUT_LSB_REG (0xF7)
|
|
||||||
|
|
||||||
#define BMP180_SOFT_RESET_REG (0xE0)
|
|
||||||
|
|
||||||
/* temperature measurement */
|
|
||||||
#define BMP180_T_MEASURE (0x2E)
|
|
||||||
|
|
||||||
/* pressure measurement*/
|
|
||||||
#define BMP180_P_MEASURE (0x34)
|
|
||||||
|
|
||||||
#define BMP180_TEMPERATURE_DATA_BYTES (2)
|
|
||||||
#define BMP180_PRESSURE_DATA_BYTES (3)
|
|
||||||
#define BMP180_TEMPERATURE_LSB_DATA (1)
|
|
||||||
#define BMP180_TEMPERATURE_MSB_DATA (0)
|
|
||||||
#define BMP180_PRESSURE_MSB_DATA (0)
|
|
||||||
#define BMP180_PRESSURE_LSB_DATA (1)
|
|
||||||
#define BMP180_PRESSURE_XLSB_DATA (2)
|
|
||||||
|
|
||||||
#define BMP180_PARAM_MG (3038)
|
|
||||||
#define BMP180_PARAM_MH (-7357)
|
|
||||||
#define BMP180_PARAM_MI (3791)
|
|
||||||
|
|
||||||
/* ID */
|
|
||||||
#define BMP180_ID (0x55)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
using namespace upm;
|
|
||||||
|
|
||||||
BMP180::BMP180 (int bus, int devAddr, uint8_t mode) {
|
|
||||||
m_name = "BMP180";
|
|
||||||
m_controlAddr = devAddr;
|
|
||||||
m_bus = bus;
|
|
||||||
|
|
||||||
m_i2c = new mraa::I2c(m_bus);
|
|
||||||
|
|
||||||
// Set mode
|
|
||||||
if (mode > BMP180_ULTRAHIGHRES) {
|
|
||||||
mode = BMP180_ULTRAHIGHRES;
|
|
||||||
}
|
|
||||||
oversampling = mode;
|
|
||||||
|
|
||||||
// Check this is a BMP180 chip and get calibration data
|
|
||||||
if (!isAvailable() || !getCalibrationData())
|
|
||||||
UPM_THROW("Init failed");
|
|
||||||
|
|
||||||
getTemperatureCelcius();
|
|
||||||
}
|
|
||||||
|
|
||||||
BMP180::~BMP180() {
|
|
||||||
delete m_i2c;
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
|
||||||
BMP180::getPressurePa () {
|
|
||||||
int pressure;
|
|
||||||
int32_t x1, x2, x3, b3, b6, value;
|
|
||||||
uint32_t b4, b7;
|
|
||||||
uint32_t raw_pressure = getPressureRaw();
|
|
||||||
|
|
||||||
/*****calculate B6************/
|
|
||||||
b6 = b5 - 4000;
|
|
||||||
|
|
||||||
/*****calculate B3************/
|
|
||||||
x1 = (b6 * b6) >> 12;
|
|
||||||
x1 *= b2;
|
|
||||||
x1 >>= 11;
|
|
||||||
|
|
||||||
x2 = (ac2 * b6);
|
|
||||||
x2 >>= 11;
|
|
||||||
|
|
||||||
x3 = x1 + x2;
|
|
||||||
b3 = (((((int32_t) ac1) * 4 + x3) << oversampling) + 2) >> 2;
|
|
||||||
|
|
||||||
/*****calculate B4************/
|
|
||||||
x1 = (ac3 * b6) >> 13;
|
|
||||||
x2 = (b1 * ((b6 * b6) >> 12)) >> 16;
|
|
||||||
x3 = ((x1 + x2) + 2) >> 2;
|
|
||||||
b4 = (ac4 * (uint32_t)(x3 + 32768)) >> 15;
|
|
||||||
b7 = ((uint32_t)(raw_pressure - b3) * (50000 >> oversampling));
|
|
||||||
|
|
||||||
if (b4 == 0)
|
|
||||||
UPM_THROW("b4 == 0");
|
|
||||||
|
|
||||||
if (b7 < 0x80000000)
|
|
||||||
pressure = (b7 << 1) / b4;
|
|
||||||
else
|
|
||||||
pressure = (b7 / b4) << 1;
|
|
||||||
|
|
||||||
x1 = pressure >> 8;
|
|
||||||
x1 *= x1;
|
|
||||||
x1 = (x1 * BMP180_PARAM_MG) >> 16;
|
|
||||||
x2 = (pressure * BMP180_PARAM_MH) >> 16;
|
|
||||||
|
|
||||||
/*pressure in Pa*/
|
|
||||||
pressure += (x1 + x2 + BMP180_PARAM_MI) >> 4;
|
|
||||||
return pressure;
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
|
||||||
BMP180::getTemperatureCelcius () {
|
|
||||||
uint32_t temp;
|
|
||||||
int32_t x1, x2;
|
|
||||||
|
|
||||||
temp = (uint32_t) getTemperatureRaw();
|
|
||||||
|
|
||||||
/* calculate temperature*/
|
|
||||||
x1 = (((int32_t) temp - (int32_t) ac6) * (int32_t) ac5) >> 15;
|
|
||||||
|
|
||||||
// Check divisor
|
|
||||||
if (x1 == 0 && md == 0)
|
|
||||||
UPM_THROW("x1 == 0 && md == 0");
|
|
||||||
|
|
||||||
x2 = ((int32_t) mc << 11) / (x1 + md);
|
|
||||||
b5 = x1 + x2;
|
|
||||||
|
|
||||||
int value = ((b5 + 8) >> 4);
|
|
||||||
return (value + 5) / 10;
|
|
||||||
}
|
|
||||||
|
|
||||||
uint32_t
|
|
||||||
BMP180::getPressureRaw () {
|
|
||||||
uint8_t data[BMP180_PRESSURE_DATA_BYTES];
|
|
||||||
|
|
||||||
m_i2c->address(m_controlAddr);
|
|
||||||
status = m_i2c->writeReg(BMP180_CTRL_MEAS_REG, BMP180_P_MEASURE + (oversampling << 6));
|
|
||||||
if (status != mraa::SUCCESS)
|
|
||||||
UPM_THROW("BMP180_CTRL_MEAS_REG write failed");
|
|
||||||
|
|
||||||
if (oversampling == BMP180_ULTRALOWPOWER) {
|
|
||||||
usleep(5000);
|
|
||||||
} else if (oversampling == BMP180_STANDARD) {
|
|
||||||
usleep(8000);
|
|
||||||
} else if (oversampling == BMP180_HIGHRES) {
|
|
||||||
usleep(14000);
|
|
||||||
} else {
|
|
||||||
usleep(26000);
|
|
||||||
}
|
|
||||||
|
|
||||||
int length = m_i2c->readBytesReg(BMP180_ADC_OUT_MSB_REG, data, BMP180_PRESSURE_DATA_LENGTH);
|
|
||||||
if (length != BMP180_PRESSURE_DATA_LENGTH)
|
|
||||||
UPM_THROW("BMP180_ADC_OUT_MSB_REG read failed");
|
|
||||||
|
|
||||||
return (uint32_t)((((uint32_t)data[BMP180_PRESSURE_MSB_DATA] << 16)
|
|
||||||
| ((uint32_t) data[BMP180_PRESSURE_LSB_DATA] << 8)
|
|
||||||
| (uint32_t) data[BMP180_PRESSURE_XLSB_DATA]) >> (8 - oversampling));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
uint16_t
|
|
||||||
BMP180::getTemperatureRaw () {
|
|
||||||
uint8_t data[BMP180_TEMPERATURE_DATA_BYTES];
|
|
||||||
|
|
||||||
m_i2c->address(m_controlAddr);
|
|
||||||
status = m_i2c->writeReg(BMP180_CTRL_MEAS_REG, BMP180_T_MEASURE);
|
|
||||||
if (status != mraa::SUCCESS)
|
|
||||||
UPM_THROW("BMP180_CTRL_MEAS_REG write failed");
|
|
||||||
|
|
||||||
usleep(5000);
|
|
||||||
|
|
||||||
int length = m_i2c->readBytesReg(BMP180_ADC_OUT_MSB_REG, data, BMP180_TEMPERATURE_DATA_LENGTH);
|
|
||||||
if (length != BMP180_TEMPERATURE_DATA_LENGTH)
|
|
||||||
UPM_THROW("BMP180_ADC_OUT_MSB_REG read failed");
|
|
||||||
|
|
||||||
return (uint16_t)((((int32_t)((int8_t)data[BMP180_TEMPERATURE_MSB_DATA])) << 8)
|
|
||||||
| (data[BMP180_TEMPERATURE_LSB_DATA]));
|
|
||||||
}
|
|
||||||
|
|
||||||
bool
|
|
||||||
BMP180::getCalibrationData() {
|
|
||||||
|
|
||||||
// Holds calibration data
|
|
||||||
uint8_t calibration_data[BMP180_CALIB_DATA_SIZE];
|
|
||||||
|
|
||||||
/* Read calibration data */
|
|
||||||
m_i2c->address(m_controlAddr);
|
|
||||||
int length = m_i2c->readBytesReg(BMP180_PROM_START_ADDR, calibration_data, BMP180_PROM_DATA_LEN);
|
|
||||||
|
|
||||||
// Check we read all calibration data
|
|
||||||
if(length != BMP180_PROM_DATA_LEN) { return false; }
|
|
||||||
|
|
||||||
ac1 = (int16_t)(((int32_t)((int8_t)calibration_data[BMP180_CALIB_PARAM_AC1_MSB] << 8))
|
|
||||||
| calibration_data[BMP180_CALIB_PARAM_AC1_LSB]);
|
|
||||||
ac2 = (int16_t)(((int32_t)((int8_t)calibration_data[BMP180_CALIB_PARAM_AC2_MSB] << 8))
|
|
||||||
| calibration_data[BMP180_CALIB_PARAM_AC2_LSB]);
|
|
||||||
ac3 = (int16_t)(((int32_t)((int8_t)calibration_data[BMP180_CALIB_PARAM_AC3_MSB] << 8))
|
|
||||||
| calibration_data[BMP180_CALIB_PARAM_AC3_LSB]);
|
|
||||||
ac4 = (uint16_t)(((uint32_t)((uint8_t)calibration_data[BMP180_CALIB_PARAM_AC4_MSB] << 8))
|
|
||||||
| calibration_data[BMP180_CALIB_PARAM_AC4_LSB]);
|
|
||||||
ac5 = (uint16_t)(((uint32_t)((uint8_t)calibration_data[BMP180_CALIB_PARAM_AC5_MSB] << 8))
|
|
||||||
| calibration_data[BMP180_CALIB_PARAM_AC5_LSB]);
|
|
||||||
ac6 = (uint16_t)(((uint32_t)((uint8_t)calibration_data[BMP180_CALIB_PARAM_AC6_MSB] << 8))
|
|
||||||
| calibration_data[BMP180_CALIB_PARAM_AC6_LSB]);
|
|
||||||
|
|
||||||
b1 = (int16_t)(((int32_t)((int8_t)calibration_data[BMP180_CALIB_PARAM_B1_MSB] << 8))
|
|
||||||
| calibration_data[BMP180_CALIB_PARAM_B1_LSB]);
|
|
||||||
b2 = (int16_t)(((int32_t)((int8_t)calibration_data[BMP180_CALIB_PARAM_B2_MSB] << 8))
|
|
||||||
| calibration_data[BMP180_CALIB_PARAM_B2_LSB]);
|
|
||||||
|
|
||||||
mb = (int16_t)(((int32_t)((int8_t)calibration_data[BMP180_CALIB_PARAM_MB_MSB] << 8))
|
|
||||||
| calibration_data[BMP180_CALIB_PARAM_MB_LSB]);
|
|
||||||
mc = (int16_t)(((int32_t)((int8_t)calibration_data[BMP180_CALIB_PARAM_MC_MSB] << 8))
|
|
||||||
| calibration_data[BMP180_CALIB_PARAM_MC_LSB]);
|
|
||||||
md = (int16_t)(((int32_t)((int8_t)calibration_data[BMP180_CALIB_PARAM_MD_MSB] << 8))
|
|
||||||
| calibration_data[BMP180_CALIB_PARAM_MD_LSB]);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool
|
|
||||||
BMP180::isAvailable() {
|
|
||||||
m_i2c->address(m_controlAddr);
|
|
||||||
if (m_i2c->readReg(BMP180_CHIP_ID_REG) != BMP180_ID) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,126 +0,0 @@
|
|||||||
/*
|
|
||||||
* Author: Yevgeniy Kiveisha <yevgeniy.kiveisha@intel.com>
|
|
||||||
* Contributions: Jon Trulson <jtrulson@ics.com>
|
|
||||||
* Copyright (c) 2014 Intel Corporation.
|
|
||||||
*
|
|
||||||
* Credits to Adafruit.
|
|
||||||
* Based on Adafruit BMP180 library.
|
|
||||||
*
|
|
||||||
* 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.
|
|
||||||
*/
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <string>
|
|
||||||
#include <mraa/i2c.hpp>
|
|
||||||
#include "upm/iPressureSensor.hpp"
|
|
||||||
#include "upm/iTemperatureSensor.hpp"
|
|
||||||
|
|
||||||
#define BMP180_ADDR 0x77 // device address
|
|
||||||
|
|
||||||
/* MODES */
|
|
||||||
#define BMP180_ULTRALOWPOWER 0
|
|
||||||
#define BMP180_STANDARD 1
|
|
||||||
#define BMP180_HIGHRES 2
|
|
||||||
#define BMP180_ULTRAHIGHRES 3
|
|
||||||
|
|
||||||
|
|
||||||
namespace upm {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief BPM180 atmospheric pressure sensor library
|
|
||||||
* @defgroup BMP180 libupm-BMP180
|
|
||||||
* @ingroup bosch seeed adafruit sparkfun i2c pressure ipressuresensor
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief API for Bosch BMP180 Pressure Sensor
|
|
||||||
*
|
|
||||||
* The Bosch BMP180 is a high precision, ultra-low
|
|
||||||
* power consumption pressure sensor. It has a range of between
|
|
||||||
* 30,000 and 110,000 Pa.
|
|
||||||
*
|
|
||||||
* @library BMP180
|
|
||||||
* @sensor BMP180
|
|
||||||
* @comname Bosch BMP Atmospheric Pressure Sensor
|
|
||||||
* @altname BMP180
|
|
||||||
* @type pressure
|
|
||||||
* @man bosch adafruit sparkfun
|
|
||||||
* @con i2c
|
|
||||||
* @if ipressuresensor
|
|
||||||
*
|
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
class BMP180 : public IPressureSensor, public ITemperatureSensor {
|
|
||||||
public:
|
|
||||||
/**
|
|
||||||
* Instanciates a BMP180 object
|
|
||||||
*
|
|
||||||
* @param bus number of used bus
|
|
||||||
* @param devAddr address of used i2c device
|
|
||||||
* @param mode BMP180 mode
|
|
||||||
*/
|
|
||||||
BMP180 (int bus, int devAddr=BMP180_ADDR, uint8_t mode=BMP180_ULTRAHIGHRES);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* BMP180 object destructor, basicaly it close i2c connection.
|
|
||||||
*/
|
|
||||||
~BMP180 ();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Return pressure
|
|
||||||
*/
|
|
||||||
uint32_t getPressureRaw();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Return calculated pressure (Pa)
|
|
||||||
*/
|
|
||||||
int getPressurePa();
|
|
||||||
|
|
||||||
uint16_t getTemperatureRaw();
|
|
||||||
/**
|
|
||||||
* Return latest calculated temperature value in Celcius
|
|
||||||
*/
|
|
||||||
int getTemperatureCelcius();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns whether the correct chip is present at the given address.
|
|
||||||
*/
|
|
||||||
bool isAvailable();
|
|
||||||
const char* getModuleName() { return m_name.c_str(); }
|
|
||||||
|
|
||||||
private:
|
|
||||||
std::string m_name;
|
|
||||||
|
|
||||||
int m_controlAddr;
|
|
||||||
int m_bus;
|
|
||||||
mraa::I2c* m_i2c;
|
|
||||||
mraa::Result status;
|
|
||||||
|
|
||||||
uint8_t oversampling;
|
|
||||||
int16_t ac1, ac2, ac3, b1, b2, mb, mc, md;
|
|
||||||
uint16_t ac4, ac5, ac6;
|
|
||||||
|
|
||||||
int32_t b5;
|
|
||||||
|
|
||||||
bool getCalibrationData();
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
%module javaupm_bmp180
|
|
||||||
%include "../upm.i"
|
|
||||||
%include "arrays_java.i";
|
|
||||||
%include "../java_buffer.i"
|
|
||||||
%include "cpointer.i"
|
|
||||||
%include "typemaps.i"
|
|
||||||
|
|
||||||
%{
|
|
||||||
#include "bmp180.hpp"
|
|
||||||
%}
|
|
||||||
|
|
||||||
%include "bmp180.hpp"
|
|
||||||
|
|
||||||
%pragma(java) jniclasscode=%{
|
|
||||||
static {
|
|
||||||
try {
|
|
||||||
System.loadLibrary("javaupm_bmp180");
|
|
||||||
} catch (UnsatisfiedLinkError e) {
|
|
||||||
System.err.println("Native code library failed to load. \n" + e);
|
|
||||||
System.exit(1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
%}
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
%module jsupm_bmp180
|
|
||||||
%include "../upm.i"
|
|
||||||
|
|
||||||
%{
|
|
||||||
#include "bmp180.hpp"
|
|
||||||
%}
|
|
||||||
|
|
||||||
%include "bmp180.hpp"
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
%module pyupm_bmp180
|
|
||||||
%include "../upm.i"
|
|
||||||
|
|
||||||
%include "stdint.i"
|
|
||||||
|
|
||||||
%include "bmp180.hpp"
|
|
||||||
%{
|
|
||||||
#include "bmp180.hpp"
|
|
||||||
%}
|
|
||||||
|
|
||||||
@ -30,6 +30,7 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <mraa/i2c.hpp>
|
#include <mraa/i2c.hpp>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
#include "upm/iPressureSensor.hpp"
|
||||||
#include "upm/iTemperatureSensor.hpp"
|
#include "upm/iTemperatureSensor.hpp"
|
||||||
|
|
||||||
#define ADDR 0x77 // device address
|
#define ADDR 0x77 // device address
|
||||||
@ -89,7 +90,7 @@ namespace upm {
|
|||||||
* @snippet bmpx8x.cxx Interesting
|
* @snippet bmpx8x.cxx Interesting
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class BMPX8X : public ITemperatureSensor {
|
class BMPX8X : public IPressureSensor, public ITemperatureSensor {
|
||||||
public:
|
public:
|
||||||
/**
|
/**
|
||||||
* Instantiates a BMPX8X object
|
* Instantiates a BMPX8X object
|
||||||
@ -149,7 +150,14 @@ class BMPX8X : public ITemperatureSensor {
|
|||||||
int getTemperatureCelcius();
|
int getTemperatureCelcius();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns name of module. This is the string in library name after libupm_
|
* Return latest calculated pressure value in Pascals
|
||||||
|
* See IPressureSensor
|
||||||
|
*/
|
||||||
|
int getPressurePa() { return getPressure(); };
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns name of module. This is the string in library name
|
||||||
|
* after libupm_
|
||||||
|
|
||||||
* @return name of module
|
* @return name of module
|
||||||
*/
|
*/
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user