kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-25 06:23:53 +01:00
Code Releases Activity

Merge pull request #13288 from catcombo/fix-ds18-temperature-conversion

Browse Source 
Fix ds18 temperature conversion
This commit is contained in:
benpicco 2020-02-07 13:09:22 +01:00 committed by GitHub
commit 5a4d39e2ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/ds18/ds18.c
View File

@ -184,8 +184,8 @@ int ds18_read(const ds18_t *dev, int16_t *temperature)
DEBUG("[DS18] Received byte: 0x%02x\n", b2);
int32_t measurement = ((int16_t)(b2 << 8 | b1) * 625);
*temperature = (int16_t)(measurement / 100);
int32_t measurement = (int16_t)(b2 << 8 | b1);
*temperature = (int16_t)((100 * measurement) >> 4);
return DS18_OK;
}

2
tests/driver_ds18/Makefile
View File

@ -1,6 +1,6 @@
include ../Makefile.tests_common
BOARD_WHITELIST := sensebox_samd21 samr21-xpro nucleo-l152re nucleo-l432kc nucleo-l073rz b-l072z-lrwan
BOARD_WHITELIST := sensebox_samd21 samr21-xpro nucleo-l152re nucleo-l432kc nucleo-l073rz b-l072z-lrwan arduino-nano
USEMODULE += ds18
USEMODULE += xtimer