diff options
author | inmarket <andrewh@inmarket.com.au> | 2015-12-22 13:25:27 +1000 |
---|---|---|
committer | inmarket <andrewh@inmarket.com.au> | 2015-12-22 13:25:27 +1000 |
commit | a7cf866da26bb6a5116e8838d6eea0d70445fa67 (patch) | |
tree | 61f903af8990a68dbc3c7256504737f6cba326b9 | |
parent | a21db25ecf4bea049f87a6ca4118ae389e9c158e (diff) | |
download | uGFX-a7cf866da26bb6a5116e8838d6eea0d70445fa67.tar.gz uGFX-a7cf866da26bb6a5116e8838d6eea0d70445fa67.tar.bz2 uGFX-a7cf866da26bb6a5116e8838d6eea0d70445fa67.zip |
Small fixes to ILI9342
-rw-r--r-- | drivers/gdisp/ILI9342/gdisp_lld_ILI9342.c | 12 | ||||
-rw-r--r-- | drivers/gdisp/ILI9342/gdisp_lld_config.h | 1 |
2 files changed, 4 insertions, 9 deletions
diff --git a/drivers/gdisp/ILI9342/gdisp_lld_ILI9342.c b/drivers/gdisp/ILI9342/gdisp_lld_ILI9342.c index 4560a166..cd6f75f7 100644 --- a/drivers/gdisp/ILI9342/gdisp_lld_ILI9342.c +++ b/drivers/gdisp/ILI9342/gdisp_lld_ILI9342.c @@ -19,8 +19,8 @@ #endif #define GDISP_DRIVER_VMT GDISPVMT_ILI9342 -#include "drivers/gdisp/ILI9342/gdisp_lld_config.h" -#include "src/gdisp/gdisp_driver.h" +#include "gdisp_lld_config.h" +#include "../../../src/gdisp/gdisp_driver.h" #include "board_ILI9342.h" @@ -28,16 +28,12 @@ /* Driver local definitions. */ /*===========================================================================*/ - #define GDISP_SCREEN_HEIGHT 240 - #define GDISP_SCREEN_WIDTH 320 -/* #ifndef GDISP_SCREEN_HEIGHT - #define GDISP_SCREEN_HEIGHT 320 + #define GDISP_SCREEN_HEIGHT 240 #endif #ifndef GDISP_SCREEN_WIDTH - #define GDISP_SCREEN_WIDTH 240 + #define GDISP_SCREEN_WIDTH 320 #endif -*/ #ifndef GDISP_INITIAL_CONTRAST #define GDISP_INITIAL_CONTRAST 50 #endif diff --git a/drivers/gdisp/ILI9342/gdisp_lld_config.h b/drivers/gdisp/ILI9342/gdisp_lld_config.h index 70947f0c..7dfd0627 100644 --- a/drivers/gdisp/ILI9342/gdisp_lld_config.h +++ b/drivers/gdisp/ILI9342/gdisp_lld_config.h @@ -15,7 +15,6 @@ /*===========================================================================*/ #define GDISP_HARDWARE_STREAM_WRITE TRUE -#define GDISP_HARDWARE_STREAM_READ FALSE #define GDISP_HARDWARE_CONTROL TRUE #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565 |