From 4597c61c57862f895ef2152870794116623b5e86 Mon Sep 17 00:00:00 2001 From: Erwin Ried <1091420+eried@users.noreply.github.com> Date: Mon, 11 May 2020 11:07:45 +0200 Subject: [PATCH 1/3] Removing playdead calls, non-implemented entries in main menu, and small UI tweaks --- firmware/application/apps/ui_debug.cpp | 2 +- firmware/application/ui_navigation.cpp | 58 +++++++++++++------------- firmware/application/ui_navigation.hpp | 4 +- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/firmware/application/apps/ui_debug.cpp b/firmware/application/apps/ui_debug.cpp index 038bbc7b..a95576dc 100644 --- a/firmware/application/apps/ui_debug.cpp +++ b/firmware/application/apps/ui_debug.cpp @@ -346,7 +346,7 @@ DebugPeripheralsMenuView::DebugPeripheralsMenuView(NavigationView& nav) { DebugMenuView::DebugMenuView(NavigationView& nav) { add_items({ { "Memory", ui::Color::white(), nullptr, [&nav](){ nav.push(); } }, - { "Radio State", ui::Color::white(), nullptr, [&nav](){ nav.push(); } }, + //{ "Radio State", ui::Color::white(), nullptr, [&nav](){ nav.push(); } }, { "SD Card", ui::Color::white(), nullptr, [&nav](){ nav.push(); } }, { "Peripherals", ui::Color::white(), nullptr, [&nav](){ nav.push(); } }, { "Temperature", ui::Color::white(), nullptr, [&nav](){ nav.push(); } }, diff --git a/firmware/application/ui_navigation.cpp b/firmware/application/ui_navigation.cpp index 46e3dd57..cc527c3d 100644 --- a/firmware/application/ui_navigation.cpp +++ b/firmware/application/ui_navigation.cpp @@ -50,7 +50,7 @@ #include "ui_morse.hpp" //#include "ui_numbers.hpp" //#include "ui_nuoptix.hpp" -#include "ui_playdead.hpp" +//#include "ui_playdead.hpp" #include "ui_pocsag_tx.hpp" #include "ui_rds.hpp" #include "ui_remote.hpp" @@ -354,20 +354,20 @@ ReceiversMenuView::ReceiversMenuView(NavigationView& nav) { { "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(); } }, - { "Analog TV", ui::Color::yellow(), &bitmap_icon_sstv, [&nav](){ nav.push(); } }, + { "Analog TV", ui::Color::yellow(), &bitmap_icon_sstv, [&nav](){ nav.push(); } }, { "ERT Meter", ui::Color::green(), &bitmap_icon_ert, [&nav](){ nav.push(); } }, { "POCSAG", ui::Color::green(), &bitmap_icon_pocsag, [&nav](){ nav.push(); } }, { "Radiosnde", ui::Color::yellow(), &bitmap_icon_sonde, [&nav](){ nav.push(); } }, { "TPMS Cars", ui::Color::green(), &bitmap_icon_tpms, [&nav](){ nav.push(); } }, - { "APRS", ui::Color::dark_grey(), &bitmap_icon_aprs, [&nav](){ nav.push(); } }, + /*{ "APRS", ui::Color::dark_grey(), &bitmap_icon_aprs, [&nav](){ nav.push(); } }, { "DMR", ui::Color::dark_grey(), &bitmap_icon_dmr, [&nav](){ nav.push(); } }, { "SIGFOX", ui::Color::dark_grey(), &bitmap_icon_fox, [&nav](){ nav.push(); } }, // SIGFRXView { "LoRa", ui::Color::dark_grey(), &bitmap_icon_lora, [&nav](){ nav.push(); } }, { "SSTV", ui::Color::dark_grey(), &bitmap_icon_sstv, [&nav](){ nav.push(); } }, - { "TETRA", ui::Color::dark_grey(), &bitmap_icon_tetra, [&nav](){ nav.push(); } }, + { "TETRA", ui::Color::dark_grey(), &bitmap_icon_tetra, [&nav](){ nav.push(); } },*/ }); - set_highlighted(4); // Default selection is "Audio" + //set_highlighted(4); // Default selection is "Audio" } /* TransmittersMenuView **************************************************/ @@ -376,21 +376,21 @@ TransmittersMenuView::TransmittersMenuView(NavigationView& nav) { add_items({ //{ "..", ui::Color::light_grey(),&bitmap_icon_previous, [&nav](){ nav.pop(); } }, { "ADS-B [S]", ui::Color::yellow(), &bitmap_icon_adsb, [&nav](){ nav.push(); } }, - { "APRS", ui::Color::orange(), &bitmap_icon_aprs, [&nav](){ nav.push(); } }, - { "BHT Xy/EP", ui::Color::green(), &bitmap_icon_bht, [&nav](){ nav.push(); } }, - { "GPS Sim", ui::Color::yellow(), &bitmap_gps_sim, [&nav](){ nav.push(); } }, - { "Jammer", ui::Color::yellow(), &bitmap_icon_jammer, [&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(); } }, + { "APRS", ui::Color::orange(), &bitmap_icon_aprs, [&nav](){ nav.push(); } }, + { "BHT Xy/EP", ui::Color::green(), &bitmap_icon_bht, [&nav](){ nav.push(); } }, + { "GPS Sim", ui::Color::yellow(), &bitmap_gps_sim, [&nav](){ nav.push(); } }, + { "Jammer", ui::Color::yellow(), &bitmap_icon_jammer, [&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(); } }, { "Mic", ui::Color::green(), &bitmap_icon_microphone,[&nav](){ nav.push(); } }, { "Morse", ui::Color::green(), &bitmap_icon_morse, [&nav](){ nav.push(); } }, { "BurgerPgr", ui::Color::yellow(), &bitmap_icon_burger, [&nav](){ nav.push(); } }, //{ "Nuoptix DTMF", ui::Color::green(), &bitmap_icon_nuoptix, [&nav](){ nav.push(); } }, { "OOK", ui::Color::yellow(), &bitmap_icon_remote, [&nav](){ nav.push(); } }, - { "POCSAG", ui::Color::green(), &bitmap_icon_pocsag, [&nav](){ nav.push(); } }, - { "RDS", ui::Color::green(), &bitmap_icon_rds, [&nav](){ nav.push(); } }, + { "POCSAG", ui::Color::green(), &bitmap_icon_pocsag, [&nav](){ nav.push(); } }, + { "RDS", ui::Color::green(), &bitmap_icon_rds, [&nav](){ nav.push(); } }, { "Soundbrd", ui::Color::green(), &bitmap_icon_soundboard,[&nav](){ nav.push(); } }, - { "SSTV", ui::Color::green(), &bitmap_icon_sstv, [&nav](){ nav.push(); } }, + { "SSTV", ui::Color::green(), &bitmap_icon_sstv, [&nav](){ nav.push(); } }, { "TEDI/LCR", ui::Color::yellow(), &bitmap_icon_lcr, [&nav](){ nav.push(); } }, { "TouchTune", ui::Color::yellow(), &bitmap_icon_remote, [&nav](){ nav.push(); } }, { "Remote", ui::Color::dark_grey(), &bitmap_icon_remote, [&nav](){ nav.push(); } }, @@ -404,13 +404,13 @@ UtilitiesMenuView::UtilitiesMenuView(NavigationView& nav) { //{ "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(); } }, + { "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(); } }, + { "Wipe SD card", ui::Color::red(), nullptr, [&nav](){ nav.push(); } }, }); set_max_rows(2); // allow wider buttons } @@ -418,7 +418,7 @@ UtilitiesMenuView::UtilitiesMenuView(NavigationView& nav) { /* SystemMenuView ********************************************************/ void SystemMenuView::hackrf_mode(NavigationView& nav) { - nav.push("Confirm", "Switch to HackRF mode ?", YESNO, + nav.push("HackRF mode", "This mode enables USB\nfunctionality. Reset the\ndevice to get back.\n\nDo you want to Switch now?", YESNO, [this](bool choice) { if (choice) { EventDispatcher::request_stop(); @@ -429,21 +429,21 @@ void SystemMenuView::hackrf_mode(NavigationView& nav) { SystemMenuView::SystemMenuView(NavigationView& nav) { add_items({ - { "Play dead", ui::Color::red(), &bitmap_icon_playdead, [&nav](){ nav.push(); } }, - { "Receivers", ui::Color::dark_cyan(), &bitmap_icon_receivers, [&nav](){ nav.push(); } }, + //{ "Play dead", ui::Color::red(), &bitmap_icon_playdead, [&nav](){ nav.push(); } }, + { "Receive", ui::Color::dark_cyan(), &bitmap_icon_receivers, [&nav](){ nav.push(); } }, { "Transmit", ui::Color::green(), &bitmap_icon_transmit, [&nav](){ nav.push(); } }, - { "Capture", ui::Color::blue(), &bitmap_icon_capture, [&nav](){ nav.push(); } }, - { "Replay", ui::Color::purple(), &bitmap_icon_replay, [&nav](){ nav.push(); } }, + { "Capture", ui::Color::blue(), &bitmap_icon_capture, [&nav](){ nav.push(); } }, + { "Replay", ui::Color::purple(), &bitmap_icon_replay, [&nav](){ nav.push(); } }, { "Calls", ui::Color::yellow(), &bitmap_icon_closecall, [&nav](){ nav.push(); } }, { "Scanner", ui::Color::orange(), &bitmap_icon_scanner, [&nav](){ nav.push(); } }, - { "Utilities", ui::Color::light_grey(), &bitmap_icon_utilities, [&nav](){ nav.push(); } }, - { "Settings", ui::Color::cyan(), &bitmap_icon_setup, [&nav](){ nav.push(); } }, + { "Tools", ui::Color::light_grey(), &bitmap_icon_utilities, [&nav](){ nav.push(); } }, + { "Options", ui::Color::cyan(), &bitmap_icon_setup, [&nav](){ nav.push(); } }, { "Debug", ui::Color::cyan(), nullptr, [&nav](){ nav.push(); } }, { "HackRF", ui::Color::cyan(), &bitmap_icon_hackrf, [this, &nav](){ hackrf_mode(nav); } }, - { "About", ui::Color::cyan(), nullptr, [&nav](){ nav.push(); } } + //{ "About", ui::Color::cyan(), nullptr, [&nav](){ nav.push(); } } }); - - set_highlighted(1); // Startup selection is "Receivers" + set_max_rows(2); // allow wider buttons + //set_highlighted(1); // Startup selection } /* SystemView ************************************************************/ @@ -528,7 +528,7 @@ void BMPView::paint(Painter&) { /* NotImplementedView ****************************************************/ -NotImplementedView::NotImplementedView(NavigationView& nav) { +/*NotImplementedView::NotImplementedView(NavigationView& nav) { button_done.on_select = [&nav](Button&){ nav.pop(); }; @@ -541,7 +541,7 @@ NotImplementedView::NotImplementedView(NavigationView& nav) { void NotImplementedView::focus() { button_done.focus(); -} +}*/ /* ModalMessageView ******************************************************/ diff --git a/firmware/application/ui_navigation.hpp b/firmware/application/ui_navigation.hpp index e84f3b0b..d4a1b128 100644 --- a/firmware/application/ui_navigation.hpp +++ b/firmware/application/ui_navigation.hpp @@ -249,7 +249,7 @@ private: Context& context_; }; -class NotImplementedView : public View { +/*class NotImplementedView : public View { public: NotImplementedView(NavigationView& nav); @@ -265,7 +265,7 @@ private: { 10 * 8, 13 * 16, 10 * 8, 24 }, "Bummer", }; -}; +};*/ class ModalMessageView : public View { public: From 50b9f3219cafed61d390ada081988f530901786d Mon Sep 17 00:00:00 2001 From: Erwin Ried <1091420+eried@users.noreply.github.com> Date: Mon, 11 May 2020 11:08:00 +0200 Subject: [PATCH 2/3] Long titles corrupt the header --- firmware/application/apps/ui_touch_calibration.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firmware/application/apps/ui_touch_calibration.hpp b/firmware/application/apps/ui_touch_calibration.hpp index 1c4fc597..b47fc859 100644 --- a/firmware/application/apps/ui_touch_calibration.hpp +++ b/firmware/application/apps/ui_touch_calibration.hpp @@ -34,7 +34,7 @@ public: void focus() override; - std::string title() const override { return "Touch calibration"; }; + std::string title() const override { return "Calibration"; }; private: enum class Phase { From f18d9f6ed1d8969baab1def869a8103a10a3e7a9 Mon Sep 17 00:00:00 2001 From: Erwin Ried <1091420+eried@users.noreply.github.com> Date: Mon, 11 May 2020 11:08:22 +0200 Subject: [PATCH 3/3] Removing playdead related stuff and small tweaks --- firmware/application/apps/ui_settings.cpp | 12 +++++++----- firmware/application/apps/ui_settings.hpp | 19 +++++++++++-------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/firmware/application/apps/ui_settings.cpp b/firmware/application/apps/ui_settings.cpp index 3b5747db..3d02f94d 100644 --- a/firmware/application/apps/ui_settings.cpp +++ b/firmware/application/apps/ui_settings.cpp @@ -183,6 +183,7 @@ SetFrequencyCorrectionModel SetRadioView::form_collect() { }; } +/* SetPlayDeadView::SetPlayDeadView(NavigationView& nav) { add_children({ &text_sequence, @@ -234,10 +235,11 @@ SetPlayDeadView::SetPlayDeadView(NavigationView& nav) { void SetPlayDeadView::focus() { button_cancel.focus(); } +*/ SetUIView::SetUIView(NavigationView& nav) { add_children({ - &checkbox_login, + //&checkbox_login, &checkbox_bloff, &options_bloff, &checkbox_showsplash, @@ -245,7 +247,7 @@ SetUIView::SetUIView(NavigationView& nav) { }); checkbox_showsplash.set_value(persistent_memory::config_splash()); - checkbox_login.set_value(persistent_memory::config_login()); + //checkbox_login.set_value(persistent_memory::config_login()); uint32_t backlight_timer = persistent_memory::config_backlight_timer(); @@ -263,13 +265,13 @@ SetUIView::SetUIView(NavigationView& nav) { persistent_memory::set_config_backlight_timer(0); persistent_memory::set_config_splash(checkbox_showsplash.value()); - persistent_memory::set_config_login(checkbox_login.value()); + //persistent_memory::set_config_login(checkbox_login.value()); nav.pop(); }; } void SetUIView::focus() { - checkbox_login.focus(); + button_ok.focus(); } SetAudioView::SetAudioView(NavigationView& nav) { @@ -478,7 +480,7 @@ SettingsMenuView::SettingsMenuView(NavigationView& nav) { //{ "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(); } } + //{ "Play dead", ui::Color::dark_cyan(), &bitmap_icon_playdead, [&nav](){ nav.push(); } } }); set_max_rows(2); // allow wider buttons } diff --git a/firmware/application/apps/ui_settings.hpp b/firmware/application/apps/ui_settings.hpp index e4084ad3..0e3abbc7 100644 --- a/firmware/application/apps/ui_settings.hpp +++ b/firmware/application/apps/ui_settings.hpp @@ -101,11 +101,11 @@ private: Button button_done { { 2 * 8, 16 * 16, 12 * 8, 32 }, - "Done" + "Save" }; Button button_cancel { { 16 * 8, 16 * 16, 12 * 8, 32 }, - "Cancel", + "Cancel" }; void form_init(const SetDateTimeModel& model); @@ -174,7 +174,7 @@ private: Button button_done { { 2 * 8, 16 * 16, 12 * 8, 32 }, - "Done" + "Save" }; Button button_cancel { { 16 * 8, 16 * 16, 12 * 8, 32 }, @@ -194,11 +194,11 @@ public: std::string title() const override { return "UI settings"; }; private: - Checkbox checkbox_login { + /*Checkbox checkbox_login { { 3 * 8, 2 * 16 }, 20, "Login with play dead" - }; + };*/ Checkbox checkbox_bloff { { 3 * 8, 5 * 16 }, @@ -212,7 +212,9 @@ private: { { "5 seconds", 5 }, { "15 seconds", 15 }, + { "30 seconds", 30 }, { "1 minute", 60 }, + { "3 minutes", 180 }, { "5 minutes", 300 }, { "10 minutes", 600 } } @@ -226,7 +228,7 @@ private: Button button_ok { { 2 * 8, 16 * 16, 12 * 8, 32 }, - "OK" + "Save" }; }; @@ -253,10 +255,11 @@ private: Button button_ok { { 2 * 8, 16 * 16, 12 * 8, 32 }, - "OK" + "Save" }; }; +/* class SetPlayDeadView : public View { public: SetPlayDeadView(NavigationView& nav); @@ -284,7 +287,7 @@ private: { 128, 192, 96, 24 }, "Cancel" }; -}; +};*/ /*class ModInfoView : public View { public: