Mirrors_Framework/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-05-27 20:05:31 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

[gpio][dallas_temp] Fix one_wire read64() and DS18S20 division by zero (#14866)

Browse Source
This commit is contained in:
Jonathan Swoboda
2026-03-16 15:39:26 -04:00
committed by GitHub
parent cdf2867baf
commit 05590a3a21
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/dallas_temp/dallas_temp.cpp
+3
View File
@@ -136,6 +136,9 @@ bool DallasTemperatureSensor::check_scratch_pad_() {
float DallasTemperatureSensor::get_temp_c_() { float DallasTemperatureSensor::get_temp_c_() {
int16_t temp = (this->scratch_pad_[1] << 8) | this->scratch_pad_[0]; int16_t temp = (this->scratch_pad_[1] << 8) | this->scratch_pad_[0];
if ((this->address_ & 0xff) == DALLAS_MODEL_DS18S20) { if ((this->address_ & 0xff) == DALLAS_MODEL_DS18S20) {
if (this->scratch_pad_[7] == 0) {
return NAN;
}
return (temp >> 1) + (this->scratch_pad_[7] - this->scratch_pad_[6]) / float(this->scratch_pad_[7]) - 0.25; return (temp >> 1) + (this->scratch_pad_[7] - this->scratch_pad_[6]) / float(this->scratch_pad_[7]) - 0.25;
} }
switch (this->resolution_) { switch (this->resolution_) {
esphome/components/gpio/one_wire/gpio_one_wire.cpp
+1 -1
View File
@@ -131,7 +131,7 @@ uint8_t IRAM_ATTR GPIOOneWireBus::read8() {
uint64_t IRAM_ATTR GPIOOneWireBus::read64() { uint64_t IRAM_ATTR GPIOOneWireBus::read64() {
InterruptLock lock; InterruptLock lock;
uint64_t ret = 0; uint64_t ret = 0;
for (uint8_t i = 0; i < 8; i++) { for (uint8_t i = 0; i < 64; i++) {
ret |= (uint64_t(this->read_bit_()) << i); ret |= (uint64_t(this->read_bit_()) << i);
} }
return ret; return ret;