sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-03-15 07:08:20 +00:00
Code Issues Releases Wiki Activity

Refactored device type identification and logging

Browse Source
This commit is contained in:
valordk 2019-07-28 16:22:35 +02:00
parent 75d2de79d8
commit 1050feb482
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
esphome/components/shtcx/shtcx.cpp
View File

@ -12,9 +12,16 @@ static const uint16_t SHTCX_COMMAND_READ_ID_REGISTER = 0xEFC8;
static const uint16_t SHTCX_COMMAND_SOFT_RESET = 0x805D; static const uint16_t SHTCX_COMMAND_SOFT_RESET = 0x805D;
static const uint16_t SHTCX_COMMAND_POLLING_H = 0x7866; static const uint16_t SHTCX_COMMAND_POLLING_H = 0x7866;
inline const char* ToString(SHTCXType type) {
switch (type) {
case SHTCX_TYPE_SHTC3: return "SHTC3";
case SHTCX_TYPE_SHTC1: return "SHTC1";
default: return "[Unknown model]";
}
}
void SHTCXComponent::setup() { void SHTCXComponent::setup() {
ESP_LOGCONFIG(TAG, "Setting up SHTCx..."); ESP_LOGCONFIG(TAG, "Setting up SHTCx...");
this->wake_up();
this->soft_reset(); this->soft_reset();
if (!this->write_command_(SHTCX_COMMAND_READ_ID_REGISTER)) { if (!this->write_command_(SHTCX_COMMAND_READ_ID_REGISTER)) {
@ -29,18 +36,21 @@ void SHTCXComponent::setup() {
this->mark_failed(); this->mark_failed();
return; return;
} }
if (((device_id_register[0] << 2) & 0x1C) == 0x1C) { if (((device_id_register[0] << 2) & 0x1C) == 0x1C) {
if ((device_id_register[0] & 0x847) == 0x847) { if ((device_id_register[0] & 0x847) == 0x847) {
this->type_ = SHTCX_TYPE_SHTC3; this->type_ = SHTCX_TYPE_SHTC3;
ESP_LOGCONFIG(TAG, " Device identified: SHTC3");
} else { } else {
this->type_ = SHTCX_TYPE_SHTC1; this->type_ = SHTCX_TYPE_SHTC1;
ESP_LOGCONFIG(TAG, " Device identified: SHTC1");
} }
} else {
this->type_ = SHTCX_TYPE_UNKNOWN;
} }
ESP_LOGCONFIG(TAG, " Device identified: %s", ToString(this->type_));
} }
void SHTCXComponent::dump_config() { void SHTCXComponent::dump_config() {
ESP_LOGCONFIG(TAG, "SHTCx:"); ESP_LOGCONFIG(TAG, "SHTCx:");
ESP_LOGCONFIG(TAG, " Model: %s", ToString(this->type_));
LOG_I2C_DEVICE(this); LOG_I2C_DEVICE(this);
if (this->is_failed()) { if (this->is_failed()) {
ESP_LOGE(TAG, "Communication with SHTCx failed!"); ESP_LOGE(TAG, "Communication with SHTCx failed!");
@ -147,9 +157,7 @@ void SHTCXComponent::soft_reset() {
delayMicroseconds(200); delayMicroseconds(200);
} }
void SHTCXComponent::sleep() { void SHTCXComponent::sleep() {
if (!this->write_command_(SHTCX_COMMAND_SLEEP)) { this->write_command_(SHTCX_COMMAND_SLEEP);
return;
}
} }
void SHTCXComponent::wake_up() { void SHTCXComponent::wake_up() {

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

@ -7,7 +7,7 @@
namespace esphome { namespace esphome {
namespace shtcx { namespace shtcx {
enum SHTCXType { SHTCX_TYPE_SHTC1 = 0, SHTCX_TYPE_SHTC3 }; enum SHTCXType { SHTCX_TYPE_SHTC3 = 0, SHTCX_TYPE_SHTC1, SHTCX_TYPE_UNKNOWN };
/// This class implements support for the SHT3x-DIS family of temperature+humidity i2c sensors. /// This class implements support for the SHT3x-DIS family of temperature+humidity i2c sensors.
class SHTCXComponent : public PollingComponent, public i2c::I2CDevice { class SHTCXComponent : public PollingComponent, public i2c::I2CDevice {