diff options
| author | Joel Bodenmann <joel@unormal.org> | 2013-02-18 08:18:09 +0100 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2013-02-18 08:18:09 +0100 |
| commit | 08f2305aeb1458dbefd435bf8e56693aa878d0b2 (patch) | |
| tree | 6bd8edcc4bb64c10938c9824b9ca54be6122dbac /gfxconf.example.h | |
| parent | f8050a84f76c5f8be7bd87fd26eb053901a11dd6 (diff) | |
| parent | 1985906bea97a015d6e035ebb3f91b6e4f94aff1 (diff) | |
| download | uGFX-08f2305aeb1458dbefd435bf8e56693aa878d0b2.tar.gz uGFX-08f2305aeb1458dbefd435bf8e56693aa878d0b2.tar.bz2 uGFX-08f2305aeb1458dbefd435bf8e56693aa878d0b2.zip | |
TDISP merge - NOT TESTED!!!
Diffstat (limited to 'gfxconf.example.h')
| -rw-r--r-- | gfxconf.example.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/gfxconf.example.h b/gfxconf.example.h index d9f1603e..d09e9d00 100644 --- a/gfxconf.example.h +++ b/gfxconf.example.h @@ -48,11 +48,8 @@ #define GDISP_INCLUDE_FONT_UI2 TRUE
#define GDISP_INCLUDE_FONT_LARGENUMBERS TRUE
-/* TDISP options */
-#define TDISP_COLUMNS 16
-#define TDISP_ROWS 2
-#define TDISP_NEED_4BIT_MODE FALSE
-#define TDISP_NEED_8BIT_MODE FALSE
+/* Features for the TDISP subsystem. */
+#define TDISP_NEED_MULTITHREAD FALSE
/* Features for the GWIN subsystem. */
#define GWIN_NEED_BUTTON FALSE
@@ -99,6 +96,13 @@ #define GDISP_SCREEN_HEIGHT 240
#define GDISP_USE_FSMC
#define GDISP_USE_GPIO
+<<<<<<< HEAD +======= + #define GDISP_VMT_NAME1(x) x##YourDriver1
+ #define GDISP_VMT_NAME2(x) x##YourDriver2
+ #define TDISP_COLUMNS 16
+ #define TDISP_ROWS 2
+>>>>>>> 1985906bea97a015d6e035ebb3f91b6e4f94aff1 */
#endif /* _GFXCONF_H */
|