diff options
Diffstat (limited to 'firmware/drivers/lcd.c')
-rw-r--r-- | firmware/drivers/lcd.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/firmware/drivers/lcd.c b/firmware/drivers/lcd.c index d85c9ade1a..f4deb89456 100644 --- a/firmware/drivers/lcd.c +++ b/firmware/drivers/lcd.c | |||
@@ -101,8 +101,6 @@ | |||
101 | 101 | ||
102 | /*** generic code ***/ | 102 | /*** generic code ***/ |
103 | 103 | ||
104 | #define SCROLL_DELAY 10 /* number of "scroll ticks" until scroll starts */ | ||
105 | |||
106 | struct scrollinfo { | 104 | struct scrollinfo { |
107 | char text[128]; | 105 | char text[128]; |
108 | int textlen; | 106 | int textlen; |
@@ -437,15 +435,6 @@ void lcd_init (void) | |||
437 | PBCR2 &= 0xff00; /* MD = 00 */ | 435 | PBCR2 &= 0xff00; /* MD = 00 */ |
438 | PBIOR |= 0x000f; /* IOR = 1 */ | 436 | PBIOR |= 0x000f; /* IOR = 1 */ |
439 | 437 | ||
440 | /* Initialize LCD */ | ||
441 | lcd_write (true, LCD_CNTL_RESET); | ||
442 | lcd_write (true, LCD_CNTL_POWER); | ||
443 | lcd_write (true, LCD_CNTL_SEGREMAP); | ||
444 | lcd_write (true, LCD_CNTL_OUTSCAN); | ||
445 | lcd_write (true, LCD_CNTL_CONTRAST); | ||
446 | lcd_write (true, 0x20); /* Contrast parameter */ | ||
447 | lcd_write (true, LCD_CNTL_DISPON); | ||
448 | |||
449 | lcd_clear_display(); | 438 | lcd_clear_display(); |
450 | lcd_update(); | 439 | lcd_update(); |
451 | create_thread(scroll_thread, scroll_stack, sizeof(scroll_stack)); | 440 | create_thread(scroll_thread, scroll_stack, sizeof(scroll_stack)); |
@@ -817,7 +806,8 @@ static void scroll_thread(void) | |||
817 | yield(); | 806 | yield(); |
818 | continue; | 807 | continue; |
819 | } | 808 | } |
820 | if ( scroll_count < SCROLL_DELAY ) | 809 | /* wait 1s before starting scroll */ |
810 | if ( scroll_count < scroll_speed ) | ||
821 | scroll_count++; | 811 | scroll_count++; |
822 | else { | 812 | else { |
823 | lcd_puts(s->xpos,s->starty,s->text + s->offset); | 813 | lcd_puts(s->xpos,s->starty,s->text + s->offset); |
@@ -831,7 +821,7 @@ static void scroll_thread(void) | |||
831 | s->offset++; | 821 | s->offset++; |
832 | 822 | ||
833 | if (s->offset > s->textlen) { | 823 | if (s->offset > s->textlen) { |
834 | scroll_count = SCROLL_DELAY; /* prevent wrap */ | 824 | scroll_count = scroll_speed; /* prevent wrap */ |
835 | s->offset=0; | 825 | s->offset=0; |
836 | s->xpos = s->space; | 826 | s->xpos = s->space; |
837 | } | 827 | } |