From e8babd16d5be8349a4b34fef636fab18ac606e1a Mon Sep 17 00:00:00 2001 From: Mateusz Date: Thu, 29 Aug 2019 11:40:31 +0200 Subject: [PATCH] WiP: Removed unneeded WakeUp/GoSleep handlers WiP: Added new handler - > SwitchPowerMode --- .../ApplicationCalendar.cpp | 8 --- .../ApplicationCalendar.hpp | 4 +- .../application-call/ApplicationCall.cpp | 9 --- .../application-call/ApplicationCall.hpp | 4 +- .../application-clock/ApplicationClock.cpp | 9 --- .../application-clock/ApplicationClock.hpp | 4 +- .../ApplicationDesktop.cpp | 9 --- .../ApplicationDesktop.hpp | 4 +- .../application-notes/ApplicationNotes.cpp | 9 --- .../application-notes/ApplicationNotes.hpp | 4 +- .../ApplicationPhonebook.cpp | 4 -- .../ApplicationPhonebook.hpp | 5 +- .../ApplicationSettings.cpp | 9 --- .../ApplicationSettings.hpp | 4 +- .../application-viewer/ApplicationViewer.cpp | 9 --- .../application-viewer/ApplicationViewer.hpp | 4 +- module-services/CMakeLists.txt | 1 - .../service-appmgr/ApplicationManager.cpp | 8 --- .../service-appmgr/ApplicationManager.hpp | 4 +- .../service-audio/ServiceAudio.cpp | 8 --- .../service-audio/ServiceAudio.hpp | 4 +- .../service-cellular/ServiceCellular.cpp | 9 --- .../service-cellular/ServiceCellular.hpp | 3 +- module-services/service-db/ServiceDB.cpp | 9 --- module-services/service-db/ServiceDB.hpp | 4 +- module-services/service-eink/ServiceEink.cpp | 9 --- module-services/service-eink/ServiceEink.hpp | 4 +- .../service-evtmgr/EventManager.cpp | 7 --- .../service-evtmgr/EventManager.hpp | 3 +- module-services/service-gui/ServiceGUI.cpp | 8 --- module-services/service-gui/ServiceGUI.hpp | 4 +- .../service-powermgr/CMakeLists.txt | 22 ------- module-services/service-powermgr/PowerMgr.cpp | 62 ------------------- module-services/service-powermgr/PowerMgr.hpp | 39 ------------ module-sys/Service/Common.hpp | 6 ++ module-sys/Service/Message.cpp | 10 +-- module-sys/Service/Message.hpp | 3 +- module-sys/Service/Service.hpp | 6 +- module-sys/SystemManager/SystemManager.cpp | 27 -------- module-sys/SystemManager/SystemManager.hpp | 12 +--- module-sys/tests/Common/SchedulerKiller.hpp | 4 +- module-sys/tests/Test1/CommandsService.cpp | 12 ---- module-sys/tests/Test1/CommandsService.hpp | 5 +- module-sys/tests/Test1/DelayedService.hpp | 10 +-- module-sys/tests/Test1/TestService1.hpp | 11 +--- source/main.cpp | 9 +-- 46 files changed, 41 insertions(+), 381 deletions(-) delete mode 100644 module-services/service-powermgr/CMakeLists.txt delete mode 100644 module-services/service-powermgr/PowerMgr.cpp delete mode 100644 module-services/service-powermgr/PowerMgr.hpp diff --git a/module-apps/application-calendar/ApplicationCalendar.cpp b/module-apps/application-calendar/ApplicationCalendar.cpp index 3e8d2e45e..687213bc0 100644 --- a/module-apps/application-calendar/ApplicationCalendar.cpp +++ b/module-apps/application-calendar/ApplicationCalendar.cpp @@ -43,14 +43,6 @@ sys::ReturnCodes ApplicationCalendar::DeinitHandler() { return sys::ReturnCodes::Success; } -sys::ReturnCodes ApplicationCalendar::WakeUpHandler() { - return sys::ReturnCodes::Success; -} - - -sys::ReturnCodes ApplicationCalendar::SleepHandler() { - return sys::ReturnCodes::Success; -} void ApplicationCalendar::createUserInterface() { diff --git a/module-apps/application-calendar/ApplicationCalendar.hpp b/module-apps/application-calendar/ApplicationCalendar.hpp index fb3b81a97..0318a35c1 100644 --- a/module-apps/application-calendar/ApplicationCalendar.hpp +++ b/module-apps/application-calendar/ApplicationCalendar.hpp @@ -29,8 +29,8 @@ public: void TickHandler(uint32_t id) override; sys::ReturnCodes InitHandler() override; sys::ReturnCodes DeinitHandler() override; - sys::ReturnCodes WakeUpHandler() override; - sys::ReturnCodes SleepHandler() override; + + sys::ReturnCodes SwitchPowerModeHandler(const sys::ServicePowerMode mode) override final{return sys::ReturnCodes::Success;} void createUserInterface() ; void destroyUserInterface(); diff --git a/module-apps/application-call/ApplicationCall.cpp b/module-apps/application-call/ApplicationCall.cpp index 91c555f2c..21c9e03b1 100644 --- a/module-apps/application-call/ApplicationCall.cpp +++ b/module-apps/application-call/ApplicationCall.cpp @@ -126,15 +126,6 @@ sys::ReturnCodes ApplicationCall::DeinitHandler() { return sys::ReturnCodes::Success; } -sys::ReturnCodes ApplicationCall::WakeUpHandler() { - return sys::ReturnCodes::Success; -} - - -sys::ReturnCodes ApplicationCall::SleepHandler() { - return sys::ReturnCodes::Success; -} - // Invoked when timer ticked, 3 seconds after end call event if user didn't press back button earlier. void ApplicationCall::TickHandler(uint32_t id) { ++callDuration; diff --git a/module-apps/application-call/ApplicationCall.hpp b/module-apps/application-call/ApplicationCall.hpp index 6ece346de..e6c8a4e9f 100644 --- a/module-apps/application-call/ApplicationCall.hpp +++ b/module-apps/application-call/ApplicationCall.hpp @@ -30,10 +30,10 @@ public: sys::Message_t DataReceivedHandler(sys::DataMessage* msgl,sys::ResponseMessage* resp) override; sys::ReturnCodes InitHandler() override; sys::ReturnCodes DeinitHandler() override; - sys::ReturnCodes WakeUpHandler() override; - sys::ReturnCodes SleepHandler() override; void TickHandler(uint32_t id) override; + sys::ReturnCodes SwitchPowerModeHandler(const sys::ServicePowerMode mode) override final{return sys::ReturnCodes::Success;} + void createUserInterface() ; void destroyUserInterface(); void setDisplayedNumber( std::string num ); diff --git a/module-apps/application-clock/ApplicationClock.cpp b/module-apps/application-clock/ApplicationClock.cpp index e4feb588e..8b1b9dd03 100644 --- a/module-apps/application-clock/ApplicationClock.cpp +++ b/module-apps/application-clock/ApplicationClock.cpp @@ -110,15 +110,6 @@ sys::ReturnCodes ApplicationClock::DeinitHandler() { return sys::ReturnCodes::Success; } -sys::ReturnCodes ApplicationClock::WakeUpHandler() { - return sys::ReturnCodes::Success; -} - - -sys::ReturnCodes ApplicationClock::SleepHandler() { - return sys::ReturnCodes::Success; -} - void ApplicationClock::createUserInterface() { gui::ClockMainWindow* mainWindow = new gui::ClockMainWindow(this); diff --git a/module-apps/application-clock/ApplicationClock.hpp b/module-apps/application-clock/ApplicationClock.hpp index 83468b4ee..f24d3e3dc 100644 --- a/module-apps/application-clock/ApplicationClock.hpp +++ b/module-apps/application-clock/ApplicationClock.hpp @@ -32,8 +32,8 @@ public: void TickHandler(uint32_t id) override; sys::ReturnCodes InitHandler() override; sys::ReturnCodes DeinitHandler() override; - sys::ReturnCodes WakeUpHandler() override; - sys::ReturnCodes SleepHandler() override; + + sys::ReturnCodes SwitchPowerModeHandler(const sys::ServicePowerMode mode) override final{return sys::ReturnCodes::Success;} void createUserInterface() ; void destroyUserInterface(); diff --git a/module-apps/application-desktop/ApplicationDesktop.cpp b/module-apps/application-desktop/ApplicationDesktop.cpp index 9663058b3..2cb2536fd 100644 --- a/module-apps/application-desktop/ApplicationDesktop.cpp +++ b/module-apps/application-desktop/ApplicationDesktop.cpp @@ -76,15 +76,6 @@ sys::ReturnCodes ApplicationDesktop::DeinitHandler() { return sys::ReturnCodes::Success; } -sys::ReturnCodes ApplicationDesktop::WakeUpHandler() { - return sys::ReturnCodes::Success; -} - - -sys::ReturnCodes ApplicationDesktop::SleepHandler() { - return sys::ReturnCodes::Success; -} - void ApplicationDesktop::createUserInterface() { gui::AppWindow* window = nullptr; diff --git a/module-apps/application-desktop/ApplicationDesktop.hpp b/module-apps/application-desktop/ApplicationDesktop.hpp index 383a59999..00e60056f 100644 --- a/module-apps/application-desktop/ApplicationDesktop.hpp +++ b/module-apps/application-desktop/ApplicationDesktop.hpp @@ -30,8 +30,8 @@ public: sys::Message_t DataReceivedHandler(sys::DataMessage* msgl,sys::ResponseMessage* resp) override; sys::ReturnCodes InitHandler() override; sys::ReturnCodes DeinitHandler() override; - sys::ReturnCodes WakeUpHandler() override; - sys::ReturnCodes SleepHandler() override; + + sys::ReturnCodes SwitchPowerModeHandler(const sys::ServicePowerMode mode) override final{return sys::ReturnCodes::Success;} void createUserInterface() ; void destroyUserInterface(); diff --git a/module-apps/application-notes/ApplicationNotes.cpp b/module-apps/application-notes/ApplicationNotes.cpp index 6df8435fc..6fe896772 100644 --- a/module-apps/application-notes/ApplicationNotes.cpp +++ b/module-apps/application-notes/ApplicationNotes.cpp @@ -70,15 +70,6 @@ sys::ReturnCodes ApplicationNotes::DeinitHandler() { return sys::ReturnCodes::Success; } -sys::ReturnCodes ApplicationNotes::WakeUpHandler() { - return sys::ReturnCodes::Success; -} - - -sys::ReturnCodes ApplicationNotes::SleepHandler() { - return sys::ReturnCodes::Success; -} - void ApplicationNotes::createUserInterface() { gui::AppWindow* window = nullptr; diff --git a/module-apps/application-notes/ApplicationNotes.hpp b/module-apps/application-notes/ApplicationNotes.hpp index a3320e5e6..c3db353d5 100644 --- a/module-apps/application-notes/ApplicationNotes.hpp +++ b/module-apps/application-notes/ApplicationNotes.hpp @@ -23,8 +23,8 @@ public: sys::Message_t DataReceivedHandler(sys::DataMessage* msgl,sys::ResponseMessage* resp) override; sys::ReturnCodes InitHandler() override; sys::ReturnCodes DeinitHandler() override; - sys::ReturnCodes WakeUpHandler() override; - sys::ReturnCodes SleepHandler() override; + + sys::ReturnCodes SwitchPowerModeHandler(const sys::ServicePowerMode mode) override final{return sys::ReturnCodes::Success;} void createUserInterface() ; void destroyUserInterface(); diff --git a/module-apps/application-phonebook/ApplicationPhonebook.cpp b/module-apps/application-phonebook/ApplicationPhonebook.cpp index dc57fbb68..077df5e5f 100644 --- a/module-apps/application-phonebook/ApplicationPhonebook.cpp +++ b/module-apps/application-phonebook/ApplicationPhonebook.cpp @@ -48,10 +48,6 @@ sys::ReturnCodes ApplicationPhonebook::InitHandler() { sys::ReturnCodes ApplicationPhonebook::DeinitHandler() { return sys::ReturnCodes::Success; } -sys::ReturnCodes ApplicationPhonebook::WakeUpHandler() { return sys::ReturnCodes::Success; } - -sys::ReturnCodes ApplicationPhonebook::SleepHandler() { return sys::ReturnCodes::Success; } - void ApplicationPhonebook::createUserInterface() { gui::AppWindow *window = nullptr; diff --git a/module-apps/application-phonebook/ApplicationPhonebook.hpp b/module-apps/application-phonebook/ApplicationPhonebook.hpp index be7f48668..574e900af 100644 --- a/module-apps/application-phonebook/ApplicationPhonebook.hpp +++ b/module-apps/application-phonebook/ApplicationPhonebook.hpp @@ -11,8 +11,9 @@ public: sys::Message_t DataReceivedHandler(sys::DataMessage* msgl,sys::ResponseMessage* resp) override; sys::ReturnCodes InitHandler() override; sys::ReturnCodes DeinitHandler() override; - sys::ReturnCodes WakeUpHandler() override; - sys::ReturnCodes SleepHandler() override; + + sys::ReturnCodes SwitchPowerModeHandler(const sys::ServicePowerMode mode) override final{return sys::ReturnCodes::Success;} + void createUserInterface() override; void destroyUserInterface() override; diff --git a/module-apps/application-settings/ApplicationSettings.cpp b/module-apps/application-settings/ApplicationSettings.cpp index 034fb0957..c85e36868 100644 --- a/module-apps/application-settings/ApplicationSettings.cpp +++ b/module-apps/application-settings/ApplicationSettings.cpp @@ -60,15 +60,6 @@ sys::ReturnCodes ApplicationSettings::DeinitHandler() { return sys::ReturnCodes::Success; } -sys::ReturnCodes ApplicationSettings::WakeUpHandler() { - return sys::ReturnCodes::Success; -} - - -sys::ReturnCodes ApplicationSettings::SleepHandler() { - return sys::ReturnCodes::Success; -} - void ApplicationSettings::createUserInterface() { gui::AppWindow* window = nullptr; diff --git a/module-apps/application-settings/ApplicationSettings.hpp b/module-apps/application-settings/ApplicationSettings.hpp index b3bb1f730..de2bbaea0 100644 --- a/module-apps/application-settings/ApplicationSettings.hpp +++ b/module-apps/application-settings/ApplicationSettings.hpp @@ -23,8 +23,8 @@ public: sys::Message_t DataReceivedHandler(sys::DataMessage* msgl,sys::ResponseMessage* resp) override; sys::ReturnCodes InitHandler() override; sys::ReturnCodes DeinitHandler() override; - sys::ReturnCodes WakeUpHandler() override; - sys::ReturnCodes SleepHandler() override; + + sys::ReturnCodes SwitchPowerModeHandler(const sys::ServicePowerMode mode) override final{return sys::ReturnCodes::Success;} void createUserInterface() ; void destroyUserInterface(); diff --git a/module-apps/application-viewer/ApplicationViewer.cpp b/module-apps/application-viewer/ApplicationViewer.cpp index d16d797f0..f5e7e3a8d 100644 --- a/module-apps/application-viewer/ApplicationViewer.cpp +++ b/module-apps/application-viewer/ApplicationViewer.cpp @@ -78,15 +78,6 @@ sys::ReturnCodes ApplicationViewer::DeinitHandler() { return sys::ReturnCodes::Success; } -sys::ReturnCodes ApplicationViewer::WakeUpHandler() { - return sys::ReturnCodes::Success; -} - - -sys::ReturnCodes ApplicationViewer::SleepHandler() { - return sys::ReturnCodes::Success; -} - void ApplicationViewer::createUserInterface() { gui::AppWindow* window = nullptr; diff --git a/module-apps/application-viewer/ApplicationViewer.hpp b/module-apps/application-viewer/ApplicationViewer.hpp index b95a73d18..bd79bcd15 100644 --- a/module-apps/application-viewer/ApplicationViewer.hpp +++ b/module-apps/application-viewer/ApplicationViewer.hpp @@ -28,8 +28,8 @@ public: sys::Message_t DataReceivedHandler(sys::DataMessage* msgl,sys::ResponseMessage* resp) override; sys::ReturnCodes InitHandler() override; sys::ReturnCodes DeinitHandler() override; - sys::ReturnCodes WakeUpHandler() override; - sys::ReturnCodes SleepHandler() override; + + sys::ReturnCodes SwitchPowerModeHandler(const sys::ServicePowerMode mode) override final{return sys::ReturnCodes::Success;} void createUserInterface() ; void destroyUserInterface(); diff --git a/module-services/CMakeLists.txt b/module-services/CMakeLists.txt index 1c9a961f2..d3cb4c9c2 100644 --- a/module-services/CMakeLists.txt +++ b/module-services/CMakeLists.txt @@ -19,7 +19,6 @@ add_subdirectory( service-eink ) add_subdirectory( service-evtmgr ) add_subdirectory( service-appmgr ) add_subdirectory( service-db ) -#add_subdirectory( service-powermgr ) add_subdirectory( service-cellular ) add_subdirectory( service-audio ) diff --git a/module-services/service-appmgr/ApplicationManager.cpp b/module-services/service-appmgr/ApplicationManager.cpp index 5550597ba..d352aee66 100644 --- a/module-services/service-appmgr/ApplicationManager.cpp +++ b/module-services/service-appmgr/ApplicationManager.cpp @@ -221,14 +221,6 @@ sys::ReturnCodes ApplicationManager::DeinitHandler() { return sys::ReturnCodes::Success; } -sys::ReturnCodes ApplicationManager::WakeUpHandler() { - return sys::ReturnCodes::Success; -} - -sys::ReturnCodes ApplicationManager::SleepHandler() { - return sys::ReturnCodes::Success; -} - bool ApplicationManager::startApplication( const std::string& appName ) { state = State::STARTING_NEW_APP; diff --git a/module-services/service-appmgr/ApplicationManager.hpp b/module-services/service-appmgr/ApplicationManager.hpp index b5b068344..f2b6e1b98 100644 --- a/module-services/service-appmgr/ApplicationManager.hpp +++ b/module-services/service-appmgr/ApplicationManager.hpp @@ -100,9 +100,7 @@ public: sys::ReturnCodes DeinitHandler() override; - sys::ReturnCodes WakeUpHandler() override; - - sys::ReturnCodes SleepHandler() override; + sys::ReturnCodes SwitchPowerModeHandler(const sys::ServicePowerMode mode) override final{return sys::ReturnCodes::Success;} /** * @brief Sends request to application manager to switch from current application to specific window in application with specified name . diff --git a/module-services/service-audio/ServiceAudio.cpp b/module-services/service-audio/ServiceAudio.cpp index d34d4805a..fb2393d09 100644 --- a/module-services/service-audio/ServiceAudio.cpp +++ b/module-services/service-audio/ServiceAudio.cpp @@ -53,14 +53,6 @@ sys::ReturnCodes ServiceAudio::DeinitHandler() { return sys::ReturnCodes::Success; } -sys::ReturnCodes ServiceAudio::WakeUpHandler() { - return sys::ReturnCodes::Success; -} - - -sys::ReturnCodes ServiceAudio::SleepHandler() { - return sys::ReturnCodes::Success; -} void ServiceAudio::TickHandler(uint32_t id) { diff --git a/module-services/service-audio/ServiceAudio.hpp b/module-services/service-audio/ServiceAudio.hpp index 961b0121b..8539cd6cc 100644 --- a/module-services/service-audio/ServiceAudio.hpp +++ b/module-services/service-audio/ServiceAudio.hpp @@ -35,9 +35,7 @@ public: sys::ReturnCodes DeinitHandler() override; - sys::ReturnCodes WakeUpHandler() override; - - sys::ReturnCodes SleepHandler() override; + sys::ReturnCodes SwitchPowerModeHandler(const sys::ServicePowerMode mode) override final{return sys::ReturnCodes::Success;} static const char *serviceName; diff --git a/module-services/service-cellular/ServiceCellular.cpp b/module-services/service-cellular/ServiceCellular.cpp index ba408b0df..6ad10a1d0 100644 --- a/module-services/service-cellular/ServiceCellular.cpp +++ b/module-services/service-cellular/ServiceCellular.cpp @@ -127,15 +127,6 @@ sys::ReturnCodes ServiceCellular::DeinitHandler() { return sys::ReturnCodes::Success; } -sys::ReturnCodes ServiceCellular::WakeUpHandler() { - return sys::ReturnCodes::Success; -} - - -sys::ReturnCodes ServiceCellular::SleepHandler() { - return sys::ReturnCodes::Success; -} - sys::Message_t ServiceCellular::DataReceivedHandler(sys::DataMessage *msgl,sys::ResponseMessage* resp) { std::shared_ptr responseMsg; diff --git a/module-services/service-cellular/ServiceCellular.hpp b/module-services/service-cellular/ServiceCellular.hpp index cc08ad4b5..fc120331f 100644 --- a/module-services/service-cellular/ServiceCellular.hpp +++ b/module-services/service-cellular/ServiceCellular.hpp @@ -44,9 +44,8 @@ public: sys::ReturnCodes DeinitHandler() override; - sys::ReturnCodes WakeUpHandler() override; + sys::ReturnCodes SwitchPowerModeHandler(const sys::ServicePowerMode mode) override final{return sys::ReturnCodes::Success;} - sys::ReturnCodes SleepHandler() override; static const char *serviceName; diff --git a/module-services/service-db/ServiceDB.cpp b/module-services/service-db/ServiceDB.cpp index 19a5ab1c0..968669ac7 100644 --- a/module-services/service-db/ServiceDB.cpp +++ b/module-services/service-db/ServiceDB.cpp @@ -454,12 +454,3 @@ sys::ReturnCodes ServiceDB::DeinitHandler() { return sys::ReturnCodes::Success; } - -sys::ReturnCodes ServiceDB::WakeUpHandler() { - return sys::ReturnCodes::Success; -} - - -sys::ReturnCodes ServiceDB::SleepHandler() { - return sys::ReturnCodes::Success; -} diff --git a/module-services/service-db/ServiceDB.hpp b/module-services/service-db/ServiceDB.hpp index dece2a006..1c6c04dfc 100644 --- a/module-services/service-db/ServiceDB.hpp +++ b/module-services/service-db/ServiceDB.hpp @@ -53,9 +53,7 @@ public: sys::ReturnCodes DeinitHandler() override; - sys::ReturnCodes WakeUpHandler() override; - - sys::ReturnCodes SleepHandler() override; + sys::ReturnCodes SwitchPowerModeHandler(const sys::ServicePowerMode mode) override final{return sys::ReturnCodes::Success;} static const char* serviceName; diff --git a/module-services/service-eink/ServiceEink.cpp b/module-services/service-eink/ServiceEink.cpp index 5cfc1a4ba..968f16fd7 100644 --- a/module-services/service-eink/ServiceEink.cpp +++ b/module-services/service-eink/ServiceEink.cpp @@ -200,15 +200,6 @@ sys::ReturnCodes ServiceEink::DeinitHandler() { return sys::ReturnCodes::Success; } -sys::ReturnCodes ServiceEink::WakeUpHandler() { - return sys::ReturnCodes::Success; -} - - -sys::ReturnCodes ServiceEink::SleepHandler() { - return sys::ReturnCodes::Success; -} - bool ServiceEink::changeWaveform( EinkWaveforms_e mode, const int32_t temperature ) { // If neither the temperature nor the waveform has changed - do nothing diff --git a/module-services/service-eink/ServiceEink.hpp b/module-services/service-eink/ServiceEink.hpp index be0789a11..0ff86be12 100644 --- a/module-services/service-eink/ServiceEink.hpp +++ b/module-services/service-eink/ServiceEink.hpp @@ -56,9 +56,7 @@ public: sys::ReturnCodes DeinitHandler() override; - sys::ReturnCodes WakeUpHandler() override; - - sys::ReturnCodes SleepHandler() override; + sys::ReturnCodes SwitchPowerModeHandler(const sys::ServicePowerMode mode) override final{return sys::ReturnCodes::Success;} }; #endif /* MODULE_SERVICES_SERVICE_EINK_SERVICEEINK_HPP_ */ diff --git a/module-services/service-evtmgr/EventManager.cpp b/module-services/service-evtmgr/EventManager.cpp index 471a015fd..d7e0c73f8 100644 --- a/module-services/service-evtmgr/EventManager.cpp +++ b/module-services/service-evtmgr/EventManager.cpp @@ -140,13 +140,6 @@ sys::ReturnCodes EventManager::DeinitHandler() { return sys::ReturnCodes::Success; } -sys::ReturnCodes EventManager::WakeUpHandler() { - return sys::ReturnCodes::Success; -} - -sys::ReturnCodes EventManager::SleepHandler() { - return sys::ReturnCodes::Success; -} bool EventManager::messageSetApplication( sys::Service* sender, const std::string& applicationName ) { diff --git a/module-services/service-evtmgr/EventManager.hpp b/module-services/service-evtmgr/EventManager.hpp index 6bded4a68..4a4b43601 100644 --- a/module-services/service-evtmgr/EventManager.hpp +++ b/module-services/service-evtmgr/EventManager.hpp @@ -45,9 +45,8 @@ public: sys::ReturnCodes DeinitHandler() override; - sys::ReturnCodes WakeUpHandler() override; + sys::ReturnCodes SwitchPowerModeHandler(const sys::ServicePowerMode mode) override final{return sys::ReturnCodes::Success;} - sys::ReturnCodes SleepHandler() override; /** * @brief Sends request to application manager to switch from current application to specific window in application with specified name . diff --git a/module-services/service-gui/ServiceGUI.cpp b/module-services/service-gui/ServiceGUI.cpp index 23b2dd2ab..ac5691478 100644 --- a/module-services/service-gui/ServiceGUI.cpp +++ b/module-services/service-gui/ServiceGUI.cpp @@ -232,14 +232,6 @@ sys::ReturnCodes ServiceGUI::DeinitHandler() { return sys::ReturnCodes::Success; } -sys::ReturnCodes ServiceGUI::WakeUpHandler() { - return sys::ReturnCodes::Success; -} - - -sys::ReturnCodes ServiceGUI::SleepHandler() { - return sys::ReturnCodes::Success; -} } /* namespace sgui */ diff --git a/module-services/service-gui/ServiceGUI.hpp b/module-services/service-gui/ServiceGUI.hpp index 92b2f9d77..060b2dc93 100644 --- a/module-services/service-gui/ServiceGUI.hpp +++ b/module-services/service-gui/ServiceGUI.hpp @@ -73,9 +73,7 @@ public: sys::ReturnCodes DeinitHandler() override; - sys::ReturnCodes WakeUpHandler() override; - - sys::ReturnCodes SleepHandler() override; + sys::ReturnCodes SwitchPowerModeHandler(const sys::ServicePowerMode mode) override final{return sys::ReturnCodes::Success;} }; } /* namespace sgui */ diff --git a/module-services/service-powermgr/CMakeLists.txt b/module-services/service-powermgr/CMakeLists.txt deleted file mode 100644 index 379a8d745..000000000 --- a/module-services/service-powermgr/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -include_directories( ${CMAKE_PROJECT_NAME} - - PUBLIC - "${CMAKE_CURRENT_LIST_DIR}" -) - -include_directories( ${PROJECT_NAME} - - PUBLIC - "${CMAKE_CURRENT_LIST_DIR}" -) - -message( "${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}" ) - -target_sources( ${PROJECT_NAME} - - PRIVATE - "${CMAKE_CURRENT_LIST_DIR}/PowerMgr.cpp" - PUBLIC - "${CMAKE_CURRENT_LIST_DIR}/PowerMgr.hpp" -) - diff --git a/module-services/service-powermgr/PowerMgr.cpp b/module-services/service-powermgr/PowerMgr.cpp deleted file mode 100644 index f80de09b9..000000000 --- a/module-services/service-powermgr/PowerMgr.cpp +++ /dev/null @@ -1,62 +0,0 @@ -/* - * @file PowerMgr.cpp - * @author Lukasz Skrzypczak (lukasz.skrzypczak@mudita.com) - * @date 08.07.19 - * @brief - * @copyright Copyright (C) 2019 mudita.com - * @details - */ - -#include "PowerMgr.hpp" -#include "log/log.hpp" - -extern "C" { -#include "lpm.h" -} - -PowerMgr::PowerMgr() { - LOG_INFO("[ServicePowerMgr] Initializing"); - - /* Restore when wakeup from suspend reset */ - LPM_SystemResumeDsm(); - - APP_PowerPostSwitchHook(LPM_PowerModeSuspend); - - /* Recover to Full Run after suspend reset */ - LPM_SystemFullRun(); - - if (true != LPM_Init(LPM_PowerModeFullRun)) - { - LOG_FATAL("LPM Init Failed!"); - return; - } -} - -PowerMgr::~PowerMgr() { - /* Recover to Full Run after suspend reset */ - LPM_SystemFullRun(); - LOG_INFO("[ServicePowerMgr] Cleaning resources"); -} - -void PowerMgr::SetPowerMode(PowerMode_t mode) { - APP_SetLPMPowerMode(static_cast(mode)); - - switch (mode) - { - case PowerModeOverRun: - LPM_SystemOverRun(); - break; - case PowerModeFullRun: - LPM_SystemFullRun(); - break; - case PowerModeLowSpeedRun: - LPM_SystemLowSpeedRun(); - break; - case PowerModeLowPowerRun: - LPM_SystemLowPowerRun(); - break; - default: - break; - } - -} diff --git a/module-services/service-powermgr/PowerMgr.hpp b/module-services/service-powermgr/PowerMgr.hpp deleted file mode 100644 index ef73bbb5b..000000000 --- a/module-services/service-powermgr/PowerMgr.hpp +++ /dev/null @@ -1,39 +0,0 @@ - -/* - * @file PowerMgr.hpp - * @author Lukasz Skrzypczak (lukasz.skrzypczak@mudita.com) - * @date 08.07.19 - * @brief - * @copyright Copyright (C) 2019 mudita.com - * @details - */ - - -#ifndef PUREPHONE_POWERMGR_HPP -#define PUREPHONE_POWERMGR_HPP - -extern "C" { -#include "lpm.h" -} - -class PowerMgr { -private: - uint32_t pmode = 0; - -protected: - -public: - PowerMgr(); - ~PowerMgr(); - - enum PowerMode_t { - PowerModeOverRun = LPM_PowerModeOverRun, - PowerModeFullRun = LPM_PowerModeFullRun, - PowerModeLowSpeedRun = LPM_PowerModeLowSpeedRun, - PowerModeLowPowerRun = LPM_PowerModeLowPowerRun, - }; - - void SetPowerMode(PowerMode_t mode); -}; - -#endif //PUREPHONE_POWERMGR_HPP diff --git a/module-sys/Service/Common.hpp b/module-sys/Service/Common.hpp index 25b5e43fa..3ee813737 100644 --- a/module-sys/Service/Common.hpp +++ b/module-sys/Service/Common.hpp @@ -32,6 +32,12 @@ enum class ServicePriority { Realtime = 4, ///< priority: realtime (highest) }; +enum class ServicePowerMode{ + Active, + SuspendToRAM, + SuspendToNVM +}; + enum class ReturnCodes{ Success, Failure, diff --git a/module-sys/Service/Message.cpp b/module-sys/Service/Message.cpp index f8a6c7502..0164bb8df 100644 --- a/module-sys/Service/Message.cpp +++ b/module-sys/Service/Message.cpp @@ -43,14 +43,8 @@ namespace sys { service->pingTimestamp = cpp_freertos::Ticks::GetTicks(); break; - case SystemMessageType ::GoSleep: - if(service->isReady) - ret = service->SleepHandler(); - break; - - case SystemMessageType ::Wakeup: - if(service->isReady) - ret = service->WakeUpHandler(); + case SystemMessageType ::SwitchPowerMode: + service->SwitchPowerModeHandler(ServicePowerMode::Active); break; case SystemMessageType ::Exit: diff --git a/module-sys/Service/Message.hpp b/module-sys/Service/Message.hpp index 6b59eb9c8..aa68acf5b 100644 --- a/module-sys/Service/Message.hpp +++ b/module-sys/Service/Message.hpp @@ -18,8 +18,7 @@ namespace sys enum class SystemMessageType{ Ping, - Wakeup, - GoSleep, + SwitchPowerMode, Start, Exit }; diff --git a/module-sys/Service/Service.hpp b/module-sys/Service/Service.hpp index 82365c9b7..53a2047af 100644 --- a/module-sys/Service/Service.hpp +++ b/module-sys/Service/Service.hpp @@ -70,11 +70,7 @@ public: // Invoked upon receiving close request virtual ReturnCodes DeinitHandler()= 0; - // Invoked upon receiving wake up request - virtual ReturnCodes WakeUpHandler() = 0; - - // Invoked upon receiving go sleep request - virtual ReturnCodes SleepHandler() = 0; + virtual ReturnCodes SwitchPowerModeHandler(const ServicePowerMode mode) = 0; void CloseHandler(); diff --git a/module-sys/SystemManager/SystemManager.cpp b/module-sys/SystemManager/SystemManager.cpp index 832fee47c..c885ad28e 100644 --- a/module-sys/SystemManager/SystemManager.cpp +++ b/module-sys/SystemManager/SystemManager.cpp @@ -120,33 +120,6 @@ namespace sys } } - bool SystemManager::SuspendService(const std::string& name,Service* caller,TickType_t timeout){ - - auto msg = std::make_shared(SystemMessageType::GoSleep); - auto ret = Bus::SendUnicast(msg,name,caller,timeout); - auto resp = std::static_pointer_cast(ret.second); - - if(ret.first == ReturnCodes::Success && (resp->retCode == ReturnCodes::Success)){ - return true; - } - else{ - return false; - } - } - - bool SystemManager::ResumeService(const std::string& name,Service* caller,TickType_t timeout){ - - auto msg = std::make_shared(SystemMessageType::Wakeup); - auto ret = Bus::SendUnicast(msg,name,caller,timeout); - auto resp = std::static_pointer_cast(ret.second); - - if(ret.first == ReturnCodes::Success && (resp->retCode == ReturnCodes::Success)){ - return true; - } - else{ - return false; - } - } ReturnCodes SystemManager::InitHandler(){ isReady = true; diff --git a/module-sys/SystemManager/SystemManager.hpp b/module-sys/SystemManager/SystemManager.hpp index ff4a84ebe..b539d090d 100644 --- a/module-sys/SystemManager/SystemManager.hpp +++ b/module-sys/SystemManager/SystemManager.hpp @@ -55,12 +55,6 @@ public: // Destroy existing service static bool DestroyService(const std::string& name,Service* caller,TickType_t timeout=5000); - // Suspend specified serivice - static bool SuspendService(const std::string& name,Service* caller,TickType_t timeout=5000); - - // Resume specified service - static bool ResumeService(const std::string& name,Service* caller,TickType_t timeout=5000); - private: void TickHandler(uint32_t id) override; @@ -69,12 +63,10 @@ private: ReturnCodes InitHandler() override; - ReturnCodes WakeUpHandler() override{return ReturnCodes::Success;} - - ReturnCodes SleepHandler() override{return ReturnCodes::Success;} - ReturnCodes DeinitHandler() override{return ReturnCodes::Success;} + ReturnCodes SwitchPowerModeHandler(const ServicePowerMode mode) override final{return ReturnCodes::Success;} + diff --git a/module-sys/tests/Common/SchedulerKiller.hpp b/module-sys/tests/Common/SchedulerKiller.hpp index 27627012d..14070c101 100644 --- a/module-sys/tests/Common/SchedulerKiller.hpp +++ b/module-sys/tests/Common/SchedulerKiller.hpp @@ -28,9 +28,7 @@ public: sys::ReturnCodes DeinitHandler() override{return sys::ReturnCodes::Success;} - sys::ReturnCodes WakeUpHandler() override{return sys::ReturnCodes::Success;} - - sys::ReturnCodes SleepHandler() override{return sys::ReturnCodes::Success;} + sys::ReturnCodes SwitchPowerModeHandler(const sys::ServicePowerMode mode) override final{return sys::ReturnCodes::Success;} private: diff --git a/module-sys/tests/Test1/CommandsService.cpp b/module-sys/tests/Test1/CommandsService.cpp index 89b75be50..43cfe0a82 100644 --- a/module-sys/tests/Test1/CommandsService.cpp +++ b/module-sys/tests/Test1/CommandsService.cpp @@ -75,18 +75,6 @@ sys::Message_t CommandsService::DataReceivedHandler(sys::DataMessage* msgl,sys:: REQUIRE( TestService1::TestServiceInstanceCount == i+1); } - for(uint32_t i =0;i