diff options
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/screen_settings.cpp | 10 | ||||
| -rw-r--r-- | src/ui/ui_fsm.cpp | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/ui/screen_settings.cpp b/src/ui/screen_settings.cpp index 63964da3..a480f920 100644 --- a/src/ui/screen_settings.cpp +++ b/src/ui/screen_settings.cpp @@ -138,10 +138,10 @@ Bluetooth::Bluetooth(drivers::Bluetooth& bt, drivers::NvsStorage& nvs) auto Bluetooth::ChangeEnabledState(bool enabled) -> void { if (enabled) { events::System().RunOnTask([&]() { bt_.Enable(); }); - nvs_.OutputMode(drivers::NvsStorage::Output::kBluetooth).get(); + nvs_.OutputMode(drivers::NvsStorage::Output::kBluetooth); } else { events::System().RunOnTask([&]() { bt_.Disable(); }); - nvs_.OutputMode(drivers::NvsStorage::Output::kHeadphones).get(); + nvs_.OutputMode(drivers::NvsStorage::Output::kHeadphones); } events::Audio().Dispatch(audio::OutputModeChanged{}); RefreshDevicesList(); @@ -156,7 +156,7 @@ auto Bluetooth::RefreshDevicesList() -> void { auto devices = bt_.KnownDevices(); std::optional<drivers::bluetooth::mac_addr_t> preferred_device = - nvs_.PreferredBluetoothDevice().get(); + nvs_.PreferredBluetoothDevice(); // If the user's current selection is within the devices list, then we need // to be careful not to rearrange the list items underneath them. @@ -283,7 +283,7 @@ Headphones::Headphones(drivers::NvsStorage& nvs) "before clipping (+10dB)\nCustom"); lv_group_add_obj(group_, vol_dropdown); - uint16_t level = nvs.AmpMaxVolume().get(); + uint16_t level = nvs.AmpMaxVolume(); for (int i = 0; i < index_to_level_.size() + 1; i++) { if (i == index_to_level_.size() || index_to_level_[i] == level) { lv_dropdown_set_selected(vol_dropdown, i); @@ -386,7 +386,7 @@ Appearance::Appearance(drivers::NvsStorage& nvs, drivers::Display& display) lv_obj_t* toggle = lv_switch_create(toggle_container); lv_group_add_obj(group_, toggle); - uint_fast8_t initial_brightness = nvs_.ScreenBrightness().get(); + uint_fast8_t initial_brightness = nvs_.ScreenBrightness(); lv_obj_t* brightness_label = lv_label_create(content_); lv_label_set_text(brightness_label, "Brightness"); diff --git a/src/ui/ui_fsm.cpp b/src/ui/ui_fsm.cpp index 62fd46f1..fa4939f3 100644 --- a/src/ui/ui_fsm.cpp +++ b/src/ui/ui_fsm.cpp @@ -141,7 +141,7 @@ void Splash::react(const system_fsm::BootComplete& ev) { lv_disp_set_theme(NULL, base_theme); themes::Theme::instance()->Apply(); - sDisplay->SetBrightness(sServices->nvs().ScreenBrightness().get()); + sDisplay->SetBrightness(sServices->nvs().ScreenBrightness()); auto touchwheel = sServices->touchwheel(); if (touchwheel) { @@ -153,7 +153,7 @@ void Splash::react(const system_fsm::BootComplete& ev) { ESP_LOGE(kTag, "no input devices initialised!"); } - if (sServices->nvs().HasShownOnboarding().get()) { + if (sServices->nvs().HasShownOnboarding()) { transit<Browse>(); } else { transit<Onboarding>(); |