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 a95efbc..14c63ec 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, void LCDFN(puts_scroll)(int x, int y, const unsigned char *string) { - LCDFN(puts_scroll_style)(x, y, string, STYLE_DEFAULT); -} - -void LCDFN(puts_scroll_style)(int x, int y, const unsigned char *string, - int style) -{ - LCDFN(puts_scroll_style_xyoffset)(x, y, string, style, 0, 0); + LCDFN(puts_scroll_worker)(x, y, string, STYLE_DEFAULT, 0, 0, + true, LCDFN(scroll_fn), NULL); } #if !defined(HAVE_LCD_COLOR) || !defined(MAIN_LCD) diff --git a/firmware/export/lcd-remote.h b/firmware/export/lcd-remote.h index 53ddf0f..4c0a894 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 int style, int x_offset, int y_offset); extern void lcd_remote_putc(int x, int y, unsigned short ch); extern void lcd_remote_puts_scroll(int x, int y, const unsigned char *str); -extern void lcd_remote_puts_scroll_style(int x, int y, const unsigned char *str, - int style); extern void lcd_remote_puts_scroll_style_xyoffset(int x, int y, const unsigned char *string, int style, int x_offset, diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index b8c4f5c..9e6470d 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); extern void lcd_putsf(int x, int y, const unsigned char *fmt, ...); extern void lcd_putc(int x, int y, unsigned long ucs); extern void lcd_puts_scroll(int x, int y, const unsigned char* string); -extern void lcd_puts_scroll_style(int x, int y, const unsigned char* string, - int style); extern void lcd_putsxy_scroll_func(int x, int y, const unsigned char *string, void (*scroll_func)(struct scrollinfo *), void *data, int x_offset); |