scratch/esphome
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

[ltr501][ltr_als_ps] Rename enum to avoid collision with lwip defines (#12017)

Browse Source
This commit is contained in:
Jonathan Swoboda
2025-11-20 10:58:21 -05:00
parent 45b8c1e267
commit 89ee37a2d5
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
esphome/components/ltr501/ltr501.cpp
View File

@@ -174,7 +174,7 @@ void LTRAlsPs501Component::loop() {
break; break;
case State::WAITING_FOR_DATA: case State::WAITING_FOR_DATA:
if (this->is_als_data_ready_(this->als_readings_) == DataAvail::DATA_OK) { if (this->is_als_data_ready_(this->als_readings_) == LtrDataAvail::LTR_DATA_OK) {
tries = 0; tries = 0;
ESP_LOGV(TAG, "Reading sensor data assuming gain = %.0fx, time = %d ms", ESP_LOGV(TAG, "Reading sensor data assuming gain = %.0fx, time = %d ms",
get_gain_coeff(this->als_readings_.gain), get_itime_ms(this->als_readings_.integration_time)); get_gain_coeff(this->als_readings_.gain), get_itime_ms(this->als_readings_.integration_time));
@@ -379,18 +379,18 @@ void LTRAlsPs501Component::configure_integration_time_(IntegrationTime501 time)
} }
} }
DataAvail LTRAlsPs501Component::is_als_data_ready_(AlsReadings &data) { LtrDataAvail LTRAlsPs501Component::is_als_data_ready_(AlsReadings &data) {
AlsPsStatusRegister als_status{0}; AlsPsStatusRegister als_status{0};
als_status.raw = this->reg((uint8_t) CommandRegisters::ALS_PS_STATUS).get(); als_status.raw = this->reg((uint8_t) CommandRegisters::ALS_PS_STATUS).get();
if (!als_status.als_new_data) if (!als_status.als_new_data)
return DataAvail::NO_DATA; return LtrDataAvail::LTR_NO_DATA;
ESP_LOGV(TAG, "Data ready, reported gain is %.0fx", get_gain_coeff(als_status.gain)); ESP_LOGV(TAG, "Data ready, reported gain is %.0fx", get_gain_coeff(als_status.gain));
if (data.gain != als_status.gain) { if (data.gain != als_status.gain) {
ESP_LOGW(TAG, "Actual gain differs from requested (%.0f)", get_gain_coeff(data.gain)); ESP_LOGW(TAG, "Actual gain differs from requested (%.0f)", get_gain_coeff(data.gain));
return DataAvail::BAD_DATA; return LtrDataAvail::LTR_BAD_DATA;
} }
data.gain = als_status.gain; data.gain = als_status.gain;
return DataAvail::DATA_OK; return LtrDataAvail::LTR_DATA_OK;
} }
void LTRAlsPs501Component::read_sensor_data_(AlsReadings &data) { void LTRAlsPs501Component::read_sensor_data_(AlsReadings &data) {

4
esphome/components/ltr501/ltr501.h
View File

@@ -11,7 +11,7 @@
namespace esphome { namespace esphome {
namespace ltr501 { namespace ltr501 {
enum DataAvail : uint8_t { NO_DATA, BAD_DATA, DATA_OK }; enum LtrDataAvail : uint8_t { LTR_NO_DATA, LTR_BAD_DATA, LTR_DATA_OK };
enum LtrType : uint8_t { enum LtrType : uint8_t {
LTR_TYPE_UNKNOWN = 0, LTR_TYPE_UNKNOWN = 0,
@@ -106,7 +106,7 @@ class LTRAlsPs501Component : public PollingComponent, public i2c::I2CDevice {
void configure_als_(); void configure_als_();
void configure_integration_time_(IntegrationTime501 time); void configure_integration_time_(IntegrationTime501 time);
void configure_gain_(AlsGain501 gain); void configure_gain_(AlsGain501 gain);
DataAvail is_als_data_ready_(AlsReadings &data); LtrDataAvail is_als_data_ready_(AlsReadings &data);
void read_sensor_data_(AlsReadings &data); void read_sensor_data_(AlsReadings &data);
bool are_adjustments_required_(AlsReadings &data); bool are_adjustments_required_(AlsReadings &data);
void apply_lux_calculation_(AlsReadings &data); void apply_lux_calculation_(AlsReadings &data);

12
esphome/components/ltr_als_ps/ltr_als_ps.cpp
View File

@@ -165,7 +165,7 @@ void LTRAlsPsComponent::loop() {
break; break;
case State::WAITING_FOR_DATA: case State::WAITING_FOR_DATA:
if (this->is_als_data_ready_(this->als_readings_) == DataAvail::DATA_OK) { if (this->is_als_data_ready_(this->als_readings_) == LtrDataAvail::LTR_DATA_OK) {
tries = 0; tries = 0;
ESP_LOGV(TAG, "Reading sensor data having gain = %.0fx, time = %d ms", get_gain_coeff(this->als_readings_.gain), ESP_LOGV(TAG, "Reading sensor data having gain = %.0fx, time = %d ms", get_gain_coeff(this->als_readings_.gain),
get_itime_ms(this->als_readings_.integration_time)); get_itime_ms(this->als_readings_.integration_time));
@@ -376,23 +376,23 @@ void LTRAlsPsComponent::configure_integration_time_(IntegrationTime time) {
} }
} }
DataAvail LTRAlsPsComponent::is_als_data_ready_(AlsReadings &data) { LtrDataAvail LTRAlsPsComponent::is_als_data_ready_(AlsReadings &data) {
AlsPsStatusRegister als_status{0}; AlsPsStatusRegister als_status{0};
als_status.raw = this->reg((uint8_t) CommandRegisters::ALS_PS_STATUS).get(); als_status.raw = this->reg((uint8_t) CommandRegisters::ALS_PS_STATUS).get();
if (!als_status.als_new_data) if (!als_status.als_new_data)
return DataAvail::NO_DATA; return LtrDataAvail::LTR_NO_DATA;
if (als_status.data_invalid) { if (als_status.data_invalid) {
ESP_LOGW(TAG, "Data available but not valid"); ESP_LOGW(TAG, "Data available but not valid");
return DataAvail::BAD_DATA; return LtrDataAvail::LTR_BAD_DATA;
} }
ESP_LOGV(TAG, "Data ready, reported gain is %.0f", get_gain_coeff(als_status.gain)); ESP_LOGV(TAG, "Data ready, reported gain is %.0f", get_gain_coeff(als_status.gain));
if (data.gain != als_status.gain) { if (data.gain != als_status.gain) {
ESP_LOGW(TAG, "Actual gain differs from requested (%.0f)", get_gain_coeff(data.gain)); ESP_LOGW(TAG, "Actual gain differs from requested (%.0f)", get_gain_coeff(data.gain));
return DataAvail::BAD_DATA; return LtrDataAvail::LTR_BAD_DATA;
} }
return DataAvail::DATA_OK; return LtrDataAvail::LTR_DATA_OK;
} }
void LTRAlsPsComponent::read_sensor_data_(AlsReadings &data) { void LTRAlsPsComponent::read_sensor_data_(AlsReadings &data) {

4
esphome/components/ltr_als_ps/ltr_als_ps.h
View File

@@ -11,7 +11,7 @@
namespace esphome { namespace esphome {
namespace ltr_als_ps { namespace ltr_als_ps {
enum DataAvail : uint8_t { NO_DATA, BAD_DATA, DATA_OK }; enum LtrDataAvail : uint8_t { LTR_NO_DATA, LTR_BAD_DATA, LTR_DATA_OK };
enum LtrType : uint8_t { enum LtrType : uint8_t {
LTR_TYPE_UNKNOWN = 0, LTR_TYPE_UNKNOWN = 0,
@@ -106,7 +106,7 @@ class LTRAlsPsComponent : public PollingComponent, public i2c::I2CDevice {
void configure_als_(); void configure_als_();
void configure_integration_time_(IntegrationTime time); void configure_integration_time_(IntegrationTime time);
void configure_gain_(AlsGain gain); void configure_gain_(AlsGain gain);
DataAvail is_als_data_ready_(AlsReadings &data); LtrDataAvail is_als_data_ready_(AlsReadings &data);
void read_sensor_data_(AlsReadings &data); void read_sensor_data_(AlsReadings &data);
bool are_adjustments_required_(AlsReadings &data); bool are_adjustments_required_(AlsReadings &data);
void apply_lux_calculation_(AlsReadings &data); void apply_lux_calculation_(AlsReadings &data);