diff options
-rw-r--r-- | firmware/drivers/lcd-player.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/firmware/drivers/lcd-player.c b/firmware/drivers/lcd-player.c index 29639fc64e..189cb0e899 100644 --- a/firmware/drivers/lcd-player.c +++ b/firmware/drivers/lcd-player.c | |||
@@ -271,10 +271,10 @@ void lcd_clear_display(void) | |||
271 | xlcd_update(); | 271 | xlcd_update(); |
272 | } | 272 | } |
273 | 273 | ||
274 | static void lcd_do_puts(int x, int y, unsigned char *string) | 274 | static void lcd_puts_cont_scroll(int x, int y, unsigned char *string) |
275 | { | 275 | { |
276 | bool update=false; | 276 | bool update=false; |
277 | DEBUGF("lcd_do_puts(%d, %d, \"", x, y); | 277 | DEBUGF("lcd_puts_cont_scroll(%d, %d, \"", x, y); |
278 | 278 | ||
279 | for (; *string && x<11; x++) | 279 | for (; *string && x<11; x++) |
280 | { | 280 | { |
@@ -296,9 +296,9 @@ static void lcd_do_puts(int x, int y, unsigned char *string) | |||
296 | } | 296 | } |
297 | void lcd_puts(int x, int y, unsigned char *string) | 297 | void lcd_puts(int x, int y, unsigned char *string) |
298 | { | 298 | { |
299 | DEBUGF("lcd_puts(%d, %d)", x, y); | 299 | DEBUGF("lcd_puts(%d, %d) -> ", x, y); |
300 | scroll[y].mode=SCROLL_MODE_OFF; | 300 | scroll[y].mode=SCROLL_MODE_OFF; |
301 | return lcd_do_puts(x, y, string); | 301 | return lcd_puts_cont_scroll(x, y, string); |
302 | } | 302 | } |
303 | 303 | ||
304 | void lcd_putc(int x, int y, unsigned short ch) | 304 | void lcd_putc(int x, int y, unsigned short ch) |
@@ -463,7 +463,7 @@ void lcd_puts_scroll(int x, int y, unsigned char* string ) | |||
463 | 463 | ||
464 | s = &scroll[y]; | 464 | s = &scroll[y]; |
465 | 465 | ||
466 | lcd_do_puts(x,y,string); | 466 | lcd_puts_cont_scroll(x,y,string); |
467 | s->textlen = strlen(string); | 467 | s->textlen = strlen(string); |
468 | 468 | ||
469 | if ( s->textlen > 11-x ) { | 469 | if ( s->textlen > 11-x ) { |
@@ -629,7 +629,7 @@ static void scroll_thread(void) | |||
629 | buffer[i++]=s->text[o++]; | 629 | buffer[i++]=s->text[o++]; |
630 | } | 630 | } |
631 | buffer[11]=0; | 631 | buffer[11]=0; |
632 | lcd_do_puts(s->startx, s->starty, buffer); | 632 | lcd_puts_cont_scroll(s->startx, s->starty, buffer); |
633 | } | 633 | } |
634 | } | 634 | } |
635 | 635 | ||