diff options
| author | Andrew Hannam <andrewh@inmarket.com.au> | 2012-12-06 18:45:54 +1000 |
|---|---|---|
| committer | Andrew Hannam <andrewh@inmarket.com.au> | 2012-12-06 18:45:54 +1000 |
| commit | 07f34835358ef65de310934ae726b66c7ca46f68 (patch) | |
| tree | 6b6875cc38f19bc1dd41b3b7edc8ea10ab7dbc84 /src/ginput | |
| parent | e236a0a6b79ccd4446df72256740913392cf12f7 (diff) | |
| download | uGFX-07f34835358ef65de310934ae726b66c7ca46f68.tar.gz uGFX-07f34835358ef65de310934ae726b66c7ca46f68.tar.bz2 uGFX-07f34835358ef65de310934ae726b66c7ca46f68.zip | |
Restructure
Create global include file called gfx.h which knows about sub-system
dependancies.
Deprecate Touchscreen (GINPUT touch is now working properly)
Merge Graph into GWIN
Change directory structure to reflect sub-system structure
Many small bugs fixed
Split Nokia6610 gdisp driver into GE8 and GE12 controller versions
Fixed broken demos.
GFX sub-systems are now clearly defined and new ones should be much
easier to add.
Diffstat (limited to 'src/ginput')
| -rw-r--r-- | src/ginput/dial.c | 6 | ||||
| -rw-r--r-- | src/ginput/keyboard.c | 6 | ||||
| -rw-r--r-- | src/ginput/mouse.c | 9 | ||||
| -rw-r--r-- | src/ginput/toggle.c | 9 |
4 files changed, 14 insertions, 16 deletions
diff --git a/src/ginput/dial.c b/src/ginput/dial.c index cb6799a9..233daa08 100644 --- a/src/ginput/dial.c +++ b/src/ginput/dial.c @@ -27,9 +27,9 @@ */
#include "ch.h"
#include "hal.h"
-#include "ginput.h"
+#include "gfx.h"
-#if GINPUT_NEED_DIAL || defined(__DOXYGEN__)
+#if (GFX_USE_GINPUT && GINPUT_NEED_DIAL) || defined(__DOXYGEN__)
#error "GINPUT: GINPUT_NEED_DIAL - Not Implemented Yet"
-#endif /* GINPUT_NEED_DIAL */
+#endif /* GFX_USE_GINPUT && GINPUT_NEED_DIAL */
/** @} */
diff --git a/src/ginput/keyboard.c b/src/ginput/keyboard.c index 1c38a408..bd443e77 100644 --- a/src/ginput/keyboard.c +++ b/src/ginput/keyboard.c @@ -27,9 +27,9 @@ */
#include "ch.h"
#include "hal.h"
-#include "ginput.h"
+#include "gfx.h"
-#if GINPUT_NEED_KEYBOARD || defined(__DOXYGEN__)
+#if (GFX_USE_GINPUT && GINPUT_NEED_KEYBOARD) || defined(__DOXYGEN__)
#error "GINPUT: GINPUT_NEED_KEYBOARD - Not Implemented Yet"
-#endif /* GINPUT_NEED_KEYBOARD */
+#endif /* GFX_USE_GINPUT && GINPUT_NEED_KEYBOARD */
/** @} */
diff --git a/src/ginput/mouse.c b/src/ginput/mouse.c index ac23e9f1..67ee5667 100644 --- a/src/ginput/mouse.c +++ b/src/ginput/mouse.c @@ -27,12 +27,11 @@ */
#include "ch.h"
#include "hal.h"
-#include "gtimer.h"
-#include "ginput.h"
+#include "gfx.h"
-#if GINPUT_NEED_MOUSE || defined(__DOXYGEN__)
+#if (GFX_USE_GINPUT && GINPUT_NEED_MOUSE) || defined(__DOXYGEN__)
-#include "lld/ginput/mouse.h"
+#include "ginput/lld/mouse.h"
#if GINPUT_MOUSE_NEED_CALIBRATION
#if !defined(GFX_USE_GDISP) || !GFX_USE_GDISP
@@ -582,5 +581,5 @@ void ginputMouseWakeupI(void) { gtimerJabI(&MouseTimer);
}
-#endif /* GINPUT_NEED_MOUSE */
+#endif /* GFX_USE_GINPUT && GINPUT_NEED_MOUSE */
/** @} */
diff --git a/src/ginput/toggle.c b/src/ginput/toggle.c index 890ac1dc..3b2e98bf 100644 --- a/src/ginput/toggle.c +++ b/src/ginput/toggle.c @@ -27,12 +27,11 @@ */
#include "ch.h"
#include "hal.h"
-#include "gtimer.h"
-#include "ginput.h"
+#include "gfx.h"
-#if GINPUT_NEED_TOGGLE || defined(__DOXYGEN__)
+#if (GFX_USE_GINPUT && GINPUT_NEED_TOGGLE) || defined(__DOXYGEN__)
-#include "lld/ginput/toggle.h"
+#include "ginput/lld/toggle.h"
#define GINPUT_TOGGLE_ISON 0x01
#define GINPUT_TOGGLE_INVERT 0x02
@@ -163,5 +162,5 @@ void ginputToggleWakeupI(void) { gtimerJabI(&ToggleTimer);
}
-#endif /* GINPUT_NEED_TOGGLE */
+#endif /* GFX_USE_GINPUT && GINPUT_NEED_TOGGLE */
/** @} */
|