Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-12 14:57:34 +01:00
Code Issues Projects Releases Wiki Activity

more and more

Browse Source
This commit is contained in:
Anton Viktorov 2024-03-10 00:29:41 +01:00
parent 6fe5a83903
commit 66bb6bdfda
2 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
esphome/components/as7343/as7343.cpp
View File

@ -36,6 +36,20 @@ static constexpr float CHANNEL_NM[NUM_USEFUL_CHANNELS] = {405, 425, 450, 475, 51
600, 640, 690, 745, 855, 718}; 600, 640, 690, 745, 855, 718};
static constexpr float CHANNEL_NM_WIDTH[NUM_USEFUL_CHANNELS] = {30, 22, 55, 30, 40, 100, 35, 80, 50, 55, 60, 54, 0}; static constexpr float CHANNEL_NM_WIDTH[NUM_USEFUL_CHANNELS] = {30, 22, 55, 30, 40, 100, 35, 80, 50, 55, 60, 54, 0};
static constexpr float CHANNEL_PHOTOPIC_LUMINOSITY[NUM_USEFUL_CHANNELS] = {0.0006400000000,
0.0073000000000,
0.0380000000000,
0.1126000000000,
0.6082000000000,
0.9949501000000,
1.0000000000000,
0.6310000000000,
0.1750000000000,
0.0082100000000,
0.0001719000000,
0,
0};
// Irradiation in mW/m² per basic count // Irradiation in mW/m² per basic count
static constexpr float CHANNEL_IRRAD_MW_PER_BASIC_COUNT[NUM_USEFUL_CHANNELS] = { static constexpr float CHANNEL_IRRAD_MW_PER_BASIC_COUNT[NUM_USEFUL_CHANNELS] = {
767.5101757, 2512.765376, 2034.308898, 5730.41039, 1404.780643, 1177.586336, 2803.31385, 767.5101757, 2512.765376, 2034.308898, 5730.41039, 1404.780643, 1177.586336, 2803.31385,
@ -137,6 +151,13 @@ void AS7343Component::update() {
this->read_18_channels(this->channel_readings_); this->read_18_channels(this->channel_readings_);
this->enable_spectral_measurement(false); this->enable_spectral_measurement(false);
for (uint8_t i = 0; i < NUM_USEFUL_CHANNELS; i++) {
ESP_LOGD(TAG, "Channel %d: %d", i, this->channel_readings_[CHANNEL_IDX[i]]);
}
this->channel_readings_[AS7343_CHANNEL_FD] = 0;
this->channel_readings_[AS7343_CHANNEL_FD_0] = 0;
this->channel_readings_[AS7343_CHANNEL_FD_1] = 0;
if (0) { if (0) {
this->channel_readings_[AS7343_CHANNEL_CLEAR] = 0; this->channel_readings_[AS7343_CHANNEL_CLEAR] = 0;
this->channel_readings_[AS7343_CHANNEL_CLEAR_0] = 0; this->channel_readings_[AS7343_CHANNEL_CLEAR_0] = 0;
@ -159,7 +180,7 @@ void AS7343Component::update() {
} }
} }
if (this->spectral_post_process_()) { if (this->spectral_post_process_(false)) {
ESP_LOGW(TAG, "Spectral post process - need to repeat 2"); ESP_LOGW(TAG, "Spectral post process - need to repeat 2");
} }
@ -375,15 +396,17 @@ void AS7343Component::calculate_irradiance(float tint_ms, float gain_x, float &i
// ESP_LOGD(TAG, "[%2d] Basic count %f", i, basic_count); // ESP_LOGD(TAG, "[%2d] Basic count %f", i, basic_count);
basic_count *= AS7343_GAIN_CORRECTION[(uint8_t) gain][i]; basic_count *= AS7343_GAIN_CORRECTION[(uint8_t) gain][i];
// ESP_LOGD(TAG, "[%2d] gain corrected %f", i, basic_count); // ESP_LOGD(TAG, "[%2d] gain corrected %f", i, basic_count);
irr_band = basic_count * CHANNEL_IRRAD_MW_PER_BASIC_COUNT[i] / 10000; // 1000 - if mW/m2, 100 if its uW/cm2 irr_band = basic_count * CHANNEL_IRRAD_MW_PER_BASIC_COUNT[i] / 1000; // 1000 - if mW/m2, 100 if its uW/cm2
// ESP_LOGD(TAG, "[%2d] irradiance %f", i, irr_band); // ESP_LOGD(TAG, "[%2d] irradiance %f", i, irr_band);
irradiance_in_w_per_m2 += irr_band * CHANNEL_ENERGY_CONTRIBUTION[i]; irr_band *= CHANNEL_ENERGY_CONTRIBUTION[i];
lux += irr_band * CHANNEL_PHOTOPIC_LUMINOSITY[i];
irradiance_in_w_per_m2 += irr_band ;
// ESP_LOGD(TAG, "[%2d] band irradiance %f", i, irr_band * CHANNEL_ENERGY_CONTRIBUTION[i]); // ESP_LOGD(TAG, "[%2d] band irradiance %f", i, irr_band * CHANNEL_ENERGY_CONTRIBUTION[i]);
} }
// sunlight equivalent // sunlight equivalent
// 1 W/m2 = 116 ± 3 lx solar // 1 W/m2 = 116 ± 3 lx solar
// https://www.extrica.com/article/21667/pdf // https://www.extrica.com/article/21667/pdf
lux = irradiance_in_w_per_m2 * 116; lux *= 116;
} }
bool AS7343Component::read_18_channels(std::array<uint16_t, AS7343_NUM_CHANNELS> &data) { bool AS7343Component::read_18_channels(std::array<uint16_t, AS7343_NUM_CHANNELS> &data) {
@ -811,7 +834,7 @@ template<typename T, size_t N> T AS7343Component::get_highest_value(std::array<T
#define SATURATION_HIGH_PERCENT 100 #define SATURATION_HIGH_PERCENT 100
#define ADC_SATURATED_VALUE 65535 #define ADC_SATURATED_VALUE 65535
bool AS7343Component::spectral_post_process_() { bool AS7343Component::spectral_post_process_(bool fire_at_will) {
bool need_to_repeat = false; bool need_to_repeat = false;
uint16_t highest_value, maximum_adc; uint16_t highest_value, maximum_adc;
bool is_saturation{false}; bool is_saturation{false};
@ -825,9 +848,11 @@ bool AS7343Component::spectral_post_process_() {
this->get_optimized_gain_(max_adc, highest_adc, AS7343Gain::AS7343_GAIN_0_5X, AS7343Gain::AS7343_GAIN_128X, new_gain, this->get_optimized_gain_(max_adc, highest_adc, AS7343Gain::AS7343_GAIN_0_5X, AS7343Gain::AS7343_GAIN_128X, new_gain,
is_saturation); is_saturation);
if (new_gain != current_gain) { if (new_gain != current_gain) {
// need to repeat the measurement if (fire_at_will) {
this->set_gain((AS7343Gain) new_gain); // need to repeat the measurement
this->setup_gain((AS7343Gain) new_gain); this->set_gain((AS7343Gain) new_gain);
this->setup_gain((AS7343Gain) new_gain);
}
need_to_repeat = true; need_to_repeat = true;
} else if (is_saturation) { } else if (is_saturation) {
// digital saturation // digital saturation

2
esphome/components/as7343/as7343.h
View File

@ -105,7 +105,7 @@ class AS7343Component : public PollingComponent, public i2c::I2CDevice {
void direct_config_3_chain_(); void direct_config_3_chain_();
void setup_tint_(float tint); void setup_tint_(float tint);
bool spectral_post_process_(); bool spectral_post_process_(bool fire_at_will = true);
void get_optimized_gain_(uint16_t maximum_adc, uint16_t highest_adc, uint8_t lower_gain_limit, void get_optimized_gain_(uint16_t maximum_adc, uint16_t highest_adc, uint8_t lower_gain_limit,
uint8_t upper_gain_limit, uint8_t &out_gain, bool &out_saturation); uint8_t upper_gain_limit, uint8_t &out_gain, bool &out_saturation);