diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/drivers/lcd-16bit.c | 5 | ||||
-rw-r--r-- | firmware/drivers/lcd-1bit-vert.c | 5 | ||||
-rw-r--r-- | firmware/drivers/lcd-2bit-horz.c | 5 | ||||
-rw-r--r-- | firmware/drivers/lcd-2bit-vert.c | 5 | ||||
-rw-r--r-- | firmware/drivers/lcd-remote-1bit-v.c | 5 | ||||
-rw-r--r-- | firmware/drivers/lcd-remote-2bit-vi.c | 5 | ||||
-rw-r--r-- | firmware/export/lcd-remote.h | 1 | ||||
-rw-r--r-- | firmware/export/lcd.h | 1 |
8 files changed, 32 insertions, 0 deletions
diff --git a/firmware/drivers/lcd-16bit.c b/firmware/drivers/lcd-16bit.c index cc5a6c5ab7..2a766d4006 100644 --- a/firmware/drivers/lcd-16bit.c +++ b/firmware/drivers/lcd-16bit.c | |||
@@ -190,6 +190,11 @@ void lcd_setfont(int newfont) | |||
190 | current_vp->font = newfont; | 190 | current_vp->font = newfont; |
191 | } | 191 | } |
192 | 192 | ||
193 | int lcd_getfont(void) | ||
194 | { | ||
195 | return current_vp->font; | ||
196 | } | ||
197 | |||
193 | int lcd_getstringsize(const unsigned char *str, int *w, int *h) | 198 | int lcd_getstringsize(const unsigned char *str, int *w, int *h) |
194 | { | 199 | { |
195 | return font_getstringsize(str, w, h, current_vp->font); | 200 | return font_getstringsize(str, w, h, current_vp->font); |
diff --git a/firmware/drivers/lcd-1bit-vert.c b/firmware/drivers/lcd-1bit-vert.c index 5c651a9613..7c9cd26e2a 100644 --- a/firmware/drivers/lcd-1bit-vert.c +++ b/firmware/drivers/lcd-1bit-vert.c | |||
@@ -122,6 +122,11 @@ void lcd_setfont(int newfont) | |||
122 | current_vp->font = newfont; | 122 | current_vp->font = newfont; |
123 | } | 123 | } |
124 | 124 | ||
125 | int lcd_getfont(void) | ||
126 | { | ||
127 | return current_vp->font; | ||
128 | } | ||
129 | |||
125 | int lcd_getstringsize(const unsigned char *str, int *w, int *h) | 130 | int lcd_getstringsize(const unsigned char *str, int *w, int *h) |
126 | { | 131 | { |
127 | return font_getstringsize(str, w, h, current_vp->font); | 132 | return font_getstringsize(str, w, h, current_vp->font); |
diff --git a/firmware/drivers/lcd-2bit-horz.c b/firmware/drivers/lcd-2bit-horz.c index 1ee0addba4..195885c072 100644 --- a/firmware/drivers/lcd-2bit-horz.c +++ b/firmware/drivers/lcd-2bit-horz.c | |||
@@ -172,6 +172,11 @@ void lcd_setfont(int newfont) | |||
172 | current_vp->font = newfont; | 172 | current_vp->font = newfont; |
173 | } | 173 | } |
174 | 174 | ||
175 | int lcd_getfont(void) | ||
176 | { | ||
177 | return current_vp->font; | ||
178 | } | ||
179 | |||
175 | int lcd_getstringsize(const unsigned char *str, int *w, int *h) | 180 | int lcd_getstringsize(const unsigned char *str, int *w, int *h) |
176 | { | 181 | { |
177 | return font_getstringsize(str, w, h, current_vp->font); | 182 | return font_getstringsize(str, w, h, current_vp->font); |
diff --git a/firmware/drivers/lcd-2bit-vert.c b/firmware/drivers/lcd-2bit-vert.c index 2341ddb3df..cb532b7aaf 100644 --- a/firmware/drivers/lcd-2bit-vert.c +++ b/firmware/drivers/lcd-2bit-vert.c | |||
@@ -175,6 +175,11 @@ void lcd_setfont(int newfont) | |||
175 | current_vp->font = newfont; | 175 | current_vp->font = newfont; |
176 | } | 176 | } |
177 | 177 | ||
178 | int lcd_getfont(void) | ||
179 | { | ||
180 | return current_vp->font; | ||
181 | } | ||
182 | |||
178 | int lcd_getstringsize(const unsigned char *str, int *w, int *h) | 183 | int lcd_getstringsize(const unsigned char *str, int *w, int *h) |
179 | { | 184 | { |
180 | return font_getstringsize(str, w, h, current_vp->font); | 185 | return font_getstringsize(str, w, h, current_vp->font); |
diff --git a/firmware/drivers/lcd-remote-1bit-v.c b/firmware/drivers/lcd-remote-1bit-v.c index a33648b76a..20c6f6655c 100644 --- a/firmware/drivers/lcd-remote-1bit-v.c +++ b/firmware/drivers/lcd-remote-1bit-v.c | |||
@@ -117,6 +117,11 @@ void lcd_remote_setfont(int newfont) | |||
117 | current_vp->font = newfont; | 117 | current_vp->font = newfont; |
118 | } | 118 | } |
119 | 119 | ||
120 | int lcd_remote_getfont(void) | ||
121 | { | ||
122 | return current_vp->font; | ||
123 | } | ||
124 | |||
120 | int lcd_remote_getstringsize(const unsigned char *str, int *w, int *h) | 125 | int lcd_remote_getstringsize(const unsigned char *str, int *w, int *h) |
121 | { | 126 | { |
122 | return font_getstringsize(str, w, h, current_vp->font); | 127 | return font_getstringsize(str, w, h, current_vp->font); |
diff --git a/firmware/drivers/lcd-remote-2bit-vi.c b/firmware/drivers/lcd-remote-2bit-vi.c index 9ab98c69aa..9f70e95195 100644 --- a/firmware/drivers/lcd-remote-2bit-vi.c +++ b/firmware/drivers/lcd-remote-2bit-vi.c | |||
@@ -174,6 +174,11 @@ void lcd_remote_setfont(int newfont) | |||
174 | current_vp->font = newfont; | 174 | current_vp->font = newfont; |
175 | } | 175 | } |
176 | 176 | ||
177 | int lcd_remote_getfont(void) | ||
178 | { | ||
179 | return current_vp->font; | ||
180 | } | ||
181 | |||
177 | int lcd_remote_getstringsize(const unsigned char *str, int *w, int *h) | 182 | int lcd_remote_getstringsize(const unsigned char *str, int *w, int *h) |
178 | { | 183 | { |
179 | return font_getstringsize(str, w, h, current_vp->font); | 184 | return font_getstringsize(str, w, h, current_vp->font); |
diff --git a/firmware/export/lcd-remote.h b/firmware/export/lcd-remote.h index 34c40e52c1..cdd48e5fa3 100644 --- a/firmware/export/lcd-remote.h +++ b/firmware/export/lcd-remote.h | |||
@@ -149,6 +149,7 @@ extern int lcd_remote_getymargin(void); | |||
149 | extern int lcd_remote_getwidth(void); | 149 | extern int lcd_remote_getwidth(void); |
150 | extern int lcd_remote_getheight(void); | 150 | extern int lcd_remote_getheight(void); |
151 | extern void lcd_remote_setfont(int font); | 151 | extern void lcd_remote_setfont(int font); |
152 | extern int lcd_remote_getfont(void); | ||
152 | extern int lcd_remote_getstringsize(const unsigned char *str, int *w, int *h); | 153 | extern int lcd_remote_getstringsize(const unsigned char *str, int *w, int *h); |
153 | 154 | ||
154 | /* low level drawing function pointer arrays */ | 155 | /* low level drawing function pointer arrays */ |
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index 276dcdfedc..57c9b1d3b8 100644 --- a/firmware/export/lcd.h +++ b/firmware/export/lcd.h | |||
@@ -372,6 +372,7 @@ extern void lcd_set_flip(bool yesno); | |||
372 | extern void lcd_set_drawmode(int mode); | 372 | extern void lcd_set_drawmode(int mode); |
373 | extern int lcd_get_drawmode(void); | 373 | extern int lcd_get_drawmode(void); |
374 | extern void lcd_setfont(int font); | 374 | extern void lcd_setfont(int font); |
375 | extern int lcd_getfont(void); | ||
375 | 376 | ||
376 | extern void lcd_puts_style_offset(int x, int y, const unsigned char *str, | 377 | extern void lcd_puts_style_offset(int x, int y, const unsigned char *str, |
377 | int style, int offset); | 378 | int style, int offset); |