diff options
| author | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-05-07 01:40:39 +0000 |
|---|---|---|
| committer | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-05-07 01:40:39 +0000 |
| commit | 69f4e02c1750d0fe4c6c31a96311b5a49ae29ac5 (patch) | |
| tree | 991d292e975f164c6291c5b926056cd753f47fe4 /nuttx/drivers | |
| parent | a17f13da064ce7a0c8430f4f0bfff5da063c8d4c (diff) | |
| download | px4-firmware-69f4e02c1750d0fe4c6c31a96311b5a49ae29ac5.tar.gz px4-firmware-69f4e02c1750d0fe4c6c31a96311b5a49ae29ac5.tar.bz2 px4-firmware-69f4e02c1750d0fe4c6c31a96311b5a49ae29ac5.zip | |
Mostly cosmetic, partial fixes for STM3240G-EVAL LCD
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4705 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'nuttx/drivers')
| -rw-r--r-- | nuttx/drivers/input/stmpe11_temp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nuttx/drivers/input/stmpe11_temp.c b/nuttx/drivers/input/stmpe11_temp.c index 8c7406761..b3eb8f6c5 100644 --- a/nuttx/drivers/input/stmpe11_temp.c +++ b/nuttx/drivers/input/stmpe11_temp.c @@ -132,12 +132,12 @@ uint16_t stmpe11_tempread(STMPE11_HANDLE handle) stmpe11_putreg8(priv, STMPE11_TEMP_CTRL, (TEMP_CTRL_ACQ|TEMP_CTRL_ENABLE)); - /* Read the tempreature */ + /* Read the temperature */ temp1 = stmpe11_getreg8(priv, STMPE11_SYS_CTRL2); temp2 = stmpe11_getreg8(priv, STMPE11_SYS_CTRL2+1); - /* Scale the tempreature */ + /* Scale the temperature (where Vio is assumed to be .33) */ temp = ((uint32_t)(temp1 & 3) << 8) | temp2; temp = (uint32_t)((33 * temp * 100) / 751); |