From b48b0efe5ce659705744ee55020e2a0972baaf72 Mon Sep 17 00:00:00 2001 From: Erwin Ried <1091420+eried@users.noreply.github.com> Date: Mon, 11 May 2020 15:30:21 +0200 Subject: [PATCH] This color scheme looks solid, more small tweaks --- firmware/application/bitmap.hpp | 72 ++++++++++++------------- firmware/application/ui_navigation.cpp | 4 +- firmware/graphics/icon_biast_off.png | Bin 140 -> 153 bytes firmware/graphics/icon_biast_on.png | Bin 143 -> 162 bytes firmware/graphics/icon_camera.png | Bin 147 -> 150 bytes firmware/graphics/icon_stealth.png | Bin 165 -> 165 bytes 6 files changed, 38 insertions(+), 38 deletions(-) diff --git a/firmware/application/bitmap.hpp b/firmware/application/bitmap.hpp index 0ce80219..58f64570 100644 --- a/firmware/application/bitmap.hpp +++ b/firmware/application/bitmap.hpp @@ -209,21 +209,21 @@ static constexpr Bitmap bitmap_icon_bht { static constexpr uint8_t bitmap_icon_biast_off_data[] = { 0x00, 0x00, - 0xFC, 0x3F, - 0x00, 0x02, - 0x00, 0x0E, - 0x00, 0x18, + 0xFE, 0x7F, + 0x00, 0x04, + 0x00, 0x08, 0x00, 0x10, - 0x88, 0x18, - 0xD8, 0x0E, - 0x70, 0x18, + 0x00, 0x08, + 0x88, 0x04, + 0x50, 0x08, 0x20, 0x10, - 0x70, 0x18, - 0xD8, 0x0E, - 0x88, 0x18, + 0x50, 0x08, + 0x88, 0x04, + 0x00, 0x08, 0x00, 0x10, - 0x00, 0x18, - 0x00, 0x0E, + 0x00, 0x08, + 0x00, 0x04, + 0x00, 0x00, }; static constexpr Bitmap bitmap_icon_biast_off { { 16, 16 }, bitmap_icon_biast_off_data @@ -232,20 +232,20 @@ static constexpr Bitmap bitmap_icon_biast_off { static constexpr uint8_t bitmap_icon_biast_on_data[] = { 0x00, 0x00, 0xFE, 0x7F, - 0x00, 0x02, - 0x00, 0x0E, - 0x20, 0x18, + 0x00, 0x04, + 0x00, 0x08, 0x20, 0x10, - 0x30, 0x18, - 0x10, 0x0E, - 0x38, 0x18, + 0x20, 0x08, + 0x30, 0x04, + 0x30, 0x08, 0xF8, 0x10, - 0xE0, 0x18, - 0x40, 0x0E, - 0x60, 0x18, + 0x60, 0x08, + 0x60, 0x04, + 0x20, 0x08, 0x20, 0x10, - 0x20, 0x18, - 0x00, 0x0E, + 0x00, 0x08, + 0x00, 0x04, + 0x00, 0x00, }; static constexpr Bitmap bitmap_icon_biast_on { { 16, 16 }, bitmap_icon_biast_on_data @@ -296,20 +296,20 @@ static constexpr Bitmap bitmap_icon_burger { }; static constexpr uint8_t bitmap_icon_camera_data[] = { + 0x00, 0x00, 0x00, 0x00, 0xE0, 0x07, 0xF0, 0x0F, + 0x3E, 0x7C, + 0xDE, 0x7B, + 0xEE, 0x77, + 0xEE, 0x77, + 0xEE, 0x77, + 0xEE, 0x77, + 0xDE, 0x7B, + 0x3E, 0x7C, 0xFE, 0x7F, - 0x3F, 0xFC, - 0xDF, 0xFB, - 0xEF, 0xF7, - 0xEF, 0xF7, - 0xEF, 0xF7, - 0xEF, 0xF7, - 0xDF, 0xFB, - 0x3F, 0xFC, - 0xFF, 0xFF, - 0xFE, 0x7F, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; @@ -1273,13 +1273,13 @@ static constexpr uint8_t bitmap_icon_stealth_data[] = { 0xE0, 0x07, 0x60, 0x06, 0x00, 0x00, - 0x70, 0x0E, 0xF0, 0x0F, - 0xF8, 0x1F, - 0xFC, 0x3E, + 0xF0, 0x0F, + 0xF8, 0x1E, 0xFC, 0x3F, 0xFC, 0x3E, 0xFC, 0x3F, + 0x00, 0x00, }; static constexpr Bitmap bitmap_icon_stealth { { 16, 16 }, bitmap_icon_stealth_data diff --git a/firmware/application/ui_navigation.cpp b/firmware/application/ui_navigation.cpp index 76688913..7939bcfc 100644 --- a/firmware/application/ui_navigation.cpp +++ b/firmware/application/ui_navigation.cpp @@ -418,7 +418,7 @@ UtilitiesMenuView::UtilitiesMenuView(NavigationView& nav) { /* SystemMenuView ********************************************************/ void SystemMenuView::hackrf_mode(NavigationView& nav) { - nav.push("HackRF mode", "This mode enables USB\nfunctionality. Reset the\ndevice to get back.\n\nDo you want to Switch now?", YESNO, + nav.push("HackRF mode", "This mode enables the USB\nfunctionality. Reset the\ndevice to get back.\n\nDo you want to Switch now?", YESNO, [this](bool choice) { if (choice) { EventDispatcher::request_stop(); @@ -435,7 +435,7 @@ SystemMenuView::SystemMenuView(NavigationView& nav) { { "Capture", ui::Color::red(), &bitmap_icon_capture, [&nav](){ nav.push(); } }, { "Replay", ui::Color::green(), &bitmap_icon_replay, [&nav](){ nav.push(); } }, { "Calls", ui::Color::yellow(), &bitmap_icon_search, [&nav](){ nav.push(); } }, - { "Scanner", ui::Color::orange(), &bitmap_icon_scanner, [&nav](){ nav.push(); } }, + { "Scanner", ui::Color::yellow(), &bitmap_icon_scanner, [&nav](){ nav.push(); } }, { "Tools", ui::Color::cyan(), &bitmap_icon_utilities, [&nav](){ nav.push(); } }, { "Options", ui::Color::cyan(), &bitmap_icon_setup, [&nav](){ nav.push(); } }, { "Debug", ui::Color::light_grey(), &bitmap_icon_debug, [&nav](){ nav.push(); } }, diff --git a/firmware/graphics/icon_biast_off.png b/firmware/graphics/icon_biast_off.png index 4fd35315ff6d549c6a94efb20871960ac808216b..2adc27447258411173bc08cff0e1b47c61edf596 100644 GIT binary patch delta 124 zcmV-?0E7RG0hs}iBz0a%L_t(IPpy){4geqsLi7JW+UCKn92HdE+VDZ7wZ~&I@9uuX zu{i8tm>@k3$fOk_0T4t2pl3{gDj4r{2Ps4Y#{~H!D>tfxrvzU**ew>_fdcuv2a0oQ er3A>J1BCNj5kZ-R5&!@I07*qoM6N<$f&c)+STR2U delta 111 zcmV-#0FeKg0gM5VBxqAfL_t(IjbmV7VE9iVhA>D47zW_OXd1A)fRF)LY$o0Sbc4t? z0Ec&QOJd^_GytXm8=I&wz^9n#Fu)gW1P!3b1r&z?#j!wfIv_?fSq9(>0{{w=uV1LR R-x2@-002ovPDHLkV1o1AC<*`o diff --git a/firmware/graphics/icon_biast_on.png b/firmware/graphics/icon_biast_on.png index 054d84603ea775456addf28667fd4450b6faca6a..ee81b19a6b9e2ce01a0cf1ac16ee6c0445cd46d3 100644 GIT binary patch delta 133 zcmV;00DAwA0ipqrBz|W}L_t(IPo{pP`XOV07*qoM6N<$g5;|!cmMzZ diff --git a/firmware/graphics/icon_camera.png b/firmware/graphics/icon_camera.png index 305219f7384d269cf24a715f31592e5648f17d7c..25e3bbce6498488ce0de95db50f9d505c561f3fb 100644 GIT binary patch delta 121 zcmV-<0EYjQ0hR%fBywFzL_t(IPu-G13IHGo1l#{V+At_YS19&YN7)%n#SkAveo%p# z85092`BLcMEzFW7U{DTr87go%16{2MSTMF9#h(39;Qy6|*zNmijko80wr~s3^H$(B bFI6xB*>z+Q%n79L00000NkvXXu0mjfNOLij delta 118 zcmV-+0Ez#W0h0lcByU+sL_t(IPu-I-4geqs1MUAGjlskP+8|-m5$RC{u!aXrZ)V2g z08)MmDDeeG$N^L$^-71~)vnBA7YwY5B?pzOSnx-Hw`}x@YG7Jz?5xLp5)3ZxgnF=v~r5}Uzpw!Id}N-LC__pk2kN_BM~3ssQ0mAwFpeK7t_#J delta 137 zcmV;40CxYS0i^+uB!6p3L_t(IPqk884!|G?Tkn5p7C$i96(rI5hd>_yp2LT%-^?uL z0LWVT$;}R=K<)x$%xp6%NoUZV?OhAb>Q-DT$IEuQQnR{`g*Zr7FhF>fC4gcr0gl#K rU7yOil4+sK&S$*^7)-w^cmXK!L=hQkY$yN#002ovPDHLkU;=^w3hFsK