diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/bitmaps/mono/Makefile | 2 | ||||
-rw-r--r-- | apps/bitmaps/native/SOURCES | 2 | ||||
-rw-r--r-- | apps/bitmaps/native/usblogo.100x32x1.bmp | bin | 0 -> 574 bytes | |||
-rw-r--r-- | apps/bitmaps/remote_mono/Makefile | 2 | ||||
-rw-r--r-- | apps/bitmaps/remote_native/SOURCES | 2 | ||||
-rw-r--r-- | apps/bitmaps/remote_native/remote_usblogo.100x32x1.bmp | bin | 0 -> 574 bytes | |||
-rw-r--r-- | apps/gui/logo.c | 47 | ||||
-rw-r--r-- | apps/gui/logo.h | 2 | ||||
-rw-r--r-- | apps/screen_access.c | 7 |
9 files changed, 21 insertions, 43 deletions
diff --git a/apps/bitmaps/mono/Makefile b/apps/bitmaps/mono/Makefile index a678b01ef4..dede4e81d9 100644 --- a/apps/bitmaps/mono/Makefile +++ b/apps/bitmaps/mono/Makefile | |||
@@ -21,7 +21,7 @@ DEPFILE = $(OBJDIR)/dep-bitmaps-mono | |||
21 | 21 | ||
22 | BMP2RB = $(BMP2RB_MONO) | 22 | BMP2RB = $(BMP2RB_MONO) |
23 | OUTPUT = $(BUILDDIR)/libbitmapsmono.a | 23 | OUTPUT = $(BUILDDIR)/libbitmapsmono.a |
24 | BMPINCDIR = $(BUILDDIR)/pluginbitmaps | 24 | BMPINCDIR = $(BUILDDIR)/bitmaps |
25 | 25 | ||
26 | include $(TOOLSDIR)/makebmp.inc | 26 | include $(TOOLSDIR)/makebmp.inc |
27 | 27 | ||
diff --git a/apps/bitmaps/native/SOURCES b/apps/bitmaps/native/SOURCES index ca4bf47bd3..3cdeadc4b2 100644 --- a/apps/bitmaps/native/SOURCES +++ b/apps/bitmaps/native/SOURCES | |||
@@ -21,4 +21,6 @@ rockboxlogo.240x74x16.bmp | |||
21 | rockboxlogo.320x98x16.bmp | 21 | rockboxlogo.320x98x16.bmp |
22 | #endif | 22 | #endif |
23 | 23 | ||
24 | usblogo.100x32x1.bmp | ||
25 | |||
24 | #endif /* HAVE_LCD_BITMAP */ | 26 | #endif /* HAVE_LCD_BITMAP */ |
diff --git a/apps/bitmaps/native/usblogo.100x32x1.bmp b/apps/bitmaps/native/usblogo.100x32x1.bmp new file mode 100644 index 0000000000..49ca1cf79d --- /dev/null +++ b/apps/bitmaps/native/usblogo.100x32x1.bmp | |||
Binary files differ | |||
diff --git a/apps/bitmaps/remote_mono/Makefile b/apps/bitmaps/remote_mono/Makefile index 4e119ba76d..dd781242b5 100644 --- a/apps/bitmaps/remote_mono/Makefile +++ b/apps/bitmaps/remote_mono/Makefile | |||
@@ -21,7 +21,7 @@ DEPFILE = $(OBJDIR)/dep-bitmaps-remotemono | |||
21 | 21 | ||
22 | BMP2RB = $(BMP2RB_REMOTEMONO) | 22 | BMP2RB = $(BMP2RB_REMOTEMONO) |
23 | OUTPUT = $(BUILDDIR)/libbitmapsremotemono.a | 23 | OUTPUT = $(BUILDDIR)/libbitmapsremotemono.a |
24 | BMPINCDIR = $(BUILDDIR)/pluginbitmaps | 24 | BMPINCDIR = $(BUILDDIR)/bitmaps |
25 | 25 | ||
26 | include $(TOOLSDIR)/makebmp.inc | 26 | include $(TOOLSDIR)/makebmp.inc |
27 | 27 | ||
diff --git a/apps/bitmaps/remote_native/SOURCES b/apps/bitmaps/remote_native/SOURCES index 34f70dbb84..7ed8d0a112 100644 --- a/apps/bitmaps/remote_native/SOURCES +++ b/apps/bitmaps/remote_native/SOURCES | |||
@@ -6,4 +6,6 @@ remote_rockboxlogo.128x42x1.bmp | |||
6 | remote_rockboxlogo.128x42x2.bmp | 6 | remote_rockboxlogo.128x42x2.bmp |
7 | #endif | 7 | #endif |
8 | 8 | ||
9 | remote_usblogo.100x32x1.bmp | ||
10 | |||
9 | #endif /* HAVE_REMOTE_LCD */ | 11 | #endif /* HAVE_REMOTE_LCD */ |
diff --git a/apps/bitmaps/remote_native/remote_usblogo.100x32x1.bmp b/apps/bitmaps/remote_native/remote_usblogo.100x32x1.bmp new file mode 100644 index 0000000000..49ca1cf79d --- /dev/null +++ b/apps/bitmaps/remote_native/remote_usblogo.100x32x1.bmp | |||
Binary files differ | |||
diff --git a/apps/gui/logo.c b/apps/gui/logo.c index 9e2945a216..f1a4786137 100644 --- a/apps/gui/logo.c +++ b/apps/gui/logo.c | |||
@@ -20,48 +20,17 @@ | |||
20 | #include "logo.h" | 20 | #include "logo.h" |
21 | 21 | ||
22 | #ifdef HAVE_LCD_BITMAP | 22 | #ifdef HAVE_LCD_BITMAP |
23 | #define BMPHEIGHT_usb_logo_main 32 | 23 | |
24 | #define BMPWIDTH_usb_logo_main 100 | 24 | #include <bitmaps/usblogo.h> |
25 | static const unsigned char usb_logo_main[] = { | 25 | #if NB_SCREENS==2 |
26 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | 26 | #include <bitmaps/remote_usblogo.h> |
27 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | 27 | #endif |
28 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x08, | ||
29 | 0x04, 0x04, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, | ||
30 | 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x81, 0x81, 0x81, 0x81, | ||
31 | 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, | ||
32 | 0x01, 0x01, 0x01, 0x01, 0xf1, 0x4f, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, | ||
33 | 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0xc0, | ||
34 | 0x00, 0x00, 0xe0, 0x1c, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, | ||
35 | 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, | ||
36 | 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x06, 0x81, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, | ||
37 | 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0x70, 0x38, 0x1c, 0x1c, | ||
38 | 0x0c, 0x0e, 0x0e, 0x06, 0x06, 0x06, 0x06, 0x06, 0x0f, 0x1f, 0x1f, 0x1f, 0x1f, | ||
39 | 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, | ||
40 | 0x00, 0x00, 0xe0, 0x1f, 0x00, 0xf8, 0x06, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, | ||
41 | 0x02, 0x02, 0x02, 0x82, 0x7e, 0x00, 0xc0, 0x3e, 0x01, | ||
42 | 0x70, 0x4f, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, | ||
43 | 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, | ||
44 | 0x40, 0x40, 0x40, 0x40, 0x40, 0x80, 0x00, 0x07, 0x0f, 0x1f, 0x1f, 0x1f, 0x1f, | ||
45 | 0x0f, 0x07, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x07, 0x0f, | ||
46 | 0x1f, 0x3f, 0x7b, 0xf3, 0xe3, 0xc3, 0x83, 0x83, 0x83, 0x83, 0xe3, 0xe3, 0xe3, | ||
47 | 0xe3, 0xe3, 0xe3, 0x03, 0x03, 0x03, 0x3f, 0x1f, 0x1f, 0x0f, 0x0f, 0x07, 0x02, | ||
48 | 0xc0, 0x3e, 0x01, 0xe0, 0x9f, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, | ||
49 | 0x80, 0x80, 0xf0, 0x0f, 0x80, 0x78, 0x07, 0x00, 0x00, | ||
50 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | ||
51 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | ||
52 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0c, 0x10, 0x20, 0x40, 0x40, 0x80, 0x80, | ||
53 | 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, | ||
54 | 0x80, 0x80, 0x80, 0x80, 0x80, 0x81, 0x81, 0x81, 0x81, 0x81, 0x87, 0x87, 0x87, | ||
55 | 0x87, 0x87, 0x87, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xf0, | ||
56 | 0x0f, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, | ||
57 | 0x04, 0x04, 0x04, 0x04, 0x07, 0x00, 0x00, 0x00, 0x00, | ||
58 | }; | ||
59 | 28 | ||
60 | struct logo usb_logos[]= | 29 | struct logo usb_logos[]= |
61 | { | 30 | { |
62 | [SCREEN_MAIN]={usb_logo_main, BMPWIDTH_usb_logo_main, BMPHEIGHT_usb_logo_main}, | 31 | [SCREEN_MAIN]={usblogo, BMPWIDTH_usblogo, BMPHEIGHT_usblogo}, |
63 | #if NB_SCREENS==2 | 32 | #if NB_SCREENS==2 |
64 | [SCREEN_REMOTE]={usb_logo_main, BMPWIDTH_usb_logo_main, BMPHEIGHT_usb_logo_main} | 33 | [SCREEN_REMOTE]={remote_usblogo, BMPWIDTH_remote_usblogo, BMPHEIGHT_remote_usblogo} |
65 | #endif | 34 | #endif |
66 | 35 | ||
67 | }; | 36 | }; |
@@ -78,7 +47,7 @@ void gui_logo_draw(struct logo * logo, struct screen * display) | |||
78 | 47 | ||
79 | #ifdef HAVE_LCD_BITMAP | 48 | #ifdef HAVE_LCD_BITMAP |
80 | /* Center bitmap on screen */ | 49 | /* Center bitmap on screen */ |
81 | display->mono_bitmap(logo->bitmap, | 50 | display->bitmap(logo->bitmap, |
82 | display->width/2-logo->width/2, | 51 | display->width/2-logo->width/2, |
83 | display->height/2-logo->height/2, | 52 | display->height/2-logo->height/2, |
84 | logo->width, | 53 | logo->width, |
diff --git a/apps/gui/logo.h b/apps/gui/logo.h index 38eafeaef2..6bd6e20b19 100644 --- a/apps/gui/logo.h +++ b/apps/gui/logo.h | |||
@@ -23,7 +23,7 @@ | |||
23 | 23 | ||
24 | struct logo{ | 24 | struct logo{ |
25 | #ifdef HAVE_LCD_BITMAP | 25 | #ifdef HAVE_LCD_BITMAP |
26 | const unsigned char * bitmap; | 26 | const fb_data* bitmap; |
27 | int width; | 27 | int width; |
28 | int height; | 28 | int height; |
29 | #else | 29 | #else |
diff --git a/apps/screen_access.c b/apps/screen_access.c index 704cab1a37..2bcd2370f5 100644 --- a/apps/screen_access.c +++ b/apps/screen_access.c | |||
@@ -54,7 +54,12 @@ void screen_init(struct screen * screen, enum screen_type screen_type) | |||
54 | screen->mono_bitmap=&lcd_remote_mono_bitmap; | 54 | screen->mono_bitmap=&lcd_remote_mono_bitmap; |
55 | screen->mono_bitmap_part=&lcd_remote_mono_bitmap_part; | 55 | screen->mono_bitmap_part=&lcd_remote_mono_bitmap_part; |
56 | screen->set_drawmode=&lcd_remote_set_drawmode; | 56 | screen->set_drawmode=&lcd_remote_set_drawmode; |
57 | #if LCD_REMOTE_DEPTH > 1 | 57 | #if LCD_REMOTE_DEPTH == 1 |
58 | screen->bitmap=&lcd_remote_mono_bitmap; | ||
59 | screen->bitmap_part=&lcd_remote_mono_bitmap_part; | ||
60 | #else | ||
61 | screen->bitmap=&lcd_remote_bitmap; | ||
62 | screen->bitmap_part=&lcd_remote_bitmap_part; | ||
58 | screen->get_background=&lcd_remote_get_background; | 63 | screen->get_background=&lcd_remote_get_background; |
59 | screen->get_foreground=&lcd_remote_get_foreground; | 64 | screen->get_foreground=&lcd_remote_get_foreground; |
60 | screen->set_background=&lcd_remote_set_background; | 65 | screen->set_background=&lcd_remote_set_background; |