diff options
Diffstat (limited to 'apps/screens.c')
-rw-r--r-- | apps/screens.c | 38 |
1 files changed, 33 insertions, 5 deletions
diff --git a/apps/screens.c b/apps/screens.c index b27dae1916..811b0b3df0 100644 --- a/apps/screens.c +++ b/apps/screens.c | |||
@@ -23,6 +23,9 @@ | |||
23 | #include "backlight.h" | 23 | #include "backlight.h" |
24 | #include "action.h" | 24 | #include "action.h" |
25 | #include "lcd.h" | 25 | #include "lcd.h" |
26 | #ifdef HAVE_REMOTE_LCD | ||
27 | #include "lcd-remote.h" | ||
28 | #endif | ||
26 | #include "lang.h" | 29 | #include "lang.h" |
27 | #include "icons.h" | 30 | #include "icons.h" |
28 | #include "font.h" | 31 | #include "font.h" |
@@ -51,10 +54,17 @@ | |||
51 | #include "statusbar.h" | 54 | #include "statusbar.h" |
52 | #include "screen_access.h" | 55 | #include "screen_access.h" |
53 | #include "quickscreen.h" | 56 | #include "quickscreen.h" |
54 | #include "logo.h" | ||
55 | #include "pcmbuf.h" | 57 | #include "pcmbuf.h" |
56 | #include "list.h" | 58 | #include "list.h" |
57 | 59 | ||
60 | #ifdef HAVE_LCD_BITMAP | ||
61 | #include <bitmaps/usblogo.h> | ||
62 | #endif | ||
63 | |||
64 | #ifdef HAVE_REMOTE_LCD | ||
65 | #include <bitmaps/remote_usblogo.h> | ||
66 | #endif | ||
67 | |||
58 | #if defined(HAVE_LCD_BITMAP) | 68 | #if defined(HAVE_LCD_BITMAP) |
59 | #include "widgets.h" | 69 | #include "widgets.h" |
60 | #endif | 70 | #endif |
@@ -82,15 +92,33 @@ void usb_screen(void) | |||
82 | #ifdef HAVE_LCD_COLOR | 92 | #ifdef HAVE_LCD_COLOR |
83 | show_main_backdrop(); | 93 | show_main_backdrop(); |
84 | #endif | 94 | #endif |
85 | FOR_NB_SCREENS(i) { | 95 | |
96 | FOR_NB_SCREENS(i) | ||
86 | screens[i].backlight_on(); | 97 | screens[i].backlight_on(); |
87 | gui_logo_draw(&usb_logos[i], &screens[i]); | 98 | |
88 | } | 99 | #ifdef HAVE_REMOTE_LCD |
89 | #ifdef HAVE_LCD_CHARCELLS | 100 | lcd_remote_clear_display(); |
101 | lcd_remote_bitmap(remote_usblogo, | ||
102 | (LCD_REMOTE_WIDTH-BMPWIDTH_remote_usblogo)/2, | ||
103 | (LCD_REMOTE_HEIGHT-BMPHEIGHT_remote_usblogo)/2, | ||
104 | BMPWIDTH_remote_usblogo, BMPHEIGHT_remote_usblogo); | ||
105 | lcd_remote_update(); | ||
106 | #endif | ||
107 | |||
108 | #ifdef HAVE_LCD_BITMAP | ||
109 | lcd_clear_display(); | ||
110 | lcd_bitmap(usblogo, (LCD_WIDTH-BMPWIDTH_usblogo)/2, | ||
111 | (LCD_HEIGHT-BMPHEIGHT_usblogo)/2, | ||
112 | BMPWIDTH_usblogo, BMPHEIGHT_usblogo); | ||
113 | lcd_update(); | ||
114 | #else | ||
115 | lcd_double_height(false); | ||
116 | lcd_puts_scroll(0, 0, "[USB Mode]"); | ||
90 | status_set_param(false); | 117 | status_set_param(false); |
91 | status_set_audio(false); | 118 | status_set_audio(false); |
92 | status_set_usb(true); | 119 | status_set_usb(true); |
93 | #endif /* HAVE_LCD_BITMAP */ | 120 | #endif /* HAVE_LCD_BITMAP */ |
121 | |||
94 | gui_syncstatusbar_draw(&statusbars, true); | 122 | gui_syncstatusbar_draw(&statusbars, true); |
95 | #ifdef SIMULATOR | 123 | #ifdef SIMULATOR |
96 | while (button_get(true) & BUTTON_REL); | 124 | while (button_get(true) & BUTTON_REL); |