From bedaa08f560063ce64514108d67d84a90321ad90 Mon Sep 17 00:00:00 2001 From: Michele Bini Date: Sun, 27 Mar 2022 09:22:39 +0200 Subject: Revert "this appears to fix a simulator crash!" This reverts commit bde464a7844fd51daf73b9ec939fbd9412424a5e. diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp index 01dd534..b71e333 100644 --- a/src/displayapp/screens/settings/Settings.cpp +++ b/src/displayapp/screens/settings/Settings.cpp @@ -17,9 +17,6 @@ Settings::Settings(Pinetime::Applications::DisplayApp* app, Pinetime::Controller [this]() -> std::unique_ptr { return CreateScreen1(); }, - [this]() -> std::unique_ptr { - return CreateScreen2(); - }, }, Screens::ScreenListModes::UpDown} { } @@ -37,20 +34,10 @@ std::unique_ptr Settings::CreateScreen1() { {Symbols::sun, "Display", Apps::SettingDisplay}, {Symbols::eye, "Wake Up", Apps::SettingWakeUp}, {Symbols::clock, "Time format", Apps::SettingTimeFormat}, - {Symbols::none, "None", Apps::None} + {Symbols::check, "Firmware", Apps::FirmwareValidation}, }}; return std::make_unique(0, 1, app, settingsController, applications); } -std::unique_ptr Settings::CreateScreen2() { - std::array applications {{ - {Symbols::tachometer, "Shake Calib.", Apps::SettingShakeThreshold}, - {Symbols::check, "Firmware", Apps::FirmwareValidation}, - {Symbols::none, "None", Apps::None}, - {Symbols::none, "None", Apps::None} -}}; - - return std::make_unique(1, 2, app, settingsController, applications); -} -- cgit v0.10.2