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

mhz19: move response checksum check into mhz19_write_command_()

Browse Source 
update() is supposed to deal with reading and updating CO2/Temp,
while response checksum verification applies to other responses
as well.
Move check into mhz19_write_command_() that handles communications
with sensor.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
This commit is contained in:
Igor Mammedov 2019-05-23 21:25:01 +02:00
parent 622c7d18c1
commit 909cec7016
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
esphome/components/mhz19/mhz19.cpp
View File

@ -39,13 +39,6 @@ void MHZ19Component::update() {
return; return;
} }
uint8_t checksum = mhz19_checksum(response);
if (response[8] != checksum) {
ESP_LOGW(TAG, "MHZ19 Checksum doesn't match: 0x%02X!=0x%02X", response[8], checksum);
this->status_set_warning();
return;
}
this->status_clear_warning(); this->status_clear_warning();
const uint16_t ppm = (uint16_t(response[2]) << 8) | response[3]; const uint16_t ppm = (uint16_t(response[2]) << 8) | response[3];
const int temp = int(response[4]) - 40; const int temp = int(response[4]) - 40;
@ -68,6 +61,15 @@ bool MHZ19Component::mhz19_write_command_(const uint8_t *command, uint8_t *respo
bool ret = this->read_array(response, MHZ19_PDU_LENGTH); bool ret = this->read_array(response, MHZ19_PDU_LENGTH);
ESP_LOGD(TAG, "resp [%s]", dump_data_buf(response)); ESP_LOGD(TAG, "resp [%s]", dump_data_buf(response));
uint8_t checksum = mhz19_checksum(response);
if (checksum != response[8]) {
ESP_LOGW(TAG, "MHZ19 Checksum doesn't match: 0x%02X!=0x%02X [%s]",
response[8], checksum, dump_data_buf(response));
this->status_set_warning();
return false;
}
return ret; return ret;
} }
float MHZ19Component::get_setup_priority() const { return setup_priority::DATA; } float MHZ19Component::get_setup_priority() const { return setup_priority::DATA; }