diff options
author | Joel Bodenmann <joel@unormal.org> | 2012-10-11 01:41:18 +0200 |
---|---|---|
committer | Joel Bodenmann <joel@unormal.org> | 2012-10-11 01:41:18 +0200 |
commit | cf1a759ad6bcd51066036e40e91c617b91f1beba (patch) | |
tree | 31a403b38c0c5eba3664967d0f055c33339ec5e2 /drivers/gdisp/SSD1963 | |
parent | b9de7e6ce3f7e3b3344d1893c0516114a91277ae (diff) | |
download | uGFX-cf1a759ad6bcd51066036e40e91c617b91f1beba.tar.gz uGFX-cf1a759ad6bcd51066036e40e91c617b91f1beba.tar.bz2 uGFX-cf1a759ad6bcd51066036e40e91c617b91f1beba.zip |
SCREEN_WIDTH and SCREEN_HEIGHT renamed to GDISP_SCREEN_WIDTH and GDISP_SCREEN_HEIGHT
Diffstat (limited to 'drivers/gdisp/SSD1963')
-rw-r--r-- | drivers/gdisp/SSD1963/gdisp_lld.c | 28 | ||||
-rw-r--r-- | drivers/gdisp/SSD1963/gdisp_lld_panel.h | 8 | ||||
-rw-r--r-- | drivers/gdisp/SSD1963/readme.txt | 4 |
3 files changed, 20 insertions, 20 deletions
diff --git a/drivers/gdisp/SSD1963/gdisp_lld.c b/drivers/gdisp/SSD1963/gdisp_lld.c index cc8ff875..a1fae8a1 100644 --- a/drivers/gdisp/SSD1963/gdisp_lld.c +++ b/drivers/gdisp/SSD1963/gdisp_lld.c @@ -259,10 +259,10 @@ bool_t GDISP_LLD(init)(void) { // GDISP_LLD(writedata)(0x0000);
GDISP_LLD(writedata)(0b00011000); //Enabled dithering
GDISP_LLD(writedata)(0x0000);
- GDISP_LLD(writedata)(mHIGH((SCREEN_WIDTH+1)));
- GDISP_LLD(writedata)((SCREEN_WIDTH+1));
- GDISP_LLD(writedata)(mHIGH((SCREEN_HEIGHT+1)));
- GDISP_LLD(writedata)((SCREEN_HEIGHT+1));
+ GDISP_LLD(writedata)(mHIGH((GDISP_SCREEN_WIDTH+1)));
+ GDISP_LLD(writedata)((GDISP_SCREEN_WIDTH+1));
+ GDISP_LLD(writedata)(mHIGH((GDISP_SCREEN_HEIGHT+1)));
+ GDISP_LLD(writedata)((GDISP_SCREEN_HEIGHT+1));
GDISP_LLD(writedata)(0x0000);
GDISP_LLD(writeindex)(SSD1963_SET_PIXEL_DATA_INTERFACE);
@@ -306,8 +306,8 @@ bool_t GDISP_LLD(init)(void) { #endif
/* Initialise the GDISP structure to match */
- GDISP.Width = SCREEN_WIDTH;
- GDISP.Height = SCREEN_HEIGHT;
+ GDISP.Width = GDISP_SCREEN_WIDTH;
+ GDISP.Height = GDISP_SCREEN_HEIGHT;
GDISP.Orientation = GDISP_ROTATE_0;
GDISP.Powermode = powerOn;
GDISP.Backlight = 100;
@@ -565,23 +565,23 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) { switch((gdisp_orientation_t)value) {
case GDISP_ROTATE_0:
/* Code here */
- GDISP.Height = SCREEN_HEIGHT;
- GDISP.Width = SCREEN_WIDTH;
+ GDISP.Height = GDISP_SCREEN_HEIGHT;
+ GDISP.Width = GDISP_SCREEN_WIDTH;
break;
case GDISP_ROTATE_90:
/* Code here */
- GDISP.Height = SCREEN_WIDTH;
- GDISP.Width = SCREEN_HEIGHT;
+ GDISP.Height = GDISP_SCREEN_WIDTH;
+ GDISP.Width = GDISP_SCREEN_HEIGHT;
break;
case GDISP_ROTATE_180:
/* Code here */
- GDISP.Height = SCREEN_HEIGHT;
- GDISP.Width = SCREEN_WIDTH;
+ GDISP.Height = GDISP_SCREEN_HEIGHT;
+ GDISP.Width = GDISP_SCREEN_WIDTH;
break;
case GDISP_ROTATE_270:
/* Code here */
- GDISP.Height = SCREEN_WIDTH;
- GDISP.Width = SCREEN_HEIGHT;
+ GDISP.Height = GDISP_SCREEN_WIDTH;
+ GDISP.Width = GDISP_SCREEN_HEIGHT;
break;
default:
return;
diff --git a/drivers/gdisp/SSD1963/gdisp_lld_panel.h b/drivers/gdisp/SSD1963/gdisp_lld_panel.h index 36050ff4..b4ed5c80 100644 --- a/drivers/gdisp/SSD1963/gdisp_lld_panel.h +++ b/drivers/gdisp/SSD1963/gdisp_lld_panel.h @@ -30,8 +30,8 @@ #define _GDISP_LLD_PANEL_H /* LCD panel specs */ -#define SCREEN_WIDTH 480 -#define SCREEN_HEIGHT 272 +#define GDISP_SCREEN_WIDTH 480 +#define GDISP_SCREEN_HEIGHT 272 #define SCREEN_FPS 60ULL @@ -43,8 +43,8 @@ #define SCREEN_VSYNC_FRONT_PORCH 2ULL #define SCREEN_VSYNC_PULSE 10ULL -#define SCREEN_HSYNC_PERIOD (SCREEN_HSYNC_PULSE + SCREEN_HSYNC_BACK_PORCH + SCREEN_WIDTH + SCREEN_HSYNC_FRONT_PORCH) -#define SCREEN_VSYNC_PERIOD (SCREEN_VSYNC_PULSE + SCREEN_VSYNC_BACK_PORCH + SCREEN_HEIGHT + SCREEN_VSYNC_FRONT_PORCH) +#define SCREEN_HSYNC_PERIOD (SCREEN_HSYNC_PULSE + SCREEN_HSYNC_BACK_PORCH + GDISP_SCREEN_WIDTH + SCREEN_HSYNC_FRONT_PORCH) +#define SCREEN_VSYNC_PERIOD (SCREEN_VSYNC_PULSE + SCREEN_VSYNC_BACK_PORCH + GDISP_SCREEN_HEIGHT + SCREEN_VSYNC_FRONT_PORCH) #define SCREEN_PCLK (SCREEN_HSYNC_PERIOD * SCREEN_VSYNC_PERIOD * SCREEN_FPS) #define GDISP_FPR ((SCREEN_PCLK * 1048576)/100000000) diff --git a/drivers/gdisp/SSD1963/readme.txt b/drivers/gdisp/SSD1963/readme.txt index 375133a7..7bc7262b 100644 --- a/drivers/gdisp/SSD1963/readme.txt +++ b/drivers/gdisp/SSD1963/readme.txt @@ -18,8 +18,8 @@ To use this driver: Example FSMC config with DMA: -#define SCREEN_WIDTH 480 -#define SCREEN_HEIGHT 272 +#define GDISP_SCREEN_WIDTH 480 +#define GDISP_SCREEN_HEIGHT 272 #define GDISP_USE_FSMC |