Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-09 09:51:20 +01:00
Code Issues Projects Releases Wiki Activity

Correct ADS1115 handling of multiple sensors in continuous mode (#2016)

Browse Source 
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
This commit is contained in:
Sean Vig 2021-07-20 01:05:25 -04:00 committed by Jesse Hills
parent 5c57b51378
commit 73ead5f328
No known key found for this signature in database
GPG Key ID: BEAAE804EFD8E83A
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
esphome/components/ads1115/ads1115.cpp
View File

@ -107,17 +107,22 @@ float ADS1115Component::request_measurement(ADS1115Sensor *sensor) {
} }
this->prev_config_ = config; this->prev_config_ = config;
// about 1.6 ms with 860 samples per second // about 1.2 ms with 860 samples per second
delay(2); delay(2);
uint32_t start = millis(); // in continuous mode, conversion will always be running, rely on the delay
while (this->read_byte_16(ADS1115_REGISTER_CONFIG, &config) && (config >> 15) == 0) { // to ensure conversion is taking place with the correct settings
if (millis() - start > 100) { // can we use the rdy pin to trigger when a conversion is done?
ESP_LOGW(TAG, "Reading ADS1115 timed out"); if (!this->continuous_mode_) {
this->status_set_warning(); uint32_t start = millis();
return NAN; while (this->read_byte_16(ADS1115_REGISTER_CONFIG, &config) && (config >> 15) == 0) {
if (millis() - start > 100) {
ESP_LOGW(TAG, "Reading ADS1115 timed out");
this->status_set_warning();
return NAN;
}
yield();
} }
yield();
} }
} }