From 2cdd11d96ab6da9bb4e6ad2b44017ad8ca53bcbb Mon Sep 17 00:00:00 2001 From: Erwin Ried <1091420+eried@users.noreply.github.com> Date: Sat, 30 May 2020 16:26:06 +0200 Subject: [PATCH] More icon standarization --- firmware/application/bitmap.hpp | 86 +++++++++++++++++---------- firmware/graphics/icon_file_text.png | Bin 143 -> 156 bytes firmware/graphics/icon_file_wav.png | Bin 0 -> 168 bytes firmware/graphics/icon_replay.png | Bin 149 -> 116 bytes 4 files changed, 54 insertions(+), 32 deletions(-) create mode 100644 firmware/graphics/icon_file_wav.png diff --git a/firmware/application/bitmap.hpp b/firmware/application/bitmap.hpp index 45c254e1..e1f9f10b 100644 --- a/firmware/application/bitmap.hpp +++ b/firmware/application/bitmap.hpp @@ -582,27 +582,49 @@ static constexpr Bitmap bitmap_icon_file_iq { }; static constexpr uint8_t bitmap_icon_file_text_data[] = { - 0x00, 0x20, - 0x00, 0x30, - 0x00, 0x38, - 0x00, 0x38, - 0x00, 0x34, - 0x00, 0x32, - 0x00, 0x31, - 0x80, 0x30, - 0xC0, 0x30, - 0xE0, 0x3F, - 0x30, 0x30, - 0x18, 0x30, - 0x0C, 0x30, - 0x0E, 0x78, - 0x1F, 0xFC, - 0x00, 0x00, + 0xFC, 0x03, + 0x04, 0x06, + 0x04, 0x0E, + 0x04, 0x1E, + 0xF4, 0x3E, + 0x04, 0x20, + 0xF4, 0x2F, + 0x04, 0x20, + 0xF4, 0x2F, + 0x04, 0x20, + 0xF4, 0x2F, + 0x04, 0x20, + 0xF4, 0x2F, + 0x04, 0x20, + 0x04, 0x20, + 0xFC, 0x3F, }; static constexpr Bitmap bitmap_icon_file_text { { 16, 16 }, bitmap_icon_file_text_data }; +static constexpr uint8_t bitmap_icon_file_wav_data[] = { + 0xFC, 0x03, + 0x04, 0x06, + 0x04, 0x0E, + 0x04, 0x1E, + 0x04, 0x3E, + 0x84, 0x20, + 0xC4, 0x22, + 0xF4, 0x20, + 0xF4, 0x2E, + 0xF4, 0x20, + 0xC4, 0x22, + 0x84, 0x24, + 0x04, 0x28, + 0x04, 0x20, + 0x04, 0x20, + 0xFC, 0x3F, +}; +static constexpr Bitmap bitmap_icon_file_wav { + { 16, 16 }, bitmap_icon_file_wav_data +}; + static constexpr uint8_t bitmap_icon_fox_data[] = { 0x18, 0x18, 0x28, 0x14, @@ -1044,22 +1066,22 @@ static constexpr Bitmap bitmap_icon_remote { }; static constexpr uint8_t bitmap_icon_replay_data[] = { - 0x60, 0x00, - 0xE0, 0x00, - 0xE0, 0x01, - 0xE0, 0x03, - 0xE0, 0x07, - 0xE0, 0x0F, - 0xE0, 0x1F, - 0xE0, 0x3F, - 0xE0, 0x3F, - 0xE0, 0x1F, - 0xE0, 0x0F, - 0xE0, 0x07, - 0xE0, 0x03, - 0xE0, 0x01, - 0xE0, 0x00, - 0x60, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x0C, 0x00, + 0x3C, 0x00, + 0xFC, 0x00, + 0xFC, 0x03, + 0xFC, 0x0F, + 0xFC, 0x3F, + 0xFC, 0x3F, + 0xFC, 0x0F, + 0xFC, 0x03, + 0xFC, 0x00, + 0x3C, 0x00, + 0x0C, 0x00, + 0x00, 0x00, + 0x00, 0x00, }; static constexpr Bitmap bitmap_icon_replay { { 16, 16 }, bitmap_icon_replay_data diff --git a/firmware/graphics/icon_file_text.png b/firmware/graphics/icon_file_text.png index b31f8129e2af1b2ad3583d48d8943c9dfebc90ab..c5f4a0d49e010c02a088c818a5aa973dcc2ab26d 100644 GIT binary patch delta 127 zcmeBYoWnRlr6S4G#WBRf|81}%-vI@lN&oG4c~9P`d3a^`VsYQ4A{$+IhP$ww&tqqh zUe8&jFlqPic2h^?CY@z7QkhhL3ak*1y!g{uHJIzlo?kniS!emUx*xo4Z2j-heV1Ja jvu$R0szopr0If?Y+W-In diff --git a/firmware/graphics/icon_file_wav.png b/firmware/graphics/icon_file_wav.png new file mode 100644 index 0000000000000000000000000000000000000000..2e798c2d8866020e5214a1644eb4b2bcbde8171c GIT binary patch literal 168 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7@;qG}LoEEaUJm49P~>2_ zF!#6oErB9Qw$kE-bzPIxXFj}n_>9iAn>-9J?U+LY9^Cx7y6S@XgOes{JQ|<46PB>9 z%Kli#S@2LKi?R0HnhnVff$YZ{%r4xODlj`2vbO)1!|lH>xb7a`#a rEHP{N*XZ%T#icB08AEUy1H(eiUn1J^pG_GU7#KWV{an^LB{Ts5;ldns delta 119 zcmXS!$~Zx#FvioxF~q|E=w(Ab1_cgghu{C*lVyB5R&LqxqNAcP!|+6BM?^A1!uLuy zakB>sLIEADAsxJTCWsxFU{;{y@8I^2!7|~k{G69Lj5@c>3SPIehAf@bkd?x@;