mirror of
https://github.com/eclipse/upm.git
synced 2025-07-01 09:21:12 +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:
@ -285,9 +285,9 @@ add_custom_example (ak8975-example ak8975.cxx mpu9150)
|
||||
add_custom_example (mpu9250-example mpu9250.cxx mpu9150)
|
||||
add_custom_example (groveledbar-example groveledbar.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 (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 (adc-example adc-sensor.cxx "ads1x15")
|
||||
add_custom_example (light-sensor-example light-sensor.cxx "si1132;max44009")
|
||||
|
@ -24,7 +24,7 @@
|
||||
|
||||
#include <unistd.h>
|
||||
#include <iostream>
|
||||
#include "bmp180.hpp"
|
||||
#include "bmpx8x.hpp"
|
||||
#include "bme280.hpp"
|
||||
|
||||
|
||||
@ -49,10 +49,10 @@ upm::IPressureSensor* getPressureSensor()
|
||||
}
|
||||
|
||||
try {
|
||||
pressureSensor = new upm::BMP180(EDISON_I2C_BUS);
|
||||
pressureSensor = new upm::BMPX8X(EDISON_I2C_BUS);
|
||||
return pressureSensor;
|
||||
} catch (std::exception& e) {
|
||||
std::cerr << "BMP180: " << e.what() << std::endl;
|
||||
std::cerr << "BMPX8X: " << e.what() << std::endl;
|
||||
}
|
||||
return pressureSensor;
|
||||
}
|
||||
|
@ -25,7 +25,7 @@
|
||||
#include <unistd.h>
|
||||
#include <iostream>
|
||||
#include "si7005.hpp"
|
||||
#include "bmp180.hpp"
|
||||
#include "bmpx8x.hpp"
|
||||
#include "bme280.hpp"
|
||||
|
||||
#define EDISON_I2C_BUS 1
|
||||
@ -58,10 +58,10 @@ upm::ITemperatureSensor* getTemperatureSensor()
|
||||
std::cerr << "SI7005: " << e.what() << std::endl;
|
||||
}
|
||||
try {
|
||||
temperatureSensor = new upm::BMP180(EDISON_I2C_BUS);
|
||||
temperatureSensor = new upm::BMPX8X(EDISON_I2C_BUS);
|
||||
return temperatureSensor;
|
||||
} catch (std::exception& e) {
|
||||
std::cerr << "BMP180: " << e.what() << std::endl;
|
||||
std::cerr << "BMPX8X: " << e.what() << std::endl;
|
||||
}
|
||||
return temperatureSensor;
|
||||
}
|
||||
|
Reference in New Issue
Block a user