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

Merge pull request #29 from Tectu/master 

Merge Tectu Changes
ugfx_release_2.6
Andrew Hannam 2013-05-15 08:37:00 -07:00
parent 88fd3ad62e 3571d18741
commit 9ad0d07923
5 changed files with 342 additions and 326 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/modules/tdisp/main.c
View File

@ -30,7 +30,7 @@
#include "gfx.h"
int main(void) {
char charmap[8];
uint8_t charmap[8];
halInit();
chSysInit();

12
drivers/tdisp/HD44780/tdisp_lld.c
View File

@ -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);

13
include/tdisp/tdisp.h
View File

@ -108,7 +108,7 @@ void tdispSetCursor(coord_t col, coord_t row);
* made up of @p tdispGetCharBitWidth() bits of data. Note that bits in multiple rows are not
* packed.
*/
void tdispCreateChar(uint8_t address, uint8_t *charmap);
void tdispCreateChar(uint8_t address, char* charmap);
/**
* @brief Draws a single character at the current cursor position and advances the cursor
@ -129,6 +129,17 @@ void tdispDrawChar(char c);
*/
void tdispDrawString(char* s);
/**
* @brief Draws a string at a specific position
*
* @param[in] col The column (x)
* @param[in] row The row (y)
* @param[in] s The string to be drawin
*
* @note The cursor position after this call is not the same as before.
*/
void tdispDrawStringLocation(coord_t col, coord_t row, char* s);
/**
* @brief Control different display properties
* @note A wrapper macro exists for each option, please use them

5
src/tdisp/tdisp.c
View File

@ -94,6 +94,11 @@ void tdispDrawString(char *s) {
MUTEX_LEAVE();
}
void tdispDrawStringLocation(coord_t col, coord_t row, char *s) {
tdispSetCursor(col, row);
tdispDrawString(s);
}
void tdispControl(uint16_t what, void *value) {
MUTEX_ENTER();
tdisp_lld_control(what, value);