fsfw/fsfw
fsfw/fsfw
10
3
Fork 6
Code Issues 32 Pull Requests 4 Releases 10 Wiki Activity

ObjectManagerIF improvements #73

Merged
gaisser merged 13 commits from KSat/fsfw:mueller_objectManagerIF into master 2020-06-08 12:08:26 +02:00
Conversation 5 Commits 13 Files Changed 2 +68 -62
muellerr commented 2020-05-11 12:03:04 +02:00
Owner
Copy Link

fixes #67 .
I don't know if the exit is a good idea, could also just return nullptr.

fixes #67 . I don't know if the exit is a good idea, could also just return nullptr.
muellerr added the
feature
API Change
 labels 2020-05-11 12:03:04 +02:00
muellerr changed title from removed config include, new retvals, nullptr check to ObjectManagerIF improvements 2020-05-29 17:17:15 +02:00
gaisser reviewed 2020-06-04 14:08:58 +02:00
objectmanager/ObjectManagerIF.h Outdated
@ -8,10 +8,11 @@
#ifndef OBJECTMANAGERIF_H_
#define OBJECTMANAGERIF_H_
#include "systemObjectList.h"
gaisser commented 2020-06-04 14:08:58 +02:00
Owner
Copy Link

I think we can remove that include

I think we can remove that include
gaisser reviewed 2020-06-04 14:09:43 +02:00
objectmanager/ObjectManagerIF.h
@ -92,0 +94,4 @@
if(objectManager == nullptr) {
sif::error << "ObjectManagerIF: Global object manager has not "
"been initialized yet!" << std::endl;
std::exit(0);
gaisser commented 2020-06-04 14:09:43 +02:00
Owner
Copy Link

This should be std::exit(1), we do exit with an failure here?

This should be std::exit(1), we do exit with an failure here?
gaisser self-assigned this 2020-06-04 14:11:53 +02:00
gaisser commented 2020-06-04 16:42:59 +02:00
Owner
Copy Link

The current software does not know what to do if no ObjectManager is instanciated. So exit seems fine from my point of view.

API_Change because of removed inlcudes.

The current software does not know what to do if no ObjectManager is instanciated. So exit seems fine from my point of view. API_Change because of removed inlcudes.
muellerr commented 2020-06-04 17:28:11 +02:00
Author
Owner
Copy Link

THe software does not compile if the object manager is not instantiated I think. But it is possible to forget the initialization.

THe software does not compile if the object manager is not instantiated I think. But it is possible to forget the initialization.
gaisser commented 2020-06-04 18:38:07 +02:00
Owner
Copy Link

Hm if it does not compile, we can remove the exit.

Hm if it does not compile, we can remove the exit.
muellerr commented 2020-06-04 19:54:03 +02:00
Author
Owner
Copy Link

Actually, its a linker error.

Actually, its a linker error.
gaisser commented 2020-06-04 20:53:19 +02:00
Owner
Copy Link

Ok a linker error is ok. So, I think we can remove the sys.exit now.

Ok a linker error is ok. So, I think we can remove the sys.exit now.
gaisser reviewed 2020-06-05 18:14:52 +02:00
objectmanager/ObjectManager.cpp
@ -72,1 +71,3 @@
<< std::dec << std::endl;
object_id_t var = it.first;
sif::error << "Object 0x" << std::hex << std::setw(8) <<
std::setfill('0')<< var << " failed to initialize " <<
gaisser commented 2020-06-05 18:14:51 +02:00
Owner
Copy Link

std::setfill is not reset.

std::setfill is not reset.
muellerr commented 2020-06-05 20:54:39 +02:00
Author
Owner
Copy Link

should std::setw be reset as well? how to reset std::setfill?

should std::setw be reset as well? how to reset std::setfill?
muellerr commented 2020-06-05 20:59:53 +02:00
Author
Owner
Copy Link

okay, i put std::setfill('') at the end

okay, i put std::setfill('') at the end
gaisser closed this pull request 2020-06-08 12:08:26 +02:00
gaisser deleted branch mueller_objectManagerIF 2020-06-08 12:09:36 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
API Change

Changes the API, so Users need to adapted

  
Breaking API Change

Changes the API in a non backwards compatible way

  
bug

Something is not working

  
build

Issues related to the buildsystem, including CI

  
cosmetics

Small change most users won't notice

  
Documentation

Improvement of code documentation

  
duplicate

This issue or pull request already exists

  
feature

New feature

  
help wanted

Need some help

  
hotfix

Quick or important fix that is merged directly into master, causing a new revision

  
invalid

#worksforme

  
question

More information is needed

  
Refactor

Contains a refactoring of some code

  
Tests

Issues related to testing code

  
wontfix

This won't be fixed

No Label
API Change
Breaking API Change
bug
build
cosmetics
Documentation
duplicate
feature
help wanted
hotfix
invalid
question
Refactor
Tests
wontfix
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
gaisser
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: fsfw/fsfw#73
No description provided.
Delete Branch "KSat/fsfw:mueller_objectManagerIF"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?