aboutsummaryrefslogtreecommitdiffstats
path: root/halext/include
diff options
context:
space:
mode:
Diffstat (limited to 'halext/include')
-rw-r--r--halext/include/touchpad.h35
1 files changed, 15 insertions, 20 deletions
diff --git a/halext/include/touchpad.h b/halext/include/touchpad.h
index c6e44b55..222411cf 100644
--- a/halext/include/touchpad.h
+++ b/halext/include/touchpad.h
@@ -45,6 +45,16 @@
/* Type definitions */
/*===========================================================================*/
+/**
+ * @brief Struct used for calibration
+ */
+struct cal {
+ float xm;
+ float ym;
+ float xn;
+ float yn;
+};
+
/*===========================================================================*/
/* External declarations. */
/*===========================================================================*/
@@ -53,29 +63,14 @@
extern "C" {
#endif
-#if TOUCHPAD_NEED_MULTITHREAD
-
- void tpInit(TOUCHPADDriver *tp);
- uint16_t tpReadX(void);
- uint16_t tpReadY(void);
-
- #if TOUCHPAD_PRESSURE
- uint16_t tpReadZ(void);
- #endif
-
-#else
-
- #define tpInit(tp) tp_lld_init(tp)
- #define tpReadX() tp_lld_read_x()
- #define tpReadY() tp_lld_read_y()
-
- #if TOUCHPAD_PRESSURE
- #define tpReadZ() tp_lld_read_z()
- #endif
+void tpInit(TOUCHPADDriver *tp);
+uint16_t tpReadX(void);
+uint16_t tpReadY(void);
+#if TOUCHPAD_PRESSURE
+ uint16_t tpReadZ(void);
#endif
-
#ifdef __cplusplus
}
#endif