diff options
Diffstat (limited to 'firmware/drivers/lcd.c')
-rw-r--r-- | firmware/drivers/lcd.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/firmware/drivers/lcd.c b/firmware/drivers/lcd.c index b67be4e761..ff02783da4 100644 --- a/firmware/drivers/lcd.c +++ b/firmware/drivers/lcd.c | |||
@@ -322,7 +322,7 @@ static void lcd_write(bool command, int byte) | |||
322 | #endif /* ASM_IMPLEMENTATION */ | 322 | #endif /* ASM_IMPLEMENTATION */ |
323 | #endif /* !SIMULATOR */ | 323 | #endif /* !SIMULATOR */ |
324 | 324 | ||
325 | unsigned char icon_mirror[11]; | 325 | static unsigned char icon_mirror[11]; |
326 | 326 | ||
327 | /*** model specific code */ | 327 | /*** model specific code */ |
328 | 328 | ||
@@ -424,7 +424,7 @@ void lcd_define_pattern (int which,char *pattern,int length) | |||
424 | int i; | 424 | int i; |
425 | lcd_write(true,LCD_PRAM|which); | 425 | lcd_write(true,LCD_PRAM|which); |
426 | for (i=0;i<length;i++) | 426 | for (i=0;i<length;i++) |
427 | lcd_write(false,pattern[i]); | 427 | lcd_write(false,pattern[i]); |
428 | } | 428 | } |
429 | 429 | ||
430 | void lcd_double_height(bool on) | 430 | void lcd_double_height(bool on) |
@@ -881,12 +881,18 @@ void lcd_puts(int x, int y, unsigned char *str) | |||
881 | } | 881 | } |
882 | 882 | ||
883 | 883 | ||
884 | void lcd_putsxy(int x, int y, unsigned char *str, int thisfont) | ||
885 | { | ||
886 | #ifdef LOADABLE_FONTS | ||
887 | lcd_putsldfxy(x,y,str); | ||
888 | (void)thisfont; | ||
889 | #elif LCD_PROPFONTS | ||
890 | lcd_putspropxy(x,y,str,thisfont); | ||
891 | #else | ||
884 | /* | 892 | /* |
885 | * Put a string at specified bit position | 893 | * Put a string at specified bit position |
886 | */ | 894 | */ |
887 | 895 | ||
888 | void lcd_putsxy(int x, int y, unsigned char *str, int thisfont) | ||
889 | { | ||
890 | int nx = fonts[thisfont]; | 896 | int nx = fonts[thisfont]; |
891 | int ny = fontheight[thisfont]; | 897 | int ny = fontheight[thisfont]; |
892 | int ch; | 898 | int ch; |
@@ -919,6 +925,7 @@ void lcd_putsxy(int x, int y, unsigned char *str, int thisfont) | |||
919 | lcd_x += nx; | 925 | lcd_x += nx; |
920 | 926 | ||
921 | } | 927 | } |
928 | #endif | ||
922 | } | 929 | } |
923 | 930 | ||
924 | /* | 931 | /* |