diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/drivers/lcd-bitmap-common.c | 9 | ||||
-rw-r--r-- | firmware/export/lcd-remote.h | 2 | ||||
-rw-r--r-- | firmware/export/lcd.h | 2 |
3 files changed, 2 insertions, 11 deletions
diff --git a/firmware/drivers/lcd-bitmap-common.c b/firmware/drivers/lcd-bitmap-common.c index a95efbc1d8..14c63ec471 100644 --- a/firmware/drivers/lcd-bitmap-common.c +++ b/firmware/drivers/lcd-bitmap-common.c | |||
@@ -602,13 +602,8 @@ void LCDFN(putsxy_scroll_func)(int x, int y, const unsigned char *string, | |||
602 | 602 | ||
603 | void LCDFN(puts_scroll)(int x, int y, const unsigned char *string) | 603 | void LCDFN(puts_scroll)(int x, int y, const unsigned char *string) |
604 | { | 604 | { |
605 | LCDFN(puts_scroll_style)(x, y, string, STYLE_DEFAULT); | 605 | LCDFN(puts_scroll_worker)(x, y, string, STYLE_DEFAULT, 0, 0, |
606 | } | 606 | true, LCDFN(scroll_fn), NULL); |
607 | |||
608 | void LCDFN(puts_scroll_style)(int x, int y, const unsigned char *string, | ||
609 | int style) | ||
610 | { | ||
611 | LCDFN(puts_scroll_style_xyoffset)(x, y, string, style, 0, 0); | ||
612 | } | 607 | } |
613 | 608 | ||
614 | #if !defined(HAVE_LCD_COLOR) || !defined(MAIN_LCD) | 609 | #if !defined(HAVE_LCD_COLOR) || !defined(MAIN_LCD) |
diff --git a/firmware/export/lcd-remote.h b/firmware/export/lcd-remote.h index 53ddf0fcea..4c0a894072 100644 --- a/firmware/export/lcd-remote.h +++ b/firmware/export/lcd-remote.h | |||
@@ -179,8 +179,6 @@ extern void lcd_remote_puts_style_xyoffset(int x, int y, const unsigned char *st | |||
179 | int style, int x_offset, int y_offset); | 179 | int style, int x_offset, int y_offset); |
180 | extern void lcd_remote_putc(int x, int y, unsigned short ch); | 180 | extern void lcd_remote_putc(int x, int y, unsigned short ch); |
181 | extern void lcd_remote_puts_scroll(int x, int y, const unsigned char *str); | 181 | extern void lcd_remote_puts_scroll(int x, int y, const unsigned char *str); |
182 | extern void lcd_remote_puts_scroll_style(int x, int y, const unsigned char *str, | ||
183 | int style); | ||
184 | extern void lcd_remote_puts_scroll_style_xyoffset(int x, int y, | 182 | extern void lcd_remote_puts_scroll_style_xyoffset(int x, int y, |
185 | const unsigned char *string, | 183 | const unsigned char *string, |
186 | int style, int x_offset, | 184 | int style, int x_offset, |
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index b8c4f5ce1c..9e6470d526 100644 --- a/firmware/export/lcd.h +++ b/firmware/export/lcd.h | |||
@@ -208,8 +208,6 @@ extern void lcd_puts(int x, int y, const unsigned char *string); | |||
208 | extern void lcd_putsf(int x, int y, const unsigned char *fmt, ...); | 208 | extern void lcd_putsf(int x, int y, const unsigned char *fmt, ...); |
209 | extern void lcd_putc(int x, int y, unsigned long ucs); | 209 | extern void lcd_putc(int x, int y, unsigned long ucs); |
210 | extern void lcd_puts_scroll(int x, int y, const unsigned char* string); | 210 | extern void lcd_puts_scroll(int x, int y, const unsigned char* string); |
211 | extern void lcd_puts_scroll_style(int x, int y, const unsigned char* string, | ||
212 | int style); | ||
213 | extern void lcd_putsxy_scroll_func(int x, int y, const unsigned char *string, | 211 | extern void lcd_putsxy_scroll_func(int x, int y, const unsigned char *string, |
214 | void (*scroll_func)(struct scrollinfo *), | 212 | void (*scroll_func)(struct scrollinfo *), |
215 | void *data, int x_offset); | 213 | void *data, int x_offset); |