aboutsummaryrefslogtreecommitdiffstats
path: root/halext/include
diff options
context:
space:
mode:
authorTectu <joel@unormal.org>2012-08-09 03:21:52 +0200
committerTectu <joel@unormal.org>2012-08-09 03:21:52 +0200
commit956f6125446cd73fc839a58a999dbe57e5a35e97 (patch)
treee17a01316acbbc2bd249293e672d77fc08b14483 /halext/include
parent69bcdbba84f936e5da1dd430c75ebd2a9ded41c8 (diff)
downloaduGFX-956f6125446cd73fc839a58a999dbe57e5a35e97.tar.gz
uGFX-956f6125446cd73fc839a58a999dbe57e5a35e97.tar.bz2
uGFX-956f6125446cd73fc839a58a999dbe57e5a35e97.zip
TOUCHPAD_PRESSURE -> TOUCHPAD_HAS_PRESSURE
Diffstat (limited to 'halext/include')
-rw-r--r--halext/include/touchpad.h3
-rw-r--r--halext/include/touchpad_lld.h4
2 files changed, 4 insertions, 3 deletions
diff --git a/halext/include/touchpad.h b/halext/include/touchpad.h
index 21e71a97..4f9dce1a 100644
--- a/halext/include/touchpad.h
+++ b/halext/include/touchpad.h
@@ -73,8 +73,9 @@ extern "C" {
void tpInit(TOUCHPADDriver *tp);
uint16_t tpReadX(void);
uint16_t tpReadY(void);
+void tpCalibrate(void);
-#if TOUCHPAD_PRESSURE
+#if TOUCHPAD_HAS_PRESSURE
uint16_t tpReadZ(void);
#endif
diff --git a/halext/include/touchpad_lld.h b/halext/include/touchpad_lld.h
index ab2e54d6..7b33f366 100644
--- a/halext/include/touchpad_lld.h
+++ b/halext/include/touchpad_lld.h
@@ -41,8 +41,8 @@
/* Error checks. */
/*===========================================================================*/
-#ifndef TOUCHPAD_PRESSURE
- #define TOUCHPAD_PRESSURE FALSE
+#ifndef TOUCHPAD_HAS_PRESSURE
+ #define TOUCHPAD_HAS_PRESSURE FALSE
#endif
/*===========================================================================*/