Merge branch 'master' into newmouse

This commit is contained in:
Joel Bodenmann 2014-10-26 15:21:43 +01:00
commit ccf2323335
5 changed files with 4 additions and 4 deletions

View File

@ -1,2 +0,0 @@
GFXINC += $(GFXLIB)/drivers/gdisp/LGD4532
GFXSRC += $(GFXLIB)/drivers/gdisp/LGD4532/gdisp_lld_LGD4532.c

View File

@ -0,0 +1,2 @@
GFXINC += $(GFXLIB)/drivers/gdisp/LGDP4532
GFXSRC += $(GFXLIB)/drivers/gdisp/LGDP4532/gdisp_lld_LGDP4532.c

View File

@ -19,11 +19,11 @@
#undef GDISP_SCREEN_WIDTH #undef GDISP_SCREEN_WIDTH
#endif #endif
#define GDISP_DRIVER_VMT GDISPVMT_LGD4532 #define GDISP_DRIVER_VMT GDISPVMT_LGDP4532
#include "gdisp_lld_config.h" #include "gdisp_lld_config.h"
#include "src/gdisp/driver.h" #include "src/gdisp/driver.h"
#include "board_LGD4532.h" #include "board_LGDP4532.h"
/*===========================================================================*/ /*===========================================================================*/
/* Driver local definitions. */ /* Driver local definitions. */