Michel2/BH1750
1
0
Fork 0
mirror of https://github.com/claws/BH1750.git synced 2026-07-28 04:06:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33 from claws/fixes

Browse Source 
fix regression
This commit is contained in:
claws
2018-01-05 10:38:10 +00:00
committed by GitHub
parent b54c1d76e9 107f06631e
commit ec0695b267
4 changed files with 50 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BH1750.cpp
+25 -26
View File
@@ -53,7 +53,6 @@
BH1750::BH1750(byte addr) {
BH1750_I2CADDR = addr;
BH1750_CONFIGURED = false;
}
@@ -62,7 +61,7 @@ BH1750::BH1750(byte addr) {
* Configure sensor
* @param mode Measurement mode
*/
bool BH1750::begin(uint8_t mode) {
bool BH1750::begin(Mode mode) {
// I2C is expected to be initialized outside this library
@@ -76,9 +75,7 @@ bool BH1750::begin(uint8_t mode) {
* Configure BH1750 with specified mode
* @param mode Measurement mode
*/
bool BH1750::configure(uint8_t mode) {
BH1750_CONFIGURED = false;
bool BH1750::configure(Mode mode) {
// default transmission result to a value out of normal range
byte ack = 5;
@@ -86,12 +83,12 @@ bool BH1750::configure(uint8_t mode) {
// Check measurement mode is valid
switch (mode) {
case BH1750_CONTINUOUS_HIGH_RES_MODE:
case BH1750_CONTINUOUS_HIGH_RES_MODE_2:
case BH1750_CONTINUOUS_LOW_RES_MODE:
case BH1750_ONE_TIME_HIGH_RES_MODE:
case BH1750_ONE_TIME_HIGH_RES_MODE_2:
case BH1750_ONE_TIME_LOW_RES_MODE:
case BH1750::CONTINUOUS_HIGH_RES_MODE:
case BH1750::CONTINUOUS_HIGH_RES_MODE_2:
case BH1750::CONTINUOUS_LOW_RES_MODE:
case BH1750::ONE_TIME_HIGH_RES_MODE:
case BH1750::ONE_TIME_HIGH_RES_MODE_2:
case BH1750::ONE_TIME_LOW_RES_MODE:
// Send mode to sensor
Wire.beginTransmission(BH1750_I2CADDR);
@@ -106,7 +103,7 @@ bool BH1750::configure(uint8_t mode) {
// Invalid measurement mode
#ifdef BH1750_DEBUG
Serial.println(F("[BH1750] ERROR: Invalid measurement mode"));
Serial.println(F("[BH1750] ERROR: Invalid BH1750 mode"));
#endif
break;
@@ -117,7 +114,7 @@ bool BH1750::configure(uint8_t mode) {
switch (ack) {
case 0:
BH1750_MODE = mode;
BH1750_CONFIGURED = true;
return true;
case 1: // too long for transmit buffer
#ifdef BH1750_DEBUG
Serial.println(F("[BH1750] ERROR: too long for transmit buffer"));
@@ -138,7 +135,7 @@ bool BH1750::configure(uint8_t mode) {
break;
}
return BH1750_CONFIGURED;
return false;
}
@@ -149,13 +146,13 @@ bool BH1750::configure(uint8_t mode) {
*/
uint16_t BH1750::readLightLevel(bool maxWait) {
if (!BH1750_CONFIGURED) {
if (BH1750_MODE == UNCONFIGURED) {
Serial.println(F("[BH1750] Device is not configured!"));
return 0;
}
// Measurement result will be stored here
uint16_t level;
uint16_t level(NAN);
// Send mode to sensor
Wire.beginTransmission(BH1750_I2CADDR);
@@ -169,20 +166,22 @@ uint16_t BH1750::readLightLevel(bool maxWait) {
// measurement time is used by default and if maxWait is set to True then
// the maximum measurement time will be used. See data sheet pages 2, 5
// and 7 for more details.
// A continuous mode measurement can be read immediately after re-sending
// the mode command.
switch (BH1750_MODE) {
case BH1750_CONTINUOUS_LOW_RES_MODE:
case BH1750_ONE_TIME_LOW_RES_MODE:
maxWait ? _delay_ms(24) : _delay_ms(16);
break;
case BH1750::ONE_TIME_LOW_RES_MODE:
case BH1750::ONE_TIME_HIGH_RES_MODE:
case BH1750::ONE_TIME_HIGH_RES_MODE_2:
case BH1750_CONTINUOUS_HIGH_RES_MODE:
case BH1750_CONTINUOUS_HIGH_RES_MODE_2:
case BH1750_ONE_TIME_HIGH_RES_MODE:
case BH1750_ONE_TIME_HIGH_RES_MODE_2:
maxWait ? _delay_ms(180) :_delay_ms(120);
if (BH1750_MODE == BH1750::ONE_TIME_LOW_RES_MODE) {
maxWait ? _delay_ms(24) : _delay_ms(16);
}
else {
maxWait ? _delay_ms(180) :_delay_ms(120);
}
break;
}
// Read two bytes from the sensor, which are low and high parts of the sensor
BH1750.h
+23 -27
View File
@@ -30,45 +30,41 @@
// No active state
#define BH1750_POWER_DOWN 0x00
// Wating for measurment command
// Wating for measurement command
#define BH1750_POWER_ON 0x01
// Reset data register value - not accepted in POWER_DOWN mode
#define BH1750_RESET 0x07
// Start measurement at 1lx resolution. Measurement time is approx 120ms.
#define BH1750_CONTINUOUS_HIGH_RES_MODE 0x10
// Start measurement at 0.5lx resolution. Measurement time is approx 120ms.
#define BH1750_CONTINUOUS_HIGH_RES_MODE_2 0x11
// Start measurement at 4lx resolution. Measurement time is approx 16ms.
#define BH1750_CONTINUOUS_LOW_RES_MODE 0x13
// Start measurement at 1lx resolution. Measurement time is approx 120ms.
// Device is automatically set to Power Down after measurement.
#define BH1750_ONE_TIME_HIGH_RES_MODE 0x20
// Start measurement at 0.5lx resolution. Measurement time is approx 120ms.
// Device is automatically set to Power Down after measurement.
#define BH1750_ONE_TIME_HIGH_RES_MODE_2 0x21
// Start measurement at 1lx resolution. Measurement time is approx 120ms.
// Device is automatically set to Power Down after measurement.
#define BH1750_ONE_TIME_LOW_RES_MODE 0x23
class BH1750 {
public:
BH1750 (byte addr = 0x23);
bool begin (uint8_t mode = BH1750_CONTINUOUS_HIGH_RES_MODE);
bool configure (uint8_t mode);
enum Mode
{
UNCONFIGURED = 0,
// Measurement at 1lx resolution. Measurement time is approx 120ms.
CONTINUOUS_HIGH_RES_MODE = 0x10,
// Measurement at 0.5lx resolution. Measurement time is approx 120ms.
CONTINUOUS_HIGH_RES_MODE_2 = 0x11,
// Measurement at 4lx resolution. Measurement time is approx 16ms.
CONTINUOUS_LOW_RES_MODE = 0x13,
// Measurement at 1lx resolution. Measurement time is approx 120ms.
ONE_TIME_HIGH_RES_MODE = 0x20,
// Measurement at 0.5lx resolution. Measurement time is approx 120ms.
ONE_TIME_HIGH_RES_MODE_2 = 0x21,
// Measurement at 1lx resolution. Measurement time is approx 120ms.
ONE_TIME_LOW_RES_MODE = 0x23
};
BH1750(byte addr = 0x23);
bool begin(Mode mode = CONTINUOUS_HIGH_RES_MODE);
bool configure(Mode mode);
uint16_t readLightLevel(bool maxWait = false);
private:
int BH1750_I2CADDR;
uint8_t BH1750_MODE;
bool BH1750_CONFIGURED;
Mode BH1750_MODE = UNCONFIGURED;
};
examples/BH1750advanced/BH1750advanced.ino
+1 -1
View File
@@ -75,7 +75,7 @@ void setup(){
*/
// begin returns a boolean that can be used to detect setup problems.
if (lightMeter.begin(BH1750_CONTINUOUS_HIGH_RES_MODE)) {
if (lightMeter.begin(BH1750::CONTINUOUS_HIGH_RES_MODE)) {
Serial.println(F("BH1750 Advanced begin"));
}
else {
examples/BH1750onetime/BH1750onetime.ino
+1 -1
View File
@@ -24,7 +24,7 @@ void setup(){
Wire.begin();
// On esp8266 you can select SCL and SDA pins using Wire.begin(D4, D3);
lightMeter.begin(BH1750_ONE_TIME_HIGH_RES_MODE);
lightMeter.begin(BH1750::ONE_TIME_HIGH_RES_MODE);
Serial.println(F("BH1750 One-Time Test"));