diff options
| author | Andrew Hannam <andrewh@inmarket.com.au> | 2012-12-20 00:03:33 -0800 |
|---|---|---|
| committer | Andrew Hannam <andrewh@inmarket.com.au> | 2012-12-20 00:03:33 -0800 |
| commit | b669bf98f1bc57672b222c6cdac759d0a30858ed (patch) | |
| tree | 99c19a5aa83b94fba9df0a88f1c84fcf42a2b771 /src/ginput | |
| parent | f31a1f7f4aeb09bc09d49944daaf2f38fddd94e7 (diff) | |
| parent | e00f8593e85245a847280dafe10e5a834268557e (diff) | |
| download | uGFX-b669bf98f1bc57672b222c6cdac759d0a30858ed.tar.gz uGFX-b669bf98f1bc57672b222c6cdac759d0a30858ed.tar.bz2 uGFX-b669bf98f1bc57672b222c6cdac759d0a30858ed.zip | |
Merge pull request #12 from Tectu/master
Merge Tectu Changes
Diffstat (limited to 'src/ginput')
| -rw-r--r-- | src/ginput/dial.c | 3 | ||||
| -rw-r--r-- | src/ginput/keyboard.c | 5 | ||||
| -rw-r--r-- | src/ginput/mouse.c | 12 | ||||
| -rw-r--r-- | src/ginput/toggle.c | 3 |
4 files changed, 11 insertions, 12 deletions
diff --git a/src/ginput/dial.c b/src/ginput/dial.c index 233daa08..a447d8bc 100644 --- a/src/ginput/dial.c +++ b/src/ginput/dial.c @@ -22,7 +22,8 @@ * @file src/ginput/dial.c
* @brief GINPUT dial code.
*
- * @addtogroup GINPUT
+ * @defgroup Dial Dial
+ * @ingroup GINPUT
* @{
*/
#include "ch.h"
diff --git a/src/ginput/keyboard.c b/src/ginput/keyboard.c index bd443e77..56ff5e8a 100644 --- a/src/ginput/keyboard.c +++ b/src/ginput/keyboard.c @@ -22,9 +22,12 @@ * @file src/ginput/keyboard.c
* @brief GINPUT keyboard code.
*
- * @addtogroup GINPUT
+ * @defgroup Keyboard Keyboard
+ * @ingroup GINPUT
+ *
* @{
*/
+
#include "ch.h"
#include "hal.h"
#include "gfx.h"
diff --git a/src/ginput/mouse.c b/src/ginput/mouse.c index 5e762ef9..35a55bc5 100644 --- a/src/ginput/mouse.c +++ b/src/ginput/mouse.c @@ -22,7 +22,8 @@ * @file src/ginput/mouse.c
* @brief GINPUT mouse/touch code.
*
- * @addtogroup GINPUT_MOUSE
+ * @defgroup Mouse Mouse
+ * @ingroup GINPUT
* @{
*/
#include "ch.h"
@@ -322,7 +323,6 @@ static void MousePoll(void *param) { }
}
-/* Mouse Functions */
GSourceHandle ginputGetMouse(uint16_t instance) {
#if GINPUT_MOUSE_NEED_CALIBRATION
Calibration *pc;
@@ -377,10 +377,6 @@ GSourceHandle ginputGetMouse(uint16_t instance) { return (GSourceHandle)&MouseConfig;
}
-/* Get the current mouse position and button status.
- * Unlike a listener event, this status cannot record meta events such as "CLICK"
- * Returns FALSE on error (eg invalid instance)
- */
bool_t ginputGetMouseStatus(uint16_t instance, GEventMouse *pe) {
if (instance || (MouseConfig.flags & (FLG_INIT_DONE|FLG_IN_CAL)) != FLG_INIT_DONE)
return FALSE;
@@ -401,9 +397,6 @@ bool_t ginputGetMouseStatus(uint16_t instance, GEventMouse *pe) { return TRUE;
}
-/* Run a mouse calibration.
- * Returns FALSE if the driver doesn't support it or if the handle is invalid.
- */
bool_t ginputCalibrateMouse(uint16_t instance) {
#if !GINPUT_MOUSE_NEED_CALIBRATION
(void) instance;
@@ -527,6 +520,7 @@ bool_t ginputCalibrateMouse(uint16_t instance) { MouseConfig.fnsavecal(instance, (const uint8_t *)&MouseConfig.caldata, sizeof(MouseConfig.caldata));
MouseConfig.flags |= FLG_CAL_SAVED;
}
+
return TRUE;
#endif
}
diff --git a/src/ginput/toggle.c b/src/ginput/toggle.c index 3b2e98bf..66021cd0 100644 --- a/src/ginput/toggle.c +++ b/src/ginput/toggle.c @@ -22,7 +22,8 @@ * @file src/ginput/toggle.c
* @brief GINPUT toggle code.
*
- * @addtogroup GINPUT_TOGGLE
+ * @defgroup Toggle Toggle
+ * @ingroup GINPUT
* @{
*/
#include "ch.h"
|