From 112781baee6c1a3c7520e710eb609d0234c89edf Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Sun, 11 Nov 2012 16:02:44 +0100 Subject: [PATCH 1/8] set GWIN_NEED_CONSOLE default value to FALSE --- include/gwin.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/gwin.h b/include/gwin.h index 37fecab4..b1c644a6 100644 --- a/include/gwin.h +++ b/include/gwin.h @@ -47,14 +47,14 @@ */ /** * @brief Should console functions be included. - * @details Defaults to TRUE + * @details Defaults to FALSE */ #ifndef GWIN_NEED_CONSOLE - #define GWIN_NEED_CONSOLE TRUE + #define GWIN_NEED_CONSOLE FALSE #endif /** * @brief Should button functions be included. - * @details Defaults to FALSE for now as implementation is not complete + * @details Defaults to FALSE */ #ifndef GWIN_NEED_BUTTON #define GWIN_NEED_BUTTON FALSE From c0de701066c25c79e2e5bd798575886ca2e6b7e0 Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Sun, 11 Nov 2012 16:19:50 +0100 Subject: [PATCH 2/8] GDISP_NEED_TEXT getting set automatically if GWIN_NEED_CONSOLE or GWIN_NEED_BUTTON set to TRUE --- include/gwin.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/gwin.h b/include/gwin.h index b1c644a6..6b33a5ff 100644 --- a/include/gwin.h +++ b/include/gwin.h @@ -76,11 +76,11 @@ #endif #if GWIN_NEED_CONSOLE && !GDISP_NEED_TEXT - #error "GWIN: Text support (GDISP_NEED_TEXT) is required if GWIN_NEED_CONSOLE is defined." + #define GDISP_NEED_TEXT TRUE #endif #if GWIN_NEED_BUTTON && !GDISP_NEED_TEXT - #error "GWIN: Text support (GDISP_NEED_TEXT) is required if GWIN_NEED_BUTTON is defined." + #define GDISP_NEED_TEXT TRUE #endif #if GWIN_NEED_BUTTON From eb6e5760fc508fa59bf6291dadb974955010ae3b Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Sun, 11 Nov 2012 18:20:23 +0100 Subject: [PATCH 3/8] added ILI9320 driver - not finished yet, but working --- drivers/gdisp/ILI9320/gdisp_lld.c | 487 +++++++++++++++++++++++ drivers/gdisp/ILI9320/gdisp_lld.mk | 5 + drivers/gdisp/ILI9320/gdisp_lld_config.h | 53 +++ drivers/gdisp/ILI9320/ili9320_lld.c.h | 124 ++++++ drivers/gdisp/ILI9320/readme.txt | 19 + 5 files changed, 688 insertions(+) create mode 100644 drivers/gdisp/ILI9320/gdisp_lld.c create mode 100644 drivers/gdisp/ILI9320/gdisp_lld.mk create mode 100644 drivers/gdisp/ILI9320/gdisp_lld_config.h create mode 100644 drivers/gdisp/ILI9320/ili9320_lld.c.h create mode 100644 drivers/gdisp/ILI9320/readme.txt diff --git a/drivers/gdisp/ILI9320/gdisp_lld.c b/drivers/gdisp/ILI9320/gdisp_lld.c new file mode 100644 index 00000000..045c8a57 --- /dev/null +++ b/drivers/gdisp/ILI9320/gdisp_lld.c @@ -0,0 +1,487 @@ +/* + ChibiOS/RT - Copyright (C) 2012 + Joel Bodenmann aka Tectu + + This file is part of ChibiOS/GFX. + + ChibiOS/GFX is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + ChibiOS/GFX is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +/** + * @file drivers/gdisp/ILI9320/gdisp_lld.c + * @brief GDISP Graphics Driver subsystem low level driver source for the SSD1289 display. + * + * @addtogroup GDISP + * @{ + */ + +#include "ch.h" +#include "hal.h" +#include "gdisp.h" + +#if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/ + +/* Include the emulation code for things we don't support */ +#include "gdisp_emulation.c" + +#include "ili9320_lld.c.h" + +/*===========================================================================*/ +/* Driver interrupt handlers. */ +/*===========================================================================*/ + +/*===========================================================================*/ +/* Driver exported functions. */ +/*===========================================================================*/ + +/* ---- Required Routines ---- */ +/* + The following 2 routines are required. + All other routines are optional. +*/ + +/** + * @brief Low level GDISP driver initialization. + * + * @notapi + */ +bool_t GDISP_LLD(init)(void) { +#if defined(GDISP_USE_FSMC) + + /* FSMC setup for F1/F3 */ + rccEnableAHB(RCC_AHBENR_FSMCEN, 0); + + /* set pins to FSMC mode */ + IOBus busD = {GPIOD, PAL_WHOLE_PORT, 0}; + IOBus busE = {GPIOE, PAL_WHOLE_PORT, 0}; + + palSetBusMode(&busD, PAL_MODE_STM32_ALTERNATE_PUSHPULL ); + palSetBusMode(&busE, PAL_MODE_STM32_ALTERNATE_PUSHPULL ); + + // const unsigned char FSMC_Bank = 0; + const unsigned char FSMC_Bank = 6; + + /* FSMC timing */ + FSMC_Bank1->BTCR[FSMC_Bank+1] = (10) | (10 << 8) | (10 << 16); + + /* Bank1 NOR/SRAM control register configuration + * This is actually not needed as already set by default after reset */ + FSMC_Bank1->BTCR[FSMC_Bank] = FSMC_BCR1_MWID_0 | FSMC_BCR1_WREN | FSMC_BCR1_MBKEN; +#endif + + palSetPadMode(GPIOE, GPIOE_TFT_RST, PAL_MODE_OUTPUT_PUSHPULL); + palSetPad(GPIOE, GPIOE_TFT_RST); + + uint32_t DISPLAY_CODE = lld_lcdReadReg(0); + + lld_lcdWriteReg(0x0000, 0x0001); //start Int. osc + lld_lcdDelay(500); + lld_lcdWriteReg(0x0001, 0x0100); //Set SS bit (shift direction of outputs is from S720 to S1) + lld_lcdWriteReg(0x0002, 0x0700); //select the line inversion + lld_lcdWriteReg(0x0003, 0x1038); //Entry mode(Horizontal : increment,Vertical : increment, AM=1) + lld_lcdWriteReg(0x0004, 0x0000); //Resize control(No resizing) + lld_lcdWriteReg(0x0008, 0x0202); //front and back porch 2 lines + lld_lcdWriteReg(0x0009, 0x0000); //select normal scan + lld_lcdWriteReg(0x000A, 0x0000); //display control 4 + lld_lcdWriteReg(0x000C, 0x0000); //system interface(2 transfer /pixel), internal sys clock, + lld_lcdWriteReg(0x000D, 0x0000); //Frame marker position + lld_lcdWriteReg(0x000F, 0x0000); //selects clk, enable and sync signal polarity, + lld_lcdWriteReg(0x0010, 0x0000); // + lld_lcdWriteReg(0x0011, 0x0000); //power control 2 reference voltages = 1:1, + lld_lcdWriteReg(0x0012, 0x0000); //power control 3 VRH + lld_lcdWriteReg(0x0013, 0x0000); //power control 4 VCOM amplitude + lld_lcdDelay(500); + lld_lcdWriteReg(0x0010, 0x17B0); //power control 1 BT,AP + lld_lcdWriteReg(0x0011, 0x0137); //power control 2 DC,VC + lld_lcdDelay(500); + lld_lcdWriteReg(0x0012, 0x0139); //power control 3 VRH + lld_lcdDelay(500); + lld_lcdWriteReg(0x0013, 0x1d00); //power control 4 vcom amplitude + lld_lcdWriteReg(0x0029, 0x0011); //power control 7 VCOMH + lld_lcdDelay(500); + lld_lcdWriteReg(0x0030, 0x0007); + lld_lcdWriteReg(0x0031, 0x0403); + lld_lcdWriteReg(0x0032, 0x0404); + lld_lcdWriteReg(0x0035, 0x0002); + lld_lcdWriteReg(0x0036, 0x0707); + lld_lcdWriteReg(0x0037, 0x0606); + lld_lcdWriteReg(0x0038, 0x0106); + lld_lcdWriteReg(0x0039, 0x0007); + lld_lcdWriteReg(0x003c, 0x0700); + lld_lcdWriteReg(0x003d, 0x0707); + lld_lcdWriteReg(0x0020, 0x0000); //starting Horizontal GRAM Address + lld_lcdWriteReg(0x0021, 0x0000); //starting Vertical GRAM Address + lld_lcdWriteReg(0x0050, 0x0000); //Horizontal GRAM Start Position + lld_lcdWriteReg(0x0051, 0x00EF); //Horizontal GRAM end Position + lld_lcdWriteReg(0x0052, 0x0000); //Vertical GRAM Start Position + lld_lcdWriteReg(0x0053, 0x013F); //Vertical GRAM end Position + + switch (DISPLAY_CODE) { + case 0x9320: + lld_lcdWriteReg(0x0060, 0x2700); //starts scanning from G1, and 320 drive lines + break; + case 0x9325: + lld_lcdWriteReg(0x0060, 0xA700); //starts scanning from G1, and 320 drive lines + break; + } + + lld_lcdWriteReg(0x0061, 0x0001); //fixed base display + lld_lcdWriteReg(0x006a, 0x0000); //no scroll + lld_lcdWriteReg(0x0090, 0x0010); //set Clocks/Line =16, Internal Operation Clock Frequency=fosc/1, + lld_lcdWriteReg(0x0092, 0x0000); //set gate output non-overlap period=0 + lld_lcdWriteReg(0x0093, 0x0003); //set Source Output Position=3 + lld_lcdWriteReg(0x0095, 0x0110); //RGB interface(Clocks per line period=16 clocks) + lld_lcdWriteReg(0x0097, 0x0110); //set Gate Non-overlap Period 0 locksc + lld_lcdWriteReg(0x0098, 0x0110); // + lld_lcdWriteReg(0x0007, 0x0173); //display On + + /* Initialise the GDISP structure */ + GDISP.Width = GDISP_SCREEN_WIDTH; + GDISP.Height = GDISP_SCREEN_HEIGHT; + GDISP.Orientation = GDISP_ROTATE_0; + GDISP.Powermode = powerOn; + GDISP.Backlight = 100; + GDISP.Contrast = 50; + #if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP + GDISP.clipx0 = 0; + GDISP.clipy0 = 0; + GDISP.clipx1 = GDISP.Width; + GDISP.clipy1 = GDISP.Height; + #endif + return TRUE; +} + +/** + * @brief Draws a pixel on the display. + * + * @param[in] x X location of the pixel + * @param[in] y Y location of the pixel + * @param[in] color The color of the pixel + * + * @notapi + */ +void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) { + #if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP + if (x < GDISP.clipx0 || y < GDISP.clipy0 || x >= GDISP.clipx1 || y >= GDISP.clipy1) return; + #endif + lld_lcdSetCursor(x, y); + lld_lcdWriteReg(0x0022, color); +} + +/* ---- Optional Routines ---- */ +/* + All the below routines are optional. + Defining them will increase speed but everything + will work if they are not defined. + If you are not using a routine - turn it off using + the appropriate GDISP_HARDWARE_XXXX macro. + Don't bother coding for obvious similar routines if + there is no performance penalty as the emulation software + makes a good job of using similar routines. + eg. If gfillarea() is defined there is little + point in defining clear() unless the + performance bonus is significant. + For good performance it is suggested to implement + fillarea() and blitarea(). +*/ + +#if GDISP_HARDWARE_CLEARS || defined(__DOXYGEN__) + /** + * @brief Clear the display. + * @note Optional - The high level driver can emulate using software. + * + * @param[in] color The color of the pixel + * + * @notapi + */ + void GDISP_LLD(clear)(color_t color) { + unsigned i; + + lld_lcdSetCursor(0, 0); + lld_lcdWriteStreamStart(); + + for(i = 0; i < GDISP_SCREEN_WIDTH * GDISP_SCREEN_HEIGHT; i++) + lld_lcdWriteData(color); + + lld_lcdWriteStreamStop(); + } +#endif + +#if GDISP_HARDWARE_FILLS || defined(__DOXYGEN__) + /** + * @brief Fill an area with a color. + * @note Optional - The high level driver can emulate using software. + * + * @param[in] x, y The start filled area + * @param[in] cx, cy The width and height to be filled + * @param[in] color The color of the fill + * + * @notapi + */ + void GDISP_LLD(fillarea)(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color) { + #if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP + if (x < GDISP.clipx0) { cx -= GDISP.clipx0 - x; x = GDISP.clipx0; } + if (y < GDISP.clipy0) { cy -= GDISP.clipy0 - y; y = GDISP.clipy0; } + if (cx <= 0 || cy <= 0 || x >= GDISP.clipx1 || y >= GDISP.clipy1) return; + if (x+cx > GDISP.clipx1) cx = GDISP.clipx1 - x; + if (y+cy > GDISP.clipy1) cy = GDISP.clipy1 - y; + #endif + + unsigned i, area; + + area = cx*cy; + lld_lcdSetViewPort(x, y, cx, cy); + lld_lcdWriteStreamStart(); + for(i = 0; i < area; i++) + lld_lcdWriteData(color); + lld_lcdWriteStreamStop(); + lld_lcdResetViewPort(); + } +#endif + +#if GDISP_HARDWARE_BITFILLS || defined(__DOXYGEN__) + /** + * @brief Fill an area with a bitmap. + * @note Optional - The high level driver can emulate using software. + * + * @param[in] x, y The start filled area + * @param[in] cx, cy The width and height to be filled + * @param[in] srcx, srcy The bitmap position to start the fill from + * @param[in] srccx The width of a line in the bitmap. + * @param[in] buffer The pixels to use to fill the area. + * + * @notapi + */ + void GDISP_LLD(blitareaex)(coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t srcx, coord_t srcy, coord_t srccx, const pixel_t *buffer) { + coord_t endx, endy; + unsigned lg; + + #if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP + if (x < GDISP.clipx0) { cx -= GDISP.clipx0 - x; srcx += GDISP.clipx0 - x; x = GDISP.clipx0; } + if (y < GDISP.clipy0) { cy -= GDISP.clipy0 - y; srcy += GDISP.clipy0 - y; y = GDISP.clipy0; } + if (srcx+cx > srccx) cx = srccx - srcx; + if (cx <= 0 || cy <= 0 || x >= GDISP.clipx1 || y >= GDISP.clipy1) return; + if (x+cx > GDISP.clipx1) cx = GDISP.clipx1 - x; + if (y+cy > GDISP.clipy1) cy = GDISP.clipy1 - y; + #endif + + lld_lcdSetViewPort(x, y, cx, cy); + lld_lcdWriteStreamStart(); + + endx = srcx + cx; + endy = y + cy; + lg = srccx - cx; + buffer += srcx + srcy * srccx; + for(; y < endy; y++, buffer += lg) + for(x=srcx; x < endx; x++) + lld_lcdWriteData(*buffer++); + lld_lcdWriteStreamStop(); + lld_lcdResetViewPort(); + } +#endif + +#if (GDISP_NEED_PIXELREAD && GDISP_HARDWARE_PIXELREAD) || defined(__DOXYGEN__) + /** + * @brief Get the color of a particular pixel. + * @note Optional. + * @note If x,y is off the screen, the result is undefined. + * + * @param[in] x, y The start of the text + * + * @notapi + */ + color_t GDISP_LLD(getpixelcolor)(coord_t x, coord_t y) { + color_t color; + + #if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP + if (x < 0 || x >= GDISP.Width || y < 0 || y >= GDISP.Height) return 0; + #endif + + lld_lcdSetCursor(x, y); + lld_lcdWriteStreamStart(); + + color = lld_lcdReadData(); + color = lld_lcdReadData(); + + lld_lcdWriteStreamStop(); + + return color; + } +#endif + +#if (GDISP_NEED_SCROLL && GDISP_HARDWARE_SCROLL) || defined(__DOXYGEN__) + /** + * @brief Scroll vertically a section of the screen. + * @note Optional. + * @note If x,y + cx,cy is off the screen, the result is undefined. + * @note If lines is >= cy, it is equivelent to a area fill with bgcolor. + * + * @param[in] x, y The start of the area to be scrolled + * @param[in] cx, cy The size of the area to be scrolled + * @param[in] lines The number of lines to scroll (Can be positive or negative) + * @param[in] bgcolor The color to fill the newly exposed area. + * + * @notapi + */ + void GDISP_LLD(verticalscroll)(coord_t x, coord_t y, coord_t cx, coord_t cy, int lines, color_t bgcolor) { + static color_t buf[((GDISP_SCREEN_HEIGHT > GDISP_SCREEN_WIDTH ) ? GDISP_SCREEN_HEIGHT : GDISP_SCREEN_WIDTH)]; + coord_t row0, row1; + unsigned i, gap, abslines; + + #if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP + if (x < GDISP.clipx0) { cx -= GDISP.clipx0 - x; x = GDISP.clipx0; } + if (y < GDISP.clipy0) { cy -= GDISP.clipy0 - y; y = GDISP.clipy0; } + if (!lines || cx <= 0 || cy <= 0 || x >= GDISP.clipx1 || y >= GDISP.clipy1) return; + if (x+cx > GDISP.clipx1) cx = GDISP.clipx1 - x; + if (y+cy > GDISP.clipy1) cy = GDISP.clipy1 - y; + #endif + + abslines = lines < 0 ? -lines : lines; + + if (abslines >= cy) { + abslines = cy; + gap = 0; + } else { + gap = cy - abslines; + for(i = 0; i < gap; i++) { + if(lines > 0) { + row0 = y + i + lines; + row1 = y + i; + } else { + row0 = (y - i - 1) + lines; + row1 = (y - i - 1); + } + + /* read row0 into the buffer and then write at row1*/ + lld_lcdSetViewPort(x, row0, cx, 1); + lld_lcdReadStreamStart(); + lld_lcdReadStream(buf, cx); + lld_lcdReadStreamStop(); + + lld_lcdSetViewPort(x, row1, cx, 1); + lld_lcdWriteStreamStart(); + lld_lcdWriteStream(buf, cx); + lld_lcdWriteStreamStop(); + } + } + + /* fill the remaining gap */ + lld_lcdSetViewPort(x, lines > 0 ? (y+gap) : y, cx, abslines); + lld_lcdWriteStreamStart(); + gap = cx*abslines; + for(i = 0; i < gap; i++) lld_lcdWriteData(bgcolor); + lld_lcdWriteStreamStop(); + lld_lcdResetViewPort(); + } +#endif + +#if (GDISP_NEED_CONTROL && GDISP_HARDWARE_CONTROL) || defined(__DOXYGEN__) + /** + * @brief Driver Control + * @details Unsupported control codes are ignored. + * @note The value parameter should always be typecast to (void *). + * @note There are some predefined and some specific to the low level driver. + * @note GDISP_CONTROL_POWER - Takes a gdisp_powermode_t + * GDISP_CONTROL_ORIENTATION - Takes a gdisp_orientation_t + * GDISP_CONTROL_BACKLIGHT - Takes an int from 0 to 100. For a driver + * that only supports off/on anything other + * than zero is on. + * GDISP_CONTROL_CONTRAST - Takes an int from 0 to 100. + * GDISP_CONTROL_LLD - Low level driver control constants start at + * this value. + * + * @param[in] what What to do. + * @param[in] value The value to use (always cast to a void *). + * + * @notapi + */ + void GDISP_LLD(control)(unsigned what, void *value) { + switch(what) { + case GDISP_CONTROL_POWER: + if (GDISP.Powermode == (gdisp_powermode_t)value) + return; + switch((gdisp_powermode_t)value) { + case powerOff: + lld_lcdWriteReg(0x0010, 0x0000); // leave sleep mode + lld_lcdWriteReg(0x0007, 0x0000); // halt operation + lld_lcdWriteReg(0x0000, 0x0000); // turn off oszillator + lld_lcdWriteReg(0x0010, 0x0001); // enter sleepmode + break; + case powerOn: + lld_lcdWriteReg(0x0010, 0x0000); // leave sleep mode + if (GDISP.Powermode != powerSleep) + GDISP_LLD(init)(); + break; + case powerSleep: + lld_lcdWriteReg(0x0010, 0x0001); // enter sleep mode + break; + default: + return; + } + GDISP.Powermode = (gdisp_powermode_t)value; + return; + case GDISP_CONTROL_ORIENTATION: + if (GDISP.Orientation == (gdisp_orientation_t)value) + return; + switch((gdisp_orientation_t)value) { + case GDISP_ROTATE_0: + lld_lcdWriteReg(0x0001, 0x2B3F); + /* ID = 11 AM = 0 */ + lld_lcdWriteReg(0x0011, 0x6070); + GDISP.Height = GDISP_SCREEN_HEIGHT; + GDISP.Width = GDISP_SCREEN_WIDTH; + break; + case GDISP_ROTATE_90: + lld_lcdWriteReg(0x0001, 0x293F); + /* ID = 11 AM = 1 */ + lld_lcdWriteReg(0x0011, 0x6078); + GDISP.Height = GDISP_SCREEN_WIDTH; + GDISP.Width = GDISP_SCREEN_HEIGHT; + break; + case GDISP_ROTATE_180: + lld_lcdWriteReg(0x0001, 0x2B3F); + /* ID = 01 AM = 0 */ + lld_lcdWriteReg(0x0011, 0x6040); + GDISP.Height = GDISP_SCREEN_HEIGHT; + GDISP.Width = GDISP_SCREEN_WIDTH; + break; + case GDISP_ROTATE_270: + lld_lcdWriteReg(0x0001, 0x293F); + /* ID = 01 AM = 1 */ + lld_lcdWriteReg(0x0011, 0x6048); + GDISP.Height = GDISP_SCREEN_WIDTH; + GDISP.Width = GDISP_SCREEN_HEIGHT; + break; + default: + return; + } + #if GDISP_NEED_CLIP || GDISP_NEED_VALIDATION + GDISP.clipx0 = 0; + GDISP.clipy0 = 0; + GDISP.clipx1 = GDISP.Width; + GDISP.clipy1 = GDISP.Height; + #endif + GDISP.Orientation = (gdisp_orientation_t)value; + return; +/* + case GDISP_CONTROL_BACKLIGHT: + case GDISP_CONTROL_CONTRAST: +*/ + } + } + +#endif + +#endif /* GFX_USE_GDISP */ +/** @} */ diff --git a/drivers/gdisp/ILI9320/gdisp_lld.mk b/drivers/gdisp/ILI9320/gdisp_lld.mk new file mode 100644 index 00000000..bcdd3230 --- /dev/null +++ b/drivers/gdisp/ILI9320/gdisp_lld.mk @@ -0,0 +1,5 @@ +# List the required driver. +GFXSRC += $(GFXLIB)/drivers/gdisp/ILI9320/gdisp_lld.c + +# Required include directories +GFXINC += $(GFXLIB)/drivers/gdisp/ILI9320 diff --git a/drivers/gdisp/ILI9320/gdisp_lld_config.h b/drivers/gdisp/ILI9320/gdisp_lld_config.h new file mode 100644 index 00000000..2c9802ab --- /dev/null +++ b/drivers/gdisp/ILI9320/gdisp_lld_config.h @@ -0,0 +1,53 @@ +/* + ChibiOS/RT - Copyright (C) 2012 + Joel Bodenmann aka Tectu + + This file is part of ChibiOS/GFX. + + ChibiOS/GFX is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + ChibiOS/GFX is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +/** + * @file drivers/gdisp/ILI9320/gdisp_lld_config.h + * @brief GDISP Graphic Driver subsystem low level driver header for the SSD1289 display. + * + * @addtogroup GDISP + * @{ + */ + +#ifndef GDISP_LLD_CONFIG_H +#define GDISP_LLD_CONFIG_H + +#if GFX_USE_GDISP + +/*===========================================================================*/ +/* Driver hardware support. */ +/*===========================================================================*/ + +#define GDISP_DRIVER_NAME "ILI9320" +#define GDISP_LLD(x) gdisp_lld_##x##_ILI9320 + +#define GDISP_HARDWARE_CLEARS TRUE +#define GDISP_HARDWARE_FILLS TRUE +#define GDISP_HARDWARE_BITFILLS FALSE +#define GDISP_HARDWARE_SCROLL FALSE +#define GDISP_HARDWARE_PIXELREAD FALSE +#define GDISP_HARDWARE_CONTROL TRUE + +#define GDISP_PIXELFORMAT GDISP_PIXELFORMAT_RGB565 + +#endif /* GFX_USE_GDISP */ + +#endif /* _GDISP_LLD_CONFIG_H */ +/** @} */ diff --git a/drivers/gdisp/ILI9320/ili9320_lld.c.h b/drivers/gdisp/ILI9320/ili9320_lld.c.h new file mode 100644 index 00000000..ed664833 --- /dev/null +++ b/drivers/gdisp/ILI9320/ili9320_lld.c.h @@ -0,0 +1,124 @@ +/* + ChibiOS/RT - Copyright (C) 2012 + Joel Bodenmann aka Tectu + + This file is part of ChibiOS/GFX. + + ChibiOS/GFX is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + ChibiOS/GFX is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#ifndef ILI9320_H +#define ILI9320_H + +#if defined(GDISP_USE_GPIO) + #error "ILI9320: GPIO interface not implemented yet" + +#elif defined(GDISP_USE_SPI) + #error "ILI9320: GDISP_USE_SPI not implemented yet" + +#elif defined(GDISP_USE_FSMC) + #define GDISP_REG (*((volatile uint16_t *) 0x60000000)) /* RS = 0 */ + #define GDISP_RAM (*((volatile uint16_t *) 0x60100000)) /* RS = 1 */ + + static __inline void lld_lcdWriteIndex(uint16_t index) { + GDISP_REG = index; + } + + static __inline void lld_lcdWriteData(uint16_t data) { + GDISP_RAM = data; + } + + static __inline void lld_lcdWriteReg(uint16_t lcdReg,uint16_t lcdRegValue) { + GDISP_REG = lcdReg; + GDISP_RAM = lcdRegValue; + } + + static __inline uint16_t lld_lcdReadData(void) { + return (GDISP_RAM); + } + + static __inline uint16_t lld_lcdReadReg(uint16_t lcdReg) { + volatile uint16_t dummy; + + GDISP_REG = lcdReg; + dummy = GDISP_RAM; + (void)dummy; + + return (GDISP_RAM); + } + + static __inline void lld_lcdWriteStreamStart(void) { + GDISP_REG = 0x0022; + } + + static __inline void lld_lcdWriteStreamStop(void) { + } + + static __inline void lld_lcdWriteStream(uint16_t *buffer, uint16_t size) { + uint16_t i; + + for(i = 0; i < size; i++) + GDISP_RAM = buffer[i]; + } + + static __inline void lld_lcdReadStreamStart(void) { + GDISP_REG = 0x0022; + } + + static __inline void lld_lcdReadStreamStop(void) { + + } + + static __inline void lld_lcdReadStream(uint16_t *buffer, size_t size) { + uint16_t i; + volatile uint16_t dummy; + + dummy = GDISP_RAM; /* throw away first value read */ + (void)dummy; + + for(i = 0; i < size; i++) + buffer[i] = GDISP_RAM; + } + +#endif + +static __inline void lld_lcdDelay(uint16_t us) { + chThdSleepMicroseconds(us); +} + +static void lld_lcdSetCursor(uint16_t x, uint16_t y) { + uint32_t addr; + + addr = y * 0x100 + x; + + lld_lcdWriteReg(0x0020, addr & 0xff); /* low addr */ + lld_lcdWriteReg(0x0021, (addr >> 8) & 0x1ff); /* high addr */ + GDISP_REG = 0x0022; /* data reg in IR */ +} + +static void lld_lcdSetViewPort(uint16_t x, uint16_t y, uint16_t cx, uint16_t cy) { + lld_lcdWriteReg(0x0050, x - 1); + lld_lcdWriteReg(0x0051, x + cx - 2); + lld_lcdWriteReg(0x0052, y - 1); + lld_lcdWriteReg(0x0053, y + cy - 2); + + lld_lcdSetCursor(x, y); +} + +static __inline void lld_lcdResetViewPort(void) { + /* ToDo */ +} + +#endif /* ILI9320_H */ + diff --git a/drivers/gdisp/ILI9320/readme.txt b/drivers/gdisp/ILI9320/readme.txt new file mode 100644 index 00000000..27234655 --- /dev/null +++ b/drivers/gdisp/ILI9320/readme.txt @@ -0,0 +1,19 @@ +To use this driver: + +1. Add in your halconf.h: + a) #define GFX_USE_GDISP TRUE + + b) Any optional high level driver defines (see gdisp.h) eg: GDISP_NEED_MULTITHREAD + + c) One (only) of: + #define GDISP_USE_GPIO + #define GDISP_USE_SPI + #define GDISP_USE_FSMC + + d) All of the following (with appropriate values): + #define GDISP_SCREEN_WIDTH 320 + #define GDISP_SCREEN_HEIGHT 240 + +2. To your makefile add the following lines: + include $(GFXLIB)/drivers/gdisp/ILI9320/gdisp_lld.mk + From 0e6ddaf7ff3481712230530f84668d278950fc1b Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Sun, 11 Nov 2012 18:56:30 +0100 Subject: [PATCH 4/8] added ILI3920 orientation dummies --- drivers/gdisp/ILI9320/ili9320_lld.c.h | 39 ++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/drivers/gdisp/ILI9320/ili9320_lld.c.h b/drivers/gdisp/ILI9320/ili9320_lld.c.h index ed664833..6dd9d3fc 100644 --- a/drivers/gdisp/ILI9320/ili9320_lld.c.h +++ b/drivers/gdisp/ILI9320/ili9320_lld.c.h @@ -102,16 +102,41 @@ static void lld_lcdSetCursor(uint16_t x, uint16_t y) { addr = y * 0x100 + x; - lld_lcdWriteReg(0x0020, addr & 0xff); /* low addr */ - lld_lcdWriteReg(0x0021, (addr >> 8) & 0x1ff); /* high addr */ - GDISP_REG = 0x0022; /* data reg in IR */ + switch(GDISP.Orientation) { + case GDISP_ROTATE_0: + lld_lcdWriteReg(0x0020, addr & 0xff); /* low addr */ + lld_lcdWriteReg(0x0021, (addr >> 8) & 0x1ff); /* high addr */ + //GDISP_REG = 0x0022; /* data reg in IR */ + case GDISP_ROTATE_90: + break; + + case GDISP_ROTATE_180: + break; + + case GDISP_ROTATE_270: + break; + } } static void lld_lcdSetViewPort(uint16_t x, uint16_t y, uint16_t cx, uint16_t cy) { - lld_lcdWriteReg(0x0050, x - 1); - lld_lcdWriteReg(0x0051, x + cx - 2); - lld_lcdWriteReg(0x0052, y - 1); - lld_lcdWriteReg(0x0053, y + cy - 2); + switch(GDISP.Orientation) { + case GDISP_ROTATE_0: + lld_lcdWriteReg(0x0050, x - 1); + lld_lcdWriteReg(0x0051, x + cx - 2); + lld_lcdWriteReg(0x0052, y - 1); + lld_lcdWriteReg(0x0053, y + cy - 2); + break; + + case GDISP_ROTATE_90: + break; + + case GDISP_ROTATE_180: + break; + + case GDISP_ROTATE_270: + break; + + } lld_lcdSetCursor(x, y); } From 5683a9058ea098f4f5c4183376879ad51b782b45 Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Mon, 12 Nov 2012 00:07:35 +0100 Subject: [PATCH 5/8] added MCU driver dummy - not implemented yet --- .../MCU/.touchscreen_lld_config.h.swp | Bin 0 -> 12288 bytes drivers/touchscreen/MCU/readme.txt | 8 ++ drivers/touchscreen/MCU/touchscreen_lld.c | 125 ++++++++++++++++++ drivers/touchscreen/MCU/touchscreen_lld.mk | 6 + .../touchscreen/MCU/touchscreen_lld_config.h | 56 ++++++++ 5 files changed, 195 insertions(+) create mode 100644 drivers/touchscreen/MCU/.touchscreen_lld_config.h.swp create mode 100644 drivers/touchscreen/MCU/readme.txt create mode 100644 drivers/touchscreen/MCU/touchscreen_lld.c create mode 100644 drivers/touchscreen/MCU/touchscreen_lld.mk create mode 100644 drivers/touchscreen/MCU/touchscreen_lld_config.h diff --git a/drivers/touchscreen/MCU/.touchscreen_lld_config.h.swp b/drivers/touchscreen/MCU/.touchscreen_lld_config.h.swp new file mode 100644 index 0000000000000000000000000000000000000000..a899a6963679a3cf228e57acf667db82a1863be8 GIT binary patch literal 12288 zcmeI2&u<$=6vrn>h?*Y-QBIs5%_VVDZ<-vanzpLz*s)7uTmC_t(`xLU^-jCqS?$io zF-hSH{{p`RCk|W?NB#vkazJnb2_z2v6Oj1s+G!j}8ddayG9!Is+3&rX_dfGBk(Jk5 zez&$oZx>b>)@zKtVSUj|&b`ULd7d#X`Z`HJKV@}9zp94f6fef!&o;EeNZrTIu@#9} zB~f3*R^O97sbWj)YHQ%`T23T)L=;FeA-UZ-!(iy>eL7y^cXAz%m?0)~JgUcHTaEGz_ImYhfkUakX zfAIbPuU8rS3Hk*37}8J-U4ni)&)BDshGJ+Ldh`loUqkOfV`vrn^JT{VfPRO5g}#D( zNJ4d}3avvW=pr-+G3bYv82cXDgDye8yvW$k(6`V>(1*|vYD3o`f?j|gp@tu!@1QTC z&!NwteP|ErLhnFntyRb@L%PN+-#Sh>{wohU#`>YmKn41H=f3TeJMm!P}Ct+Gy zfu4G0`#rn#Ze;x=T{^Clto;5yP4GGkw!PlCx4nUWv=_6WW4O29r4ZFDx7RW*3RZv*vh3wB^d)LS zt4BQ0X;s-4rF2@m(YDZQ1d5Ktb1ktiT;(LvQ(<}{*CaLe^?m9IN@C$A{?erK1=z-z z{w5V_se(n~!I*rmMMUZ3H$IvaoKmb{{+rs$)!8#wQAyzNG-!)QFtP5D@O!F9t6Z6aKh-lPU!l5SZ*bOiiX@z d`}O9(lD$kN^kpOmo~DJ;BCRZ6S;22K_BYnBT@C;M literal 0 HcmV?d00001 diff --git a/drivers/touchscreen/MCU/readme.txt b/drivers/touchscreen/MCU/readme.txt new file mode 100644 index 00000000..105e7462 --- /dev/null +++ b/drivers/touchscreen/MCU/readme.txt @@ -0,0 +1,8 @@ +To use this driver: + +1. Add in your halconf.h: + a) #define GFX_USE_TOUCHSCREEN TRUE + +2. To your makefile add the following lines: + include $(GFXLIB)/drivers/touchscreen/MCU/touchscreen_lld.mk + diff --git a/drivers/touchscreen/MCU/touchscreen_lld.c b/drivers/touchscreen/MCU/touchscreen_lld.c new file mode 100644 index 00000000..25a2398b --- /dev/null +++ b/drivers/touchscreen/MCU/touchscreen_lld.c @@ -0,0 +1,125 @@ +/* + ChibiOS/GFX - Copyright (C) 2012 + Joel Bodenmann aka Tectu + + This file is part of ChibiOS/GFX. + + ChibiOS/GFX is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + ChibiOS/GFX is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +/** + * @file drivers/touchscreen/MCU/touchscreen_lld.c + * @brief Touchscreen Driver subsystem low level driver source. + * + * @addtogroup TOUCHSCREEN + * @{ + */ + +#include "ch.h" +#include "hal.h" +#include "touchscreen.h" + +#if GFX_USE_TOUCHSCREEN /*|| defined(__DOXYGEN__)*/ + + +/*===========================================================================*/ +/* Driver local variables. */ +/*===========================================================================*/ + +#if !defined(__DOXYGEN__) + /* Local copy of the current touchpad driver */ + static const TouchscreenDriver *tsDriver; + +#endif + +/** + * @brief Low level Touchscreen driver initialization. + * + * @param[in] ts The touchscreen driver struct + * + * @notapi + */ +void ts_lld_init(const TouchscreenDriver *ts) { + tsDriver = ts; + + /* set pins to analog input */ + palSetPadMode(ts->ts_yd_port, ts->ts_yd_pin, PAL_MODE_INPUT_ANALOG); + palSetPadMode(ts->ts_yu_port, ts->ts_yu_pin, PAL_MODE_INPUT_ANALOG); + palSetPadMode(ts->ts_xl_port, ts->ts_yl_pin, PAL_MODE_INPUT_ANALOG); + palSetPadMode(ts->ts_xr_port, ts->ts_xr_pin, PAL_MODE_INPUT_ANALOG); +} + + +/** + * @brief Reads a conversion from the touchscreen + * + * @param[in] cmd The command bits to send to the touchscreen + * + * @return The read value 12-bit right-justified + * + * @note This function only reads data, it is assumed that the pins are + * configured properly and the bus has been acquired beforehand + * + * @notapi + */ +uint16_t ts_lld_read_value(uint8_t cmd) { + return 0; +} + +/** + * @brief 7-point median filtering code for touchscreen samples + * + * @note This is an internally used routine only. + * + * @notapi + */ +static void ts_lld_filter(void) { + return 0; +} + +/** + * @brief Reads out the X direction. + * + * @note The samples are median filtered for greater noise reduction + * + * @notapi + */ +uint16_t ts_lld_read_x(void) { + return 0; +} + +/** + * @brief Reads out the Y direction. + * + * @notapi + */ +uint16_t ts_lld_read_y(void) { + return 0; +} + +/* + * @brief Checks if touchscreen is pressed or not. + * + * @return 1 if pressed, 0 otherwise + * + * @notapi + */ +uint8_t ts_lld_pressed(void) { + return 0; +} + + +#endif /* GFX_USE_TOUCHSCREEN */ +/** @} */ + diff --git a/drivers/touchscreen/MCU/touchscreen_lld.mk b/drivers/touchscreen/MCU/touchscreen_lld.mk new file mode 100644 index 00000000..8d594c2c --- /dev/null +++ b/drivers/touchscreen/MCU/touchscreen_lld.mk @@ -0,0 +1,6 @@ +# List the required driver. +GFXSRC += $(GFXLIB)/drivers/touchscreen/MCU/touchscreen_lld.c + +# Required include directories +GFXINC += $(GFXLIB)/drivers/touchscreen/MCU + diff --git a/drivers/touchscreen/MCU/touchscreen_lld_config.h b/drivers/touchscreen/MCU/touchscreen_lld_config.h new file mode 100644 index 00000000..e57d5723 --- /dev/null +++ b/drivers/touchscreen/MCU/touchscreen_lld_config.h @@ -0,0 +1,56 @@ +/* + ChibiOS/GFX - Copyright (C) 2012 + Joel Bodenmann aka Tectu + + This file is part of ChibiOS/GFX. + + ChibiOS/GFX is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + ChibiOS/GFX is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +/** + * @file drivers/touchscreen/MCU/touchscreen_lld_config.h + * @brief Touchscreen Driver subsystem low level driver. + * + * @addtogroup TOUCHSCREEN + * @{ + */ + +#ifndef TOUCHSCREEN_LLD_CONFIG_H +#define TOUCHSCREEN_LLD_CONFIG_H + +#if GFX_USE_TOUCHSCREEN /*|| defined(__DOXYGEN__)*/ + +/*===========================================================================*/ +/* Driver hardware support. */ +/*===========================================================================*/ + +#define TOUCHSCREEN_HAS_PRESSED TRUE +#define TOUCHSCREEN_HAS_PRESSURE FALSE + +struct TouchscreenDriver { + ioportid_t ts_yd_port; + ioportmask_t ts_yd_pin; + ioportid_t ts_yu_port; + ioportmask_t ts_yu_pin; + ioportid_t ts_xl_port; + ioportmask_t ts_xl_pin; + ioportid_t ts_xr_port; + ioportmask_t ts_xr_pin; +}; + +#endif /* GFX_USE_TOUCHSCREEN */ + +#endif /* TOUCHSCREEN_LLD_CONFIG_H */ +/** @} */ + From fafe23f2e45d5ecc755f2115ddb517e831b338a4 Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Mon, 12 Nov 2012 00:13:39 +0100 Subject: [PATCH 6/8] small fix --- .../MCU/.touchscreen_lld_config.h.swp | Bin 12288 -> 12288 bytes drivers/touchscreen/MCU/touchscreen_lld.c | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/touchscreen/MCU/.touchscreen_lld_config.h.swp b/drivers/touchscreen/MCU/.touchscreen_lld_config.h.swp index a899a6963679a3cf228e57acf667db82a1863be8..595c456fd2b9057efb453648640ac2b272e3f26f 100644 GIT binary patch delta 36 scmZojXh@hK!KA{rQR+PNL<3ev-p%isIc1qVIX5%11afTl*4)Yl0L8ot7ytkO delta 38 ucmZojXh@hK!L)&Oqttn3w$hR`T?@X=@0mGenLIc*GqMD7Z1&dN$_4=RC<~SV diff --git a/drivers/touchscreen/MCU/touchscreen_lld.c b/drivers/touchscreen/MCU/touchscreen_lld.c index 25a2398b..46db4fa0 100644 --- a/drivers/touchscreen/MCU/touchscreen_lld.c +++ b/drivers/touchscreen/MCU/touchscreen_lld.c @@ -56,7 +56,7 @@ void ts_lld_init(const TouchscreenDriver *ts) { /* set pins to analog input */ palSetPadMode(ts->ts_yd_port, ts->ts_yd_pin, PAL_MODE_INPUT_ANALOG); palSetPadMode(ts->ts_yu_port, ts->ts_yu_pin, PAL_MODE_INPUT_ANALOG); - palSetPadMode(ts->ts_xl_port, ts->ts_yl_pin, PAL_MODE_INPUT_ANALOG); + palSetPadMode(ts->ts_xl_port, ts->ts_xl_pin, PAL_MODE_INPUT_ANALOG); palSetPadMode(ts->ts_xr_port, ts->ts_xr_pin, PAL_MODE_INPUT_ANALOG); } From 7ccd3da85f9d913366eec5b8ed7109bd84430f9a Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Mon, 12 Nov 2012 02:35:06 +0100 Subject: [PATCH 7/8] implemented power modes for ILI9320 --- drivers/gdisp/ILI9320/gdisp_lld.c | 175 +++++++++++++++++++----------- include/gdisp_lld.h | 2 +- 2 files changed, 111 insertions(+), 66 deletions(-) diff --git a/drivers/gdisp/ILI9320/gdisp_lld.c b/drivers/gdisp/ILI9320/gdisp_lld.c index 045c8a57..5d83588b 100644 --- a/drivers/gdisp/ILI9320/gdisp_lld.c +++ b/drivers/gdisp/ILI9320/gdisp_lld.c @@ -408,76 +408,121 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) { */ void GDISP_LLD(control)(unsigned what, void *value) { switch(what) { - case GDISP_CONTROL_POWER: - if (GDISP.Powermode == (gdisp_powermode_t)value) + case GDISP_CONTROL_POWER: + if(GDISP.Powermode == (gdisp_powermode_t)value) + return; + + switch((gdisp_powermode_t)value) { + case powerOff: + lld_lcdWriteReg(0x0007, 0x0000); + lld_lcdWriteReg(0x0010, 0x0000); + lld_lcdWriteReg(0x0011, 0x0000); + lld_lcdWriteReg(0x0012, 0x0000); + lld_lcdWriteReg(0x0013, 0x0000); + break; + + case powerOn: + //*************Power On sequence ******************// + lld_lcdWriteReg(0x0010, 0x0000); /* SAP, BT[3:0], AP, DSTB, SLP, STB */ + lld_lcdWriteReg(0x0011, 0x0000); /* DC1[2:0], DC0[2:0], VC[2:0] */ + lld_lcdWriteReg(0x0012, 0x0000); /* VREG1OUT voltage */ + lld_lcdWriteReg(0x0013, 0x0000); /* VDV[4:0] for VCOM amplitude */ + lld_lcdDelay(2000); /* Dis-charge capacitor power voltage */ + lld_lcdWriteReg(0x0010, 0x17B0); /* SAP, BT[3:0], AP, DSTB, SLP, STB */ + lld_lcdWriteReg(0x0011, 0x0147); /* DC1[2:0], DC0[2:0], VC[2:0] */ + lld_lcdDelay(500); + lld_lcdWriteReg(0x0012, 0x013C); /* VREG1OUT voltage */ + lld_lcdDelay(500); + lld_lcdWriteReg(0x0013, 0x0E00); /* VDV[4:0] for VCOM amplitude */ + lld_lcdWriteReg(0x0029, 0x0009); /* VCM[4:0] for VCOMH */ + lld_lcdDelay(500); + lld_lcdWriteReg(0x0007, 0x0173); /* 262K color and display ON */ + if(GDISP.Powermode != powerSleep || GDISP.Powermode != powerDeepSleep) + GDISP_LLD(init)(); + break; + + case powerSleep: + lld_lcdWriteReg(0x0007, 0x0000); /* display OFF */ + lld_lcdWriteReg(0x0010, 0x0000); /* SAP, BT[3:0], APE, AP, DSTB, SLP */ + lld_lcdWriteReg(0x0011, 0x0000); /* DC1[2:0], DC0[2:0], VC[2:0] */ + lld_lcdWriteReg(0x0012, 0x0000); /* VREG1OUT voltage */ + lld_lcdWriteReg(0x0013, 0x0000); /* VDV[4:0] for VCOM amplitude */ + lld_lcdDelay(2000); /* Dis-charge capacitor power voltage */ + lld_lcdWriteReg(0x0010, 0x0002); /* SAP, BT[3:0], APE, AP, DSTB, SLP */ + break; + + case powerDeepSleep: + lld_lcdWriteReg(0x0007, 0x0000); /* display OFF */ + lld_lcdWriteReg(0x0010, 0x0000); /* SAP, BT[3:0], APE, AP, DSTB, SLP */ + lld_lcdWriteReg(0x0011, 0x0000); /* DC1[2:0], DC0[2:0], VC[2:0] */ + lld_lcdWriteReg(0x0012, 0x0000); /* VREG1OUT voltage */ + lld_lcdWriteReg(0x0013, 0x0000); /* VDV[4:0] for VCOM amplitude */ + lld_lcdDelay(2000); /* Dis-charge capacitor power voltage */ + lld_lcdWriteReg(0x0010, 0x0004); /* SAP, BT[3:0], APE, AP, DSTB, SLP */ + break; + + default: + return; + } + GDISP.Powermode = (gdisp_powermode_t)value; return; - switch((gdisp_powermode_t)value) { - case powerOff: - lld_lcdWriteReg(0x0010, 0x0000); // leave sleep mode - lld_lcdWriteReg(0x0007, 0x0000); // halt operation - lld_lcdWriteReg(0x0000, 0x0000); // turn off oszillator - lld_lcdWriteReg(0x0010, 0x0001); // enter sleepmode - break; - case powerOn: - lld_lcdWriteReg(0x0010, 0x0000); // leave sleep mode - if (GDISP.Powermode != powerSleep) - GDISP_LLD(init)(); - break; - case powerSleep: - lld_lcdWriteReg(0x0010, 0x0001); // enter sleep mode - break; - default: - return; - } - GDISP.Powermode = (gdisp_powermode_t)value; - return; - case GDISP_CONTROL_ORIENTATION: - if (GDISP.Orientation == (gdisp_orientation_t)value) - return; - switch((gdisp_orientation_t)value) { - case GDISP_ROTATE_0: - lld_lcdWriteReg(0x0001, 0x2B3F); - /* ID = 11 AM = 0 */ - lld_lcdWriteReg(0x0011, 0x6070); - GDISP.Height = GDISP_SCREEN_HEIGHT; - GDISP.Width = GDISP_SCREEN_WIDTH; - break; - case GDISP_ROTATE_90: - lld_lcdWriteReg(0x0001, 0x293F); - /* ID = 11 AM = 1 */ - lld_lcdWriteReg(0x0011, 0x6078); - GDISP.Height = GDISP_SCREEN_WIDTH; - GDISP.Width = GDISP_SCREEN_HEIGHT; - break; - case GDISP_ROTATE_180: - lld_lcdWriteReg(0x0001, 0x2B3F); - /* ID = 01 AM = 0 */ - lld_lcdWriteReg(0x0011, 0x6040); - GDISP.Height = GDISP_SCREEN_HEIGHT; - GDISP.Width = GDISP_SCREEN_WIDTH; - break; - case GDISP_ROTATE_270: - lld_lcdWriteReg(0x0001, 0x293F); - /* ID = 01 AM = 1 */ - lld_lcdWriteReg(0x0011, 0x6048); - GDISP.Height = GDISP_SCREEN_WIDTH; - GDISP.Width = GDISP_SCREEN_HEIGHT; - break; - default: - return; - } - #if GDISP_NEED_CLIP || GDISP_NEED_VALIDATION + + case GDISP_CONTROL_ORIENTATION: + if(GDISP.Orientation == (gdisp_orientation_t)value) + return; + switch((gdisp_orientation_t)value) { + case GDISP_ROTATE_0: + lld_lcdWriteReg(0x0001, 0x2B3F); + /* ID = 11 AM = 0 */ + lld_lcdWriteReg(0x0011, 0x6070); + GDISP.Height = GDISP_SCREEN_HEIGHT; + GDISP.Width = GDISP_SCREEN_WIDTH; + break; + + case GDISP_ROTATE_90: + lld_lcdWriteReg(0x0001, 0x293F); + /* ID = 11 AM = 1 */ + lld_lcdWriteReg(0x0011, 0x6078); + GDISP.Height = GDISP_SCREEN_WIDTH; + GDISP.Width = GDISP_SCREEN_HEIGHT; + break; + + case GDISP_ROTATE_180: + lld_lcdWriteReg(0x0001, 0x2B3F); + /* ID = 01 AM = 0 */ + lld_lcdWriteReg(0x0011, 0x6040); + GDISP.Height = GDISP_SCREEN_HEIGHT; + GDISP.Width = GDISP_SCREEN_WIDTH; + break; + + case GDISP_ROTATE_270: + lld_lcdWriteReg(0x0001, 0x293F); + /* ID = 01 AM = 1 */ + lld_lcdWriteReg(0x0011, 0x6048); + GDISP.Height = GDISP_SCREEN_WIDTH; + GDISP.Width = GDISP_SCREEN_HEIGHT; + break; + + default: + return; + } + + #if GDISP_NEED_CLIP || GDISP_NEED_VALIDATION GDISP.clipx0 = 0; GDISP.clipy0 = 0; GDISP.clipx1 = GDISP.Width; GDISP.clipy1 = GDISP.Height; - #endif - GDISP.Orientation = (gdisp_orientation_t)value; - return; -/* - case GDISP_CONTROL_BACKLIGHT: - case GDISP_CONTROL_CONTRAST: -*/ + #endif + GDISP.Orientation = (gdisp_orientation_t)value; + return; + + case GDISP_CONTROL_BACKLIGHT: + /* ToDo */ + break; + + case GDISP_CONTROL_CONTRAST: + /* ToDo */ + break; } } diff --git a/include/gdisp_lld.h b/include/gdisp_lld.h index 1a78e448..fecd710a 100644 --- a/include/gdisp_lld.h +++ b/include/gdisp_lld.h @@ -556,7 +556,7 @@ typedef enum orientation {GDISP_ROTATE_0, GDISP_ROTATE_90, GDISP_ROTATE_180, GDI /** * @brief Type for the available power modes for the screen. */ -typedef enum powermode {powerOff, powerSleep, powerOn} gdisp_powermode_t; +typedef enum powermode {powerOff, powerSleep, powerDeepSleep, powerOn} gdisp_powermode_t; /*===========================================================================*/ /* External declarations. */ From ed73471f99dda8db0c4aa267291d9688b76a3d82 Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Mon, 12 Nov 2012 02:51:06 +0100 Subject: [PATCH 8/8] removed false ILI9320 code --- drivers/gdisp/ILI9320/gdisp_lld.c | 19 +++++++------------ releases.txt | 1 + 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/gdisp/ILI9320/gdisp_lld.c b/drivers/gdisp/ILI9320/gdisp_lld.c index 5d83588b..d17c5cb0 100644 --- a/drivers/gdisp/ILI9320/gdisp_lld.c +++ b/drivers/gdisp/ILI9320/gdisp_lld.c @@ -472,33 +472,25 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) { return; switch((gdisp_orientation_t)value) { case GDISP_ROTATE_0: - lld_lcdWriteReg(0x0001, 0x2B3F); - /* ID = 11 AM = 0 */ - lld_lcdWriteReg(0x0011, 0x6070); + /* ToDo */ GDISP.Height = GDISP_SCREEN_HEIGHT; GDISP.Width = GDISP_SCREEN_WIDTH; break; case GDISP_ROTATE_90: - lld_lcdWriteReg(0x0001, 0x293F); - /* ID = 11 AM = 1 */ - lld_lcdWriteReg(0x0011, 0x6078); + /* ToDo */ GDISP.Height = GDISP_SCREEN_WIDTH; GDISP.Width = GDISP_SCREEN_HEIGHT; break; case GDISP_ROTATE_180: - lld_lcdWriteReg(0x0001, 0x2B3F); - /* ID = 01 AM = 0 */ - lld_lcdWriteReg(0x0011, 0x6040); + /* ToDo */ GDISP.Height = GDISP_SCREEN_HEIGHT; GDISP.Width = GDISP_SCREEN_WIDTH; break; case GDISP_ROTATE_270: - lld_lcdWriteReg(0x0001, 0x293F); - /* ID = 01 AM = 1 */ - lld_lcdWriteReg(0x0011, 0x6048); + /* ToDo */ GDISP.Height = GDISP_SCREEN_WIDTH; GDISP.Width = GDISP_SCREEN_HEIGHT; break; @@ -523,6 +515,9 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) { case GDISP_CONTROL_CONTRAST: /* ToDo */ break; + + default: + return; } } diff --git a/releases.txt b/releases.txt index a9f0ecc7..60456877 100644 --- a/releases.txt +++ b/releases.txt @@ -12,6 +12,7 @@ FIX: tsIRQ() renamed into tsPressed() FEATURE: Touchscreen support added to gdisp Win32 driver FIX: gdisp Win32 driver fixes DEPRECATE: console deprecated - replaced with gwin functionality +FEATURE: ILI9320 GDISP driver *** changes after 1.3 ***