Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-06-26 10:35:18 +02:00
Code Issues Projects Releases Wiki Activity

Fix SCD30 configuration on ESP32 (#1830)

Browse Source
This commit is contained in:
Stefan Agner 2021-06-05 10:56:54 +02:00 committed by GitHub
parent 80ad784a4e
commit 18a8c727fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
esphome/components/scd30/scd30.cpp
View File

@ -43,14 +43,6 @@ void SCD30Component::setup() {
ESP_LOGD(TAG, "SCD30 Firmware v%0d.%02d", (uint16_t(raw_firmware_version[0]) >> 8),
uint16_t(raw_firmware_version[0] & 0xFF));
/// Sensor initialization
if (!this->write_command_(SCD30_CMD_START_CONTINUOUS_MEASUREMENTS, this->ambient_pressure_compensation_)) {
ESP_LOGE(TAG, "Sensor SCD30 error starting continuous measurements.");
this->error_code_ = MEASUREMENT_INIT_FAILED;
this->mark_failed();
return;
}
if (this->temperature_offset_ != 0) {
if (!this->write_command_(SCD30_CMD_TEMPERATURE_OFFSET, (uint16_t)(temperature_offset_ * 100.0))) {
ESP_LOGE(TAG, "Sensor SCD30 error setting temperature offset.");
@ -59,15 +51,31 @@ void SCD30Component::setup() {
return;
}
}
#ifdef ARDUINO_ARCH_ESP32
// According ESP32 clock stretching is typically 30ms and up to 150ms "due to
// internal calibration processes". The I2C peripheral only supports 13ms (at
// least when running at 80MHz).
// In practise it seems that clock stretching occures during this calibration
// calls. It also seems that delays in between calls makes them
// disappear/shorter. Hence work around with delays for ESP32.
//
// By experimentation a delay of 20ms as already sufficient. Let's go
// safe and use 30ms delays.
delay(30);
#endif
// The start measurement command disables the altitude compensation, if any, so we only set it if it's turned on
if (this->altitude_compensation_ != 0xFFFF) {
if (!this->write_command_(SCD30_CMD_ALTITUDE_COMPENSATION, altitude_compensation_)) {
ESP_LOGE(TAG, "Sensor SCD30 error starting continuous measurements.");
ESP_LOGE(TAG, "Sensor SCD30 error setting altitude compensation.");
this->error_code_ = MEASUREMENT_INIT_FAILED;
this->mark_failed();
return;
}
}
#ifdef ARDUINO_ARCH_ESP32
delay(30);
#endif
if (!this->write_command_(SCD30_CMD_AUTOMATIC_SELF_CALIBRATION, enable_asc_ ? 1 : 0)) {
ESP_LOGE(TAG, "Sensor SCD30 error setting automatic self calibration.");
@ -75,6 +83,17 @@ void SCD30Component::setup() {
this->mark_failed();
return;
}
#ifdef ARDUINO_ARCH_ESP32
delay(30);
#endif
/// Sensor initialization
if (!this->write_command_(SCD30_CMD_START_CONTINUOUS_MEASUREMENTS, this->ambient_pressure_compensation_)) {
ESP_LOGE(TAG, "Sensor SCD30 error starting continuous measurements.");
this->error_code_ = MEASUREMENT_INIT_FAILED;
this->mark_failed();
return;
}
}
void SCD30Component::dump_config() {