KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 3 Releases Wiki Activity

WIP: somethings wrong.. #19

Closed
muellerr wants to merge 808 commits from source/master into master
pull from: source/master
merge into: KSat:master
Conversation 0 Commits 808 Files Changed 512 +6 -3
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9056ad36ed - Show all commits

3
datapoolglob/GlobalPoolVector.h
View File

@ -220,4 +220,7 @@ public:
} }
}; };
template<typename T, uint16_t vectorSize>
using gp_vec_t = GlobPoolVector<T, vectorSize>;
#endif /* POOLVECTOR_H_ */ #endif /* POOLVECTOR_H_ */

6
objectmanager/ObjectManager.cpp
View File

@ -67,9 +67,9 @@ void ObjectManager::initialize() {
return_value = it->second->initialize(); return_value = it->second->initialize();
if ( return_value != RETURN_OK ) { if ( return_value != RETURN_OK ) {
object_id_t var = it->first; object_id_t var = it->first;
sif::error << "Object " << std::hex << (int) var sif::error << "Object 0x" << std::hex << std::setw(8) <<
<< " failed to initialize with code 0x" << return_value std::setfill('0')<< var << " failed to initialize " <<
<< std::dec << std::endl; "with code 0x" << return_value << std::dec << std::endl;
error_count++; error_count++;
} }
} }