eive/fsfw
eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

Update FSFW #70

Merged
meierj merged 44 commits from mueller/update-fsfw into eive/develop 2022-04-27 07:48:57 +02:00
Conversation 0 Commits 44 Files Changed 19 +5 -11
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0b3255e463 - Show all commits

12
tests/src/fsfw_tests/unit/osal/TestClock.cpp
View File

@ -51,20 +51,14 @@ TEST_CASE("OSAL::Clock Test", "[OSAL::Clock Test]") {
REQUIRE(result == HasReturnvaluesIF::RETURN_OK); REQUIRE(result == HasReturnvaluesIF::RETURN_OK);
double timeAsUsecDouble = static_cast<double>(timeAsUsec) / 1000000.0; double timeAsUsecDouble = static_cast<double>(timeAsUsec) / 1000000.0;
timeval timeAsUsecTimeval = timevalOperations::toTimeval(timeAsUsecDouble); timeval timeAsUsecTimeval = timevalOperations::toTimeval(timeAsUsecDouble);
double difference = timevalOperations::toDouble(timeAsTimeval - timeAsUsecTimeval); double difference = timevalOperations::toDouble(timeAsUsecTimeval - timeAsTimeval);
// We accept 5 ms difference // We accept 5 ms difference
CHECK(abs(difference) <= 0.005); CHECK(difference >= 0.0);
CHECK(difference <= 0.005);
uint64_t timevalAsUint64 = static_cast<uint64_t>(timeAsTimeval.tv_sec) * 1000000ull + uint64_t timevalAsUint64 = static_cast<uint64_t>(timeAsTimeval.tv_sec) * 1000000ull +
static_cast<uint64_t>(timeAsTimeval.tv_usec); static_cast<uint64_t>(timeAsTimeval.tv_usec);
if (timeAsUsec > timevalAsUint64) {
// This should not be the case but we can see some rounding issue sometimes
// This is the case if used in valgrind. This might indicate an other issue
CHECK((timeAsUsec - timevalAsUint64) >= 0); CHECK((timeAsUsec - timevalAsUint64) >= 0);
CHECK((timeAsUsec - timevalAsUint64) <= (5 * 1000)); CHECK((timeAsUsec - timevalAsUint64) <= (5 * 1000));
} else {
CHECK((timevalAsUint64 - timeAsUsec) >= 0);
CHECK((timevalAsUint64 - timeAsUsec) <= (5 * 1000));
}
} }
SECTION("Test j2000") { SECTION("Test j2000") {
double j2000; double j2000;