From d299f0916eedfc4cb2cc50cdb295240a2cfc2f0b Mon Sep 17 00:00:00 2001 From: Mateusz Date: Wed, 28 Aug 2019 10:51:48 +0200 Subject: [PATCH] Auto stash before merge of "EGD-2080_evtmgrdeinit" and "origin/EGD-2079_pwrmgr_services" Fix: Service's params order --- module-sys/Service/Service.cpp | 2 +- module-sys/Service/Service.hpp | 2 +- module-sys/SystemManager/SystemManager.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module-sys/Service/Service.cpp b/module-sys/Service/Service.cpp index 7ba0234fc..10e7a24ac 100644 --- a/module-sys/Service/Service.cpp +++ b/module-sys/Service/Service.cpp @@ -13,7 +13,7 @@ namespace sys using namespace cpp_freertos; using namespace std; -Service::Service(std::string name,uint32_t stackDepth,ServicePriority priority,std::string parent) +Service::Service(std::string name,std::string parent,uint32_t stackDepth,ServicePriority priority) : cpp_freertos::Thread(name, stackDepth/4 /* Stack depth in bytes */, static_cast(priority)), parent(parent), mailbox(this), diff --git a/module-sys/Service/Service.hpp b/module-sys/Service/Service.hpp index 4adbbf558..82365c9b7 100644 --- a/module-sys/Service/Service.hpp +++ b/module-sys/Service/Service.hpp @@ -39,7 +39,7 @@ private: class Service : public cpp_freertos::Thread,public std::enable_shared_from_this { public: - Service(std::string name,uint32_t stackDepth=4096,ServicePriority priority=ServicePriority::Idle,std::string parent=""); + Service(std::string name,std::string parent="",uint32_t stackDepth=4096,ServicePriority priority=ServicePriority::Idle); virtual ~Service(); diff --git a/module-sys/SystemManager/SystemManager.cpp b/module-sys/SystemManager/SystemManager.cpp index 418a1c8bb..31e5adc5d 100644 --- a/module-sys/SystemManager/SystemManager.cpp +++ b/module-sys/SystemManager/SystemManager.cpp @@ -25,7 +25,7 @@ namespace sys const char* systemManagerServiceName = "SysMgrService"; SystemManager::SystemManager(TickType_t pingInterval) - : Service(systemManagerServiceName,4096,ServicePriority::Idle), + : Service(systemManagerServiceName), pingInterval(pingInterval) { // Specify list of channels which System Manager is registered to