uGFX/ugfx
2
0
Fork 0
Code Issues2 Pull requests Projects Releases Wiki Activity

cleanup

Browse source
This commit is contained in:
Joel Bodenmann 2013-02-18 08:20:19 +01:00
parent 08f2305aeb
commit d41120ee2d
1 changed files with 105 additions and 109 deletions

6
gfxconf.example.h
View file

@ -96,13 +96,9 @@
#define GDISP_SCREEN_HEIGHT 240 #define GDISP_SCREEN_HEIGHT 240
#define GDISP_USE_FSMC #define GDISP_USE_FSMC
#define GDISP_USE_GPIO #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_COLUMNS 16
#define TDISP_ROWS 2 #define TDISP_ROWS 2
>>>>>>> 1985906bea97a015d6e035ebb3f91b6e4f94aff1
*/ */
#endif /* _GFXCONF_H */ #endif /* _GFXCONF_H */