Merge pull request #3347 from thoherr/add-bmp085_180-sensor

add BMP085 (and BMP180) sensor (temperature and air pressure)

platformio.ini

@@ -116,6 +116,7 @@ lib_deps =
   adafruit/Adafruit BusIO@^1.11.4
   adafruit/Adafruit Unified Sensor@^1.1.11
   adafruit/Adafruit BMP280 Library@^2.6.8
+  adafruit/Adafruit BMP085 Library@^1.2.4
   adafruit/Adafruit BME280 Library@^2.2.2
   https://github.com/boschsensortec/Bosch-BSEC2-Library#v1.5.2400
   boschsensortec/BME68x Sensor Library@^1.1.40407

src/detect/ScanI2C.h

@@ -23,6 +23,7 @@ class ScanI2C
         BME_680,
         BME_280,
         BMP_280,
+        BMP_085,
         INA260,
         INA219,
         INA3221,

src/detect/ScanI2CTwoWire.cpp

@@ -242,6 +242,10 @@ void ScanI2CTwoWire::scanPort(I2CPort port)
                     LOG_INFO("BME-280 sensor found at address 0x%x\n", (uint8_t)addr.address);
                     type = BME_280;
                     break;
+                case 0x55:
+                    LOG_INFO("BMP-085 or BMP-180 sensor found at address 0x%x\n", (uint8_t)addr.address);
+                    type = BMP_085;
+                    break;
                 default:
                     LOG_INFO("BMP-280 sensor found at address 0x%x\n", (uint8_t)addr.address);
                     type = BMP_280;

src/main.cpp

@@ -500,6 +500,7 @@ void setup()
     SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::BME_680, meshtastic_TelemetrySensorType_BME680)
     SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::BME_280, meshtastic_TelemetrySensorType_BME280)
     SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::BMP_280, meshtastic_TelemetrySensorType_BMP280)
+    SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::BMP_085, meshtastic_TelemetrySensorType_BMP085)
     SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::INA260, meshtastic_TelemetrySensorType_INA260)
     SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::INA219, meshtastic_TelemetrySensorType_INA219)
     SCANNER_TO_SENSORS_MAP(ScanI2C::DeviceType::INA3221, meshtastic_TelemetrySensorType_INA3221)

src/modules/Telemetry/EnvironmentTelemetry.cpp

@@ -16,12 +16,14 @@
 // Sensors
 #include "Sensor/BME280Sensor.h"
 #include "Sensor/BME680Sensor.h"
+#include "Sensor/BMP085Sensor.h"
 #include "Sensor/BMP280Sensor.h"
 #include "Sensor/LPS22HBSensor.h"
 #include "Sensor/MCP9808Sensor.h"
 #include "Sensor/SHT31Sensor.h"
 #include "Sensor/SHTC3Sensor.h"
 
+BMP085Sensor bmp085Sensor;
 BMP280Sensor bmp280Sensor;
 BME280Sensor bme280Sensor;
 BME680Sensor bme680Sensor;
@@ -67,6 +69,8 @@ int32_t EnvironmentTelemetryModule::runOnce()
             LOG_INFO("Environment Telemetry: Initializing\n");
             // it's possible to have this module enabled, only for displaying values on the screen.
             // therefore, we should only enable the sensor loop if measurement is also enabled
+            if (bmp085Sensor.hasSensor())
+                result = bmp085Sensor.runOnce();
             if (bmp280Sensor.hasSensor())
                 result = bmp280Sensor.runOnce();
             if (bme280Sensor.hasSensor())
@@ -219,6 +223,8 @@ bool EnvironmentTelemetryModule::sendTelemetry(NodeNum dest, bool phoneOnly)
         valid = lps22hbSensor.getMetrics(&m);
     if (shtc3Sensor.hasSensor())
         valid = shtc3Sensor.getMetrics(&m);
+    if (bmp085Sensor.hasSensor())
+        valid = bmp085Sensor.getMetrics(&m);
     if (bmp280Sensor.hasSensor())
         valid = bmp280Sensor.getMetrics(&m);
     if (bme280Sensor.hasSensor())

src/modules/Telemetry/Sensor/BMP085Sensor.cpp

@@ -0,0 +1,31 @@
+#include "BMP085Sensor.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "TelemetrySensor.h"
+#include "configuration.h"
+#include <Adafruit_BMP085.h>
+#include <typeinfo>
+
+BMP085Sensor::BMP085Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_BMP085, "BMP085") {}
+
+int32_t BMP085Sensor::runOnce()
+{
+    LOG_INFO("Init sensor: %s\n", sensorName);
+    if (!hasSensor()) {
+        return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
+    }
+    bmp085 = Adafruit_BMP085();
+    status = bmp085.begin(nodeTelemetrySensorsMap[sensorType].first, nodeTelemetrySensorsMap[sensorType].second);
+
+    return initI2CSensor();
+}
+
+void BMP085Sensor::setup() {}
+
+bool BMP085Sensor::getMetrics(meshtastic_Telemetry *measurement)
+{
+    LOG_DEBUG("BMP085Sensor::getMetrics\n");
+    measurement->variant.environment_metrics.temperature = bmp085.readTemperature();
+    measurement->variant.environment_metrics.barometric_pressure = bmp085.readPressure() / 100.0F;
+
+    return true;
+}

src/modules/Telemetry/Sensor/BMP085Sensor.h

@@ -0,0 +1,17 @@
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "TelemetrySensor.h"
+#include <Adafruit_BMP085.h>
+
+class BMP085Sensor : public TelemetrySensor
+{
+  private:
+    Adafruit_BMP085 bmp085;
+
+  protected:
+    virtual void setup() override;
+
+  public:
+    BMP085Sensor();
+    virtual int32_t runOnce() override;
+    virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
+};