WiP: Removed merge conflicts,

This commit is contained in:
Mateusz committed 2019-09-17 16:57:44 +02:00
1 parent b4f9bc6512
commit a8068e4157
5 files changed
+21 -15

No files matched your search

+7 -1
View File
@@ -77,7 +77,8 @@ namespace sys {
bool SystemManager::SuspendSystem(Service *caller) {
if(lowPowerMode->GetCurrentMode() != bsp::LowPowerMode::Mode::FullSpeed){
if(powerManager.GetCurrentMode() != PowerManager::Mode::FullSpeed){
LOG_WARN("System is already suspended.");
return false;
}
@@ -101,6 +102,11 @@ namespace sys {
bool SystemManager::ResumeSystem(Service *caller) {
if(powerManager.GetCurrentMode() == PowerManager::Mode::FullSpeed){
LOG_WARN("System is already resumed.");
return false;
}
powerManager.Switch(PowerManager::Mode::FullSpeed);
for(const auto &w : servicesList){