deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed bug when reading temperature (abstemp was not always set).

Browse source
This commit is contained in:
Niclas Finne 2011-06-30 18:16:35 +02:00
parent 6ea7250af7
commit d635c03b52
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
platform/z1/dev/tmp102.c
View file

@ -181,11 +181,12 @@ tmp102_read_temp_simple (void)
int16_t abstemp, temp_int; int16_t abstemp, temp_int;
raw = (int16_t) tmp102_read_reg (TMP102_TEMP); raw = (int16_t) tmp102_read_reg (TMP102_TEMP);
if (raw < 0) if(raw < 0) {
{ abstemp = (raw ^ 0xFFFF) + 1;
abstemp = (raw ^ 0xFFFF) + 1; sign = -1;
sign = -1; } else {
} abstemp = raw;
}
/* Integer part of the temperature value */ /* Integer part of the temperature value */
temp_int = (abstemp >> 8) * sign; temp_int = (abstemp >> 8) * sign;
@ -200,6 +201,3 @@ tmp102_read_temp_simple (void)
rd = (int8_t) (temp_int); rd = (int8_t) (temp_int);
return rd; return rd;
} }