3 files changed, 10 insertions(+), 8 deletions(-)

M image/user/db/settings_bell_002.sql
M products/BellHybrid/apps/application-bell-settings/include/application-bell-settings/models/TimeUnitsModel.hpp
M products/BellHybrid/services/audio/ServiceAudio.cpp

@@ 33,12 33,12 @@ INSERT OR IGNORE INTO settings_tab (path, value) VALUES
     ('temperature_unit', 'C'),
     ('snooze_active', '1'),
     ('snooze_length','10'),
-    ('snooze_interval','1'),
+    ('snooze_interval','0'),
     ('snooze_tone','Gentle Chime'),
-    ('prewake_up_duration', '10'),
+    ('prewake_up_duration', '0'),
     ('prewake_up_tone','Joyful Awakening'),
-    ('prewake_up_light_duration','10'),
-    ('alarm_tone','Gentle Daybreak'),
+    ('prewake_up_light_duration','0'),
+    ('alarm_tone','Brand New Morning'),
     ('alarm_light_active','1'),
     ('alarm_duration','10000'),
     ('bedtime_active','0'),

@@ 63,7 63,7 @@ namespace app::bell_settings
         auto loadData() -> void override;
 
       private:
-        static constexpr int factoryResetTime    = 12; // noon
+        static constexpr int factoryResetTime    = 12 * 60 * 60; // 12:00 PM
         static constexpr auto factoryRestTimeFmt = utils::time::Locale::TimeFormat::FormatTime12H;
     };
 } // namespace app::bell_settings

@@ 12,6 12,8 @@ namespace
 {
     constexpr auto stackSize            = 1024 * 4;
     constexpr auto defaultVolume        = "5";
+    constexpr auto defaultSnoozeVolume  = "4";
+    constexpr auto defaultBedtimeVolume = "6";
     constexpr audio::Volume maxInVolume = 10;
     constexpr audio::Volume minVolume   = 0;
     constexpr auto profileType          = audio::Profile::Type::PlaybackLoudspeaker;


@@ 23,9 25,9 @@ namespace
             {DbPathElement{Setting::Volume, PlaybackType::Meditation, Profile::Type::PlaybackLoudspeaker},defaultVolume},
             {DbPathElement{Setting::Volume, PlaybackType::Multimedia, Profile::Type::PlaybackLoudspeaker},defaultVolume},
             {DbPathElement{Setting::Volume, PlaybackType::Alarm, Profile::Type::PlaybackLoudspeaker}, defaultVolume},
-            {DbPathElement{Setting::Volume, PlaybackType::Bedtime, Profile::Type::PlaybackLoudspeaker}, defaultVolume},
-            {DbPathElement{Setting::Volume, PlaybackType::PreWakeUp, Profile::Type::PlaybackLoudspeaker},defaultVolume},
-            {DbPathElement{Setting::Volume, PlaybackType::Snooze, Profile::Type::PlaybackLoudspeaker}, defaultVolume},
+            {DbPathElement{Setting::Volume, PlaybackType::Bedtime, Profile::Type::PlaybackLoudspeaker}, defaultBedtimeVolume},
+            {DbPathElement{Setting::Volume, PlaybackType::PreWakeUp, Profile::Type::PlaybackLoudspeaker},defaultSnoozeVolume},
+            {DbPathElement{Setting::Volume, PlaybackType::Snooze, Profile::Type::PlaybackLoudspeaker}, defaultSnoozeVolume},
 
             /// Profiles below are not used but unfortunately, must exist in order to satisfy audio module requirements
             {DbPathElement{Setting::Volume, PlaybackType::Meditation, Profile::Type::PlaybackHeadphones},defaultVolume},