diff options
Diffstat (limited to 'firmware/drivers/lcd-h100-remote.c')
-rw-r--r-- | firmware/drivers/lcd-h100-remote.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/firmware/drivers/lcd-h100-remote.c b/firmware/drivers/lcd-h100-remote.c index a28cd2f4e5..3be907a574 100644 --- a/firmware/drivers/lcd-h100-remote.c +++ b/firmware/drivers/lcd-h100-remote.c | |||
@@ -1138,7 +1138,7 @@ void lcd_remote_putsxy(int x, int y, const unsigned char *str) | |||
1138 | /* put a string at a given char position */ | 1138 | /* put a string at a given char position */ |
1139 | void lcd_remote_puts(int x, int y, const unsigned char *str) | 1139 | void lcd_remote_puts(int x, int y, const unsigned char *str) |
1140 | { | 1140 | { |
1141 | lcd_remote_puts_style(x, y, str, STYLE_DEFAULT); | 1141 | lcd_remote_puts_style_offset(x, y, str, STYLE_DEFAULT, 0); |
1142 | } | 1142 | } |
1143 | 1143 | ||
1144 | void lcd_remote_puts_style(int x, int y, const unsigned char *str, int style) | 1144 | void lcd_remote_puts_style(int x, int y, const unsigned char *str, int style) |
@@ -1151,7 +1151,8 @@ void lcd_remote_puts_offset(int x, int y, const unsigned char *str, int offset) | |||
1151 | lcd_remote_puts_style_offset(x, y, str, STYLE_DEFAULT, offset); | 1151 | lcd_remote_puts_style_offset(x, y, str, STYLE_DEFAULT, offset); |
1152 | } | 1152 | } |
1153 | 1153 | ||
1154 | /* put a string at a given char position at a given style and with a given offset */ | 1154 | /* put a string at a given char position, style, and pixel position, |
1155 | * skipping first offset pixel columns */ | ||
1155 | void lcd_remote_puts_style_offset(int x, int y, const unsigned char *str, int style, int offset) | 1156 | void lcd_remote_puts_style_offset(int x, int y, const unsigned char *str, int style, int offset) |
1156 | { | 1157 | { |
1157 | int xpos,ypos,w,h; | 1158 | int xpos,ypos,w,h; |
@@ -1223,16 +1224,16 @@ void lcd_remote_puts_scroll(int x, int y, const unsigned char *string) | |||
1223 | 1224 | ||
1224 | void lcd_remote_puts_scroll_style(int x, int y, const unsigned char *string, int style) | 1225 | void lcd_remote_puts_scroll_style(int x, int y, const unsigned char *string, int style) |
1225 | { | 1226 | { |
1226 | lcd_remote_puts_scroll_style_offset(x, y, string, style, 0); | 1227 | lcd_remote_puts_scroll_style_offset(x, y, string, style, 0); |
1227 | } | 1228 | } |
1228 | 1229 | ||
1229 | void lcd_remote_puts_scroll_offset(int x, int y, const unsigned char *string, int offset) | 1230 | void lcd_remote_puts_scroll_offset(int x, int y, const unsigned char *string, int offset) |
1230 | { | 1231 | { |
1231 | lcd_remote_puts_scroll_style_offset(x, y, string, STYLE_DEFAULT, offset); | 1232 | lcd_remote_puts_scroll_style_offset(x, y, string, STYLE_DEFAULT, offset); |
1232 | } | 1233 | } |
1233 | 1234 | ||
1234 | void lcd_remote_puts_scroll_style_offset(int x, int y, const unsigned char *string, | 1235 | void lcd_remote_puts_scroll_style_offset(int x, int y, const unsigned char *string, |
1235 | int style, int offset) | 1236 | int style, int offset) |
1236 | { | 1237 | { |
1237 | struct scrollinfo* s; | 1238 | struct scrollinfo* s; |
1238 | int w, h; | 1239 | int w, h; |
@@ -1289,7 +1290,6 @@ void lcd_remote_puts_scroll_style_offset(int x, int y, const unsigned char *stri | |||
1289 | scrolling_lines &= ~(1<<y); | 1290 | scrolling_lines &= ~(1<<y); |
1290 | } | 1291 | } |
1291 | 1292 | ||
1292 | |||
1293 | static void scroll_thread(void) | 1293 | static void scroll_thread(void) |
1294 | { | 1294 | { |
1295 | struct font* pf; | 1295 | struct font* pf; |