diff --git a/src/fsfw/devicehandlers/FreshDeviceHandlerBase.cpp b/src/fsfw/devicehandlers/FreshDeviceHandlerBase.cpp index a245fa5f..215c3f3a 100644 --- a/src/fsfw/devicehandlers/FreshDeviceHandlerBase.cpp +++ b/src/fsfw/devicehandlers/FreshDeviceHandlerBase.cpp @@ -145,20 +145,20 @@ void FreshDeviceHandlerBase::setToExternalControl() { setHealth(HealthState::EXT // System Object overrides. ReturnValue_t FreshDeviceHandlerBase::initialize() { - ReturnValue_t result = modeHelper.initialize(); + ReturnValue_t result = modeHelper.initialize(); // ModeHelper.initialize() is an empty function, always returns OK if (result != returnvalue::OK) { return result; } result = healthHelper.initialize(); - if (result != returnvalue::OK) { + if (result != returnvalue::OK) { // check if all objects were successfully registered with HEALTHY flag stored in table (otherwise default HEALTHY = HEALTHY) return result; } result = actionHelper.initialize(messageQueue); - if (result != returnvalue::OK) { + if (result != returnvalue::OK) { // check if actionHelper got messageQueue assigned to use for its work successfully return result; } - result = paramHelper.initialize(); - if (result != returnvalue::OK) { + result = paramHelper.initialize(); + if (result != returnvalue::OK) { return result; } diff --git a/src/fsfw/objectmanager/frameworkObjects.h b/src/fsfw/objectmanager/frameworkObjects.h index bf153cae..cd29555f 100644 --- a/src/fsfw/objectmanager/frameworkObjects.h +++ b/src/fsfw/objectmanager/frameworkObjects.h @@ -29,7 +29,7 @@ enum framework_objects : object_id_t { // MODE_STORE = 0x53010100, EVENT_MANAGER = 0x53030000, INTERNAL_ERROR_REPORTER = 0x53040000, - IPC_STORE = 0x534f0300, + IPC_STORE = 0x534f0300, // Inter-process communication // IDs for PUS Packet Communication TC_STORE = 0x534f0100, TM_STORE = 0x534f0200, diff --git a/src/fsfw/parameters/ParameterHelper.cpp b/src/fsfw/parameters/ParameterHelper.cpp index ba0e70a4..773b819a 100644 --- a/src/fsfw/parameters/ParameterHelper.cpp +++ b/src/fsfw/parameters/ParameterHelper.cpp @@ -117,7 +117,7 @@ ReturnValue_t ParameterHelper::sendParameter(MessageQueueId_t to, uint32_t id, ReturnValue_t ParameterHelper::initialize() { ownerQueueId = owner->getCommandQueue(); - storage = ObjectManager::instance()->get(objects::IPC_STORE); + storage = ObjectManager::instance()->get(objects::IPC_STORE); // get storage pointer for inter-process communication if (storage == nullptr) { return ObjectManagerIF::CHILD_INIT_FAILED; }