diff --git a/firmware/application/apps/ais_app.hpp b/firmware/application/apps/ais_app.hpp index c79230497..c6a8a7d57 100644 --- a/firmware/application/apps/ais_app.hpp +++ b/firmware/application/apps/ais_app.hpp @@ -166,7 +166,7 @@ public: void focus() override; - std::string title() const override { return "AIS"; }; + std::string title() const override { return "AIS Boats RX"; }; private: static constexpr uint32_t initial_target_frequency = 162025000; diff --git a/firmware/application/apps/analog_audio_app.hpp b/firmware/application/apps/analog_audio_app.hpp index 8f62e237b..04795e47f 100644 --- a/firmware/application/apps/analog_audio_app.hpp +++ b/firmware/application/apps/analog_audio_app.hpp @@ -143,7 +143,7 @@ public: void focus() override; - std::string title() const override { return "Analog audio"; }; + std::string title() const override { return "Audio RX"; }; size_t get_spec_bw_index(); void set_spec_bw(size_t index, uint32_t bw); diff --git a/firmware/application/apps/analog_tv_app.hpp b/firmware/application/apps/analog_tv_app.hpp index 6f90a55cf..81ac8ea56 100644 --- a/firmware/application/apps/analog_tv_app.hpp +++ b/firmware/application/apps/analog_tv_app.hpp @@ -53,7 +53,7 @@ public: void focus() override; - std::string title() const override { return "Analog TV"; }; + std::string title() const override { return "Analog TV RX"; }; private: static constexpr ui::Dim header_height = 3 * 16; diff --git a/firmware/application/apps/ert_app.hpp b/firmware/application/apps/ert_app.hpp index 14eb61c07..19cf70d09 100644 --- a/firmware/application/apps/ert_app.hpp +++ b/firmware/application/apps/ert_app.hpp @@ -125,7 +125,7 @@ public: void focus() override; - std::string title() const override { return "ERT"; }; + std::string title() const override { return "ERT Meter RX"; }; private: ERTRecentEntries recent { }; diff --git a/firmware/application/apps/gps_sim_app.hpp b/firmware/application/apps/gps_sim_app.hpp index 34c7bb2de..b027eeecc 100644 --- a/firmware/application/apps/gps_sim_app.hpp +++ b/firmware/application/apps/gps_sim_app.hpp @@ -44,7 +44,7 @@ public: void set_parent_rect(const Rect new_parent_rect) override; void focus() override; - std::string title() const override { return "GPS Simulator"; }; + std::string title() const override { return "GPS Sim TX"; }; private: NavigationView& nav_; diff --git a/firmware/application/apps/lge_app.hpp b/firmware/application/apps/lge_app.hpp index 818258007..99c5014db 100644 --- a/firmware/application/apps/lge_app.hpp +++ b/firmware/application/apps/lge_app.hpp @@ -40,7 +40,7 @@ public: void focus() override; - std::string title() const override { return "LGE tool"; }; + std::string title() const override { return "LGE tool TX"; }; private: enum tx_modes { diff --git a/firmware/application/apps/soundboard_app.hpp b/firmware/application/apps/soundboard_app.hpp index 91feaf964..ee9e1b124 100644 --- a/firmware/application/apps/soundboard_app.hpp +++ b/firmware/application/apps/soundboard_app.hpp @@ -45,7 +45,7 @@ public: void focus() override; - std::string title() const override { return "Soundboard"; }; + std::string title() const override { return "Soundboard TX"; }; private: NavigationView& nav_; diff --git a/firmware/application/apps/tpms_app.hpp b/firmware/application/apps/tpms_app.hpp index 7ccef6445..2d9b670d3 100644 --- a/firmware/application/apps/tpms_app.hpp +++ b/firmware/application/apps/tpms_app.hpp @@ -103,7 +103,7 @@ public: void focus() override; - std::string title() const override { return "TPMS"; }; + std::string title() const override { return "TPMS Cars RX"; }; private: static constexpr uint32_t initial_target_frequency = 315000000; diff --git a/firmware/application/apps/ui_adsb_rx.hpp b/firmware/application/apps/ui_adsb_rx.hpp index 36e1a190c..879e9d8c3 100644 --- a/firmware/application/apps/ui_adsb_rx.hpp +++ b/firmware/application/apps/ui_adsb_rx.hpp @@ -361,7 +361,7 @@ public: void focus() override; - std::string title() const override { return "ADS-B receive"; }; + std::string title() const override { return "ADS-B RX"; }; void replace_entry(AircraftRecentEntry & entry); AircraftRecentEntry find_or_create_entry(uint32_t ICAO_address); diff --git a/firmware/application/apps/ui_adsb_tx.hpp b/firmware/application/apps/ui_adsb_tx.hpp index f68da2414..0cf07f19e 100644 --- a/firmware/application/apps/ui_adsb_tx.hpp +++ b/firmware/application/apps/ui_adsb_tx.hpp @@ -152,7 +152,7 @@ public: void focus() override; - std::string title() const override { return "ADS-B transmit"; }; + std::string title() const override { return "ADS-B TX"; }; private: /*enum tx_modes { diff --git a/firmware/application/apps/ui_bht_tx.hpp b/firmware/application/apps/ui_bht_tx.hpp index 64cf838d4..01e6b48c5 100644 --- a/firmware/application/apps/ui_bht_tx.hpp +++ b/firmware/application/apps/ui_bht_tx.hpp @@ -178,7 +178,7 @@ public: void focus() override; - std::string title() const override { return "BHT transmit"; }; + std::string title() const override { return "BHT Xy/EP TX"; }; private: void on_tx_progress(const uint32_t progress, const bool done); diff --git a/firmware/application/apps/ui_coasterp.hpp b/firmware/application/apps/ui_coasterp.hpp index 8d169d866..68963302e 100644 --- a/firmware/application/apps/ui_coasterp.hpp +++ b/firmware/application/apps/ui_coasterp.hpp @@ -39,7 +39,7 @@ public: void focus() override; - std::string title() const override { return "Si44xx TX"; }; + std::string title() const override { return "BurgerPgr TX"; }; private: enum tx_modes { diff --git a/firmware/application/apps/ui_debug.cpp b/firmware/application/apps/ui_debug.cpp index 2bec78fae..a1856e257 100644 --- a/firmware/application/apps/ui_debug.cpp +++ b/firmware/application/apps/ui_debug.cpp @@ -352,7 +352,7 @@ DebugMenuView::DebugMenuView(NavigationView& nav) { { "SD Card", ui::Color::dark_cyan(), &bitmap_icon_sdcard, [&nav](){ nav.push(); } }, { "Peripherals", ui::Color::dark_cyan(), &bitmap_icon_peripherals, [&nav](){ nav.push(); } }, { "Temperature", ui::Color::dark_cyan(), &bitmap_icon_temperature, [&nav](){ nav.push(); } }, - { "Buttons test", ui::Color::dark_cyan(), &bitmap_icon_controls, [&nav](){ nav.push(); } }, + { "Buttons Test", ui::Color::dark_cyan(), &bitmap_icon_controls, [&nav](){ nav.push(); } }, }); set_max_rows(2); // allow wider buttons } diff --git a/firmware/application/apps/ui_debug.hpp b/firmware/application/apps/ui_debug.hpp index 1e3d60035..19118721c 100644 --- a/firmware/application/apps/ui_debug.hpp +++ b/firmware/application/apps/ui_debug.hpp @@ -43,6 +43,8 @@ public: void focus() override; + std::string title() const override { return "Memory"; }; + private: Text text_title { { 96, 96, 48, 16 }, @@ -113,6 +115,8 @@ public: void focus() override; + std::string title() const override { return "Temperature"; }; + private: Text text_title { { 76, 16, 240, 16 }, @@ -252,6 +256,8 @@ public: void focus() override; + std::string title() const override { return "Buttons Test"; }; + private: Text text_title { { 64, 16, 184, 16 }, diff --git a/firmware/application/apps/ui_encoders.hpp b/firmware/application/apps/ui_encoders.hpp index ee311e389..7eef80d51 100644 --- a/firmware/application/apps/ui_encoders.hpp +++ b/firmware/application/apps/ui_encoders.hpp @@ -158,7 +158,7 @@ public: void focus() override; - std::string title() const override { return "OOK transmit"; }; + std::string title() const override { return "OOK TX"; }; private: NavigationView& nav_; diff --git a/firmware/application/apps/ui_jammer.hpp b/firmware/application/apps/ui_jammer.hpp index 8158a6f77..13869262b 100644 --- a/firmware/application/apps/ui_jammer.hpp +++ b/firmware/application/apps/ui_jammer.hpp @@ -106,7 +106,7 @@ public: void focus() override; - std::string title() const override { return "Jammer"; }; + std::string title() const override { return "Jammer TX"; }; private: NavigationView& nav_; diff --git a/firmware/application/apps/ui_keyfob.hpp b/firmware/application/apps/ui_keyfob.hpp index 7f28d554b..0c723340c 100644 --- a/firmware/application/apps/ui_keyfob.hpp +++ b/firmware/application/apps/ui_keyfob.hpp @@ -36,7 +36,7 @@ public: void focus() override; - std::string title() const override { return "Keyfob (BETA)"; }; + std::string title() const override { return "Key fob TX (beta)"; }; private: NavigationView& nav_; diff --git a/firmware/application/apps/ui_lcr.hpp b/firmware/application/apps/ui_lcr.hpp index a9c7548ac..096a597af 100644 --- a/firmware/application/apps/ui_lcr.hpp +++ b/firmware/application/apps/ui_lcr.hpp @@ -39,7 +39,7 @@ public: void focus() override; - std::string title() const override { return "LCR transmit"; }; + std::string title() const override { return "TEDI/LCR TX"; }; private: struct scan_list_t { diff --git a/firmware/application/apps/ui_mictx.hpp b/firmware/application/apps/ui_mictx.hpp index aaab059cb..9b091e53f 100644 --- a/firmware/application/apps/ui_mictx.hpp +++ b/firmware/application/apps/ui_mictx.hpp @@ -58,7 +58,7 @@ public: }; */ - std::string title() const override { return "Mic TX RX"; }; + std::string title() const override { return "Microphone"; }; private: static constexpr uint32_t sampling_rate = 1536000U; diff --git a/firmware/application/apps/ui_rds.hpp b/firmware/application/apps/ui_rds.hpp index 6e6e07978..35d80ba4f 100644 --- a/firmware/application/apps/ui_rds.hpp +++ b/firmware/application/apps/ui_rds.hpp @@ -144,7 +144,7 @@ public: void focus() override; - std::string title() const override { return "RDS transmit"; }; + std::string title() const override { return "RDS TX"; }; private: NavigationView& nav_; diff --git a/firmware/application/apps/ui_scanner.hpp b/firmware/application/apps/ui_scanner.hpp index 3936904ed..caa571f9c 100644 --- a/firmware/application/apps/ui_scanner.hpp +++ b/firmware/application/apps/ui_scanner.hpp @@ -111,7 +111,7 @@ public: .foreground = Color::red(), }; - std::string title() const override { return "SCANNER"; }; + std::string title() const override { return "Scanner"; }; std::vector frequency_list{ }; std::vector description_list { }; diff --git a/firmware/application/apps/ui_sd_wipe.hpp b/firmware/application/apps/ui_sd_wipe.hpp index 6d49b6f4f..fc593f160 100644 --- a/firmware/application/apps/ui_sd_wipe.hpp +++ b/firmware/application/apps/ui_sd_wipe.hpp @@ -38,7 +38,7 @@ public: ~WipeSDView(); void focus() override; - std::string title() const override { return "Wipe FAT"; }; + std::string title() const override { return "Wipe SD Card"; }; private: NavigationView& nav_; diff --git a/firmware/application/apps/ui_settings.cpp b/firmware/application/apps/ui_settings.cpp index a928ea430..5b3cc4d3e 100644 --- a/firmware/application/apps/ui_settings.cpp +++ b/firmware/application/apps/ui_settings.cpp @@ -348,10 +348,10 @@ SettingsMenuView::SettingsMenuView(NavigationView& nav) { add_items({ { "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(); } }, + { "User Interface", ui::Color::dark_cyan(), &bitmap_icon_options_ui, [&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(); } }, - { "QR code", ui::Color::dark_cyan(), &bitmap_icon_qr_code, [&nav](){ nav.push(); } } + { "Calibration", ui::Color::dark_cyan(), &bitmap_icon_options_touch, [&nav](){ nav.push(); } }, + { "QR Code", ui::Color::dark_cyan(), &bitmap_icon_qr_code, [&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 03bb4e8cc..68c1e7507 100644 --- a/firmware/application/apps/ui_settings.hpp +++ b/firmware/application/apps/ui_settings.hpp @@ -47,7 +47,7 @@ public: void focus() override; - std::string title() const override { return "Set Date/Time"; }; + std::string title() const override { return "Date/Time"; }; private: Labels labels { @@ -322,7 +322,7 @@ public: void focus() override; - std::string title() const override { return "QR code"; }; + std::string title() const override { return "QR Code"; }; private: Checkbox checkbox_bigger_qr { diff --git a/firmware/application/apps/ui_siggen.hpp b/firmware/application/apps/ui_siggen.hpp index 5abcdd855..f55d19d1f 100644 --- a/firmware/application/apps/ui_siggen.hpp +++ b/firmware/application/apps/ui_siggen.hpp @@ -40,7 +40,7 @@ public: void focus() override; - std::string title() const override { return "Generator"; }; + std::string title() const override { return "Signal gen"; }; private: void start_tx(); diff --git a/firmware/application/ui_navigation.cpp b/firmware/application/ui_navigation.cpp index 435a7b735..601112c1d 100644 --- a/firmware/application/ui_navigation.cpp +++ b/firmware/application/ui_navigation.cpp @@ -522,14 +522,14 @@ 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(); } }, + { "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(); } }, + { "WAV 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(); } }, + { "Wipe SD Card", ui::Color::red(), &bitmap_icon_tools_wipesd, [&nav](){ nav.push(); } }, }); set_max_rows(2); // allow wider buttons } @@ -553,12 +553,12 @@ SystemMenuView::SystemMenuView(NavigationView& nav) { { "Transmit", ui::Color::cyan(), &bitmap_icon_transmit, [&nav](){ nav.push(); } }, { "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(); } }, + { "Search", ui::Color::yellow(), &bitmap_icon_search, [&nav](){ nav.push(); } }, { "Scanner", ui::Color::yellow(), &bitmap_icon_scanner, [&nav](){ nav.push(); } }, { "Microphone", ui::Color::yellow(), &bitmap_icon_microphone,[&nav](){ nav.push(); } }, { "Looking Glass", ui::Color::yellow(), &bitmap_icon_looking, [&nav](){ nav.push(); } }, - { "Tools", ui::Color::cyan(), &bitmap_icon_utilities, [&nav](){ nav.push(); } }, - { "Options", ui::Color::cyan(), &bitmap_icon_setup, [&nav](){ nav.push(); } }, + { "Utilities", ui::Color::cyan(), &bitmap_icon_utilities, [&nav](){ nav.push(); } }, + { "Settings", ui::Color::cyan(), &bitmap_icon_setup, [&nav](){ nav.push(); } }, { "Debug", ui::Color::light_grey(), &bitmap_icon_debug, [&nav](){ nav.push(); } }, { "HackRF", ui::Color::cyan(), &bitmap_icon_hackrf, [this, &nav](){ hackrf_mode(nav); } }, //{ "About", ui::Color::cyan(), nullptr, [&nav](){ nav.push(); } } diff --git a/firmware/application/ui_navigation.hpp b/firmware/application/ui_navigation.hpp index 68723744d..d0e3b03f1 100644 --- a/firmware/application/ui_navigation.hpp +++ b/firmware/application/ui_navigation.hpp @@ -248,14 +248,14 @@ namespace ui { public: ReceiversMenuView(NavigationView &nav); - std::string title() const override { return "Receivers"; }; + std::string title() const override { return "Receive"; }; }; class TransmittersMenuView : public BtnGridView { public: TransmittersMenuView(NavigationView &nav); - std::string title() const override { return "Transmitters"; }; + std::string title() const override { return "Transmit"; }; }; class UtilitiesMenuView : public BtnGridView diff --git a/firmware/application/ui_sd_card_debug.hpp b/firmware/application/ui_sd_card_debug.hpp index 170c2a68e..56253c533 100644 --- a/firmware/application/ui_sd_card_debug.hpp +++ b/firmware/application/ui_sd_card_debug.hpp @@ -38,6 +38,8 @@ public: void focus() override; + std::string title() const override { return "SD Card"; }; + private: SignalToken sd_card_status_signal_token { };