diff --git a/firmware/application/bitmap.hpp b/firmware/application/bitmap.hpp index eee5dbca..2c1fe93d 100644 --- a/firmware/application/bitmap.hpp +++ b/firmware/application/bitmap.hpp @@ -105,44 +105,6 @@ static constexpr Bitmap bitmap_icon_utilities{ {16, 16}, bitmap_icon_utilities_data}; -static constexpr uint8_t bitmap_icon_games_data[] = { - 0x0C, - 0x0C, - 0x0C, - 0x0C, - 0x3F, - 0x3C, - 0xFF, - 0x7E, - 0xFF, - 0xFF, - 0xFF, - 0xFF, - 0xCC, - 0xCC, - 0xCC, - 0xCC, - 0xFF, - 0xFF, - 0xE7, - 0x73, - 0xE7, - 0x73, - 0x33, - 0x33, - 0x03, - 0x30, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, -}; -static constexpr Bitmap bitmap_icon_games{ - {16, 16}, - bitmap_icon_games_data}; - static constexpr uint8_t bitmap_stripes_data[] = { 0xFF, 0x03, @@ -287,6 +249,44 @@ static constexpr Bitmap bitmap_icon_file_wav{ {16, 16}, bitmap_icon_file_wav_data}; +static constexpr uint8_t bitmap_icon_games_data[] = { + 0x00, + 0x01, + 0x00, + 0x01, + 0x80, + 0x00, + 0x80, + 0x00, + 0x80, + 0x00, + 0xFE, + 0x7F, + 0xFF, + 0xFF, + 0xFF, + 0xFF, + 0xE7, + 0xD7, + 0xE7, + 0x93, + 0x81, + 0xFF, + 0x81, + 0x93, + 0xE7, + 0xD7, + 0xE7, + 0xFF, + 0x3F, + 0xF9, + 0xFE, + 0x7F, +}; +static constexpr Bitmap bitmap_icon_games{ + {16, 16}, + bitmap_icon_games_data}; + static constexpr uint8_t bitmap_icon_tetra_data[] = { 0xE0, 0x0F, @@ -402,23 +402,23 @@ static constexpr Bitmap bitmap_icon_downconvert{ bitmap_icon_downconvert_data}; static constexpr uint8_t bitmap_icon_speaker_and_headphones_data[] = { - 0x20, + 0x40, 0x10, - 0x30, + 0x60, 0x20, - 0x38, + 0x70, 0x44, - 0x3E, + 0x7C, 0x48, - 0x3E, + 0x7C, 0x91, - 0x3E, + 0x7C, 0x92, - 0x38, + 0x70, 0x92, - 0x30, + 0x60, 0x92, - 0x20, + 0x40, 0x92, 0x00, 0x92, @@ -1025,6 +1025,44 @@ static constexpr Bitmap bitmap_icon_previous{ {16, 16}, bitmap_icon_previous_data}; +static constexpr uint8_t bitmap_icon_tools_antenna_data[] = { + 0x38, + 0x3E, + 0x10, + 0x22, + 0x10, + 0x26, + 0x10, + 0x22, + 0x10, + 0x2E, + 0x10, + 0x22, + 0x10, + 0x26, + 0x10, + 0x22, + 0x38, + 0x2E, + 0x38, + 0x22, + 0x38, + 0x26, + 0x38, + 0x22, + 0x38, + 0x2E, + 0x38, + 0x22, + 0x38, + 0x3E, + 0x00, + 0x00, +}; +static constexpr Bitmap bitmap_icon_tools_antenna{ + {16, 16}, + bitmap_icon_tools_antenna_data}; + static constexpr uint8_t bitmap_icon_batt_text_data[] = { 0x00, 0x00, @@ -1651,6 +1689,44 @@ static constexpr Bitmap bitmap_icon_qr_code{ {16, 16}, bitmap_icon_qr_code_data}; +static constexpr uint8_t bitmap_stopwatch_data[] = { + 0x00, + 0x00, + 0xC0, + 0x01, + 0x80, + 0x00, + 0x80, + 0x20, + 0x60, + 0x13, + 0x10, + 0x0C, + 0x88, + 0x08, + 0x84, + 0x10, + 0x84, + 0x10, + 0xC2, + 0x21, + 0x84, + 0x10, + 0x04, + 0x10, + 0x08, + 0x08, + 0x10, + 0x04, + 0x60, + 0x03, + 0x80, + 0x00, +}; +static constexpr Bitmap bitmap_stopwatch{ + {16, 16}, + bitmap_stopwatch_data}; + static constexpr uint8_t bitmap_icon_sonde_data[] = { 0x80, 0x03, @@ -1799,45 +1875,6 @@ static constexpr uint8_t bitmap_icon_lge_data[] = { 0x00, 0x00, }; - -static constexpr uint8_t bitmap_icon_file_iq_data[] = { - 0xFC, - 0x03, - 0x04, - 0x06, - 0x04, - 0x0E, - 0x04, - 0x1E, - 0x04, - 0x3E, - 0x04, - 0x20, - 0x04, - 0x20, - 0x04, - 0x21, - 0x44, - 0x25, - 0x54, - 0x25, - 0xF4, - 0x2F, - 0xA4, - 0x2A, - 0x84, - 0x22, - 0x04, - 0x22, - 0x04, - 0x20, - 0xFC, - 0x3F, -}; -static constexpr Bitmap bitmap_icon_file_iq{ - {16, 16}, - bitmap_icon_file_iq_data}; - static constexpr Bitmap bitmap_icon_lge{ {16, 16}, bitmap_icon_lge_data}; @@ -2752,6 +2789,44 @@ static constexpr Bitmap bitmap_icon_touchtunes{ {16, 16}, bitmap_icon_touchtunes_data}; +static constexpr uint8_t bitmap_icon_file_iq_data[] = { + 0xFC, + 0x03, + 0x04, + 0x06, + 0x04, + 0x0E, + 0x04, + 0x1E, + 0x04, + 0x3E, + 0x04, + 0x20, + 0x04, + 0x20, + 0x04, + 0x21, + 0x44, + 0x25, + 0x54, + 0x25, + 0xF4, + 0x2F, + 0xA4, + 0x2A, + 0x84, + 0x22, + 0x04, + 0x22, + 0x04, + 0x20, + 0xFC, + 0x3F, +}; +static constexpr Bitmap bitmap_icon_file_iq{ + {16, 16}, + bitmap_icon_file_iq_data}; + static constexpr uint8_t bitmap_icon_sd_data[] = { 0x00, 0x00, diff --git a/firmware/application/ui_navigation.cpp b/firmware/application/ui_navigation.cpp index 73209e98..3581c7e2 100644 --- a/firmware/application/ui_navigation.cpp +++ b/firmware/application/ui_navigation.cpp @@ -126,7 +126,7 @@ const NavigationView::AppList NavigationView::appList = { {"microphone", "Microphone", HOME, Color::green(), &bitmap_icon_microphone, new ViewFactory()}, {"lookingglass", "Looking Glass", HOME, Color::green(), &bitmap_icon_looking, new ViewFactory()}, {nullptr, "Utilities", HOME, Color::cyan(), &bitmap_icon_utilities, new ViewFactory()}, - {nullptr, "Games", HOME, Color::purple(), &bitmap_icon_games, new ViewFactory()}, + {nullptr, "Games", HOME, Color::cyan(), &bitmap_icon_games, new ViewFactory()}, {nullptr, "Settings", HOME, Color::cyan(), &bitmap_icon_setup, new ViewFactory()}, /* RX ********************************************************************/ {"adsbrx", "ADS-B", RX, Color::green(), &bitmap_icon_adsb, new ViewFactory()}, diff --git a/firmware/graphics/icon_games.png b/firmware/graphics/icon_games.png new file mode 100644 index 00000000..a1dffcc7 Binary files /dev/null and b/firmware/graphics/icon_games.png differ