From b2252bb7bede275461700db9c56b702a93a33982 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Tue, 30 Apr 2013 17:35:34 +0700 Subject: [PATCH 1/2] New LLD: HVGA_X81 For HVGA : 320 x 480, 16bpp displays, controlled by ILI9481 or compatible controllers. * Pixel readback TODO * Powermodes: Sleep implemented --- drivers/gdisp/HVGA_X81/gdisp_lld.c | 621 ++++++++++++++++++ drivers/gdisp/HVGA_X81/gdisp_lld.mk | 5 + .../gdisp/HVGA_X81/gdisp_lld_board_example.h | 126 ++++ .../HVGA_X81/gdisp_lld_board_example_fsmc.h | 165 +++++ .../gdisp_lld_board_firebullstm32f103.h | 158 +++++ drivers/gdisp/HVGA_X81/gdisp_lld_config.h | 53 ++ drivers/gdisp/HVGA_X81/readme.txt | 15 + 7 files changed, 1143 insertions(+) create mode 100644 drivers/gdisp/HVGA_X81/gdisp_lld.c create mode 100644 drivers/gdisp/HVGA_X81/gdisp_lld.mk create mode 100644 drivers/gdisp/HVGA_X81/gdisp_lld_board_example.h create mode 100644 drivers/gdisp/HVGA_X81/gdisp_lld_board_example_fsmc.h create mode 100644 drivers/gdisp/HVGA_X81/gdisp_lld_board_firebullstm32f103.h create mode 100644 drivers/gdisp/HVGA_X81/gdisp_lld_config.h create mode 100644 drivers/gdisp/HVGA_X81/readme.txt diff --git a/drivers/gdisp/HVGA_X81/gdisp_lld.c b/drivers/gdisp/HVGA_X81/gdisp_lld.c new file mode 100644 index 00000000..e0cedad1 --- /dev/null +++ b/drivers/gdisp/HVGA_X81/gdisp_lld.c @@ -0,0 +1,621 @@ +/* + ChibiOS/GFX - Copyright (C) 2012, 2013 + 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/HVGA_X81/gdisp_lld.c + * @brief GDISP Graphics Driver subsystem low level driver source for + * the ILI9481 and compatible HVGA display + * + * @addtogroup GDISP + * @{ + */ + +#include "ch.h" +#include "hal.h" +#include "gfx.h" + +#if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/ + +/* Include the emulation code for things we don't support */ +#include "gdisp/lld/emulation.c" + +/*===========================================================================*/ +/* Driver local definitions. */ +/*===========================================================================*/ + +#if defined(GDISP_SCREEN_HEIGHT) + #warning "GDISP: This low level driver does not support setting a screen size. It is being ignored." + #undef GISP_SCREEN_HEIGHT +#endif +#if defined(GDISP_SCREEN_WIDTH) + #warning "GDISP: This low level driver does not support setting a screen size. It is being ignored." + #undef GDISP_SCREEN_WIDTH +#endif + +#define GDISP_SCREEN_HEIGHT 480 +#define GDISP_SCREEN_WIDTH 320 + +#define GDISP_INITIAL_CONTRAST 50 +#define GDISP_INITIAL_BACKLIGHT 100 + +/*===========================================================================*/ +/* Driver local functions. */ +/*===========================================================================*/ + +#if defined(GDISP_USE_CUSTOM_BOARD) && GDISP_USE_CUSTOM_BOARD + /* Include the user supplied board definitions */ + #include "gdisp_lld_board.h" +#elif defined(BOARD_FIREBULL_STM32_F103) + #include "gdisp_lld_board_firebullstm32f103.h" +#else + /* Include the user supplied board definitions */ + #include "gdisp_lld_board.h" +#endif + +// Some common routines and macros +#define write_reg(reg, data) { write_index(reg); write_data(data); } +#define stream_start() write_index(0x2C); +#define stream_stop() +#define delay(us) chThdSleepMicroseconds(us) +#define delayms(ms) chThdSleepMilliseconds(ms) + +static inline void set_cursor(coord_t x, coord_t y) { + write_index(0x2A); + write_data((x >> 8)); + write_data((uint8_t) x); + write_data((x) >> 8); + write_data((uint8_t) (x)); + + write_index(0x2B); + write_data((y >> 8)); + write_data((uint8_t) y); + write_data((y) >> 8); + write_data((uint8_t) (y)); +} + +static void set_viewport(coord_t x, coord_t y, coord_t cx, coord_t cy) { + write_index(0x2A); + write_data((x >> 8)); + write_data((uint8_t) x); + write_data((x + cx - 1) >> 8); + write_data((uint8_t) (x + cx - 1)); + + write_index(0x2B); + write_data((y >> 8)); + write_data((uint8_t) y); + write_data((y + cy - 1) >> 8); + write_data((uint8_t) (y + cy - 1)); +} + +static inline void reset_viewport(void) { + set_viewport(0, 0, GDISP.Width, GDISP.Height); +} + +/*===========================================================================*/ +/* 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) { + /* Initialise your display */ + init_board(); + + /* Hardware reset */ + setpin_reset(TRUE); + delayms(20); + setpin_reset(FALSE); + delayms(20); + + /* Get the bus for the following initialisation commands */ + acquire_bus(); + + /* Enable Access to all Manufacturer commands (0xB0 and higher opcodes) */ + write_index(0xB0); + write_data(0x00); + + /* Frame Memory Access and Interface Setting */ + write_index(0xB3); + write_data(0x02); + write_data(0x00); + write_data(0x00); + write_data(0x10); + + /* Display Mode and Frame Memory Write Mode Setting (B4h) */ + /* Use internal clock for synchronization */ + /* Use DBI interface (only DB0-17, no HSYNC, VSYNC or CLK) */ + write_index(0xB4); + write_data(0x00); + + /* Internal Backlight Control */ +/* write_index(0xB9); /*PWM Settings for Brightness Control */ +/* write_data(0x01); /* Disabled by default. */ +/* write_data(0xFF); /*0xFF = Max brightness */ +/* write_data(0xFF); +/* write_data(0x18); + + /* Panel Driving settings */ + write_index(0xC0); + write_data(0x03); + write_data(0x3B); + write_data(0x00); + write_data(0x00); + write_data(0x00); + write_data(0x01); + write_data(0x00); /* NW */ + write_data(0x43); + + /* Display timings in Operating Mode */ + write_index(0xC1); + write_data(0x08); + write_data(0x15); /* CLOCK */ + write_data(0x08); + write_data(0x08); + + /* S/VCOM/Gate Driving timing setting */ + write_index(0xC4); + write_data(0x15); + write_data(0x03); + write_data(0x03); + write_data(0x01); + + /* Interface Setting */ + write_index(0xC6); + write_data(0x02); + + /* Gamma Setting - should be changed if using a different panel */ + write_index(0xC8); + write_data(0x0C); + write_data(0x05); + write_data(0x0A); /*0X12 */ + write_data(0x6B); /*0x7D */ + write_data(0x04); + write_data(0x06); /*0x08 */ + write_data(0x15); /*0x0A */ + write_data(0x10); + write_data(0x00); + write_data(0x60); /*0x23 */ + + /* Address Mode setting */ + write_index(0x36); + write_data(0x00); + + /* Set Pixel Format = 16 bits per pixel */ + /* The driver supports upto 24 bits per pixel, with dither */ + write_index(0x3A); + write_data(0x55); + + /* Exit Idle Mode */ + write_index(0x38); + + /* Power Setting */ + write_index(0xD0); + write_data(0x07); + write_data(0x07); /* VCI = VCI1 */ + write_data(0x14); /* VRH 0x1D */ + write_data(0xA2); /* BT 0x06 */ + + /* VCOM Setting */ + write_index(0xD1); + write_data(0x03); + write_data(0x5A); /* VCM 0x5A */ + write_data(0x10); /* VDV */ + + /* Power Setting for Normal Mode */ + write_index(0xD2); + write_data(0x03); + write_data(0x04); /* 0x24 */ + write_data(0x04); + + /* Exit Sleep Mode */ + write_index(0x11); + delay(150); + + /* Display ON */ + write_index(0x29); + delay(30); + + /* Release the bus */ + release_bus(); + + /* Turn on the back-light */ + set_backlight(GDISP_INITIAL_BACKLIGHT); + + /* Initialise the GDISP structure */ + GDISP.Width = GDISP_SCREEN_WIDTH; + GDISP.Height = GDISP_SCREEN_HEIGHT; + GDISP.Orientation = GDISP_ROTATE_0; + GDISP.Powermode = powerOn; + GDISP.Backlight = GDISP_INITIAL_BACKLIGHT; + GDISP.Contrast = GDISP_INITIAL_CONTRAST; + #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_draw_pixel(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 + + acquire_bus(); + + set_cursor(x, y); + write_reg(0x002c, color); + + release_bus(); +} + +/* ---- 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; + + acquire_bus(); + reset_viewport(); + stream_start(); + for(i = 0; i < GDISP_SCREEN_WIDTH * GDISP_SCREEN_HEIGHT; i++) + write_data(color); + stream_stop(); + release_bus(); + } +#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_fill_area(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color) { + unsigned i, area; + + #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 + + area = cx*cy; + + acquire_bus(); + + set_viewport(x, y, cx, cy); + + stream_start(); + for(i = 0; i < area; i++) + write_data(color); + stream_stop(); + + release_bus(); + } +#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_blit_area_ex(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 + + acquire_bus(); + set_viewport(x, y, cx, cy); + stream_start(); + + 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++) + write_data(*buffer++); + stream_stop(); + release_bus(); + } +#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 pixel to be read + * + * @notapi + */ + color_t gdisp_lld_get_pixel_color(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 + + acquire_bus(); + set_cursor(x, y); + stream_start(); + color = read_data(); // dummy read + color = read_data(); + stream_stop(); + release_bus(); + + 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_vertical_scroll(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, j; + + #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; + + acquire_bus(); + if ((coord_t)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*/ + set_viewport(x, row0, cx, 1); + stream_start(); + j = read_data(); // dummy read + for (j = 0; (coord_t)j < cx; j++) + buf[j] = read_data(); + stream_stop(); + + set_viewport(x, row1, cx, 1); + stream_start(); + for (j = 0; (coord_t)j < cx; j++) + write_data(buf[j]); + stream_stop(); + } + } + + /* fill the remaining gap */ + set_viewport(x, lines > 0 ? (y+(coord_t)gap) : y, cx, abslines); + stream_start(); + gap = cx*abslines; + for(i = 0; i < gap; i++) write_data(bgcolor); + stream_stop(); + release_bus(); + } +#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: + acquire_bus(); + write_reg(0x0010, 0x0001); /* enter sleep mode */ + release_bus(); + break; + case powerOn: + acquire_bus(); + write_reg(0x0010, 0x0000); /* leave sleep mode */ + release_bus(); + if (GDISP.Powermode != powerSleep) + gdisp_lld_init(); + break; + case powerSleep: + acquire_bus(); + write_reg(0x0010, 0x0001); /* enter sleep mode */ + release_bus(); + 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: + acquire_bus(); + + write_reg(0xC0, 0x03); + write_reg(0x36, 0x00); /* X and Y axes non-inverted */ + + release_bus(); + GDISP.Height = GDISP_SCREEN_HEIGHT; + GDISP.Width = GDISP_SCREEN_WIDTH; + break; + case GDISP_ROTATE_90: + acquire_bus(); + + write_reg(0xC0, 0x02); + write_reg(0x36, 0x20); /* Invert X and Y axes */ + + release_bus(); + GDISP.Height = GDISP_SCREEN_WIDTH; + GDISP.Width = GDISP_SCREEN_HEIGHT; + break; + case GDISP_ROTATE_180: + acquire_bus(); + + write_reg(0xC0, 0x06); + write_reg(0x36, 0x00); /* X and Y axes non-inverted */ + + release_bus(); + GDISP.Height = GDISP_SCREEN_HEIGHT; + GDISP.Width = GDISP_SCREEN_WIDTH; + break; + case GDISP_ROTATE_270: + acquire_bus(); + + write_reg(0xC0, 0x07); + write_reg(0x36, 0x20); /* Invert X and Y axes */ + + release_bus(); + 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/HVGA_X81/gdisp_lld.mk b/drivers/gdisp/HVGA_X81/gdisp_lld.mk new file mode 100644 index 00000000..a097e0c5 --- /dev/null +++ b/drivers/gdisp/HVGA_X81/gdisp_lld.mk @@ -0,0 +1,5 @@ +# List the required driver. +GFXSRC += $(GFXLIB)/drivers/gdisp/HVGA_X81/gdisp_lld.c + +# Required include directories +GFXINC += $(GFXLIB)/drivers/gdisp/HVGA_X81 diff --git a/drivers/gdisp/HVGA_X81/gdisp_lld_board_example.h b/drivers/gdisp/HVGA_X81/gdisp_lld_board_example.h new file mode 100644 index 00000000..2c81c906 --- /dev/null +++ b/drivers/gdisp/HVGA_X81/gdisp_lld_board_example.h @@ -0,0 +1,126 @@ +/* + ChibiOS/GFX - Copyright (C) 2012, 2013 + 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/HVGA_X81/gdisp_lld_board_example.h + * @brief GDISP Graphics Driver subsystem low level driver source for + * the ILI9481 and compatible HVGA display + * + * @addtogroup GDISP + * @{ + */ + +#ifndef _GDISP_LLD_BOARD_H +#define _GDISP_LLD_BOARD_H + +/** + * @brief Initialise the board for the display. + * + * @notapi + */ +static inline void init_board(void) { + /* Code here */ +#error "HVGA_X81: You must supply a definition for init_board for your board" +} + +/** + * @brief Set or clear the lcd reset pin. + * + * @param[in] state TRUE = lcd in reset, FALSE = normal operation + * + * @notapi + */ +static inline void setpin_reset(bool_t state) { + /* Code here */ +#error "HVGA_X81: You must supply a definition for setpin_reset for your board" +} + +/** + * @brief Set the lcd back-light level. + * + * @param[in] percent 0 to 100% + * + * @notapi + */ +static inline void set_backlight(uint8_t percent) { + /* Code here */ +#error "HVGA_X81: You must supply a definition for set_backlight for your board" +} + +/** + * @brief Take exclusive control of the bus + * + * @notapi + */ +static inline void acquire_bus(void) { +#error "HVGA_X81: You must supply a definition for acquire_bus for your board" +} + +/** + * @brief Release exclusive control of the bus + * + * @notapi + */ +static inline void release_bus(void) { +#error "HVGA_X81: You must supply a definition for release_bus for your board" +} + +/** + * @brief Send data to the index register. + * + * @param[in] index The index register to set + * + * @notapi + */ +static inline void write_index(uint16_t index) { + /* Code here */ +#error "HVGA_X81: You must supply a definition for write_index for your board" +} + +/** + * @brief Send data to the lcd. + * + * @param[in] data The data to send + * + * @notapi + */ +static inline void write_data(uint16_t data) { + /* Code here */ +#error "HVGA_X81: You must supply a definition for write_data for your board" +} + +#if GDISP_HARDWARE_READPIXEL || GDISP_HARDWARE_SCROLL || defined(__DOXYGEN__) +/** + * @brief Read data from the lcd. + * + * @return The data from the lcd + * @note The chip select may need to be asserted/de-asserted + * around the actual spi read + * + * @notapi + */ +static inline uint16_t read_data(void) { + /* Code here */ +#error "HVGA_X81: You must supply a definition for read_data for your board" +} +#endif + +#endif /* _GDISP_LLD_BOARD_H */ +/** @} */ diff --git a/drivers/gdisp/HVGA_X81/gdisp_lld_board_example_fsmc.h b/drivers/gdisp/HVGA_X81/gdisp_lld_board_example_fsmc.h new file mode 100644 index 00000000..8367b53c --- /dev/null +++ b/drivers/gdisp/HVGA_X81/gdisp_lld_board_example_fsmc.h @@ -0,0 +1,165 @@ +/* + ChibiOS/GFX - Copyright (C) 2012, 2013 + 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/HVGA_X81/gdisp_lld_board_example_fsmc.h + * @brief GDISP Graphics Driver subsystem low level driver source for + * the ILI9481 and compatible HVGA display + * + * @addtogroup GDISP + * @{ + */ + +#ifndef _GDISP_LLD_BOARD_H +#define _GDISP_LLD_BOARD_H + +#define GDISP_REG ((volatile uint16_t *) 0x60000000)[0] /* RS = 0 */ +#define GDISP_RAM ((volatile uint16_t *) 0x60020000)[0] /* RS = 1 */ + +/** + * @brief Initialise the board for the display. + * @notes Performs the following functions: + * 1. initialise the io port used by your display + * 2. initialise the reset pin (initial state not-in-reset) + * 3. initialise the chip select pin (initial state not-active) + * 4. initialise the backlight pin (initial state back-light off) + * + * @notapi + */ +static inline void init_board(void) { + const unsigned char FSMC_Bank; + + #if defined(STM32F1XX) || defined(STM32F3XX) + /* FSMC setup for F1/F3 */ + rccEnableAHB(RCC_AHBENR_FSMCEN, 0); + + #if defined(GDISP_USE_DMA) && defined(GDISP_DMA_STREAM) + #error "DMA not implemented for F1/F3 Devices" + #endif + #elif defined(STM32F4XX) || defined(STM32F2XX) + /* STM32F2-F4 FSMC init */ + rccEnableAHB3(RCC_AHB3ENR_FSMCEN, 0); + + #if defined(GDISP_USE_DMA) && defined(GDISP_DMA_STREAM) + if (dmaStreamAllocate(GDISP_DMA_STREAM, 0, NULL, NULL)) chSysHalt(); + dmaStreamSetMemory0(GDISP_DMA_STREAM, &GDISP_RAM); + dmaStreamSetMode(GDISP_DMA_STREAM, STM32_DMA_CR_PL(0) | STM32_DMA_CR_PSIZE_HWORD | STM32_DMA_CR_MSIZE_HWORD | STM32_DMA_CR_DIR_M2M); + #endif + #else + #error "FSMC not implemented for this device" + #endif + + /* set pins to FSMC mode */ + IOBus busD = {GPIOD, (1 << 0) | (1 << 1) | (1 << 4) | (1 << 5) | (1 << 7) | (1 << 8) | + (1 << 9) | (1 << 10) | (1 << 11) | (1 << 14) | (1 << 15), 0}; + + IOBus busE = {GPIOE, (1 << 7) | (1 << 8) | (1 << 9) | (1 << 10) | (1 << 11) | (1 << 12) | + (1 << 13) | (1 << 14) | (1 << 15), 0}; + + palSetBusMode(&busD, PAL_MODE_ALTERNATE(12)); + palSetBusMode(&busE, PAL_MODE_ALTERNATE(12)); + + FSMC_Bank = 0; + + /* FSMC timing */ + FSMC_Bank1->BTCR[FSMC_Bank+1] = (FSMC_BTR1_ADDSET_1 | FSMC_BTR1_ADDSET_3) \ + | (FSMC_BTR1_DATAST_1 | FSMC_BTR1_DATAST_3) \ + | (FSMC_BTR1_BUSTURN_1 | FSMC_BTR1_BUSTURN_3) ; + + /* 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; +} + +/** + * @brief Set or clear the lcd reset pin. + * + * @param[in] state TRUE = lcd in reset, FALSE = normal operation + * + * @notapi + */ +static inline void setpin_reset(bool_t state) { + (void) state; + /* Nothing to do here */ +} + +/** + * @brief Set the lcd back-light level. + * + * @param[in] percent 0 to 100% + * + * @notapi + */ +static inline void set_backlight(uint8_t percent) { + (void) percent; + /* Nothing to do here */ +} + +/** + * @brief Take exclusive control of the bus + * + * @notapi + */ +static inline void acquire_bus(void) { + /* Nothing to do here */ +} + +/** + * @brief Release exclusive control of the bus + * + * @notapi + */ +static inline void release_bus(void) { + /* Nothing to do here */ +} + +/** + * @brief Send data to the index register. + * + * @param[in] index The index register to set + * + * @notapi + */ +static inline void write_index(uint16_t index) { GDISP_REG = index; } + +/** + * @brief Send data to the lcd. + * + * @param[in] data The data to send + * + * @notapi + */ +static inline void write_data(uint16_t data) { GDISP_RAM = data; } + +#if GDISP_HARDWARE_READPIXEL || GDISP_HARDWARE_SCROLL || defined(__DOXYGEN__) +/** + * @brief Read data from the lcd. + * + * @return The data from the lcd + * @note The chip select may need to be asserted/de-asserted + * around the actual spi read + * + * @notapi + */ +static inline uint16_t read_data(void) { return GDISP_RAM; } +#endif + +#endif /* _GDISP_LLD_BOARD_H */ +/** @} */ diff --git a/drivers/gdisp/HVGA_X81/gdisp_lld_board_firebullstm32f103.h b/drivers/gdisp/HVGA_X81/gdisp_lld_board_firebullstm32f103.h new file mode 100644 index 00000000..176e8452 --- /dev/null +++ b/drivers/gdisp/HVGA_X81/gdisp_lld_board_firebullstm32f103.h @@ -0,0 +1,158 @@ +/* + ChibiOS/GFX - Copyright (C) 2012, 2013 + 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/HVGA_X81/gdisp_lld_board_firebullstm32f103.h + * @brief GDISP Graphics Driver subsystem low level driver source for + * the ILI9481 and compatible HVGA display + * + * @addtogroup GDISP + * @{ + */ + +#ifndef _GDISP_LLD_BOARD_H +#define _GDISP_LLD_BOARD_H + +#define SET_CS palSetPad(GPIOD, 12); +#define CLR_CS palClearPad(GPIOD, 12); +#define SET_RS palSetPad(GPIOD, 13); +#define CLR_RS palClearPad(GPIOD, 13); +#define SET_WR palSetPad(GPIOD, 14); +#define CLR_WR palClearPad(GPIOD, 14); +#define SET_RD palSetPad(GPIOD, 15); +#define CLR_RD palClearPad(GPIOD, 15); + +/** + * @brief Initialise the board for the display. + * @notes This board definition uses GPIO and assumes exclusive access to these GPIO pins + * + * @notapi + */ +static inline void init_board(void) { + palSetGroupMode(GPIOE, PAL_WHOLE_PORT, 0, PAL_MODE_OUTPUT_PUSHPULL); + palSetPadMode(GPIOD, 12, PAL_MODE_OUTPUT_PUSHPULL); + palSetPadMode(GPIOD, 13, PAL_MODE_OUTPUT_PUSHPULL); + palSetPadMode(GPIOD, 14, PAL_MODE_OUTPUT_PUSHPULL); + palSetPadMode(GPIOD, 15, PAL_MODE_OUTPUT_PUSHPULL); + + // Configure the pins to a well know state + SET_RS; + SET_RD; + SET_WR; + CLR_CS; +} + + +/** + * @brief Set or clear the lcd reset pin. + * + * @param[in] state TRUE = lcd in reset, FALSE = normal operation + * + * @notapi + */ +static inline void setpin_reset(bool_t state) { + (void) state; + /* Nothing to do here - reset pin tied to Vcc */ +} + +/** + * @brief Set the lcd back-light level. + * + * @param[in] percent 0 to 100% + * + * @notapi + */ +static inline void set_backlight(uint8_t percent) { + (void) percent; + /* Nothing to do here - Backlight always on */ +} + +/** + * @brief Take exclusive control of the bus + * + * @notapi + */ +static inline void acquire_bus(void) { + /* Nothing to do here since LCD is the only device on that bus */ +} + +/** + * @brief Release exclusive control of the bus + * + * @notapi + */ +static inline void release_bus(void) { + /* Nothing to do here since LCD is the only device on that bus */ +} + +/** + * @brief Send data to the index register. + * + * @param[in] index The index register to set + * + * @notapi + */ +static inline void write_index(uint16_t index) { + palWritePort(GPIOE, index); + CLR_RS; CLR_WR; SET_WR; SET_RS; +} + +/** + * @brief Send data to the lcd. + * + * @param[in] data The data to send + * + * @notapi + */ +static inline void write_data(uint16_t data) { + palWritePort(GPIOE, data); + CLR_WR; SET_WR; +} + +#if GDISP_HARDWARE_READPIXEL || GDISP_HARDWARE_SCROLL || defined(__DOXYGEN__) +/** + * @brief Read data from the lcd. + * + * @return The data from the lcd + * @note The chip select may need to be asserted/de-asserted + * around the actual spi read + * + * @notapi + */ +static inline uint16_t read_data(void) { + uint16_t value; + + // change pin mode to digital input + palSetGroupMode(GPIOE, PAL_WHOLE_PORT, 0, PAL_MODE_INPUT); + + CLR_RD; + value = palReadPort(GPIOE); + value = palReadPort(GPIOE); + SET_RD; + + // change pin mode back to digital output + palSetGroupMode(GPIOE, PAL_WHOLE_PORT, 0, PAL_MODE_OUTPUT_PUSHPULL); + + return value; +} +#endif + +#endif /* _GDISP_LLD_BOARD_H */ +/** @} */ diff --git a/drivers/gdisp/HVGA_X81/gdisp_lld_config.h b/drivers/gdisp/HVGA_X81/gdisp_lld_config.h new file mode 100644 index 00000000..a9dd8659 --- /dev/null +++ b/drivers/gdisp/HVGA_X81/gdisp_lld_config.h @@ -0,0 +1,53 @@ +/* + ChibiOS/GFX - Copyright (C) 2012, 2013 + 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/SSD1289/gdisp_lld_config.h + * @brief GDISP Graphics Driver subsystem low level driver source for + * the ILI9481 and compatible HVGA display + * + * @addtogroup GDISP + * @{ + */ + +#ifndef _GDISP_LLD_CONFIG_H +#define _GDISP_LLD_CONFIG_H + +#if GFX_USE_GDISP + +/*===========================================================================*/ +/* Driver hardware support. */ +/*===========================================================================*/ + +#define GDISP_DRIVER_NAME "HVGA_X81" + +#define GDISP_HARDWARE_CLEARS TRUE +#define GDISP_HARDWARE_FILLS TRUE +#define GDISP_HARDWARE_BITFILLS TRUE +#define GDISP_HARDWARE_SCROLL TRUE +#define GDISP_HARDWARE_PIXELREAD TRUE +#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/HVGA_X81/readme.txt b/drivers/gdisp/HVGA_X81/readme.txt new file mode 100644 index 00000000..b4236b88 --- /dev/null +++ b/drivers/gdisp/HVGA_X81/readme.txt @@ -0,0 +1,15 @@ +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) If you are not using a known board then create a gdisp_lld_board.h file + and ensure it is on your include path. + Use the gdisp_lld_board_example.h or gdisp_lld_board_fsmc.h file as a basis. + Currently known boards are: + BOARD_FIREBULL_STM32_F103 - GPIO interface: requires GDISP_CMD_PORT and GDISP_DATA_PORT to be defined + +2. To your makefile add the following lines: + include $(GFXLIB)/drivers/gdisp/HVGA_X81/gdisp_lld.mk From 048a05790235acb338a35ffc7663cbcddc26457a Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Tue, 30 Apr 2013 17:47:25 +0700 Subject: [PATCH 2/2] Renamed HVGA_X81 to ILI9481 --- drivers/gdisp/HVGA_X81/gdisp_lld.mk | 5 ----- .../gdisp/{HVGA_X81 => ILI9481}/gdisp_lld.c | 2 +- drivers/gdisp/ILI9481/gdisp_lld.mk | 5 +++++ .../gdisp_lld_board_example.h | 18 +++++++++--------- .../gdisp_lld_board_example_fsmc.h | 2 +- .../gdisp_lld_board_firebullstm32f103.h | 2 +- .../{HVGA_X81 => ILI9481}/gdisp_lld_config.h | 4 ++-- drivers/gdisp/{HVGA_X81 => ILI9481}/readme.txt | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 drivers/gdisp/HVGA_X81/gdisp_lld.mk rename drivers/gdisp/{HVGA_X81 => ILI9481}/gdisp_lld.c (99%) create mode 100644 drivers/gdisp/ILI9481/gdisp_lld.mk rename drivers/gdisp/{HVGA_X81 => ILI9481}/gdisp_lld_board_example.h (80%) rename drivers/gdisp/{HVGA_X81 => ILI9481}/gdisp_lld_board_example_fsmc.h (98%) rename drivers/gdisp/{HVGA_X81 => ILI9481}/gdisp_lld_board_firebullstm32f103.h (98%) rename drivers/gdisp/{HVGA_X81 => ILI9481}/gdisp_lld_config.h (94%) rename drivers/gdisp/{HVGA_X81 => ILI9481}/readme.txt (90%) diff --git a/drivers/gdisp/HVGA_X81/gdisp_lld.mk b/drivers/gdisp/HVGA_X81/gdisp_lld.mk deleted file mode 100644 index a097e0c5..00000000 --- a/drivers/gdisp/HVGA_X81/gdisp_lld.mk +++ /dev/null @@ -1,5 +0,0 @@ -# List the required driver. -GFXSRC += $(GFXLIB)/drivers/gdisp/HVGA_X81/gdisp_lld.c - -# Required include directories -GFXINC += $(GFXLIB)/drivers/gdisp/HVGA_X81 diff --git a/drivers/gdisp/HVGA_X81/gdisp_lld.c b/drivers/gdisp/ILI9481/gdisp_lld.c similarity index 99% rename from drivers/gdisp/HVGA_X81/gdisp_lld.c rename to drivers/gdisp/ILI9481/gdisp_lld.c index e0cedad1..2ea8c6e7 100644 --- a/drivers/gdisp/HVGA_X81/gdisp_lld.c +++ b/drivers/gdisp/ILI9481/gdisp_lld.c @@ -19,7 +19,7 @@ */ /** - * @file drivers/gdisp/HVGA_X81/gdisp_lld.c + * @file drivers/gdisp/ILI9481/gdisp_lld.c * @brief GDISP Graphics Driver subsystem low level driver source for * the ILI9481 and compatible HVGA display * diff --git a/drivers/gdisp/ILI9481/gdisp_lld.mk b/drivers/gdisp/ILI9481/gdisp_lld.mk new file mode 100644 index 00000000..b0b3f533 --- /dev/null +++ b/drivers/gdisp/ILI9481/gdisp_lld.mk @@ -0,0 +1,5 @@ +# List the required driver. +GFXSRC += $(GFXLIB)/drivers/gdisp/ILI9481/gdisp_lld.c + +# Required include directories +GFXINC += $(GFXLIB)/drivers/gdisp/ILI9481 diff --git a/drivers/gdisp/HVGA_X81/gdisp_lld_board_example.h b/drivers/gdisp/ILI9481/gdisp_lld_board_example.h similarity index 80% rename from drivers/gdisp/HVGA_X81/gdisp_lld_board_example.h rename to drivers/gdisp/ILI9481/gdisp_lld_board_example.h index 2c81c906..de459641 100644 --- a/drivers/gdisp/HVGA_X81/gdisp_lld_board_example.h +++ b/drivers/gdisp/ILI9481/gdisp_lld_board_example.h @@ -19,7 +19,7 @@ */ /** - * @file drivers/gdisp/HVGA_X81/gdisp_lld_board_example.h + * @file drivers/gdisp/ILI9481/gdisp_lld_board_example.h * @brief GDISP Graphics Driver subsystem low level driver source for * the ILI9481 and compatible HVGA display * @@ -37,7 +37,7 @@ */ static inline void init_board(void) { /* Code here */ -#error "HVGA_X81: You must supply a definition for init_board for your board" +#error "ILI9481: You must supply a definition for init_board for your board" } /** @@ -49,7 +49,7 @@ static inline void init_board(void) { */ static inline void setpin_reset(bool_t state) { /* Code here */ -#error "HVGA_X81: You must supply a definition for setpin_reset for your board" +#error "ILI9481: You must supply a definition for setpin_reset for your board" } /** @@ -61,7 +61,7 @@ static inline void setpin_reset(bool_t state) { */ static inline void set_backlight(uint8_t percent) { /* Code here */ -#error "HVGA_X81: You must supply a definition for set_backlight for your board" +#error "ILI9481: You must supply a definition for set_backlight for your board" } /** @@ -70,7 +70,7 @@ static inline void set_backlight(uint8_t percent) { * @notapi */ static inline void acquire_bus(void) { -#error "HVGA_X81: You must supply a definition for acquire_bus for your board" +#error "ILI9481: You must supply a definition for acquire_bus for your board" } /** @@ -79,7 +79,7 @@ static inline void acquire_bus(void) { * @notapi */ static inline void release_bus(void) { -#error "HVGA_X81: You must supply a definition for release_bus for your board" +#error "ILI9481: You must supply a definition for release_bus for your board" } /** @@ -91,7 +91,7 @@ static inline void release_bus(void) { */ static inline void write_index(uint16_t index) { /* Code here */ -#error "HVGA_X81: You must supply a definition for write_index for your board" +#error "ILI9481: You must supply a definition for write_index for your board" } /** @@ -103,7 +103,7 @@ static inline void write_index(uint16_t index) { */ static inline void write_data(uint16_t data) { /* Code here */ -#error "HVGA_X81: You must supply a definition for write_data for your board" +#error "ILI9481: You must supply a definition for write_data for your board" } #if GDISP_HARDWARE_READPIXEL || GDISP_HARDWARE_SCROLL || defined(__DOXYGEN__) @@ -118,7 +118,7 @@ static inline void write_data(uint16_t data) { */ static inline uint16_t read_data(void) { /* Code here */ -#error "HVGA_X81: You must supply a definition for read_data for your board" +#error "ILI9481: You must supply a definition for read_data for your board" } #endif diff --git a/drivers/gdisp/HVGA_X81/gdisp_lld_board_example_fsmc.h b/drivers/gdisp/ILI9481/gdisp_lld_board_example_fsmc.h similarity index 98% rename from drivers/gdisp/HVGA_X81/gdisp_lld_board_example_fsmc.h rename to drivers/gdisp/ILI9481/gdisp_lld_board_example_fsmc.h index 8367b53c..3fc3f632 100644 --- a/drivers/gdisp/HVGA_X81/gdisp_lld_board_example_fsmc.h +++ b/drivers/gdisp/ILI9481/gdisp_lld_board_example_fsmc.h @@ -19,7 +19,7 @@ */ /** - * @file drivers/gdisp/HVGA_X81/gdisp_lld_board_example_fsmc.h + * @file drivers/gdisp/ILI9481/gdisp_lld_board_example_fsmc.h * @brief GDISP Graphics Driver subsystem low level driver source for * the ILI9481 and compatible HVGA display * diff --git a/drivers/gdisp/HVGA_X81/gdisp_lld_board_firebullstm32f103.h b/drivers/gdisp/ILI9481/gdisp_lld_board_firebullstm32f103.h similarity index 98% rename from drivers/gdisp/HVGA_X81/gdisp_lld_board_firebullstm32f103.h rename to drivers/gdisp/ILI9481/gdisp_lld_board_firebullstm32f103.h index 176e8452..ce7af96f 100644 --- a/drivers/gdisp/HVGA_X81/gdisp_lld_board_firebullstm32f103.h +++ b/drivers/gdisp/ILI9481/gdisp_lld_board_firebullstm32f103.h @@ -19,7 +19,7 @@ */ /** - * @file drivers/gdisp/HVGA_X81/gdisp_lld_board_firebullstm32f103.h + * @file drivers/gdisp/ILI9481/gdisp_lld_board_firebullstm32f103.h * @brief GDISP Graphics Driver subsystem low level driver source for * the ILI9481 and compatible HVGA display * diff --git a/drivers/gdisp/HVGA_X81/gdisp_lld_config.h b/drivers/gdisp/ILI9481/gdisp_lld_config.h similarity index 94% rename from drivers/gdisp/HVGA_X81/gdisp_lld_config.h rename to drivers/gdisp/ILI9481/gdisp_lld_config.h index a9dd8659..c1fc7a2d 100644 --- a/drivers/gdisp/HVGA_X81/gdisp_lld_config.h +++ b/drivers/gdisp/ILI9481/gdisp_lld_config.h @@ -19,7 +19,7 @@ */ /** - * @file drivers/gdisp/SSD1289/gdisp_lld_config.h + * @file drivers/gdisp/ILI9481/gdisp_lld_config.h * @brief GDISP Graphics Driver subsystem low level driver source for * the ILI9481 and compatible HVGA display * @@ -36,7 +36,7 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define GDISP_DRIVER_NAME "HVGA_X81" +#define GDISP_DRIVER_NAME "ILI9481" #define GDISP_HARDWARE_CLEARS TRUE #define GDISP_HARDWARE_FILLS TRUE diff --git a/drivers/gdisp/HVGA_X81/readme.txt b/drivers/gdisp/ILI9481/readme.txt similarity index 90% rename from drivers/gdisp/HVGA_X81/readme.txt rename to drivers/gdisp/ILI9481/readme.txt index b4236b88..dc66e27b 100644 --- a/drivers/gdisp/HVGA_X81/readme.txt +++ b/drivers/gdisp/ILI9481/readme.txt @@ -12,4 +12,4 @@ To use this driver: BOARD_FIREBULL_STM32_F103 - GPIO interface: requires GDISP_CMD_PORT and GDISP_DATA_PORT to be defined 2. To your makefile add the following lines: - include $(GFXLIB)/drivers/gdisp/HVGA_X81/gdisp_lld.mk + include $(GFXLIB)/drivers/gdisp/ILI9481/gdisp_lld.mk