github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-09-14 16:48:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

tidy

Browse Source
This commit is contained in:
J. Nick Koston
2025-11-16 22:30:59 -06:00
parent 8934d4b498
commit 9b14444dad
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/bh1750/bh1750.cpp
+7 -5
View File
@@ -82,10 +82,12 @@ void BH1750Sensor::dump_config() {
}
void BH1750Sensor::update() {
const uint32_t now = millis();
// Start coarse measurement to determine optimal mode/mtreg
if (this->state_ != IDLE) {
// Safety timeout: reset if stuck
if (millis() - this->measurement_start_time_ > MEASUREMENT_TIMEOUT_MS) {
if (now - this->measurement_start_time_ > MEASUREMENT_TIMEOUT_MS) {
ESP_LOGW(TAG, "Measurement timeout, resetting state");
this->state_ = IDLE;
} else {
@@ -94,7 +96,7 @@ void BH1750Sensor::update() {
}
}
if (!this->start_measurement_(BH1750_MODE_L, 31)) {
if (!this->start_measurement_(BH1750_MODE_L, MTREG_MIN, now)) {
this->status_set_warning();
this->publish_state(NAN);
return;
@@ -131,7 +133,7 @@ void BH1750Sensor::loop() {
this->process_coarse_result_(lx);
// Start fine measurement with optimal settings
if (!this->start_measurement_(this->fine_mode_, this->fine_mtreg_)) {
if (!this->start_measurement_(this->fine_mode_, this->fine_mtreg_, now)) {
this->status_set_warning();
this->publish_state(NAN);
this->state_ = IDLE;
@@ -166,7 +168,7 @@ void BH1750Sensor::loop() {
}
}
bool BH1750Sensor::start_measurement_(BH1750Mode mode, uint8_t mtreg) {
bool BH1750Sensor::start_measurement_(BH1750Mode mode, uint8_t mtreg, uint32_t now) {
// Power on
uint8_t turn_on = BH1750_COMMAND_POWER_ON;
if (this->write(&turn_on, 1) != i2c::ERROR_OK) {
@@ -214,7 +216,7 @@ bool BH1750Sensor::start_measurement_(BH1750Mode mode, uint8_t mtreg) {
// Store current measurement parameters
this->current_mode_ = mode;
this->current_mtreg_ = mtreg;
this->measurement_start_time_ = millis();
this->measurement_start_time_ = now;
this->measurement_duration_ = meas_time + 1; // Add 1ms for safety
return true;
esphome/components/bh1750/bh1750.h
+1 -1
View File
@@ -46,7 +46,7 @@ class BH1750Sensor : public sensor::Sensor, public PollingComponent, public i2c:
uint8_t active_mtreg_{0};
// Helper methods
bool start_measurement_(BH1750Mode mode, uint8_t mtreg);
bool start_measurement_(BH1750Mode mode, uint8_t mtreg, uint32_t now);
bool read_measurement_(float &lx_out);
void process_coarse_result_(float lx);
};