diff --git a/firmware/application/apps/ui_settings.cpp b/firmware/application/apps/ui_settings.cpp index c25133aa..3174c5a0 100644 --- a/firmware/application/apps/ui_settings.cpp +++ b/firmware/application/apps/ui_settings.cpp @@ -674,32 +674,6 @@ void SetAudioView::focus() { button_save.focus(); } -/* SetQRCodeView *****************************************/ - -SetQRCodeView::SetQRCodeView(NavigationView& nav) { - add_children({ - &labels, - &checkbox_bigger_qr, - &button_save, - &button_cancel, - }); - - checkbox_bigger_qr.set_value(pmem::show_bigger_qr_code()); - - button_save.on_select = [&nav, this](Button&) { - pmem::set_show_bigger_qr_code(checkbox_bigger_qr.value()); - nav.pop(); - }; - - button_cancel.on_select = [&nav, this](Button&) { - nav.pop(); - }; -} - -void SetQRCodeView::focus() { - button_save.focus(); -} - /* SetEncoderDialView ************************************/ SetEncoderDialView::SetEncoderDialView(NavigationView& nav) { @@ -1098,7 +1072,6 @@ void SettingsMenuView::on_populate() { {"Radio", ui::Color::dark_cyan(), &bitmap_icon_options_radio, [this]() { nav_.push(); }}, {"SD Card", ui::Color::dark_cyan(), &bitmap_icon_sdcard, [this]() { nav_.push(); }}, {"User Interface", ui::Color::dark_cyan(), &bitmap_icon_options_ui, [this]() { nav_.push(); }}, - //{"QR Code", ui::Color::dark_cyan(), &bitmap_icon_qr_code, [this]() { nav_.push(); }}, {"Display", ui::Color::dark_cyan(), &bitmap_icon_brightness, [this]() { nav_.push(); }}, {"Menu Color", ui::Color::dark_cyan(), &bitmap_icon_brightness, [this]() { nav_.push(); }}, {"Theme", ui::Color::dark_cyan(), &bitmap_icon_setup, [this]() { nav_.push(); }}, diff --git a/firmware/application/apps/ui_settings.hpp b/firmware/application/apps/ui_settings.hpp index 03eb8bdb..201d6417 100644 --- a/firmware/application/apps/ui_settings.hpp +++ b/firmware/application/apps/ui_settings.hpp @@ -545,35 +545,6 @@ class SetAudioView : public View { }; }; -class SetQRCodeView : public View { - public: - SetQRCodeView(NavigationView& nav); - - void focus() override; - - std::string title() const override { return "QR Code"; }; - - private: - Labels labels{ - {{1 * 8, 1 * 16}, "Change the size of the QR", Theme::getInstance()->fg_light->foreground}, - {{1 * 8, 2 * 16}, "code shown in Radiosonde.", Theme::getInstance()->fg_light->foreground}, - }; - - Checkbox checkbox_bigger_qr{ - {3 * 8, 4 * 16}, - 20, - "Show large QR code"}; - - Button button_save{ - {2 * 8, 16 * 16, 12 * 8, 32}, - "Save"}; - - Button button_cancel{ - {16 * 8, 16 * 16, 12 * 8, 32}, - "Cancel", - }; -}; - using portapack::persistent_memory::encoder_dial_direction; using portapack::persistent_memory::encoder_dial_sensitivity; using portapack::persistent_memory::encoder_rate_multiplier; diff --git a/firmware/common/portapack_persistent_memory.cpp b/firmware/common/portapack_persistent_memory.cpp index 8fb32c4f..a9c12c92 100644 --- a/firmware/common/portapack_persistent_memory.cpp +++ b/firmware/common/portapack_persistent_memory.cpp @@ -103,7 +103,7 @@ struct ui_config_t { uint8_t show_gui_return_icon : 1; uint8_t load_app_settings : 1; uint8_t save_app_settings : 1; - uint8_t show_large_qr_code : 1; + uint8_t UNUSED_1 : 1; // Deprecated, but bit can be set by older firmware bool disable_touchscreen : 1; bool hide_clock : 1; @@ -603,10 +603,6 @@ bool show_gui_return_icon() { // add return icon in touchscreen menu return data->ui_config.show_gui_return_icon != 0; } -bool show_bigger_qr_code() { // show bigger QR code - return data->ui_config.show_large_qr_code != 0; -} - bool disable_touchscreen() { // Option to disable touch screen return data->ui_config.disable_touchscreen; } @@ -684,10 +680,6 @@ void set_save_app_settings(bool v) { data->ui_config.save_app_settings = v ? 1 : 0; } -void set_show_bigger_qr_code(bool v) { - data->ui_config.show_large_qr_code = v ? 1 : 0; -} - void set_disable_touchscreen(bool v) { data->ui_config.disable_touchscreen = v; } @@ -1270,7 +1262,7 @@ bool debug_dump() { pmem_dump_file.write_line("ui_config show_gui_return_icon: " + to_string_dec_uint(data->ui_config.show_gui_return_icon)); pmem_dump_file.write_line("ui_config load_app_settings: " + to_string_dec_uint(data->ui_config.load_app_settings)); pmem_dump_file.write_line("ui_config save_app_settings: " + to_string_dec_uint(data->ui_config.save_app_settings)); - pmem_dump_file.write_line("ui_config show_bigger_qr_code: " + to_string_dec_uint(data->ui_config.show_large_qr_code)); + // pmem_dump_file.write_line("ui_config show_bigger_qr_code: " + to_string_dec_uint(data->ui_config.show_large_qr_code)); pmem_dump_file.write_line("ui_config disable_touchscreen: " + to_string_dec_uint(data->ui_config.disable_touchscreen)); pmem_dump_file.write_line("ui_config hide_clock: " + to_string_dec_uint(data->ui_config.hide_clock)); pmem_dump_file.write_line("ui_config clock_with_date: " + to_string_dec_uint(data->ui_config.clock_show_date)); diff --git a/firmware/common/portapack_persistent_memory.hpp b/firmware/common/portapack_persistent_memory.hpp index 90041ee2..18395db2 100644 --- a/firmware/common/portapack_persistent_memory.hpp +++ b/firmware/common/portapack_persistent_memory.hpp @@ -205,7 +205,6 @@ bool config_converter(); bool config_updown_converter(); int64_t config_converter_freq(); bool show_gui_return_icon(); -bool show_bigger_qr_code(); bool hide_clock(); bool clock_with_date(); bool config_login(); @@ -217,7 +216,6 @@ bool disable_touchscreen(); void set_gui_return_icon(bool v); void set_load_app_settings(bool v); void set_save_app_settings(bool v); -void set_show_bigger_qr_code(bool v); void set_config_disable_external_tcxo(bool v); void set_config_sdcard_high_speed_io(bool v, bool save); void set_config_disable_config_mode(bool v);