From 7aca7ce74dee649fa4e2625ec65eae1d8c1aad38 Mon Sep 17 00:00:00 2001 From: gullradriel <3157857+gullradriel@users.noreply.github.com> Date: Thu, 18 May 2023 21:01:58 +0200 Subject: [PATCH] removing keyfob app (#1006) * removing icon * disabling keyfob app * icon file rebuild --- firmware/application/CMakeLists.txt | 4 +- firmware/application/bitmap.hpp | 241 +++++++++++-------------- firmware/application/ui_navigation.cpp | 4 +- firmware/graphics/icon_keyfob.png | Bin 129 -> 0 bytes 4 files changed, 114 insertions(+), 135 deletions(-) delete mode 100644 firmware/graphics/icon_keyfob.png diff --git a/firmware/application/CMakeLists.txt b/firmware/application/CMakeLists.txt index 0ca186ad..e8de6eaa 100644 --- a/firmware/application/CMakeLists.txt +++ b/firmware/application/CMakeLists.txt @@ -212,7 +212,7 @@ set(CPPSRC ui/ui_channel.cpp ui/ui_font_fixed_8x16.cpp ui/ui_geomap.cpp - ui/ui_qrcode.cpp + ui/ui_qrcode.cpp ui/ui_menu.cpp ui/ui_btngrid.cpp ui/ui_receiver.cpp @@ -240,7 +240,7 @@ set(CPPSRC apps/ui_sd_over_usb.cpp apps/ui_freqman.cpp apps/ui_jammer.cpp - apps/ui_keyfob.cpp + #apps/ui_keyfob.cpp apps/ui_lcr.cpp apps/lge_app.cpp apps/ui_looking_glass_app.cpp diff --git a/firmware/application/bitmap.hpp b/firmware/application/bitmap.hpp index d21e002e..96d1a678 100644 --- a/firmware/application/bitmap.hpp +++ b/firmware/application/bitmap.hpp @@ -507,6 +507,28 @@ static constexpr Bitmap bitmap_icon_tools_antenna { { 16, 16 }, bitmap_icon_tools_antenna_data }; +static constexpr uint8_t bitmap_icon_new_file_data[] = { + 0x00, 0x00, + 0xFC, 0x07, + 0x04, 0x0C, + 0x04, 0x1C, + 0x04, 0x3C, + 0x84, 0x21, + 0x84, 0x21, + 0x84, 0x21, + 0xF4, 0x2F, + 0xF4, 0x2F, + 0x84, 0x21, + 0x84, 0x21, + 0x84, 0x21, + 0x04, 0x20, + 0xFC, 0x3F, + 0x00, 0x00, +}; +static constexpr Bitmap bitmap_icon_new_file { + { 16, 16 }, bitmap_icon_new_file_data +}; + static constexpr uint8_t bitmap_sig_cw_data[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -935,6 +957,28 @@ static constexpr Bitmap bitmap_icon_clk_ext { { 8, 16 }, bitmap_icon_clk_ext_data }; +static constexpr uint8_t bitmap_icon_trash_data[] = { + 0x00, 0x00, + 0xC0, 0x01, + 0x20, 0x02, + 0xFC, 0x1F, + 0x00, 0x00, + 0xA8, 0x0A, + 0xA8, 0x0A, + 0xA8, 0x0A, + 0xA8, 0x0A, + 0xA8, 0x0A, + 0xA8, 0x0A, + 0xA8, 0x0A, + 0xA8, 0x0A, + 0x08, 0x08, + 0xF0, 0x07, + 0x00, 0x00, +}; +static constexpr Bitmap bitmap_icon_trash { + { 16, 16 }, bitmap_icon_trash_data +}; + static constexpr uint8_t bitmap_icon_fox_data[] = { 0x18, 0x18, 0x28, 0x14, @@ -1693,6 +1737,50 @@ static constexpr Bitmap bitmap_icon_notepad { { 16, 16 }, bitmap_icon_notepad_data }; +static constexpr uint8_t bitmap_icon_copy_data[] = { + 0x00, 0x00, + 0xFC, 0x00, + 0x84, 0x01, + 0xC4, 0x0F, + 0x74, 0x18, + 0x44, 0x38, + 0x44, 0x78, + 0x74, 0x40, + 0x44, 0x44, + 0x44, 0x44, + 0x74, 0x5F, + 0x44, 0x44, + 0x44, 0x44, + 0x7C, 0x40, + 0xC0, 0x7F, + 0x00, 0x00, +}; +static constexpr Bitmap bitmap_icon_copy { + { 16, 16 }, bitmap_icon_copy_data +}; + +static constexpr uint8_t bitmap_icon_cut_data[] = { + 0x00, 0x00, + 0x10, 0x10, + 0x30, 0x18, + 0x20, 0x08, + 0x60, 0x0C, + 0x40, 0x04, + 0xC0, 0x06, + 0x80, 0x00, + 0x80, 0x01, + 0x80, 0x01, + 0xC0, 0x03, + 0x78, 0x1E, + 0x44, 0x22, + 0x44, 0x22, + 0x44, 0x22, + 0x38, 0x1C, +}; +static constexpr Bitmap bitmap_icon_cut { + { 16, 16 }, bitmap_icon_cut_data +}; + static constexpr uint8_t bitmap_target_calibrate_data[] = { 0x02, 0x00, 0x00, 0x40, 0x07, 0x00, 0x00, 0xE0, @@ -1885,28 +1973,6 @@ static constexpr Bitmap bitmap_icon_transmit { { 16, 16 }, bitmap_icon_transmit_data }; -static constexpr uint8_t bitmap_icon_keyfob_data[] = { - 0x30, 0x00, - 0x30, 0x00, - 0x30, 0x00, - 0x30, 0x00, - 0x30, 0x00, - 0x30, 0x00, - 0xFC, 0x00, - 0xCE, 0x01, - 0x86, 0x01, - 0xFE, 0x01, - 0x86, 0x31, - 0x86, 0x49, - 0xCE, 0x87, - 0xFC, 0x84, - 0xFC, 0x4B, - 0x78, 0x30, -}; -static constexpr Bitmap bitmap_icon_keyfob { - { 16, 16 }, bitmap_icon_keyfob_data -}; - static constexpr uint8_t bitmap_icon_looking_data[] = { 0xF8, 0x01, 0xFC, 0x03, @@ -2387,6 +2453,28 @@ static constexpr Bitmap bitmap_icon_peripherals_details { { 16, 16 }, bitmap_icon_peripherals_details_data }; +static constexpr uint8_t bitmap_icon_paste_data[] = { + 0x00, 0x00, + 0xE0, 0x00, + 0x18, 0x03, + 0xE4, 0x04, + 0x04, 0x04, + 0x04, 0x04, + 0x84, 0x3F, + 0x84, 0x20, + 0x84, 0x2E, + 0x84, 0x20, + 0x84, 0x2E, + 0x84, 0x20, + 0x84, 0x2E, + 0xF8, 0x20, + 0x80, 0x3F, + 0x00, 0x00, +}; +static constexpr Bitmap bitmap_icon_paste { + { 16, 16 }, bitmap_icon_paste_data +}; + static constexpr uint8_t bitmap_bulb_ignore_data[] = { 0x00, 0x3C, 0x00, 0x00, 0xC3, 0x00, @@ -2543,94 +2631,6 @@ static constexpr Bitmap bitmap_target { { 16, 16 }, bitmap_target_data }; -static constexpr uint8_t bitmap_icon_trash_data[] = { - 0x00, 0x00, - 0xC0, 0x01, - 0x20, 0x02, - 0xFC, 0x1F, - 0x00, 0x00, - 0xA8, 0x0A, - 0xA8, 0x0A, - 0xA8, 0x0A, - 0xA8, 0x0A, - 0xA8, 0x0A, - 0xA8, 0x0A, - 0xA8, 0x0A, - 0xA8, 0x0A, - 0x08, 0x08, - 0xF0, 0x07, - 0x00, 0x00, -}; -static constexpr Bitmap bitmap_icon_trash { - { 16, 16 }, bitmap_icon_trash_data -}; - -static constexpr uint8_t bitmap_icon_copy_data[] = { - 0x00, 0x00, - 0xFC, 0x00, - 0x84, 0x01, - 0xC4, 0x0F, - 0x74, 0x18, - 0x44, 0x38, - 0x44, 0x78, - 0x74, 0x40, - 0x44, 0x44, - 0x44, 0x44, - 0x74, 0x5F, - 0x44, 0x44, - 0x44, 0x44, - 0x7C, 0x40, - 0xC0, 0x7F, - 0x00, 0x00, -}; -static constexpr Bitmap bitmap_icon_copy { - { 16, 16 }, bitmap_icon_copy_data -}; - -static constexpr uint8_t bitmap_icon_cut_data[] = { - 0x00, 0x00, - 0x10, 0x10, - 0x30, 0x18, - 0x20, 0x08, - 0x60, 0x0C, - 0x40, 0x04, - 0xC0, 0x06, - 0x80, 0x00, - 0x80, 0x01, - 0x80, 0x01, - 0xC0, 0x03, - 0x78, 0x1E, - 0x44, 0x22, - 0x44, 0x22, - 0x44, 0x22, - 0x38, 0x1C, -}; -static constexpr Bitmap bitmap_icon_cut { - { 16, 16 }, bitmap_icon_cut_data -}; - -static constexpr uint8_t bitmap_icon_paste_data[] = { - 0x00, 0x00, - 0xE0, 0x00, - 0x18, 0x03, - 0xE4, 0x04, - 0x04, 0x04, - 0x04, 0x04, - 0x84, 0x3F, - 0x84, 0x20, - 0x84, 0x2E, - 0x84, 0x20, - 0x84, 0x2E, - 0x84, 0x20, - 0x84, 0x2E, - 0xF8, 0x20, - 0x80, 0x3F, - 0x00, 0x00, -}; -static constexpr Bitmap bitmap_icon_paste { - { 16, 16 }, bitmap_icon_paste_data -}; - static constexpr uint8_t bitmap_icon_new_dir_data[] = { 0x00, 0x00, 0x1E, 0x00, @@ -2653,27 +2653,6 @@ static constexpr Bitmap bitmap_icon_new_dir { { 16, 16 }, bitmap_icon_new_dir_data }; -static constexpr uint8_t bitmap_icon_new_file_data[] = { - 0x00, 0x00, - 0xFC, 0x07, - 0x04, 0x0C, - 0x04, 0x1C, - 0x04, 0x3C, - 0x84, 0x21, - 0x84, 0x21, - 0x84, 0x21, - 0xF4, 0x2F, - 0xF4, 0x2F, - 0x84, 0x21, - 0x84, 0x21, - 0x84, 0x21, - 0x04, 0x20, - 0xFC, 0x3F, - 0x00, 0x00, -}; -static constexpr Bitmap bitmap_icon_new_file { - { 16, 16 }, bitmap_icon_new_file_data -}; } /* namespace ui */ diff --git a/firmware/application/ui_navigation.cpp b/firmware/application/ui_navigation.cpp index 7103feb7..20cd1213 100644 --- a/firmware/application/ui_navigation.cpp +++ b/firmware/application/ui_navigation.cpp @@ -46,7 +46,7 @@ #include "ui_fileman.hpp" #include "ui_freqman.hpp" #include "ui_jammer.hpp" -#include "ui_keyfob.hpp" +//#include "ui_keyfob.hpp" #include "ui_lcr.hpp" #include "ui_mictx.hpp" #include "ui_morse.hpp" @@ -584,7 +584,7 @@ TransmittersMenuView::TransmittersMenuView(NavigationView& nav) { { "BHT Xy/EP", ui::Color::green(), &bitmap_icon_bht, [&nav](){ nav.push(); } }, { "GPS Sim", ui::Color::yellow(), &bitmap_icon_gps_sim, [&nav](){ nav.push(); } }, { "Jammer", ui::Color::green(), &bitmap_icon_jammer, [&nav](){ nav.push(); } }, - { "Key fob", ui::Color::orange(), &bitmap_icon_keyfob, [&nav](){ nav.push(); } }, + //{ "Key fob", ui::Color::orange(), &bitmap_icon_keyfob, [&nav](){ nav.push(); } }, { "LGE tool", ui::Color::yellow(), &bitmap_icon_lge, [&nav](){ nav.push(); } }, { "Morse", ui::Color::green(), &bitmap_icon_morse, [&nav](){ nav.push(); } }, { "BurgerPgr", ui::Color::yellow(), &bitmap_icon_burger, [&nav](){ nav.push(); } }, diff --git a/firmware/graphics/icon_keyfob.png b/firmware/graphics/icon_keyfob.png deleted file mode 100644 index 9cb6826e366dfe6515d230bf04184e7f83814714..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 129 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`9-c0aAr`&K2?+^5`g;-?VrBT{ zOdGP;9x%B`Huy4gwmm2_JIOZTCGVw}2G^bn=7J5J>`Hdr9er+_cpc0*mWvliHtAlu a_>{pa>7%T)XNe8aOa@O^KbLh*2~7Z5*(FQ>