From 7ce1d5d18ca65166b9420931cd98a48014a113c9 Mon Sep 17 00:00:00 2001 From: Dawid Wojtas Date: Fri, 9 Dec 2022 11:08:39 +0100 Subject: [PATCH] [BH-1619] Use default brightness If there is no record in the database using the default brightness. --- .../alarms/src/actions/FrontlightAction.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/products/BellHybrid/alarms/src/actions/FrontlightAction.cpp b/products/BellHybrid/alarms/src/actions/FrontlightAction.cpp index f53a78ce7b9c05dbd553f875fcc1aeef742a292a..d52de1a65ab5cbe9d1381360208fb6f30eb64717 100644 --- a/products/BellHybrid/alarms/src/actions/FrontlightAction.cpp +++ b/products/BellHybrid/alarms/src/actions/FrontlightAction.cpp @@ -13,6 +13,18 @@ namespace alarms { + namespace + { + void validateBrightness(std::string &brightness) + { + constexpr std::string_view DefaultBrightness{"50.0"}; + + if (brightness.empty()) { + brightness = DefaultBrightness; + } + } + } // namespace + namespace { screen_light_control::Sender translateDependency(FrontlightAction::SettingsDependency dependency) @@ -136,7 +148,7 @@ namespace alarms { std::string brightnessString = settings.getValue(bell::settings::Alarm::brightness, settings::SettingsScope::Global); - + validateBrightness(brightnessString); screen_light_control::ManualModeParameters params{}; params.manualModeBrightness = utils::toNumeric(brightnessString); @@ -195,6 +207,7 @@ namespace alarms std::string brightnessString = settings.getValue(bell::settings::PrewakeUp::brightness, settings::SettingsScope::Global); + validateBrightness(brightnessString); const auto value = settings.getValue(bell::settings::PrewakeUp::lightDuration, settings::SettingsScope::Global); const auto lightDuration = std::chrono::minutes{utils::toNumeric(value)}; const auto secondTargetDuration = lightDuration - std::chrono::minutes{1} - firstTargetDuration;