uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

Small fix to the Nokia6610GE12 driver

Browse source
This commit is contained in:
inmarket 2013-10-19 16:33:13 +10:00
parent e9895b5d14
commit ad416c32b3
2 changed files with 9 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
drivers/gdisp/Nokia6610GE12/board_Nokia6610GE12_olimexsam7ex256.h
View file

@ -118,13 +118,10 @@ static inline void init_board(GDisplay *g) {
} }
} }
/** static inline void post_init_board(GDisplay *g) {
* @brief Set or clear the lcd reset pin. (void) g;
* }
* @param[in] state TRUE = lcd in reset, FALSE = normal operation
*
* @notapi
*/
static inline void setpin_reset(GDisplay *g, bool_t state) { static inline void setpin_reset(GDisplay *g, bool_t state) {
(void) g; (void) g;
if (state) if (state)
@ -133,16 +130,6 @@ static inline void setpin_reset(GDisplay *g, bool_t state) {
palSetPad(IOPORT1, PIOA_LCD_RESET); palSetPad(IOPORT1, PIOA_LCD_RESET);
} }
/**
* @brief Set the lcd back-light level.
* @note For now 0% turns the backlight off, anything else the backlight is on.
* While the hardware supports PWM backlight control, we are not using it
* yet.
*
* @param[in] percent 0 to 100%
*
* @notapi
*/
static inline void set_backlight(GDisplay *g, uint8_t percent) { static inline void set_backlight(GDisplay *g, uint8_t percent) {
(void) g; (void) g;
@ -170,33 +157,14 @@ static inline void set_backlight(GDisplay *g, uint8_t percent) {
} }
} }
/**
* @brief Take exclusive control of the bus
*
* @notapi
*/
static inline void acquire_bus(GDisplay *g) { static inline void acquire_bus(GDisplay *g) {
(void) g; (void) g;
/* Nothing to do for this board as the LCD is the only device on the SPI port */
} }
/**
* @brief Release exclusive control of the bus
*
* @notapi
*/
static inline void release_bus(GDisplay *g) { static inline void release_bus(GDisplay *g) {
(void) g; (void) g;
// Nothing to do for this board as the LCD is the only device on the SPI port
} }
/**
* @brief Send an 8 bit command to the lcd.
*
* @param[in] cmd The command to send
*
* @notapi
*/
static inline void write_index(GDisplay *g, uint16_t cmd) { static inline void write_index(GDisplay *g, uint16_t cmd) {
(void) g; (void) g;
@ -206,13 +174,6 @@ static inline void write_index(GDisplay *g, uint16_t cmd) {
pSPI->SPI_TDR = cmd & 0xFF; pSPI->SPI_TDR = cmd & 0xFF;
} }
/**
* @brief Send an 8 bit data to the lcd.
*
* @param[in] data The data to send
*
* @notapi
*/
static inline void write_data(GDisplay *g, uint16_t data) { static inline void write_data(GDisplay *g, uint16_t data) {
(void) g; (void) g;

5
drivers/gdisp/Nokia6610GE12/gdisp_lld.c
View file

@ -106,11 +106,16 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
delayms(20); delayms(20);
acquire_bus(g); acquire_bus(g);
write_index(g, SLEEPOUT); // Sleep out write_index(g, SLEEPOUT); // Sleep out
write_reg(g, COLMOD, 0x03); // Color Interface Pixel Format - 0x03 = 12 bits-per-pixel write_reg(g, COLMOD, 0x03); // Color Interface Pixel Format - 0x03 = 12 bits-per-pixel
write_reg(g, MADCTL, 0x00); // Memory access controller write_reg(g, MADCTL, 0x00); // Memory access controller
write_reg(g, SETCON, 127*GDISP_INITIAL_CONTRAST/100-64); // Write contrast write_reg(g, SETCON, 127*GDISP_INITIAL_CONTRAST/100-64); // Write contrast
delayms(20); delayms(20);
// Finish Init
post_init_board(g);
release_bus(g); release_bus(g);
/* Turn on the back-light */ /* Turn on the back-light */