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

text scrolling sort of starting to work 

but it is slow and the font has artefacts, probably because a fixed
width is being used
ugfx_release_2.6
Thomas Saunders 2012-06-22 21:41:24 +01:00
parent d0e3a0636e
commit 5c7d3819be
2 changed files with 65 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
console.c
View File

@ -87,8 +87,8 @@ msg_t lcdConsoleInit(GLCDConsole *console, uint16_t x0, uint16_t y0, uint16_t x1
console->fx = *(ptr++); console->fx = *(ptr++);
/* calculate the size of the console in characters */ /* calculate the size of the console in characters */
console->sx = (x1-x0)/console->fx; console->sx = (x1-x0);
console->sy = (y1-y0)/console->fy; console->sy = (y1-y0);
console->cx = 0; console->cx = 0;
console->cy = 0; console->cy = 0;
@ -96,7 +96,7 @@ msg_t lcdConsoleInit(GLCDConsole *console, uint16_t x0, uint16_t y0, uint16_t x1
console->y0 = y0; console->y0 = y0;
console->buf = buffer; console->buf = buffer;
console->bidx = 0; console->wptr = 0;
console->blen = console->sx*console->sy; console->blen = console->sx*console->sy;
console->bstrt = 0; console->bstrt = 0;
@ -112,56 +112,82 @@ msg_t lcdConsoleUpdate(GLCDConsole *console) {
} }
msg_t lcdConsolePut(GLCDConsole *console, char c) { msg_t lcdConsolePut(GLCDConsole *console, char c) {
uint8_t width = console->fx;
uint16_t i;
uint16_t s = console->wptr;
bool_t redraw = FALSE;
if(console->full) { if(console->full) {
return RDY_RESET; return RDY_RESET;
} }
bool_t redraw = FALSE; /* write character to current position in buffer and update wptr */
/* write character to current position in buffer */ console->buf[console->wptr] = c;
console->buf[console->bidx++] = c;
if(console->bidx == console->blen) { if(++console->wptr == console->blen) {
/* wrap around to the beginning */ /* wrap around to the beginning */
console->bidx = 0; console->wptr = 0;
} }
if(c == '\n') { lcdSetFont(console->font);
console->cx = 0; lcdSetFontTransparency(solid);
console->cy++; /* keep looping until we've finished writing
redraw = TRUE; * we may write more than one character if the console needs to be re-drawn
} else if(c == '\r') { * at the end of the loop leave the cursor set to the position for the next character
console->cx = 0; * checks to see if this is out of range will be performed at the start of that character
} else { */
console->cx++; do {
} if(console->buf[s] == '\n') {
console->cx = 0;
console->cy += console->fy;
} else if(console->buf[s] == '\r') {
/* TODO: work backwards through the buffer to the start of the current line */
//console->cx = 0;
} else {
if(console->cx >= console->sx) {
console->cx = 0;
console->cy += console->fy;
}
if(console->cx > console->sx) { if((console->cy + console->fy) >= console->sy) {
/* character has extended beyond end of line */ /* we've gone beyond the end of the console */
redraw = TRUE; //console->full = TRUE;
} //return RDY_RESET;
/* start at beginning of buffer and remove the first line */
if(redraw && console->cy == console->sy) { /* increment s from bstrt until it has been incremented more than
* console->sx or finds a new line */
s = console->bstrt;
console->cx = 0;
/* we've gone past the end of the console */ while((console->cx <= console->sx) && (console->buf[s % console->blen] != '\n')) {
console->full = TRUE; s++;
return RDY_RESET; /* TODO: increment based on the width of the character at s */
/* start at beginning of buffer and remove the first line */ /* TODO: this doesn't handle carriage return */
uint16_t i; console->cx += width;
}
/* increment i from bstrt until it has been incremented more than console->sx or finds a new line */ /* update bstrt to the new start point of the console */
for(i = console->bstrt; ((i - console->bstrt) < console->sx) && (console->buf[i % console->sx] != '\n'); i++); console->bstrt = s;
/* update bstrt to the new start point of the console */ /* reset the cursor */
console->bstrt = i; console->cx = 0;
} else { console->cy = 0;
/* just draw the character at the current position */ }
lcdMoveCursor(console->x0 + console->cx*console->fx, console->y0 + console->cy*console->fy, lcdMoveCursor(console->x0 + console->cx, console->y0 + console->cy,
console->color, console->bkcolor); console->color, console->bkcolor);
lcdDrawChar(console->buf[s]);
/* update cursor */
console->cx += width;
}
/* finally increment index */
if(++s == console->blen)
s = 0;
} while(s != console->wptr);
lcdSetFont(console->font);
lcdDrawChar(c);
}
} }
msg_t lcdConsoleWrite(GLCDConsole *console, uint8_t *bp, size_t n) { msg_t lcdConsoleWrite(GLCDConsole *console, uint8_t *bp, size_t n) {

2
console.h
View File

@ -48,7 +48,7 @@ struct GLCDConsole {
/* font size in pixels */ /* font size in pixels */
uint8_t fx,fy; uint8_t fx,fy;
/* buffer index */ /* buffer index */
uint16_t bidx, blen, bstrt; uint16_t wptr, blen, bstrt;
bool_t full; bool_t full;
}; };