Clang format

This commit is contained in:
Steffen Gaisser 2022-02-23 18:24:07 +01:00
parent f6357b4531
commit 09815f5cce
6 changed files with 21 additions and 22 deletions

View File

@ -1,12 +1,12 @@
#ifndef FSFW_SRC_FSFW_CFDP_FILESTOREREQUESTBASE_H_
#define FSFW_SRC_FSFW_CFDP_FILESTOREREQUESTBASE_H_
#include <FSFWConfig.h>
#include <fsfw/cfdp/definitions.h>
#include <fsfw/cfdp/tlv/Lv.h>
#include <fsfw/cfdp/tlv/Tlv.h>
#include <fsfw/cfdp/tlv/TlvIF.h>
#include <fsfw/serialize/SerializeIF.h>
#include <FSFWConfig.h>
#include <cstddef>
#include <cstdint>

View File

@ -1,6 +1,7 @@
#include "fsfw/osal/linux/BinarySemaphore.h"
#include <errno.h>
#include <stdio.h>
#include <time.h>
#include <cstring>
@ -9,8 +10,6 @@
#include "fsfw/serviceinterface/ServiceInterfacePrinter.h"
#include "fsfw/serviceinterface/ServiceInterfaceStream.h"
#include <stdio.h>
BinarySemaphore::BinarySemaphore() {
// Using unnamed semaphores for now
initSemaphore();

View File

@ -77,9 +77,9 @@ class RMAPChannelIF {
* command; command was not sent
* - @c COMMAND_BUFFER_FULL no receiver buffer available for
* expected len; command was not sent
* - @c COMMAND_TOO_BIG the data that was to be sent was too long
* for the hw to handle (write command) or the expected len was bigger than maximal expected len
* (read command) command was not sent
* - @c COMMAND_TOO_BIG the data that was to be sent was too
* long for the hw to handle (write command) or the expected len was bigger than maximal expected
* len (read command) command was not sent
* - @c COMMAND_CHANNEL_DEACTIVATED the channel has no port set
* - @c NOT_SUPPORTED if you dont feel like
* implementing something...

View File

@ -1,9 +1,9 @@
#include "fsfw/storagemanager/LocalPool.h"
#include <cstring>
#include <FSFWConfig.h>
#include <cstring>
#include "fsfw/FSFW.h"
#include "fsfw/objectmanager/ObjectManager.h"

View File

@ -127,7 +127,7 @@ ReturnValue_t CCSDSTime::convertFromCCS(Clock::TimeOfDay_t* to, const uint8_t* f
}
to->month = tempMonth;
to->day = tempDay;
}else{
} else {
to->month = temp->month;
to->day = temp->day;
}
@ -228,8 +228,8 @@ ReturnValue_t CCSDSTime::convertFromASCII(Clock::TimeOfDay_t* to, const uint8_t*
}
// try Code B (yyyy-ddd)
count = sscanf((const char*)from, "%4" SCNu16 "-%3" SCNu16 "T%2" SCNu8 ":%2" SCNu8 ":%fZ", &year, &day,
&hour, &minute, &second);
count = sscanf((const char*)from, "%4" SCNu16 "-%3" SCNu16 "T%2" SCNu8 ":%2" SCNu8 ":%fZ", &year,
&day, &hour, &minute, &second);
if (count == 5) {
uint8_t tempDay;
ReturnValue_t result = CCSDSTime::convertDaysOfYear(day, year, &month, &tempDay);

View File

@ -1,9 +1,8 @@
#include <array>
#include <fsfw/timemanager/CCSDSTime.h>
#include <catch2/catch_test_macros.hpp>
#include <array>
#include <catch2/catch_approx.hpp>
#include <catch2/catch_test_macros.hpp>
#include "fsfw_tests/unit/CatchDefinitions.h"
@ -53,11 +52,12 @@ TEST_CASE("CCSDSTime Tests", "[TestCCSDSTime]") {
REQUIRE(timeTo.second == 45);
REQUIRE(timeTo.usecond == 123400);
}
SECTION("CCS_Day of Year"){
SECTION("CCS_Day of Year") {
Clock::TimeOfDay_t timeTo;
std::array<uint8_t,8> ccsDayOfYear = {0b01011000, 0x07, 0xe4, 0, 60, 13, 24, 45};
std::array<uint8_t, 8> ccsDayOfYear = {0b01011000, 0x07, 0xe4, 0, 60, 13, 24, 45};
size_t length = ccsDayOfYear.size();
auto result = CCSDSTime::convertFromCCS(&timeTo, ccsDayOfYear.data(), &length, ccsDayOfYear.size());
auto result =
CCSDSTime::convertFromCCS(&timeTo, ccsDayOfYear.data(), &length, ccsDayOfYear.size());
REQUIRE(result == HasReturnvaluesIF::RETURN_OK);
// Check constness
REQUIRE(ccsDayOfYear[0] == 0b01011000);
@ -76,11 +76,11 @@ TEST_CASE("CCSDSTime Tests", "[TestCCSDSTime]") {
REQUIRE(timeTo.second == 45);
REQUIRE(timeTo.usecond == 0);
}
SECTION("Test convertFromASCII"){
std::string timeAscii = "2022-12-31T23:59:59.123Z";
Clock::TimeOfDay_t timeTo;
const uint8_t* timeChar = reinterpret_cast<const uint8_t*>(timeAscii.c_str());
CCSDSTime::convertFromASCII(&timeTo, timeChar, timeAscii.length());
SECTION("Test convertFromASCII") {
std::string timeAscii = "2022-12-31T23:59:59.123Z";
Clock::TimeOfDay_t timeTo;
const uint8_t* timeChar = reinterpret_cast<const uint8_t*>(timeAscii.c_str());
CCSDSTime::convertFromASCII(&timeTo, timeChar, timeAscii.length());
REQUIRE(timeTo.year == 2022);
REQUIRE(timeTo.month == 12);
REQUIRE(timeTo.day == 31);