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

run auto-formatter
All checks were successful
fsfw/fsfw/pipeline/pr-development This commit looks good
Details

Browse Source
This commit is contained in:
Jakob Meier 2022-06-23 11:56:46 +02:00
parent 2d2f65bf89
commit df97bbc691
7 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/fsfw/datapoollocal/LocalDataPoolManager.cpp
View File

@ -696,7 +696,8 @@ void LocalDataPoolManager::performPeriodicHkGeneration(HkReceiver& receiver) {
if (result != HasReturnvaluesIF::RETURN_OK) { if (result != HasReturnvaluesIF::RETURN_OK) {
/* Configuration error */ /* Configuration error */
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::warning << "LocalDataPoolManager::performPeriodicHkOperation: HK generation failed." << std::endl; sif::warning << "LocalDataPoolManager::performPeriodicHkOperation: HK generation failed."
<< std::endl;
#else #else
sif::printWarning("LocalDataPoolManager::performPeriodicHkOperation: HK generation failed.\n"); sif::printWarning("LocalDataPoolManager::performPeriodicHkOperation: HK generation failed.\n");
#endif #endif

2
src/fsfw/osal/linux/FixedTimeslotTask.cpp
View File

@ -54,7 +54,7 @@ ReturnValue_t FixedTimeslotTask::sleepFor(uint32_t ms) {
// If the deadline was missed, the deadlineMissedFunc is called. // If the deadline was missed, the deadlineMissedFunc is called.
if (!PosixThread::delayUntil(&lastWakeTime, interval)) { if (!PosixThread::delayUntil(&lastWakeTime, interval)) {
// No time left on timer -> we missed the deadline // No time left on timer -> we missed the deadline
if(dlmFunc != nullptr){ if (dlmFunc != nullptr) {
dlmFunc(); dlmFunc();
} }
} }

2
tests/src/fsfw_tests/unit/hal/testCommandExecutor.cpp
View File

@ -4,12 +4,12 @@
#include <fstream> #include <fstream>
#include <iostream> #include <iostream>
#include "tests/TestsConfig.h"
#include "fsfw/container/DynamicFIFO.h" #include "fsfw/container/DynamicFIFO.h"
#include "fsfw/container/SimpleRingBuffer.h" #include "fsfw/container/SimpleRingBuffer.h"
#include "fsfw/platform.h" #include "fsfw/platform.h"
#include "fsfw/serviceinterface.h" #include "fsfw/serviceinterface.h"
#include "fsfw_hal/linux/CommandExecutor.h" #include "fsfw_hal/linux/CommandExecutor.h"
#include "tests/TestsConfig.h"
#ifdef PLATFORM_UNIX #ifdef PLATFORM_UNIX

6
tests/src/fsfw_tests/unit/storagemanager/TestNewAccessor.cpp
View File

@ -157,7 +157,7 @@ TEST_CASE("New Accessor", "[NewAccessor]") {
} }
} }
SECTION("Operators"){ SECTION("Operators") {
result = SimplePool.addData(&testStoreId, testDataArray.data(), size); result = SimplePool.addData(&testStoreId, testDataArray.data(), size);
REQUIRE(result == retval::CATCH_OK); REQUIRE(result == retval::CATCH_OK);
{ {
@ -176,10 +176,10 @@ TEST_CASE("New Accessor", "[NewAccessor]") {
std::array<uint8_t, 10> newData; std::array<uint8_t, 10> newData;
// Expect data to be invalid so this must return RETURN_FAILED // Expect data to be invalid so this must return RETURN_FAILED
result = accessor.getDataCopy(newData.data(),newData.size()); result = accessor.getDataCopy(newData.data(), newData.size());
REQUIRE(result == HasReturnvaluesIF::RETURN_FAILED); REQUIRE(result == HasReturnvaluesIF::RETURN_FAILED);
// Expect data to be too small // Expect data to be too small
result = accessor2.getDataCopy(data.data(),data.size()); result = accessor2.getDataCopy(data.data(), data.size());
REQUIRE(result == HasReturnvaluesIF::RETURN_FAILED); REQUIRE(result == HasReturnvaluesIF::RETURN_FAILED);
} }
} }

2
tests/src/fsfw_tests/unit/storagemanager/TestPool.cpp
View File

@ -1,9 +1,9 @@
#include <fsfw/objectmanager/ObjectManager.h> #include <fsfw/objectmanager/ObjectManager.h>
#include <fsfw/storagemanager/LocalPool.h> #include <fsfw/storagemanager/LocalPool.h>
#include <array>
#include <catch2/catch_test_macros.hpp> #include <catch2/catch_test_macros.hpp>
#include <cstring> #include <cstring>
#include <array>
#include "fsfw_tests/unit/CatchDefinitions.h" #include "fsfw_tests/unit/CatchDefinitions.h"