esbo_ds/fsfw
3
0
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases Wiki Activity

minor formatting stuff

Browse Source
This commit is contained in:
Robin Müller 2021-01-11 22:33:58 +01:00
parent 0be4c35b73
commit 58d813c249
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
datapoollocal/LocalPoolObjectBase.cpp
View File

@ -1,9 +1,8 @@
#include "LocalPoolObjectBase.h" #include "LocalPoolObjectBase.h"
LocalPoolObjectBase::LocalPoolObjectBase(lp_id_t poolId, LocalPoolObjectBase::LocalPoolObjectBase(lp_id_t poolId, HasLocalDataPoolIF* hkOwner,
HasLocalDataPoolIF* hkOwner, DataSetIF* dataSet, DataSetIF* dataSet, pool_rwm_t setReadWriteMode):
pool_rwm_t setReadWriteMode): localPoolId(poolId), localPoolId(poolId), readWriteMode(setReadWriteMode) {
readWriteMode(setReadWriteMode) {
if(poolId == PoolVariableIF::NO_PARAMETER) { if(poolId == PoolVariableIF::NO_PARAMETER) {
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::warning << "LocalPoolVar<T>::LocalPoolVar: 0 passed as pool ID, " sif::warning << "LocalPoolVar<T>::LocalPoolVar: 0 passed as pool ID, "
@ -23,9 +22,9 @@ LocalPoolObjectBase::LocalPoolObjectBase(lp_id_t poolId,
} }
} }
LocalPoolObjectBase::LocalPoolObjectBase(object_id_t poolOwner, lp_id_t poolId, LocalPoolObjectBase::LocalPoolObjectBase(object_id_t poolOwner, lp_id_t poolId, DataSetIF *dataSet,
DataSetIF *dataSet, pool_rwm_t setReadWriteMode): localPoolId(poolId), pool_rwm_t setReadWriteMode):
readWriteMode(setReadWriteMode) { localPoolId(poolId), readWriteMode(setReadWriteMode) {
if(poolId == PoolVariableIF::NO_PARAMETER) { if(poolId == PoolVariableIF::NO_PARAMETER) {
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::warning << "LocalPoolVar<T>::LocalPoolVar: 0 passed as pool ID, " sif::warning << "LocalPoolVar<T>::LocalPoolVar: 0 passed as pool ID, "
@ -109,10 +108,9 @@ void LocalPoolObjectBase::reportReadCommitError(const char* variableType,
} }
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::warning << variableType << ": " << type << " call | " << errMsg sif::warning << variableType << ": " << type << " call | " << errMsg << " | Owner: 0x"
<< " | Owner: 0x" << std::hex << std::setw(8) << std::hex << std::setw(8) << std::setfill('0') << objectId << std::dec
<< std::setfill('0') << objectId << std::dec << " LPID: " << lpId << " LPID: " << lpId << std::endl;
<< std::endl;
#else #else
fsfw::printWarning("%s: %s call | %s | Owner: 0x%08x LPID: %lu\n", fsfw::printWarning("%s: %s call | %s | Owner: 0x%08x LPID: %lu\n",
variableType, type, errMsg, objectId, lpId); variableType, type, errMsg, objectId, lpId);