Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-12-22 10:30:13 +00:00
Code Issues Projects Releases Wiki Activity

Added api for reading out tmp100 x100 temps

Browse Source
This commit is contained in:
Joakim Eriksson 2012-01-03 10:45:03 -08:00 committed by Niclas Finne
parent 65163a9b57
commit 0ea95c21b3
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
platform/z1/dev/tmp102.c
View File

@ -160,13 +160,8 @@ tmp102_read_temp_raw (void)
return rd;
}
/*---------------------------------------------------------------------------*/
/* Simple Read temperature. Return is an integer with temperature in 1deg. precision
Return value is a signed 8 bit integer.
*/
int8_t
tmp102_read_temp_simple (void)
int16_t
tmp102_read_temp_x100(void)
{
int16_t raw = 0;
int8_t rd = 0;
@ -181,9 +176,10 @@ tmp102_read_temp_simple (void)
abstemp = raw;
}
/* Integer part of the temperature value */
temp_int = (abstemp >> 8) * sign;
/* Integer part of the temperature value and percents*/
temp_int = (abstemp >> 8) * sign * 100;
temp_int += ((abstemp & 0xff) * 100) / 0x100;
/* See test-tmp102.c on how to print values of temperature with decimals
fractional part in 1/10000 of degree
temp_frac = ((abstemp >>4) % 16) * 625;
@ -191,6 +187,16 @@ tmp102_read_temp_simple (void)
Data could be multiplied by 64 (<< 6) to trade-off precision for speed
*/
rd = (int8_t) (temp_int);
return rd;
return temp_int;
}
/*---------------------------------------------------------------------------*/
/* Simple Read temperature. Return is an integer with temperature in 1deg. precision
Return value is a signed 8 bit integer.
*/
int8_t
tmp102_read_temp_simple (void)
{
return (int8_t) tmp102_read_temp_x100() / 100;
}

5
platform/z1/dev/tmp102.h
View File

@ -72,6 +72,11 @@ u16_t tmp102_read_temp_raw();
*/
int8_t tmp102_read_temp_simple();
/* Read only integer part of the temperature in 1deg. precision.
no args needed
*/
int16_t tmp102_read_temp_x100();
/* -------------------------------------------------------------------------- */
/* Reference definitions */
/* TMP102 slave address */