diff --git a/firmware/application/bitmap.hpp b/firmware/application/bitmap.hpp index 58f64570255520fada0d226847857536d576b433..6ffb0867e39e42de8ac3349abd18206378bef955 100644 --- a/firmware/application/bitmap.hpp +++ b/firmware/application/bitmap.hpp @@ -125,17 +125,17 @@ static constexpr uint8_t bitmap_icon_adsb_data[] = { 0xC0, 0x03, 0xC0, 0x03, 0xC0, 0x03, - 0xE8, 0x17, - 0xFA, 0x5F, + 0xE0, 0x07, + 0xF8, 0x1F, 0xFE, 0x7F, 0xFF, 0xFF, - 0xC7, 0xE3, + 0xFF, 0xFF, 0xC0, 0x03, 0xC0, 0x03, 0xC0, 0x03, 0xE0, 0x07, + 0xF0, 0x0F, 0xF8, 0x1F, - 0x38, 0x1C, }; static constexpr Bitmap bitmap_icon_adsb { { 16, 16 }, bitmap_icon_adsb_data @@ -144,19 +144,19 @@ static constexpr Bitmap bitmap_icon_adsb { static constexpr uint8_t bitmap_icon_ais_data[] = { 0x00, 0x01, 0x80, 0x01, + 0xC0, 0x01, 0xC0, 0x0D, - 0xC0, 0x3D, 0xE0, 0x3D, - 0xF0, 0x7D, - 0xF8, 0x7D, + 0xF0, 0x3D, 0xF8, 0x7D, 0xFC, 0x7D, + 0xFC, 0x7D, 0xFE, 0x7D, + 0xFF, 0x7D, 0x00, 0x00, + 0xF8, 0x7F, 0xF8, 0x3F, - 0xF8, 0x1F, - 0xFB, 0xCF, - 0x00, 0x00, + 0xF0, 0x0F, 0x00, 0x00, }; static constexpr Bitmap bitmap_icon_ais { @@ -274,21 +274,21 @@ static constexpr Bitmap bitmap_icon_btle { }; static constexpr uint8_t bitmap_icon_burger_data[] = { + 0x00, 0x00, 0xE0, 0x07, - 0x58, 0x18, - 0x04, 0x25, - 0x12, 0x40, - 0x85, 0x90, - 0x21, 0x84, - 0x01, 0x80, - 0x06, 0x60, - 0xFE, 0x7F, - 0x0E, 0x78, - 0x1F, 0xFC, - 0x39, 0x9F, - 0xC3, 0xC0, - 0x0E, 0x70, 0xF8, 0x1F, + 0xFC, 0x3F, + 0xFE, 0x7F, + 0xFF, 0xFF, + 0xFF, 0xFF, + 0x00, 0x00, + 0x55, 0x55, + 0xAA, 0xAA, + 0x55, 0x55, + 0x00, 0x00, + 0xFF, 0xFF, + 0xFF, 0xFF, + 0xFE, 0x7F, 0x00, 0x00, }; static constexpr Bitmap bitmap_icon_burger { @@ -661,7 +661,7 @@ static constexpr uint8_t bitmap_icon_gps_sim_data[] = { 0x38, 0x1F, 0xF0, 0x0F, 0xE0, 0x07, - 0xC0, 0x03, + 0xE0, 0x07, 0xC0, 0x03, 0x80, 0x01, }; @@ -823,6 +823,28 @@ static constexpr Bitmap bitmap_icon_microphone { { 16, 16 }, bitmap_icon_microphone_data }; +static constexpr uint8_t bitmap_icon_modem_data[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0xF8, 0x1F, + 0x04, 0x20, + 0x02, 0x40, + 0xFF, 0xFF, + 0xFF, 0xFF, + 0xAB, 0xDF, + 0xAB, 0xDF, + 0xFF, 0xFF, + 0xFF, 0xFF, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, +}; +static constexpr Bitmap bitmap_icon_modem { + { 16, 16 }, bitmap_icon_modem_data +}; + static constexpr uint8_t bitmap_icon_morse_data[] = { 0x00, 0x00, 0x18, 0x00, @@ -1004,17 +1026,17 @@ static constexpr uint8_t bitmap_icon_remote_data[] = { 0x20, 0x00, 0x20, 0x00, 0x20, 0x00, - 0xF0, 0x03, - 0x10, 0x04, - 0xD0, 0x08, - 0xD0, 0x08, + 0xE0, 0x07, 0x10, 0x08, - 0xD0, 0x08, - 0xD0, 0x08, + 0xD0, 0x0B, + 0xD0, 0x0B, 0x10, 0x08, 0x10, 0x08, - 0x30, 0x0C, - 0xF0, 0x0F, + 0x90, 0x0A, + 0x50, 0x09, + 0x90, 0x0A, + 0x50, 0x09, + 0x10, 0x08, 0xE0, 0x07, }; static constexpr Bitmap bitmap_icon_remote { diff --git a/firmware/application/ui_navigation.cpp b/firmware/application/ui_navigation.cpp index 7939bcfc31e3c9db0a221c8cac665b2ba7d7230a..13ba68f34b116d8ce3e86293cae5383219a3d574 100644 --- a/firmware/application/ui_navigation.cpp +++ b/firmware/application/ui_navigation.cpp @@ -350,7 +350,7 @@ ReceiversMenuView::ReceiversMenuView(NavigationView& nav) { { "ADS-B", ui::Color::green(), &bitmap_icon_adsb, [&nav](){ nav.push<ADSBRxView>(); }, }, { "ACARS", ui::Color::yellow(), &bitmap_icon_adsb, [&nav](){ nav.push<ACARSAppView>(); }, }, { "AIS Boats", ui::Color::green(), &bitmap_icon_ais, [&nav](){ nav.push<AISAppView>(); } }, - { "AFSK", ui::Color::yellow(), &bitmap_icon_receivers, [&nav](){ nav.push<AFSKRxView>(); } }, + { "AFSK", ui::Color::yellow(), &bitmap_icon_modem, [&nav](){ nav.push<AFSKRxView>(); } }, { "BTLE", ui::Color::yellow(), &bitmap_icon_btle, [&nav](){ nav.push<BTLERxView>(); } }, { "NRF", ui::Color::yellow(), &bitmap_icon_nrf, [&nav](){ nav.push<NRFRxView>(); } }, { "Audio", ui::Color::green(), &bitmap_icon_speaker, [&nav](){ nav.push<AnalogAudioView>(); } }, diff --git a/firmware/graphics/icon_adsb.png b/firmware/graphics/icon_adsb.png index 6445b0f077d510e1fcbe3d793527704072c4dc87..5f598a1c57eefa866fcefa0450fe5aba58240d5f 100644 Binary files a/firmware/graphics/icon_adsb.png and b/firmware/graphics/icon_adsb.png differ diff --git a/firmware/graphics/icon_ais.png b/firmware/graphics/icon_ais.png index 1f9ab92f143a047694a3717214967f93b4dd79a5..431ef8bf0d08a19ce6d14f6f7c7c2bae9c61b50b 100644 Binary files a/firmware/graphics/icon_ais.png and b/firmware/graphics/icon_ais.png differ diff --git a/firmware/graphics/icon_burger.png b/firmware/graphics/icon_burger.png index df179d019cdf79aa4b87fccd08b8487877b1a3ea..c93719e26716af151c822f5eb7ca9ccd7aa7f076 100644 Binary files a/firmware/graphics/icon_burger.png and b/firmware/graphics/icon_burger.png differ diff --git a/firmware/graphics/icon_gps_sim.png b/firmware/graphics/icon_gps_sim.png index ed870c80eeae4497f9937ff9f18920e5d147e75c..e00466ffbee07d12994b21a6d2a0d30a023cb3c3 100644 Binary files a/firmware/graphics/icon_gps_sim.png and b/firmware/graphics/icon_gps_sim.png differ diff --git a/firmware/graphics/icon_modem.png b/firmware/graphics/icon_modem.png new file mode 100644 index 0000000000000000000000000000000000000000..712830053920254999f96bad067a89ed4b951e34 Binary files /dev/null and b/firmware/graphics/icon_modem.png differ diff --git a/firmware/graphics/icon_remote.png b/firmware/graphics/icon_remote.png index f838f1749dd6bc680ccd46cab1c8afe72ea0fd1b..24edc327fe13e03fc79688e12a3883dca64138ba 100644 Binary files a/firmware/graphics/icon_remote.png and b/firmware/graphics/icon_remote.png differ