fsfw/fsfw-example-common
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

complete iostream log replacements

Browse Source
This commit is contained in:
Robin Müller
2022-05-09 01:14:53 +02:00
parent 0e619e3327
commit b7fda13b4b
11 changed files with 63 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
example/controller/FsfwTestController.cpp
View File

@ -40,8 +40,8 @@ void FsfwTestController::performControlOperation() {
break;
}
PoolReadGuard readHelper(&deviceDataset0.testUint8Var);
FSFW_FLOGI("Tracing device 0 variable 0 (UINT8), current value: {}",
static_cast<int>(deviceDataset0.testUint8Var.value));
FSFW_LOGI("Tracing device 0 variable 0 (UINT8), current value: {}",
static_cast<int>(deviceDataset0.testUint8Var.value));
traceCounter--;
break;
}
@ -108,8 +108,8 @@ void FsfwTestController::handleChangedDataset(sid_t sid, store_address_t storeId
} else {
printout = "Snapshot";
}
FSFW_FLOGI("handleChangedDataset: {} update from object ID {:#08x} and set ID {}\n", printout,
sid.objectId, sid.ownerSetId);
FSFW_LOGI("handleChangedDataset: {} update from object ID {:#08x} and set ID {}\n", printout,
sid.objectId, sid.ownerSetId);
if (storeId == storeId::INVALID_STORE_ADDRESS) {
if (sid.objectId == device0Id) {
@ -118,13 +118,8 @@ void FsfwTestController::handleChangedDataset(sid_t sid, store_address_t storeId
floatVec[0] = deviceDataset0.testFloat3Vec.value[0];
floatVec[1] = deviceDataset0.testFloat3Vec.value[1];
floatVec[2] = deviceDataset0.testFloat3Vec.value[2];
#if FSFW_CPP_OSTREAM_ENABLED == 1
std::cout << "Current float vector (3) values: [" << floatVec[0] << ", " << floatVec[1]
<< ", " << floatVec[2] << "]" << std::endl;
#else
sif::printInfo("Current float vector (3) values: [%f, %f, %f]\n", floatVec[0], floatVec[1],
floatVec[2]);
#endif /* FSFW_CPP_OSTREAM_ENABLED == 1 */
FSFW_LOGI("Current float vector (3) values: [{},{},{}]\n", floatVec[0], floatVec[1],
floatVec[2]);
}
}
}
@ -149,29 +144,16 @@ void FsfwTestController::handleChangedPoolVariable(gp_id_t globPoolId, store_add
printout = "Snapshot";
}
#if FSFW_CPP_OSTREAM_ENABLED == 1
std::cout << "TestController::handleChangedPoolVariable: " << printout
<< " update from object "
"ID 0x"
<< setw(8) << setfill('0') << hex << globPoolId.objectId << " and local pool ID "
<< globPoolId.localPoolId << dec << setfill(' ') << endl;
#else
sif::printInfo(
"TestController::handleChangedPoolVariable: %s update from object ID 0x%08x and "
"local pool ID %lu\n",
FSFW_LOGI(
"TestController::handleChangedPoolVariable: {} update from object "
"ID {:#010x} and LPID {}\n",
printout, globPoolId.objectId, globPoolId.localPoolId);
#endif /* FSFW_CPP_OSTREAM_ENABLED == 1 */
if (storeId == storeId::INVALID_STORE_ADDRESS) {
if (globPoolId.objectId == device0Id) {
PoolReadGuard readHelper(&deviceDataset0.testUint8Var);
#if FSFW_CPP_OSTREAM_ENABLED == 1
std::cout << "Current test variable 0 (UINT8) value: "
<< static_cast<int>(deviceDataset0.testUint8Var.value) << std::endl;
#else
sif::printInfo("Current test variable 0 (UINT8) value %d\n",
deviceDataset0.testUint8Var.value);
#endif /* FSFW_CPP_OSTREAM_ENABLED == 1 */
FSFW_LOGI("Current test variable 0 (UINT8) value: {}",
static_cast<int>(deviceDataset0.testUint8Var.value));
}
}
}