Merge pull request #279 from suda-morris/bugfix/ds18b20_temperature_c…

…onversion fix(ds18b20): fix the wrong value of a sub-zero temperature (BSP-444)
espressif · Jan 22, 2024 · 539f656 · 539f656
2 parents c62e19f + 551f342
commit 539f656
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/components/ds18b20/CHANGELOG.md b/components/ds18b20/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.1
+
+- Fix the issue that sign-bit is not extended properly when doing temperature value conversion.
+
 ## 0.1.0
 
 - Initial driver version, based on the [onewire_bus](https://components.espressif.com/components/espressif/onewire_bus) library.
diff --git a/components/ds18b20/idf_component.yml b/components/ds18b20/idf_component.yml
@@ -1,4 +1,4 @@
-version: "0.1.0"
+version: "0.1.1"
 description: DS18B20 device driver
 url: https://github.com/espressif/esp-bsp/tree/master/components/ds18b20
 dependencies:

diff --git a/components/ds18b20/src/ds18b20.c b/components/ds18b20/src/ds18b20.c
@@ -134,7 +134,10 @@ esp_err_t ds18b20_get_temperature(ds18b20_device_handle_t ds18b20, float *ret_te
 
     const uint8_t lsb_mask[4] = {0x07, 0x03, 0x01, 0x00}; // mask bits not used in low resolution
     uint8_t lsb_masked = scratchpad.temp_lsb & (~lsb_mask[scratchpad.configuration >> 5]);
-    *ret_temperature = (((int16_t)scratchpad.temp_msb << 8) | lsb_masked)  / 16.0f;
+    // Combine the MSB and masked LSB into a signed 16-bit integer
+    int16_t temperature_raw = (((int16_t)scratchpad.temp_msb << 8) | lsb_masked);
+    // Convert the raw temperature to a float,
+    *ret_temperature = temperature_raw / 16.0f;
 
     return ESP_OK;
 }