diff --git a/firmware/application/apps/ui_settings.cpp b/firmware/application/apps/ui_settings.cpp index 3d02f94d..b963ab05 100644 --- a/firmware/application/apps/ui_settings.cpp +++ b/firmware/application/apps/ui_settings.cpp @@ -473,14 +473,14 @@ void ModInfoView::focus() { SettingsMenuView::SettingsMenuView(NavigationView& nav) { add_items({ - //{ "..", ui::Color::light_grey(), &bitmap_icon_previous, [&nav](){ nav.pop(); } }, - { "Audio", ui::Color::dark_cyan(), &bitmap_icon_speaker, [&nav](){ nav.push(); } }, - { "Radio", ui::Color::dark_cyan(), nullptr, [&nav](){ nav.push(); } }, - { "UI", ui::Color::dark_cyan(), nullptr, [&nav](){ nav.push(); } }, - //{ "SD card modules", ui::Color::dark_cyan(), [&nav](){ nav.push(); } }, - { "Date/Time", ui::Color::dark_cyan(), nullptr, [&nav](){ nav.push(); } }, - { "Touch screen", ui::Color::dark_cyan(), nullptr, [&nav](){ nav.push(); } }, - //{ "Play dead", ui::Color::dark_cyan(), &bitmap_icon_playdead, [&nav](){ nav.push(); } } + //{ "..", ui::Color::light_grey(), &bitmap_icon_previous, [&nav](){ nav.pop(); } }, + { "Audio", ui::Color::dark_cyan(), &bitmap_icon_speaker, [&nav](){ nav.push(); } }, + { "Radio", ui::Color::dark_cyan(), &bitmap_icon_options_radio, [&nav](){ nav.push(); } }, + { "Interface", ui::Color::dark_cyan(), &bitmap_icon_options_ui, [&nav](){ nav.push(); } }, + //{ "SD card modules", ui::Color::dark_cyan(), [&nav](){ nav.push(); } }, + { "Date/Time", ui::Color::dark_cyan(), &bitmap_icon_options_datetime, [&nav](){ nav.push(); } }, + { "Touchscreen", ui::Color::dark_cyan(), &bitmap_icon_options_touch, [&nav](){ nav.push(); } }, + //{ "Play dead", ui::Color::dark_cyan(), &bitmap_icon_playdead, [&nav](){ nav.push(); } } }); set_max_rows(2); // allow wider buttons } diff --git a/firmware/application/bitmap.hpp b/firmware/application/bitmap.hpp index bcf6d778..0097ade8 100644 --- a/firmware/application/bitmap.hpp +++ b/firmware/application/bitmap.hpp @@ -979,20 +979,20 @@ static constexpr Bitmap bitmap_icon_modem { static constexpr uint8_t bitmap_icon_morse_data[] = { 0x00, 0x00, - 0x18, 0x00, - 0x18, 0x00, - 0x18, 0x00, - 0x0C, 0x00, - 0x0C, 0x00, - 0x0C, 0x00, - 0x0C, 0x1F, - 0x06, 0x1F, - 0x06, 0x00, - 0x66, 0xC0, - 0x66, 0xC0, - 0x03, 0x00, - 0x03, 0x00, - 0x03, 0x00, + 0xFE, 0x7F, + 0xFF, 0xFF, + 0xBB, 0xD0, + 0xFF, 0xFF, + 0xFF, 0xFF, + 0x0B, 0xE1, + 0xFF, 0xFF, + 0xFF, 0xFF, + 0xEB, 0xD0, + 0xFF, 0xFF, + 0xFE, 0x7F, + 0x70, 0x00, + 0x30, 0x00, + 0x10, 0x00, 0x00, 0x00, }; static constexpr Bitmap bitmap_icon_morse { @@ -1087,6 +1087,94 @@ static constexpr Bitmap bitmap_icon_nuoptix { { 16, 16 }, bitmap_icon_nuoptix_data }; +static constexpr uint8_t bitmap_icon_options_datetime_data[] = { + 0x0C, 0x06, + 0xFF, 0x1F, + 0x49, 0x12, + 0x49, 0x12, + 0xFF, 0x1F, + 0x49, 0x00, + 0x49, 0x1C, + 0x7F, 0x63, + 0x09, 0x49, + 0x89, 0x88, + 0xBE, 0xB8, + 0x80, 0x80, + 0x00, 0x41, + 0x00, 0x63, + 0x00, 0x1C, + 0x00, 0x00, +}; +static constexpr Bitmap bitmap_icon_options_datetime { + { 16, 16 }, bitmap_icon_options_datetime_data +}; + +static constexpr uint8_t bitmap_icon_options_radio_data[] = { + 0x00, 0x00, + 0x00, 0x00, + 0x04, 0x20, + 0x12, 0x48, + 0x8A, 0x51, + 0xCA, 0x53, + 0xCA, 0x53, + 0x8A, 0x51, + 0x12, 0x48, + 0x84, 0x21, + 0xC0, 0x03, + 0x40, 0x02, + 0x60, 0x06, + 0x20, 0x04, + 0x30, 0x0C, + 0xF0, 0x0F, +}; +static constexpr Bitmap bitmap_icon_options_radio { + { 16, 16 }, bitmap_icon_options_radio_data +}; + +static constexpr uint8_t bitmap_icon_options_touch_data[] = { + 0xC7, 0xF1, + 0x97, 0xF4, + 0x27, 0xF2, + 0x8F, 0xF8, + 0x5F, 0xFD, + 0x47, 0xFD, + 0x53, 0xC1, + 0x4B, 0x9F, + 0x43, 0xB5, + 0x6F, 0xA0, + 0x2F, 0xA0, + 0x20, 0x20, + 0x60, 0x20, + 0x40, 0x10, + 0xC0, 0x1F, + 0x00, 0x00, +}; +static constexpr Bitmap bitmap_icon_options_touch { + { 16, 16 }, bitmap_icon_options_touch_data +}; + +static constexpr uint8_t bitmap_icon_options_ui_data[] = { + 0xFF, 0x1F, + 0xFF, 0x13, + 0xFF, 0x1F, + 0x01, 0x10, + 0x01, 0x10, + 0x01, 0x10, + 0x01, 0x04, + 0x01, 0x0C, + 0x01, 0x1C, + 0x01, 0x3C, + 0xFF, 0x7D, + 0x00, 0xFC, + 0x00, 0x34, + 0x00, 0x20, + 0x00, 0x60, + 0x00, 0x00, +}; +static constexpr Bitmap bitmap_icon_options_ui { + { 16, 16 }, bitmap_icon_options_ui_data +}; + static constexpr uint8_t bitmap_icon_peripherals_data[] = { 0x54, 0x01, 0x54, 0x01, @@ -1506,22 +1594,22 @@ static constexpr Bitmap bitmap_icon_sonde { }; static constexpr uint8_t bitmap_icon_soundboard_data[] = { - 0xFF, 0xAA, - 0x81, 0x00, - 0xA1, 0x42, - 0xB1, 0x20, - 0xBD, 0x52, - 0xBD, 0x28, - 0xBD, 0x52, - 0xB1, 0x20, - 0xA1, 0x42, - 0x81, 0x00, - 0xFF, 0xAA, - 0x00, 0x00, - 0xAA, 0xAA, - 0x01, 0x00, - 0xA0, 0x42, - 0x11, 0x20, + 0xF0, 0x0F, + 0x1C, 0x18, + 0x17, 0x38, + 0x15, 0x78, + 0x15, 0xF8, + 0x15, 0x82, + 0x15, 0x8B, + 0xD5, 0x83, + 0xD5, 0xBB, + 0xD5, 0x83, + 0x15, 0x8B, + 0x15, 0x92, + 0x15, 0xA0, + 0x17, 0x80, + 0x1C, 0x80, + 0xF0, 0xFF, }; static constexpr Bitmap bitmap_icon_soundboard { { 16, 16 }, bitmap_icon_soundboard_data @@ -1529,21 +1617,21 @@ static constexpr Bitmap bitmap_icon_soundboard { static constexpr uint8_t bitmap_icon_speaker_data[] = { 0x00, 0x00, - 0x00, 0x20, - 0x00, 0x30, - 0x00, 0x38, - 0x00, 0x3C, - 0xDC, 0x3E, - 0xDC, 0x3F, - 0xDC, 0x3F, - 0xDC, 0x3F, - 0xDC, 0x3F, - 0xDC, 0x3E, - 0x00, 0x3C, - 0x00, 0x38, - 0x00, 0x30, - 0x00, 0x20, - 0x00, 0x00, + 0x40, 0x10, + 0x60, 0x20, + 0x70, 0x44, + 0x78, 0x48, + 0x7F, 0x91, + 0x7F, 0x92, + 0x7F, 0x92, + 0x7F, 0x92, + 0x7F, 0x92, + 0x7F, 0x92, + 0x7F, 0x91, + 0x78, 0x48, + 0x70, 0x44, + 0x60, 0x20, + 0x40, 0x10, }; static constexpr Bitmap bitmap_icon_speaker { { 16, 16 }, bitmap_icon_speaker_data @@ -1637,6 +1725,50 @@ static constexpr Bitmap bitmap_icon_tetra { { 16, 16 }, bitmap_icon_tetra_data }; +static constexpr uint8_t bitmap_icon_tools_antenna_data[] = { + 0x38, 0x3E, + 0x10, 0x22, + 0x10, 0x26, + 0x10, 0x22, + 0x10, 0x2E, + 0x10, 0x22, + 0x10, 0x26, + 0x10, 0x22, + 0x38, 0x2E, + 0x38, 0x22, + 0x38, 0x26, + 0x38, 0x22, + 0x38, 0x2E, + 0x38, 0x22, + 0x38, 0x3E, + 0x00, 0x00, +}; +static constexpr Bitmap bitmap_icon_tools_antenna { + { 16, 16 }, bitmap_icon_tools_antenna_data +}; + +static constexpr uint8_t bitmap_icon_tools_wipesd_data[] = { + 0xF0, 0x3F, + 0x58, 0x35, + 0x5C, 0x35, + 0xFC, 0x3F, + 0xFC, 0x3F, + 0xFC, 0x3F, + 0x3C, 0x1C, + 0xBC, 0xC9, + 0xBC, 0xE3, + 0x2C, 0x77, + 0x5C, 0x3E, + 0xAC, 0x1C, + 0x5C, 0x3E, + 0x2C, 0x77, + 0x9C, 0xE3, + 0xAC, 0xC1, +}; +static constexpr Bitmap bitmap_icon_tools_wipesd { + { 16, 16 }, bitmap_icon_tools_wipesd_data +}; + static constexpr uint8_t bitmap_icon_tpms_data[] = { 0xC0, 0x03, 0xF0, 0x0F, diff --git a/firmware/application/ui_navigation.cpp b/firmware/application/ui_navigation.cpp index 937739f0..0db19513 100644 --- a/firmware/application/ui_navigation.cpp +++ b/firmware/application/ui_navigation.cpp @@ -402,15 +402,15 @@ TransmittersMenuView::TransmittersMenuView(NavigationView& nav) { UtilitiesMenuView::UtilitiesMenuView(NavigationView& nav) { add_items({ //{ "Test app", ui::Color::dark_grey(), nullptr, [&nav](){ nav.push(); } }, - //{ "..", ui::Color::light_grey(),&bitmap_icon_previous, [&nav](){ nav.pop(); } }, - { "Freq manager", ui::Color::green(), &bitmap_icon_freqman, [&nav](){ nav.push(); } }, - { "File manager", ui::Color::yellow(), &bitmap_icon_file, [&nav](){ nav.push(); } }, - //{ "Notepad", ui::Color::dark_grey(), &bitmap_icon_notepad, [&nav](){ nav.push(); } }, - { "Signal gen", ui::Color::green(), &bitmap_icon_cwgen, [&nav](){ nav.push(); } }, - //{ "Tone search", ui::Color::dark_grey(), nullptr, [&nav](){ nav.push(); } }, - { "Wave viewer", ui::Color::blue(), nullptr, [&nav](){ nav.push(); } }, - { "Antenna length", ui::Color::yellow(), nullptr, [&nav](){ nav.push(); } }, - { "Wipe SD card", ui::Color::red(), nullptr, [&nav](){ nav.push(); } }, + //{ "..", ui::Color::light_grey(),&bitmap_icon_previous, [&nav](){ nav.pop(); } }, + { "Freq manager", ui::Color::green(), &bitmap_icon_freqman, [&nav](){ nav.push(); } }, + { "File manager", ui::Color::yellow(), &bitmap_icon_dir, [&nav](){ nav.push(); } }, + //{ "Notepad", ui::Color::dark_grey(), &bitmap_icon_notepad, [&nav](){ nav.push(); } }, + { "Signal gen", ui::Color::green(), &bitmap_icon_cwgen, [&nav](){ nav.push(); } }, + //{ "Tone search", ui::Color::dark_grey(), nullptr, [&nav](){ nav.push(); } }, + { "Wave viewer", ui::Color::yellow(), &bitmap_icon_soundboard, [&nav](){ nav.push(); } }, + { "Antenna length", ui::Color::green(), &bitmap_icon_tools_antenna, [&nav](){ nav.push(); } }, + { "Wipe SD card", ui::Color::red(), &bitmap_icon_tools_wipesd, [&nav](){ nav.push(); } }, }); set_max_rows(2); // allow wider buttons }