From dd7b14173647c6e3326d705e5c4d802a35711030 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Sat, 28 Dec 2013 14:50:22 +0100 Subject: [PATCH] apps/bitmaps: Replace pseudo-native default icons with mono ones. The old icons looked exactly like the mono version, and all >1 bpp drivers support rendering mono bitmaps. Therefore a mono bitmap can be used which requires less ram. This affects only the builtin icons, not the ones used by cabbiev2. Change-Id: I3b02b5b04fe8b4bcc69e83310871254d336b648a --- apps/bitmaps/mono/SOURCES | 4 ++++ .../default_icons.bmp} | Bin apps/bitmaps/native/SOURCES | 9 --------- apps/bitmaps/native/default_icons.6x8x16.bmp | Bin 5174 -> 0 bytes apps/bitmaps/remote_mono/SOURCES | 4 ++++ .../remote_default_icons.bmp} | Bin apps/bitmaps/remote_native/SOURCES | 2 -- .../remote_native/remote_default_icons.6x8x1.bmp | Bin 5174 -> 0 bytes .../remote_native/remote_default_icons.6x8x2.bmp | Bin 5174 -> 0 bytes 9 files changed, 8 insertions(+), 11 deletions(-) rename apps/bitmaps/{native/default_icons.6x8x1.bmp => mono/default_icons.bmp} (100%) delete mode 100644 apps/bitmaps/native/default_icons.6x8x16.bmp rename apps/bitmaps/{native/default_icons.6x8x2.bmp => remote_mono/remote_default_icons.bmp} (100%) delete mode 100644 apps/bitmaps/remote_native/remote_default_icons.6x8x1.bmp delete mode 100644 apps/bitmaps/remote_native/remote_default_icons.6x8x2.bmp diff --git a/apps/bitmaps/mono/SOURCES b/apps/bitmaps/mono/SOURCES index 2dccf2ad4f..c0f72c023a 100644 --- a/apps/bitmaps/mono/SOURCES +++ b/apps/bitmaps/mono/SOURCES @@ -1,3 +1,7 @@ +#ifdef HAVE_LCD_BITMAP +default_icons.bmp +#endif + #if (CONFIG_PLATFORM & PLATFORM_HOSTED) && defined(__APPLE__) osx_dummy.bmp #endif diff --git a/apps/bitmaps/native/default_icons.6x8x1.bmp b/apps/bitmaps/mono/default_icons.bmp similarity index 100% rename from apps/bitmaps/native/default_icons.6x8x1.bmp rename to apps/bitmaps/mono/default_icons.bmp diff --git a/apps/bitmaps/native/SOURCES b/apps/bitmaps/native/SOURCES index d910dd5c06..9479f3e933 100644 --- a/apps/bitmaps/native/SOURCES +++ b/apps/bitmaps/native/SOURCES @@ -64,15 +64,6 @@ usblogo.104x27x1.bmp #endif #endif -/* List Icons */ -#if LCD_DEPTH == 16 -default_icons.6x8x16.bmp -#elif LCD_DEPTH > 1 /* greyscale */ -default_icons.6x8x2.bmp -#else -default_icons.6x8x1.bmp -#endif - #endif /* BOOTLOADER */ #endif /* HAVE_LCD_BITMAP */ diff --git a/apps/bitmaps/native/default_icons.6x8x16.bmp b/apps/bitmaps/native/default_icons.6x8x16.bmp deleted file mode 100644 index dad29b2e500a8d12a95a6394841f6633e5ee25b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5174 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