From a7cf866da26bb6a5116e8838d6eea0d70445fa67 Mon Sep 17 00:00:00 2001 From: inmarket Date: Tue, 22 Dec 2015 13:25:27 +1000 Subject: [PATCH] Small fixes to ILI9342 --- drivers/gdisp/ILI9342/gdisp_lld_ILI9342.c | 12 ++++-------- 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