From efa0e270ade023b61fc604da5b3cc6c71d627253 Mon Sep 17 00:00:00 2001 From: Mark Thompson <129641948+NotherNgineer@users.noreply.github.com> Date: Sat, 9 Dec 2023 02:25:41 -0600 Subject: [PATCH] Updated Weather & TPMS app icons (#1630) --- firmware/application/bitmap.hpp | 66 +++++++++++++++++++------ firmware/application/ui_navigation.cpp | 2 +- firmware/graphics/icon_thermometer.png | Bin 0 -> 185 bytes firmware/graphics/icon_tpms.png | Bin 183 -> 210 bytes 4 files changed, 53 insertions(+), 15 deletions(-) create mode 100644 firmware/graphics/icon_thermometer.png diff --git a/firmware/application/bitmap.hpp b/firmware/application/bitmap.hpp index 51a711ff..d700f3a9 100644 --- a/firmware/application/bitmap.hpp +++ b/firmware/application/bitmap.hpp @@ -1169,20 +1169,20 @@ static constexpr uint8_t bitmap_icon_tpms_data[] = { 0xEC, 0x37, 0x36, - 0x6C, - 0x1A, - 0x58, - 0x0B, - 0xD0, - 0x0B, - 0xD0, - 0x0B, - 0xD0, - 0x0B, - 0xD0, - 0x1A, - 0x58, - 0x36, + 0x6D, + 0x3A, + 0x59, + 0x4B, + 0xD5, + 0x8B, + 0xD3, + 0xCB, + 0xD1, + 0xAB, + 0xD2, + 0x9A, + 0x5C, + 0xB6, 0x6C, 0xEC, 0x37, @@ -5721,6 +5721,44 @@ static constexpr Bitmap bitmap_icon_hide{ {16, 16}, bitmap_icon_hide_data}; +static constexpr uint8_t bitmap_icon_thermometer_data[] = { + 0xC0, + 0x00, + 0x20, + 0x01, + 0x10, + 0x02, + 0x10, + 0x3A, + 0x10, + 0x02, + 0x10, + 0x1A, + 0x10, + 0x02, + 0xD0, + 0x3A, + 0xD0, + 0x02, + 0xD0, + 0x1A, + 0xD0, + 0x02, + 0xE8, + 0x05, + 0xE8, + 0x05, + 0xC8, + 0x04, + 0x10, + 0x02, + 0xE0, + 0x01, +}; +static constexpr Bitmap bitmap_icon_thermometer{ + {16, 16}, + bitmap_icon_thermometer_data}; + } /* namespace ui */ #endif /*__BITMAP_HPP__*/ diff --git a/firmware/application/ui_navigation.cpp b/firmware/application/ui_navigation.cpp index e05845a9..40d468cd 100644 --- a/firmware/application/ui_navigation.cpp +++ b/firmware/application/ui_navigation.cpp @@ -566,7 +566,7 @@ ReceiversMenuView::ReceiversMenuView(NavigationView& nav) { {"Recon", Color::green(), &bitmap_icon_scanner, [&nav]() { nav.push(); }}, {"Search", Color::yellow(), &bitmap_icon_search, [&nav]() { nav.push(); }}, {"TPMS Cars", Color::green(), &bitmap_icon_tpms, [&nav]() { nav.push(); }}, - {"Weather", Color::yellow(), &bitmap_icon_lge, [&nav]() { nav.push(); }}, + {"Weather", Color::green(), &bitmap_icon_thermometer, [&nav]() { nav.push(); }}, // {"FSK RX", Color::yellow(), &bitmap_icon_remote, [&nav]() { nav.push(); }}, // {"DMR", Color::dark_grey(), &bitmap_icon_dmr, [&nav](){ nav.push(); }}, // {"SIGFOX", Color::dark_grey(), &bitmap_icon_fox, [&nav](){ nav.push(); }}, diff --git a/firmware/graphics/icon_thermometer.png b/firmware/graphics/icon_thermometer.png new file mode 100644 index 0000000000000000000000000000000000000000..9e0cb33f18127b302148384cf827fe4534f51d71 GIT binary patch literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F5M?jcysy3fAP%zum z#WBR9_wHnCz5@mv&Tm(J-)|(VwMgXVlKE@pI{!QpP-tifI1;J0vaj7NU5#@RbBXkX zXIHp3ZLeUQf3Tl%mHa05*rs1|&U5NG)IRpFF7TY-Y;u25me>b3p#b-t!hzd1zH3?? e=^z!eXce=3myNpd2?HUZwG5uFelF{r5}E+u`#yaD literal 0 HcmV?d00001 diff --git a/firmware/graphics/icon_tpms.png b/firmware/graphics/icon_tpms.png index 93afb7a5849a0df3586ec32cd524ff4382c85ed3..fa66aa4ab1bcf553ccb92118d42de7cd572e4e72 100644 GIT binary patch delta 182 zcmV;n07?J10n!1GB!3BTNLh0L01m_e01m_fl`9S#0001lNklsc1&gyy$%P$RK{cJzmW(n6?N_Phsa5R~$KAb~ z%*>eU;}L}@LeK!DSVd#@0(7IwBESf_0ZfcpD4zl_I@XVn(2SJALDiqI^eGsls@7(? zBk*|uO-oE2{ls6|s32^N=^*tM#r@MLBSf|Gb(y+ocbylfu@txg?B9rJ00000NkvXX Ju0mjf002epNBRH&