M products/BellHybrid/apps/application-bell-bedtime/ApplicationBellBedtime.cpp => products/BellHybrid/apps/application-bell-bedtime/ApplicationBellBedtime.cpp +3 -2
@@ 13,8 13,9 @@ namespace app
ApplicationBellBedtime::ApplicationBellBedtime(std::string name,
std::string parent,
StatusIndicators statusIndicators,
- StartInBackground startInBackground)
- : Application(name, parent, statusIndicators, startInBackground)
+ StartInBackground startInBackground,
+ uint32_t stackDepth)
+ : Application(name, parent, statusIndicators, startInBackground, stackDepth)
{}
sys::ReturnCodes ApplicationBellBedtime::InitHandler()
M products/BellHybrid/apps/application-bell-bedtime/include/application-bell-bedtime/ApplicationBellBedtime.hpp => products/BellHybrid/apps/application-bell-bedtime/include/application-bell-bedtime/ApplicationBellBedtime.hpp +2 -1
@@ 22,7 22,8 @@ namespace app
explicit ApplicationBellBedtime(std::string name = applicationBellBedtimeName,
std::string parent = "",
StatusIndicators statusIndicators = StatusIndicators{},
- StartInBackground startInBackground = {false});
+ StartInBackground startInBackground = {false},
+ uint32_t stackDepth = 4096 * 2);
auto InitHandler() -> sys::ReturnCodes override;
M products/BellHybrid/apps/application-bell-main/windows/BellMainMenuWindow.cpp => products/BellHybrid/apps/application-bell-main/windows/BellMainMenuWindow.cpp +0 -2
@@ 50,10 50,8 @@ namespace gui
addAppMenu(utils::translate("app_bellmain_alarm"), app::applicationBellAlarmName);
addAppMenu(utils::translate("app_bellmain_power_nap"), app::applicationBellPowerNapName);
addAppMenu(utils::translate("app_bellmain_background_sounds"), app::applicationBellBackgroundSoundsName);
- // for demo only - to be replaced by call o final window
addAppMenu(utils::translate("app_bellmain_meditation_timer"), app::applicationBellMeditationTimerName);
addAppMenu(utils::translate("app_bellmain_bedtime"), app::applicationBellBedtimeName);
-
addAppMenu(utils::translate("app_bellmain_settings"), app::applicationBellSettingsName);
return menuOptionList;
M products/BellHybrid/apps/application-bell-meditation-timer/ApplicationBellMeditationTimer.cpp => products/BellHybrid/apps/application-bell-meditation-timer/ApplicationBellMeditationTimer.cpp +3 -2
@@ 16,8 16,9 @@ namespace app
ApplicationBellMeditationTimer::ApplicationBellMeditationTimer(std::string name,
std::string parent,
StatusIndicators statusIndicators,
- StartInBackground startInBackground)
- : Application(std::move(name), std::move(parent), statusIndicators, startInBackground)
+ StartInBackground startInBackground,
+ uint32_t stackDepth)
+ : Application(std::move(name), std::move(parent), statusIndicators, startInBackground, stackDepth)
{}
ApplicationBellMeditationTimer::~ApplicationBellMeditationTimer() = default;
M products/BellHybrid/apps/application-bell-meditation-timer/include/application-bell-meditation-timer/ApplicationBellMeditationTimer.hpp => products/BellHybrid/apps/application-bell-meditation-timer/include/application-bell-meditation-timer/ApplicationBellMeditationTimer.hpp +2 -1
@@ 25,7 25,8 @@ namespace app
ApplicationBellMeditationTimer(std::string name = applicationBellMeditationTimerName,
std::string parent = "",
StatusIndicators statusIndicators = StatusIndicators{},
- StartInBackground startInBackground = {false});
+ StartInBackground startInBackground = {false},
+ uint32_t stackDepth = 4096 * 2);
~ApplicationBellMeditationTimer();
sys::ReturnCodes InitHandler() override;
M products/BellHybrid/apps/application-bell-powernap/ApplicationBellPowerNap.cpp => products/BellHybrid/apps/application-bell-powernap/ApplicationBellPowerNap.cpp +3 -2
@@ 17,8 17,9 @@ namespace app
ApplicationBellPowerNap::ApplicationBellPowerNap(std::string name,
std::string parent,
StatusIndicators statusIndicators,
- StartInBackground startInBackground)
- : Application(std::move(name), std::move(parent), statusIndicators, startInBackground)
+ StartInBackground startInBackground,
+ uint32_t stackDepth)
+ : Application(std::move(name), std::move(parent), statusIndicators, startInBackground, stackDepth)
{}
ApplicationBellPowerNap::~ApplicationBellPowerNap() = default;
M products/BellHybrid/apps/application-bell-powernap/include/application-bell-powernap/ApplicationBellPowerNap.hpp => products/BellHybrid/apps/application-bell-powernap/include/application-bell-powernap/ApplicationBellPowerNap.hpp +4 -3
@@ 7,9 7,9 @@
namespace gui::window::name
{
- inline constexpr auto powernapProgress = "PowerNapProgressWindow";
+ inline constexpr auto powernapProgress = "PowerNapProgressWindow";
inline constexpr auto powernapSessionEnded = "PowerNapSessionEndedWindow";
-}
+} // namespace gui::window::name
namespace app
{
namespace powernap
@@ 25,7 25,8 @@ namespace app
ApplicationBellPowerNap(std::string name = applicationBellPowerNapName,
std::string parent = "",
StatusIndicators statusIndicators = StatusIndicators{},
- StartInBackground startInBackground = {false});
+ StartInBackground startInBackground = {false},
+ uint32_t stackDepth = 4096 * 2);
~ApplicationBellPowerNap();
sys::ReturnCodes InitHandler() override;
M products/BellHybrid/apps/application-bell-settings/ApplicationBellSettings.cpp => products/BellHybrid/apps/application-bell-settings/ApplicationBellSettings.cpp +8 -7
@@ 46,8 46,9 @@ namespace app
ApplicationBellSettings::ApplicationBellSettings(std::string name,
std::string parent,
StatusIndicators statusIndicators,
- StartInBackground startInBackground)
- : Application(std::move(name), std::move(parent), statusIndicators, startInBackground)
+ StartInBackground startInBackground,
+ uint32_t stackDepth)
+ : Application(std::move(name), std::move(parent), statusIndicators, startInBackground, stackDepth)
{}
sys::ReturnCodes ApplicationBellSettings::InitHandler()
@@ 211,16 212,16 @@ namespace app
return std::make_unique<gui::AboutYourBellWindow>(app, std::move(aboutYourBellPresenter));
});
+ windowsFactory.attach(gui::window::name::bellSettingsFactoryReset,
+ [](ApplicationCommon *app, const std::string &name) {
+ return std::make_unique<gui::BellDialogYesNo>(app, name);
+ });
+
attachPopups({gui::popup::ID::AlarmActivated,
gui::popup::ID::AlarmDeactivated,
gui::popup::ID::PowerOff,
gui::popup::ID::Reboot,
gui::popup::ID::BedtimeNotification});
-
- windowsFactory.attach(gui::window::name::bellSettingsFactoryReset,
- [](ApplicationCommon *app, const std::string &name) {
- return std::make_unique<gui::BellDialogYesNo>(app, name);
- });
}
sys::MessagePointer ApplicationBellSettings::DataReceivedHandler(sys::DataMessage *msgl, sys::ResponseMessage *resp)
M products/BellHybrid/apps/application-bell-settings/include/application-bell-settings/ApplicationBellSettings.hpp => products/BellHybrid/apps/application-bell-settings/include/application-bell-settings/ApplicationBellSettings.hpp +11 -10
@@ 8,15 8,15 @@
namespace gui::window::name
{
- inline constexpr auto bellSettings = "BellSettings";
- inline constexpr auto bellSettingsAdvanced = "BellSettingsAdvanced";
- inline constexpr auto bellSettingsTimeUnits = "BellSettingsTimeUnits";
- inline constexpr auto bellSettingsDialog = "BellSettingsDialog";
- inline constexpr auto bellSettingsFinished = "BellSettingsFinished";
- inline constexpr auto bellSettingsFrontlight = "BellSettingsFrontlight";
- inline constexpr auto bellSettingsHomeView = "BellSettingsHomeView";
- inline constexpr auto bellSettingsLanguage = "BellSettingsLanguage";
- inline constexpr auto bellSettingsBedtimeTone = "BellSettingsBedtimeTone";
+ inline constexpr auto bellSettings = "BellSettings";
+ inline constexpr auto bellSettingsAdvanced = "BellSettingsAdvanced";
+ inline constexpr auto bellSettingsTimeUnits = "BellSettingsTimeUnits";
+ inline constexpr auto bellSettingsDialog = "BellSettingsDialog";
+ inline constexpr auto bellSettingsFinished = "BellSettingsFinished";
+ inline constexpr auto bellSettingsFrontlight = "BellSettingsFrontlight";
+ inline constexpr auto bellSettingsHomeView = "BellSettingsHomeView";
+ inline constexpr auto bellSettingsLanguage = "BellSettingsLanguage";
+ inline constexpr auto bellSettingsBedtimeTone = "BellSettingsBedtimeTone";
inline constexpr auto bellSettingsFactoryReset = "BellSettingsFactoryReset";
} // namespace gui::window::name
@@ 30,7 30,8 @@ namespace app
ApplicationBellSettings(std::string name = applicationBellSettingsName,
std::string parent = "",
StatusIndicators statusIndicators = StatusIndicators{},
- StartInBackground startInBackground = {false});
+ StartInBackground startInBackground = {false},
+ uint32_t stackDepth = 4096 * 2);
sys::ReturnCodes InitHandler() override;