diff options
| author | Andrew Hannam <andrewh@inmarket.com.au> | 2013-05-15 08:37:00 -0700 |
|---|---|---|
| committer | Andrew Hannam <andrewh@inmarket.com.au> | 2013-05-15 08:37:00 -0700 |
| commit | 9ad0d079239662646bcef9b0629b48443da748e6 (patch) | |
| tree | b695ce63ec58129db7e5ab16fb29891c50b02eaa /drivers/tdisp | |
| parent | 88fd3ad62eeb0d6228e3e10127a0cd14b32c51a2 (diff) | |
| parent | 3571d18741ff00a327b6210a9c9d2594b4bdfb22 (diff) | |
| download | uGFX-9ad0d079239662646bcef9b0629b48443da748e6.tar.gz uGFX-9ad0d079239662646bcef9b0629b48443da748e6.tar.bz2 uGFX-9ad0d079239662646bcef9b0629b48443da748e6.zip | |
Merge pull request #29 from Tectu/master
Merge Tectu Changes
Diffstat (limited to 'drivers/tdisp')
| -rw-r--r-- | drivers/tdisp/HD44780/tdisp_lld.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/tdisp/HD44780/tdisp_lld.c b/drivers/tdisp/HD44780/tdisp_lld.c index ad38df8e..bfe202fc 100644 --- a/drivers/tdisp/HD44780/tdisp_lld.c +++ b/drivers/tdisp/HD44780/tdisp_lld.c @@ -112,7 +112,7 @@ bool_t tdisp_lld_init(void) { // write_cmd(0x38); // chThdSleepMilliseconds(64); // -// displaycontrol = DISPLAY_ON | CURSOR_ON | CURSOR_BLINK; // The default displaycontrol +// displaycontrol = TDISP_DISPLAY_ON | TDISP_CURSOR_ON | TDISP_CURSOR_BLINK; // The default displaycontrol // write_cmd(0x08 | displaycontrol); // chThdSleepMicroseconds(50); // @@ -171,26 +171,26 @@ void tdisp_lld_control(uint16_t what, uint16_t value) { switch(what) { case TDISP_CTRL_BACKLIGHT: if ((uint8_t)value) - displaycontrol |= DISPLAY_ON; + displaycontrol |= TDISP_DISPLAY_ON; else - displaycontrol &= ~DISPLAY_ON; + displaycontrol &= ~TDISP_DISPLAY_ON; write_cmd(0x08 | displaycontrol); break; case TDISP_CTRL_CURSOR: switch((uint8_t)value) { case cursorOff: - displaycontrol &= ~CURSOR_ON; + displaycontrol &= ~TDISP_CURSOR_ON; break; case cursorBlock: case cursorUnderline: case cursorBar: - displaycontrol = (displaycontrol | CURSOR_ON) & ~CURSOR_BLINK; + displaycontrol = (displaycontrol | TDISP_CURSOR_ON) & ~TDISP_CURSOR_BLINK; break; case cursorBlinkingBlock: case cursorBlinkingUnderline: case cursorBlinkingBar: default: - displaycontrol |= (CURSOR_ON | CURSOR_BLINK); + displaycontrol |= (TDISP_CURSOR_ON | TDISP_CURSOR_BLINK); break; } write_cmd(0x08 | displaycontrol); |