diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/drivers/lcd-player.c | 13 | ||||
-rw-r--r-- | firmware/export/lcd.h | 1 |
2 files changed, 6 insertions, 8 deletions
diff --git a/firmware/drivers/lcd-player.c b/firmware/drivers/lcd-player.c index 1b841b5848..c1657aa915 100644 --- a/firmware/drivers/lcd-player.c +++ b/firmware/drivers/lcd-player.c | |||
@@ -96,7 +96,6 @@ static char scroll_ticks = 12; /* # of ticks between updates */ | |||
96 | static int scroll_delay = HZ/2; /* delay before starting scroll */ | 96 | static int scroll_delay = HZ/2; /* delay before starting scroll */ |
97 | static int jump_scroll_delay = HZ/4; /* delay between jump scroll jumps */ | 97 | static int jump_scroll_delay = HZ/4; /* delay between jump scroll jumps */ |
98 | static char scroll_spacing = 3; /* spaces between end and start of text */ | 98 | static char scroll_spacing = 3; /* spaces between end and start of text */ |
99 | static bool allow_bidirectional_scrolling = true; | ||
100 | static int bidir_limit = 50; /* percent */ | 99 | static int bidir_limit = 50; /* percent */ |
101 | static int jump_scroll = 0; /* 0=off, 1=once, ..., JUMP_SCROLL_ALWAYS */ | 100 | static int jump_scroll = 0; /* 0=off, 1=once, ..., JUMP_SCROLL_ALWAYS */ |
102 | 101 | ||
@@ -700,12 +699,6 @@ void lcd_stop_scroll(void) | |||
700 | lcd_update(); | 699 | lcd_update(); |
701 | } | 700 | } |
702 | 701 | ||
703 | |||
704 | void lcd_allow_bidirectional_scrolling(bool on) | ||
705 | { | ||
706 | allow_bidirectional_scrolling=on; | ||
707 | } | ||
708 | |||
709 | static const char scroll_tick_table[16] = { | 702 | static const char scroll_tick_table[16] = { |
710 | /* Hz values: | 703 | /* Hz values: |
711 | 1, 1.25, 1.55, 2, 2.5, 3.12, 4, 5, 6.25, 8.33, 10, 12.5, 16.7, 20, 25, 33 */ | 704 | 1, 1.25, 1.55, 2, 2.5, 3.12, 4, 5, 6.25, 8.33, 10, 12.5, 16.7, 20, 25, 33 */ |
@@ -833,8 +826,14 @@ static void scroll_thread(void) | |||
833 | cursor.textpos++; | 826 | cursor.textpos++; |
834 | if (cursor.textpos>=cursor.len) | 827 | if (cursor.textpos>=cursor.len) |
835 | cursor.textpos=0; | 828 | cursor.textpos=0; |
829 | #ifdef SIMULATOR | ||
830 | lcdx_putc(cursor.x_pos, cursor.y_pos, | ||
831 | cursor.text[cursor.textpos]); | ||
832 | update=true; | ||
833 | #else | ||
836 | update|=lcdx_putc(cursor.x_pos, cursor.y_pos, | 834 | update|=lcdx_putc(cursor.x_pos, cursor.y_pos, |
837 | cursor.text[cursor.textpos]); | 835 | cursor.text[cursor.textpos]); |
836 | #endif | ||
838 | } | 837 | } |
839 | } | 838 | } |
840 | if (update) { | 839 | if (update) { |
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index 98e2a58a53..c5dd4f7399 100644 --- a/firmware/export/lcd.h +++ b/firmware/export/lcd.h | |||
@@ -98,7 +98,6 @@ extern void lcd_jump_scroll (int mode); /* 0=off, 1=once, ..., ALWAYS */ | |||
98 | extern void lcd_jump_scroll_delay( int ms ); | 98 | extern void lcd_jump_scroll_delay( int ms ); |
99 | unsigned char lcd_get_locked_pattern(void); | 99 | unsigned char lcd_get_locked_pattern(void); |
100 | void lcd_unlock_pattern(unsigned char pat); | 100 | void lcd_unlock_pattern(unsigned char pat); |
101 | void lcd_allow_bidirectional_scrolling(bool on); | ||
102 | extern void lcd_bidir_scroll(int threshold); | 101 | extern void lcd_bidir_scroll(int threshold); |
103 | void lcd_put_cursor(int x, int y, char cursor_char); | 102 | void lcd_put_cursor(int x, int y, char cursor_char); |
104 | void lcd_remove_cursor(void); | 103 | void lcd_remove_cursor(void); |