From 15a6bc17b59f92e2f71d26ef5c3a8b39b8a3332b Mon Sep 17 00:00:00 2001 From: Erwin Ried <1091420+eried@users.noreply.github.com> Date: Mon, 11 May 2020 16:33:53 +0200 Subject: [PATCH] More small tweaks to the icons --- firmware/application/bitmap.hpp | 86 ++++++++++++++++--------- firmware/application/ui_navigation.cpp | 2 +- firmware/graphics/icon_adsb.png | Bin 133 -> 141 bytes firmware/graphics/icon_ais.png | Bin 134 -> 165 bytes firmware/graphics/icon_burger.png | Bin 163 -> 150 bytes firmware/graphics/icon_gps_sim.png | Bin 174 -> 174 bytes firmware/graphics/icon_modem.png | Bin 0 -> 150 bytes firmware/graphics/icon_remote.png | Bin 121 -> 147 bytes 8 files changed, 55 insertions(+), 33 deletions(-) create mode 100644 firmware/graphics/icon_modem.png diff --git a/firmware/application/bitmap.hpp b/firmware/application/bitmap.hpp index 58f64570..6ffb0867 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 7939bcfc..13ba68f3 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(); }, }, { "ACARS", ui::Color::yellow(), &bitmap_icon_adsb, [&nav](){ nav.push(); }, }, { "AIS Boats", ui::Color::green(), &bitmap_icon_ais, [&nav](){ nav.push(); } }, - { "AFSK", ui::Color::yellow(), &bitmap_icon_receivers, [&nav](){ nav.push(); } }, + { "AFSK", ui::Color::yellow(), &bitmap_icon_modem, [&nav](){ nav.push(); } }, { "BTLE", ui::Color::yellow(), &bitmap_icon_btle, [&nav](){ nav.push(); } }, { "NRF", ui::Color::yellow(), &bitmap_icon_nrf, [&nav](){ nav.push(); } }, { "Audio", ui::Color::green(), &bitmap_icon_speaker, [&nav](){ nav.push(); } }, diff --git a/firmware/graphics/icon_adsb.png b/firmware/graphics/icon_adsb.png index 6445b0f077d510e1fcbe3d793527704072c4dc87..5f598a1c57eefa866fcefa0450fe5aba58240d5f 100644 GIT binary patch delta 112 zcmV-$0FVEL0gVBWBxzDfL_t(IPh(`j1OEU2{~sjH$jHcuOBqfHm}ZzpT!su+1JM1C zFC0+90GCGe7(fnCumQws#AXm9xtihLqSydjDQt)*B(l>1F;R-1sVGiJ06F_W31~WL S-T(jq07*qoM6N<$f&c(rJ1jf^ delta 104 zcmeBWY-OCFlIY{<;uvDlo1Bo4@S~smFoT^bPm76g;)xAL49f(>9m1NE7!-S1c$DIl z&6-bK=QU%*+6Q zU84yXxY+k2K!|?>FgIljWA$)Q#dC5J;;#cHz5`fQmkyLz0@Nt0{Pc}G rZbqPw_%R@~TZ5FVPG{Al%0DK+SP`qH`}_a^002ovPDHLkU;=^wXaqT3 delta 105 zcmV-v0G9uy0fqsPBw|fTL_t(IjlGb;4geqsLizunrmJlR$y#h2%<)VCfXXCgA1)jN zstjxfXh1qV26R&IaN&OdB@1x6ULmxW)mrusX?!pMZ boIwZkY=iwltsF)G0000d%B!6{DL_t(IPpy+n62Kq`L(BaSO~*w#DFmb+ml&RrA$Ex4?yl-) zX0e_MRWlkRZDC^Ljs;y)ZKH;Z$01E&B07*qoM6N<$f)j{5 A?EnA( delta 146 zcmV;D0B!%S0j>d%B!6^CL_t(IPpy+n62Kq`L*@R5ro#d!g@E+q5|bw~K^8fxs;n*| z66>i@ncWy6HvpPl$bbmhfG9*!2N?mZ{px`+AVR#uM*xJp0Xy8i#F=gHZn-{x@j+(&14bsCCgC&01E&BNkvXXu0mjf06()k AG5`Po diff --git a/firmware/graphics/icon_modem.png b/firmware/graphics/icon_modem.png new file mode 100644 index 0000000000000000000000000000000000000000..712830053920254999f96bad067a89ed4b951e34 GIT binary patch literal 150 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`(Vi}jAr}5;Cm-ZuP~dRB{l9)o zqQS?6M9GlpOm~ab7K!qA{rV>9;G%L_h@m)-U-b6@t|!Ip3GO}yrYCOAv)sjg;a}$I z`+=#?vd+j%VVwD~HSg5?il~{pzVE)kc$dff=kk9YH9%_^JYD@<);T3KF)#oC(2F-d literal 0 HcmV?d00001 diff --git a/firmware/graphics/icon_remote.png b/firmware/graphics/icon_remote.png index f838f1749dd6bc680ccd46cab1c8afe72ea0fd1b..24edc327fe13e03fc79688e12a3883dca64138ba 100644 GIT binary patch delta 117 zcmV-*0E+*4lL3$`e3 delta 91 zcmbQtSUEu@)WOrmF~p)bIUyn8M}Ob{|Nr|H+t~T7nF|;v@hDsjy&;;kS+ZTx#HfKK upC?*BAceuKwL(awP;+7i^9RW$UtNacvRNhnnoPSGfWXt$&t;ucLK6THK_D~$