mirror of
https://github.com/meshtastic/firmware.git
synced 2025-12-21 10:12:50 +00:00
Add support for Bh1750 Light Sensor (#8376)
* regenerate protobuf with bh1750 TelemetrySensorType * Added wollewald/BH1750_WE@^1.1.10 dependecy * Added support for BH1750 during i2C detection * Create new BH1750Sensor and added in EnvironmentTelemetry * clean code * Attempt to fix protobuf include --------- Co-authored-by: Tom Fifield <tom@tomfifield.net>
This commit is contained in:
@@ -181,6 +181,8 @@ lib_deps =
|
|||||||
dfrobot/DFRobot_BMM150@1.0.0
|
dfrobot/DFRobot_BMM150@1.0.0
|
||||||
# renovate: datasource=custom.pio depName=Adafruit_TSL2561 packageName=adafruit/library/Adafruit TSL2561
|
# renovate: datasource=custom.pio depName=Adafruit_TSL2561 packageName=adafruit/library/Adafruit TSL2561
|
||||||
adafruit/Adafruit TSL2561@1.1.2
|
adafruit/Adafruit TSL2561@1.1.2
|
||||||
|
# renovate: datasource=custom.pio depName=BH1750_WE packageName=wollewald/BH1750_WE@^1.1.10
|
||||||
|
wollewald/BH1750_WE@^1.1.10
|
||||||
|
|
||||||
; (not included in native / portduino)
|
; (not included in native / portduino)
|
||||||
[environmental_extra]
|
[environmental_extra]
|
||||||
|
|||||||
@@ -82,7 +82,8 @@ class ScanI2C
|
|||||||
BHI260AP,
|
BHI260AP,
|
||||||
BMM150,
|
BMM150,
|
||||||
TSL2561,
|
TSL2561,
|
||||||
DRV2605
|
DRV2605,
|
||||||
|
BH1750
|
||||||
} DeviceType;
|
} DeviceType;
|
||||||
|
|
||||||
// typedef uint8_t DeviceAddress;
|
// typedef uint8_t DeviceAddress;
|
||||||
|
|||||||
@@ -485,7 +485,25 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
|
|||||||
SCAN_SIMPLE_CASE(LTR390UV_ADDR, LTR390UV, "LTR390UV", (uint8_t)addr.address);
|
SCAN_SIMPLE_CASE(LTR390UV_ADDR, LTR390UV, "LTR390UV", (uint8_t)addr.address);
|
||||||
SCAN_SIMPLE_CASE(PCT2075_ADDR, PCT2075, "PCT2075", (uint8_t)addr.address);
|
SCAN_SIMPLE_CASE(PCT2075_ADDR, PCT2075, "PCT2075", (uint8_t)addr.address);
|
||||||
SCAN_SIMPLE_CASE(CST328_ADDR, CST328, "CST328", (uint8_t)addr.address);
|
SCAN_SIMPLE_CASE(CST328_ADDR, CST328, "CST328", (uint8_t)addr.address);
|
||||||
SCAN_SIMPLE_CASE(LTR553ALS_ADDR, LTR553ALS, "LTR553ALS", (uint8_t)addr.address);
|
case LTR553ALS_ADDR:
|
||||||
|
registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x86), 1); // Part ID register
|
||||||
|
if (registerValue == 0x92) { // LTR553ALS Part ID
|
||||||
|
type = LTR553ALS;
|
||||||
|
logFoundDevice("LTR553ALS", (uint8_t)addr.address);
|
||||||
|
} else {
|
||||||
|
// Test BH1750 - send power on command
|
||||||
|
i2cBus->beginTransmission(addr.address);
|
||||||
|
i2cBus->write(0x01); // Power On command
|
||||||
|
uint8_t bh1750_error = i2cBus->endTransmission();
|
||||||
|
if (bh1750_error == 0) {
|
||||||
|
type = BH1750;
|
||||||
|
logFoundDevice("BH1750", (uint8_t)addr.address);
|
||||||
|
} else {
|
||||||
|
LOG_INFO("Device found at address 0x%x was not able to be enumerated", (uint8_t)addr.address);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
SCAN_SIMPLE_CASE(BHI260AP_ADDR, BHI260AP, "BHI260AP", (uint8_t)addr.address);
|
SCAN_SIMPLE_CASE(BHI260AP_ADDR, BHI260AP, "BHI260AP", (uint8_t)addr.address);
|
||||||
SCAN_SIMPLE_CASE(SCD4X_ADDR, SCD4X, "SCD4X", (uint8_t)addr.address);
|
SCAN_SIMPLE_CASE(SCD4X_ADDR, SCD4X, "SCD4X", (uint8_t)addr.address);
|
||||||
SCAN_SIMPLE_CASE(BMM150_ADDR, BMM150, "BMM150", (uint8_t)addr.address);
|
SCAN_SIMPLE_CASE(BMM150_ADDR, BMM150, "BMM150", (uint8_t)addr.address);
|
||||||
|
|||||||
@@ -134,6 +134,10 @@ extern void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y, const c
|
|||||||
#include "Sensor/TSL2561Sensor.h"
|
#include "Sensor/TSL2561Sensor.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if __has_include(<BH1750_WE.h>)
|
||||||
|
#include "Sensor/BH1750Sensor.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#define FAILED_STATE_SENSOR_READ_MULTIPLIER 10
|
#define FAILED_STATE_SENSOR_READ_MULTIPLIER 10
|
||||||
#define DISPLAY_RECEIVEID_MEASUREMENTS_ON_SCREEN true
|
#define DISPLAY_RECEIVEID_MEASUREMENTS_ON_SCREEN true
|
||||||
|
|
||||||
@@ -262,6 +266,9 @@ void EnvironmentTelemetryModule::i2cScanFinished(ScanI2C *i2cScanner)
|
|||||||
#if __has_include(<SparkFun_Qwiic_Scale_NAU7802_Arduino_Library.h>)
|
#if __has_include(<SparkFun_Qwiic_Scale_NAU7802_Arduino_Library.h>)
|
||||||
addSensor<NAU7802Sensor>(i2cScanner, ScanI2C::DeviceType::NAU7802);
|
addSensor<NAU7802Sensor>(i2cScanner, ScanI2C::DeviceType::NAU7802);
|
||||||
#endif
|
#endif
|
||||||
|
#if __has_include(<BH1750_WE.h>)
|
||||||
|
addSensor<BH1750Sensor>(i2cScanner, ScanI2C::DeviceType::BH1750);
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|||||||
54
src/modules/Telemetry/Sensor/BH1750Sensor.cpp
Normal file
54
src/modules/Telemetry/Sensor/BH1750Sensor.cpp
Normal file
@@ -0,0 +1,54 @@
|
|||||||
|
#include "configuration.h"
|
||||||
|
|
||||||
|
#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<BH1750_WE.h>)
|
||||||
|
|
||||||
|
#include "../mesh/generated/meshtastic/telemetry.pb.h"
|
||||||
|
#include "BH1750Sensor.h"
|
||||||
|
#include "TelemetrySensor.h"
|
||||||
|
#include <BH1750_WE.h>
|
||||||
|
|
||||||
|
#ifndef BH1750_SENSOR_MODE
|
||||||
|
#define BH1750_SENSOR_MODE BH1750Mode::CHM
|
||||||
|
#endif
|
||||||
|
|
||||||
|
BH1750Sensor::BH1750Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_BH1750, "BH1750") {}
|
||||||
|
|
||||||
|
bool BH1750Sensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
|
||||||
|
{
|
||||||
|
LOG_INFO("Init sensor: %s with mode %d", sensorName, BH1750_SENSOR_MODE);
|
||||||
|
|
||||||
|
bh1750 = BH1750_WE(bus, dev->address.address);
|
||||||
|
status = bh1750.init();
|
||||||
|
if (!status) {
|
||||||
|
return status;
|
||||||
|
}
|
||||||
|
|
||||||
|
bh1750.setMode(BH1750_SENSOR_MODE);
|
||||||
|
|
||||||
|
initI2CSensor();
|
||||||
|
return status;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool BH1750Sensor::getMetrics(meshtastic_Telemetry *measurement)
|
||||||
|
{
|
||||||
|
|
||||||
|
/* An OTH and OTH_2 measurement takes ~120 ms. I suggest to wait
|
||||||
|
140 ms to be on the safe side.
|
||||||
|
An OTL measurement takes about 16 ms. I suggest to wait 20 ms
|
||||||
|
to be on the safe side. */
|
||||||
|
if (BH1750_SENSOR_MODE == BH1750Mode::OTH || BH1750_SENSOR_MODE == BH1750Mode::OTH_2) {
|
||||||
|
bh1750.setMode(BH1750_SENSOR_MODE);
|
||||||
|
delay(140); // wait for measurement to be completed
|
||||||
|
} else if (BH1750_SENSOR_MODE == BH1750Mode::OTL) {
|
||||||
|
bh1750.setMode(BH1750_SENSOR_MODE);
|
||||||
|
delay(20);
|
||||||
|
}
|
||||||
|
|
||||||
|
measurement->variant.environment_metrics.has_lux = true;
|
||||||
|
float lightIntensity = bh1750.getLux();
|
||||||
|
|
||||||
|
measurement->variant.environment_metrics.lux = lightIntensity;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
21
src/modules/Telemetry/Sensor/BH1750Sensor.h
Normal file
21
src/modules/Telemetry/Sensor/BH1750Sensor.h
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
#pragma once
|
||||||
|
#include "configuration.h"
|
||||||
|
|
||||||
|
#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<BH1750_WE.h>)
|
||||||
|
|
||||||
|
#include "../mesh/generated/meshtastic/telemetry.pb.h"
|
||||||
|
#include "TelemetrySensor.h"
|
||||||
|
#include <BH1750_WE.h>
|
||||||
|
|
||||||
|
class BH1750Sensor : public TelemetrySensor
|
||||||
|
{
|
||||||
|
private:
|
||||||
|
BH1750_WE bh1750;
|
||||||
|
|
||||||
|
public:
|
||||||
|
BH1750Sensor();
|
||||||
|
virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
|
||||||
|
virtual bool initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev) override;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif
|
||||||
Reference in New Issue
Block a user