Merge pull request #3 from eried/master

Upstream sync
This commit is contained in:
Gregory Fenton 2020-05-30 19:40:33 +01:00 committed by GitHub
commit 7ef617946b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 56 additions and 33 deletions

View File

@ -67,8 +67,9 @@ protected:
{ ".TXT", &bitmap_icon_file_text, ui::Color::white() }, { ".TXT", &bitmap_icon_file_text, ui::Color::white() },
{ ".PNG", &bitmap_icon_file_image, ui::Color::green() }, { ".PNG", &bitmap_icon_file_image, ui::Color::green() },
{ ".BMP", &bitmap_icon_file_image, ui::Color::green() }, { ".BMP", &bitmap_icon_file_image, ui::Color::green() },
{ ".C8", &bitmap_icon_file_iq, ui::Color::blue() },
{ ".C16", &bitmap_icon_file_iq, ui::Color::blue() }, { ".C16", &bitmap_icon_file_iq, ui::Color::blue() },
{ ".WAV", &bitmap_icon_speaker, ui::Color::dark_magenta() }, { ".WAV", &bitmap_icon_file_wav, ui::Color::dark_magenta() },
{ "", &bitmap_icon_file, ui::Color::light_grey() } { "", &bitmap_icon_file, ui::Color::light_grey() }
}; };

View File

@ -582,27 +582,49 @@ static constexpr Bitmap bitmap_icon_file_iq {
}; };
static constexpr uint8_t bitmap_icon_file_text_data[] = { static constexpr uint8_t bitmap_icon_file_text_data[] = {
0x00, 0x20, 0xFC, 0x03,
0x00, 0x30, 0x04, 0x06,
0x00, 0x38, 0x04, 0x0E,
0x00, 0x38, 0x04, 0x1E,
0x00, 0x34, 0xF4, 0x3E,
0x00, 0x32, 0x04, 0x20,
0x00, 0x31, 0xF4, 0x2F,
0x80, 0x30, 0x04, 0x20,
0xC0, 0x30, 0xF4, 0x2F,
0xE0, 0x3F, 0x04, 0x20,
0x30, 0x30, 0xF4, 0x2F,
0x18, 0x30, 0x04, 0x20,
0x0C, 0x30, 0xF4, 0x2F,
0x0E, 0x78, 0x04, 0x20,
0x1F, 0xFC, 0x04, 0x20,
0x00, 0x00, 0xFC, 0x3F,
}; };
static constexpr Bitmap bitmap_icon_file_text { static constexpr Bitmap bitmap_icon_file_text {
{ 16, 16 }, bitmap_icon_file_text_data { 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[] = { static constexpr uint8_t bitmap_icon_fox_data[] = {
0x18, 0x18, 0x18, 0x18,
0x28, 0x14, 0x28, 0x14,
@ -1044,22 +1066,22 @@ static constexpr Bitmap bitmap_icon_remote {
}; };
static constexpr uint8_t bitmap_icon_replay_data[] = { static constexpr uint8_t bitmap_icon_replay_data[] = {
0x60, 0x00, 0x00, 0x00,
0xE0, 0x00, 0x00, 0x00,
0xE0, 0x01, 0x0C, 0x00,
0xE0, 0x03, 0x3C, 0x00,
0xE0, 0x07, 0xFC, 0x00,
0xE0, 0x0F, 0xFC, 0x03,
0xE0, 0x1F, 0xFC, 0x0F,
0xE0, 0x3F, 0xFC, 0x3F,
0xE0, 0x3F, 0xFC, 0x3F,
0xE0, 0x1F, 0xFC, 0x0F,
0xE0, 0x0F, 0xFC, 0x03,
0xE0, 0x07, 0xFC, 0x00,
0xE0, 0x03, 0x3C, 0x00,
0xE0, 0x01, 0x0C, 0x00,
0xE0, 0x00, 0x00, 0x00,
0x60, 0x00, 0x00, 0x00,
}; };
static constexpr Bitmap bitmap_icon_replay { static constexpr Bitmap bitmap_icon_replay {
{ 16, 16 }, bitmap_icon_replay_data { 16, 16 }, bitmap_icon_replay_data

Binary file not shown.

Before

Width:  |  Height:  |  Size: 143 B

After

Width:  |  Height:  |  Size: 156 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 168 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 149 B

After

Width:  |  Height:  |  Size: 116 B