summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/screen_access.c2
-rw-r--r--apps/screen_access.h2
-rw-r--r--firmware/drivers/lcd-bitmap-common.c8
-rw-r--r--firmware/export/lcd-remote.h2
-rw-r--r--firmware/export/lcd.h2
5 files changed, 1 insertions, 15 deletions
diff --git a/apps/screen_access.c b/apps/screen_access.c
index c8f47ed0f6..452e5e9501 100644
--- a/apps/screen_access.c
+++ b/apps/screen_access.c
@@ -248,7 +248,6 @@ struct screen screens[NB_SCREENS] =
248 .vline=&lcd_vline, 248 .vline=&lcd_vline,
249 .hline=&lcd_hline, 249 .hline=&lcd_hline,
250 .scroll_step=&lcd_scroll_step, 250 .scroll_step=&lcd_scroll_step,
251 .puts_style_offset=&lcd_puts_style_offset,
252 .puts_style_xyoffset=&lcd_puts_style_xyoffset, 251 .puts_style_xyoffset=&lcd_puts_style_xyoffset,
253 .puts_scroll_style=&lcd_puts_scroll_style, 252 .puts_scroll_style=&lcd_puts_scroll_style,
254 .puts_scroll_style_xyoffset=&lcd_puts_scroll_style_xyoffset, 253 .puts_scroll_style_xyoffset=&lcd_puts_scroll_style_xyoffset,
@@ -351,7 +350,6 @@ struct screen screens[NB_SCREENS] =
351 .vline=&lcd_remote_vline, 350 .vline=&lcd_remote_vline,
352 .hline=&lcd_remote_hline, 351 .hline=&lcd_remote_hline,
353 .scroll_step=&lcd_remote_scroll_step, 352 .scroll_step=&lcd_remote_scroll_step,
354 .puts_style_offset=&lcd_remote_puts_style_offset,
355 .puts_style_xyoffset=&lcd_remote_puts_style_xyoffset, 353 .puts_style_xyoffset=&lcd_remote_puts_style_xyoffset,
356 .puts_scroll_style=&lcd_remote_puts_scroll_style, 354 .puts_scroll_style=&lcd_remote_puts_scroll_style,
357 .puts_scroll_style_xyoffset=&lcd_remote_puts_scroll_style_xyoffset, 355 .puts_scroll_style_xyoffset=&lcd_remote_puts_scroll_style_xyoffset,
diff --git a/apps/screen_access.h b/apps/screen_access.h
index 1d120f7bb0..4f1faac187 100644
--- a/apps/screen_access.h
+++ b/apps/screen_access.h
@@ -78,8 +78,6 @@ struct screen
78 void (*setuifont)(int newfont); 78 void (*setuifont)(int newfont);
79 79
80 void (*scroll_step)(int pixels); 80 void (*scroll_step)(int pixels);
81 void (*puts_style_offset)(int x, int y, const unsigned char *str,
82 int style, int x_offset);
83 void (*puts_style_xyoffset)(int x, int y, const unsigned char *str, 81 void (*puts_style_xyoffset)(int x, int y, const unsigned char *str,
84 int style, int x_offset, int y_offset); 82 int style, int x_offset, int y_offset);
85 void (*puts_scroll_style)(int x, int y, const unsigned char *string, 83 void (*puts_scroll_style)(int x, int y, const unsigned char *string,
diff --git a/firmware/drivers/lcd-bitmap-common.c b/firmware/drivers/lcd-bitmap-common.c
index f9bc03d48e..a95efbc1d8 100644
--- a/firmware/drivers/lcd-bitmap-common.c
+++ b/firmware/drivers/lcd-bitmap-common.c
@@ -467,15 +467,9 @@ void LCDFN(puts_style_xyoffset)(int x, int y, const unsigned char *str,
467 LCDFN(putsxyofs_style)(xpos, ypos+y_offset, str, style, h, x_offset); 467 LCDFN(putsxyofs_style)(xpos, ypos+y_offset, str, style, h, x_offset);
468} 468}
469 469
470void LCDFN(puts_style_offset)(int x, int y, const unsigned char *str,
471 int style, int x_offset)
472{
473 LCDFN(puts_style_xyoffset)(x, y, str, style, x_offset, 0);
474}
475
476void LCDFN(puts)(int x, int y, const unsigned char *str) 470void LCDFN(puts)(int x, int y, const unsigned char *str)
477{ 471{
478 LCDFN(puts_style_offset)(x, y, str, STYLE_DEFAULT, 0); 472 LCDFN(puts_style_xyoffset)(x, y, str, STYLE_DEFAULT, 0, 0);
479} 473}
480 474
481/* Formatting version of LCDFN(puts) */ 475/* Formatting version of LCDFN(puts) */
diff --git a/firmware/export/lcd-remote.h b/firmware/export/lcd-remote.h
index d803525318..53ddf0fcea 100644
--- a/firmware/export/lcd-remote.h
+++ b/firmware/export/lcd-remote.h
@@ -175,8 +175,6 @@ extern void lcd_remote_clear_display(void);
175extern void lcd_remote_clear_viewport(void); 175extern void lcd_remote_clear_viewport(void);
176extern void lcd_remote_puts(int x, int y, const unsigned char *str); 176extern void lcd_remote_puts(int x, int y, const unsigned char *str);
177extern void lcd_remote_putsf(int x, int y, const unsigned char *fmt, ...); 177extern void lcd_remote_putsf(int x, int y, const unsigned char *fmt, ...);
178extern void lcd_remote_puts_style_offset(int x, int y, const unsigned char *str,
179 int style, int offset);
180extern void lcd_remote_puts_style_xyoffset(int x, int y, const unsigned char *str, 178extern void lcd_remote_puts_style_xyoffset(int x, int y, const unsigned char *str,
181 int style, int x_offset, int y_offset); 179 int style, int x_offset, int y_offset);
182extern void lcd_remote_putc(int x, int y, unsigned short ch); 180extern void lcd_remote_putc(int x, int y, unsigned short ch);
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index 0c5cf74ac7..b8c4f5ce1c 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -498,8 +498,6 @@ extern int lcd_get_drawmode(void);
498extern void lcd_setfont(int font); 498extern void lcd_setfont(int font);
499extern int lcd_getfont(void); 499extern int lcd_getfont(void);
500 500
501extern void lcd_puts_style_offset(int x, int y, const unsigned char *str,
502 int style, int x_offset);
503extern void lcd_puts_style_xyoffset(int x, int y, const unsigned char *str, 501extern void lcd_puts_style_xyoffset(int x, int y, const unsigned char *str,
504 int style, int x_offset, int y_offset); 502 int style, int x_offset, int y_offset);
505extern void lcd_puts_scroll_style_xyoffset(int x, int y, const unsigned char *string, 503extern void lcd_puts_scroll_style_xyoffset(int x, int y, const unsigned char *string,