aboutsummaryrefslogtreecommitdiffstats
path: root/src/touchpad.c
diff options
context:
space:
mode:
authorJoel Bodenmann <joel.bodenmann@hevs.ch>2012-11-06 23:26:33 +0100
committerJoel Bodenmann <joel.bodenmann@hevs.ch>2012-11-06 23:26:33 +0100
commita39a8427d90f9d37ccc98060f08c8dbd6bcc5e94 (patch)
treeaef14cae363eb65d20e425d701040c4d92b34832 /src/touchpad.c
parent8c1ffacd2e3069c280d9f580246b35df8cade6a1 (diff)
downloaduGFX-a39a8427d90f9d37ccc98060f08c8dbd6bcc5e94.tar.gz
uGFX-a39a8427d90f9d37ccc98060f08c8dbd6bcc5e94.tar.bz2
uGFX-a39a8427d90f9d37ccc98060f08c8dbd6bcc5e94.zip
removed doxygen of static internal functions
Diffstat (limited to 'src/touchpad.c')
-rw-r--r--src/touchpad.c69
1 files changed, 27 insertions, 42 deletions
diff --git a/src/touchpad.c b/src/touchpad.c
index d47026b2..d0894686 100644
--- a/src/touchpad.c
+++ b/src/touchpad.c
@@ -54,11 +54,6 @@ static struct cal_t *cal;
/* Driver local functions. */
/*===========================================================================*/
-/**
- * @brief returns the uncalibrated readout of the X direction from the controller
- *
- * @noapi
- */
static uint16_t _tpReadRealX(void) {
uint32_t results = 0;
uint16_t i, x;
@@ -74,11 +69,6 @@ static uint16_t _tpReadRealX(void) {
return x;
}
-/**
- * @brief return the uncalibrated readout of the Y-direction from the controller
- *
- * @noapi
- */
static uint16_t _tpReadRealY(void) {
uint32_t results = 0;
uint16_t i, y;
@@ -94,11 +84,6 @@ static uint16_t _tpReadRealY(void) {
return y;
}
-/**
- * @brief draws a cross. Used for calibration.
- *
- * @noapi
- */
static void _tpDrawCross(uint16_t x, uint16_t y) {
gdispDrawLine(x-15, y, x-2, y, 0xffff);
gdispDrawLine(x+2, y, x+15, y, 0xffff);
@@ -217,6 +202,33 @@ uint16_t tpReadY(void) {
return 0;
}
+/**
+ * @brief Get the pressure.
+ *
+ * @return The pressure.
+ *
+ * @api
+ */
+#if TOUCHPAD_HAS_PRESSURE || defined(__DOXYGEN__)
+ uint16_t tpReadZ(void) {
+ /* ToDo */
+ return (tp_lld_read_z());
+ }
+#endif
+
+/**
+ * @brief returns if touchpad is pressed or not
+ *
+ * @return 1 if pressed, 0 otherwise
+ *
+ * @api
+ */
+#if TOUCHPAD_HAS_IRQ || defined(__DOXYGEN__)
+ uint8_t tpIRQ(void) {
+ return tp_lld_irq();
+ }
+#endif
+
void tpCalibrate(void) {
const uint16_t h = gdispGetHeight();
const uint16_t w = gdispGetWidth();
@@ -249,33 +261,6 @@ void tpCalibrate(void) {
#endif
}
-/**
- * @brief returns if touchpad is pressed or not
- *
- * @return 1 if pressed, 0 otherwise
- *
- * @api
- */
-#if TOUCHPAD_HAS_IRQ || defined(__DOXYGEN__)
- uint8_t tpIRQ(void) {
- return tp_lld_irq();
- }
-#endif
-
-/**
- * @brief Get the pressure.
- *
- * @return The pressure.
- *
- * @api
- */
-#if TOUCHPAD_HAS_PRESSURE || defined(__DOXYGEN__)
- uint16_t tpReadZ(void) {
- /* ToDo */
- return (tp_lld_read_z());
- }
-#endif
-
#endif /* GFX_USE_TOUCHPAD */
/** @} */