Merge pull request 'fix formatting' (#42) from auto-formatting into main

Reviewed-on: #42
This commit is contained in:
Robin Müller 2024-11-15 10:55:26 +01:00
commit 21d5800bfa
29 changed files with 46 additions and 46 deletions

View File

@ -66,9 +66,9 @@ static constexpr uint8_t FSR_DENY_DIR_NOT_ALLOWED = 0b0010;
class FilestoreTlvBase : public TlvIF { class FilestoreTlvBase : public TlvIF {
public: public:
explicit FilestoreTlvBase(cfdp::StringLv& firstFileName) : firstFileName(firstFileName){}; explicit FilestoreTlvBase(cfdp::StringLv& firstFileName) : firstFileName(firstFileName) {};
FilestoreTlvBase(FilestoreActionCode actionCode, cfdp::StringLv& firstFileName) FilestoreTlvBase(FilestoreActionCode actionCode, cfdp::StringLv& firstFileName)
: actionCode(actionCode), firstFileName(firstFileName){}; : actionCode(actionCode), firstFileName(firstFileName) {};
ReturnValue_t commonSerialize(uint8_t** buffer, size_t* size, size_t maxSize, ReturnValue_t commonSerialize(uint8_t** buffer, size_t* size, size_t maxSize,
Endianness streamEndianness, bool isResponse = false, Endianness streamEndianness, bool isResponse = false,

View File

@ -5,7 +5,7 @@
class TlvIF : public SerializeIF { class TlvIF : public SerializeIF {
public: public:
virtual ~TlvIF(){}; virtual ~TlvIF() {};
virtual uint8_t getLengthField() const = 0; virtual uint8_t getLengthField() const = 0;
virtual cfdp::TlvType getType() const = 0; virtual cfdp::TlvType getType() const = 0;

View File

@ -29,7 +29,7 @@ class Jgm3Model {
lastExecutionTime.tv_sec = 0; lastExecutionTime.tv_sec = 0;
lastExecutionTime.tv_usec = 0; lastExecutionTime.tv_usec = 0;
} }
virtual ~Jgm3Model(){}; virtual ~Jgm3Model() {};
// double acsNavOrbit(double posECF[3],double velECF[3],timeval gpsTime); // double acsNavOrbit(double posECF[3],double velECF[3],timeval gpsTime);

View File

@ -10,7 +10,7 @@
*/ */
class PoolDataSetIF : virtual public DataSetIF, virtual public ReadCommitIF { class PoolDataSetIF : virtual public DataSetIF, virtual public ReadCommitIF {
public: public:
virtual ~PoolDataSetIF(){}; virtual ~PoolDataSetIF() {};
/** /**
* @brief Most underlying data structures will have a pool like structure * @brief Most underlying data structures will have a pool like structure

View File

@ -5,7 +5,7 @@
class SharedDataSetIF { class SharedDataSetIF {
public: public:
virtual ~SharedDataSetIF(){}; virtual ~SharedDataSetIF() {};
private: private:
virtual ReturnValue_t lockDataset(MutexIF::TimeoutType timeoutType, virtual ReturnValue_t lockDataset(MutexIF::TimeoutType timeoutType,

View File

@ -9,7 +9,7 @@ class MutexIF;
*/ */
class AccessPoolManagerIF { class AccessPoolManagerIF {
public: public:
virtual ~AccessPoolManagerIF(){}; virtual ~AccessPoolManagerIF() {};
virtual MutexIF* getLocalPoolMutex() = 0; virtual MutexIF* getLocalPoolMutex() = 0;

View File

@ -44,7 +44,7 @@ class HasLocalDataPoolIF {
friend class HasLocalDpIFUserAttorney; friend class HasLocalDpIFUserAttorney;
public: public:
virtual ~HasLocalDataPoolIF(){}; virtual ~HasLocalDataPoolIF() {};
static constexpr uint32_t INVALID_LPID = localpool::INVALID_LPID; static constexpr uint32_t INVALID_LPID = localpool::INVALID_LPID;

View File

@ -257,7 +257,7 @@ class LocalDataPoolManager : public ProvidesDataPoolSubscriptionIF, public Acces
MessageQueueId_t hkDestinationId = MessageQueueIF::NO_QUEUE; MessageQueueId_t hkDestinationId = MessageQueueIF::NO_QUEUE;
union DataId { union DataId {
DataId() : sid(){}; DataId() : sid() {};
sid_t sid; sid_t sid;
lp_id_t localPoolId; lp_id_t localPoolId;
}; };

View File

@ -76,7 +76,7 @@ class LocalPoolVariable : public LocalPoolObjectBase {
LocalPoolVariable(gp_id_t globalPoolId, DataSetIF* dataSet = nullptr, LocalPoolVariable(gp_id_t globalPoolId, DataSetIF* dataSet = nullptr,
pool_rwm_t setReadWriteMode = pool_rwm_t::VAR_READ_WRITE); pool_rwm_t setReadWriteMode = pool_rwm_t::VAR_READ_WRITE);
virtual ~LocalPoolVariable(){}; virtual ~LocalPoolVariable() {};
/** /**
* @brief This is the local copy of the data pool entry. * @brief This is the local copy of the data pool entry.

View File

@ -88,7 +88,7 @@ class LocalPoolVector : public LocalPoolObjectBase {
* @details If commit() was not called, the local value is * @details If commit() was not called, the local value is
* discarded and not written back to the data pool. * discarded and not written back to the data pool.
*/ */
~LocalPoolVector(){}; ~LocalPoolVector() {};
/** /**
* @brief The operation returns the number of array entries * @brief The operation returns the number of array entries
* in this variable. * in this variable.

View File

@ -6,7 +6,7 @@
*/ */
class MarkChangedIF { class MarkChangedIF {
public: public:
virtual ~MarkChangedIF(){}; virtual ~MarkChangedIF() {};
virtual bool hasChanged() const = 0; virtual bool hasChanged() const = 0;
virtual void setChanged(bool changed) = 0; virtual void setChanged(bool changed) = 0;

View File

@ -28,7 +28,7 @@ using address_t = uint32_t;
*/ */
class CookieIF { class CookieIF {
public: public:
virtual ~CookieIF(){}; virtual ~CookieIF() {};
}; };
#endif /* FSFW_DEVICEHANDLER_COOKIE_H_ */ #endif /* FSFW_DEVICEHANDLER_COOKIE_H_ */

View File

@ -23,7 +23,7 @@ class HousekeepingSnapshot : public SerializeIF {
HousekeepingSnapshot(CCSDSTime::CDS_short* cdsShort, LocalPoolDataSetBase* dataSetPtr) HousekeepingSnapshot(CCSDSTime::CDS_short* cdsShort, LocalPoolDataSetBase* dataSetPtr)
: timeStamp(reinterpret_cast<uint8_t*>(cdsShort)), : timeStamp(reinterpret_cast<uint8_t*>(cdsShort)),
timeStampSize(sizeof(CCSDSTime::CDS_short)), timeStampSize(sizeof(CCSDSTime::CDS_short)),
updateData(dataSetPtr){}; updateData(dataSetPtr) {};
/** /**
* Update packet constructor for datasets. * Update packet constructor for datasets.
@ -32,7 +32,7 @@ class HousekeepingSnapshot : public SerializeIF {
* @param dataSetPtr Pointer to the dataset instance to deserialize the data into * @param dataSetPtr Pointer to the dataset instance to deserialize the data into
*/ */
HousekeepingSnapshot(uint8_t* timeStamp, size_t timeStampSize, LocalPoolDataSetBase* dataSetPtr) HousekeepingSnapshot(uint8_t* timeStamp, size_t timeStampSize, LocalPoolDataSetBase* dataSetPtr)
: timeStamp(timeStamp), timeStampSize(timeStampSize), updateData(dataSetPtr){}; : timeStamp(timeStamp), timeStampSize(timeStampSize), updateData(dataSetPtr) {};
/** /**
* Update packet constructor for pool variables. * Update packet constructor for pool variables.
@ -43,7 +43,7 @@ class HousekeepingSnapshot : public SerializeIF {
HousekeepingSnapshot(CCSDSTime::CDS_short* cdsShort, LocalPoolObjectBase* dataSetPtr) HousekeepingSnapshot(CCSDSTime::CDS_short* cdsShort, LocalPoolObjectBase* dataSetPtr)
: timeStamp(reinterpret_cast<uint8_t*>(cdsShort)), : timeStamp(reinterpret_cast<uint8_t*>(cdsShort)),
timeStampSize(sizeof(CCSDSTime::CDS_short)), timeStampSize(sizeof(CCSDSTime::CDS_short)),
updateData(dataSetPtr){}; updateData(dataSetPtr) {};
/** /**
* Update packet constructor for pool variables. * Update packet constructor for pool variables.
@ -52,7 +52,7 @@ class HousekeepingSnapshot : public SerializeIF {
* @param dataSetPtr * @param dataSetPtr
*/ */
HousekeepingSnapshot(uint8_t* timeStamp, size_t timeStampSize, LocalPoolObjectBase* dataSetPtr) HousekeepingSnapshot(uint8_t* timeStamp, size_t timeStampSize, LocalPoolObjectBase* dataSetPtr)
: timeStamp(timeStamp), timeStampSize(timeStampSize), updateData(dataSetPtr){}; : timeStamp(timeStamp), timeStampSize(timeStampSize), updateData(dataSetPtr) {};
ReturnValue_t serialize(uint8_t** buffer, size_t* size, size_t maxSize, ReturnValue_t serialize(uint8_t** buffer, size_t* size, size_t maxSize,
Endianness streamEndianness) const { Endianness streamEndianness) const {

View File

@ -37,7 +37,7 @@ class CommandMessageIF {
//! Parameter 1 should contain the error code //! Parameter 1 should contain the error code
static const Command_t REPLY_REJECTED = MAKE_COMMAND_ID(2); static const Command_t REPLY_REJECTED = MAKE_COMMAND_ID(2);
virtual ~CommandMessageIF(){}; virtual ~CommandMessageIF() {};
/** /**
* A command message shall have a uint16_t command ID field. * A command message shall have a uint16_t command ID field.

View File

@ -5,7 +5,7 @@
#include <fsfw/objectmanager/frameworkObjects.h> #include <fsfw/objectmanager/frameworkObjects.h>
struct MqArgs { struct MqArgs {
MqArgs(){}; MqArgs() {};
MqArgs(object_id_t objectId, void* args = nullptr) : objectId(objectId), args(args) {} MqArgs(object_id_t objectId, void* args = nullptr) : objectId(objectId), args(args) {}
object_id_t objectId = objects::NO_OBJECT; object_id_t objectId = objects::NO_OBJECT;
void* args = nullptr; void* args = nullptr;

View File

@ -40,7 +40,7 @@ class ObjectManagerIF {
/** /**
* @brief This is the empty virtual destructor as requested by C++ interfaces. * @brief This is the empty virtual destructor as requested by C++ interfaces.
*/ */
virtual ~ObjectManagerIF(void){}; virtual ~ObjectManagerIF(void) {};
/** /**
* @brief With this call, new objects are inserted to the list. * @brief With this call, new objects are inserted to the list.
* @details The implementation shall return an error code in case the * @details The implementation shall return an error code in case the

View File

@ -9,7 +9,7 @@
class RMAPChannelIF { class RMAPChannelIF {
public: public:
virtual ~RMAPChannelIF(){}; virtual ~RMAPChannelIF() {};
/** /**
* Reset an RMAP channel * Reset an RMAP channel
* *

View File

@ -12,7 +12,7 @@
struct TableSequenceBase { struct TableSequenceBase {
public: public:
TableSequenceBase(Mode_t mode, ArrayList<ModeListEntry> *table) : mode(mode), table(table){}; TableSequenceBase(Mode_t mode, ArrayList<ModeListEntry> *table) : mode(mode), table(table) {};
Mode_t mode; Mode_t mode;
ArrayList<ModeListEntry> *table; ArrayList<ModeListEntry> *table;
bool inStore = false; bool inStore = false;
@ -21,7 +21,7 @@ struct TableSequenceBase {
struct TableEntry : public TableSequenceBase { struct TableEntry : public TableSequenceBase {
public: public:
TableEntry(Mode_t mode, ArrayList<ModeListEntry> *table) : TableSequenceBase(mode, table){}; TableEntry(Mode_t mode, ArrayList<ModeListEntry> *table) : TableSequenceBase(mode, table) {};
}; };
struct SequenceEntry : public TableSequenceBase { struct SequenceEntry : public TableSequenceBase {

View File

@ -34,7 +34,7 @@ class ExecutableObjectIF {
* a reference to the executing task * a reference to the executing task
* @param task_ Pointer to the taskIF of this task * @param task_ Pointer to the taskIF of this task
*/ */
virtual void setTaskIF(PeriodicTaskIF* task_){}; virtual void setTaskIF(PeriodicTaskIF* task_) {};
/** /**
* This function should be called after the object was assigned to a * This function should be called after the object was assigned to a

View File

@ -30,7 +30,7 @@ class SemaphoreIF {
BLOCKING //!< Block indefinitely until the mutex becomes available. BLOCKING //!< Block indefinitely until the mutex becomes available.
}; };
virtual ~SemaphoreIF(){}; virtual ~SemaphoreIF() {};
static const uint8_t INTERFACE_ID = CLASS_ID::SEMAPHORE_IF; static const uint8_t INTERFACE_ID = CLASS_ID::SEMAPHORE_IF;
//! Semaphore timeout //! Semaphore timeout

View File

@ -212,8 +212,8 @@ class CCSDSTime {
static uint32_t subsecondsToMicroseconds(uint16_t subseconds); static uint32_t subsecondsToMicroseconds(uint16_t subseconds);
private: private:
CCSDSTime(){}; CCSDSTime() {};
virtual ~CCSDSTime(){}; virtual ~CCSDSTime() {};
/** /**
* checks a ccs time stream for validity * checks a ccs time stream for validity
* *

View File

@ -22,7 +22,7 @@ struct PusTmSecHeader {
struct PusTmParams { struct PusTmParams {
PusTmParams() = default; PusTmParams() = default;
explicit PusTmParams(PusTmSecHeader secHeader) : secHeader(secHeader){}; explicit PusTmParams(PusTmSecHeader secHeader) : secHeader(secHeader) {};
PusTmParams(PusTmSecHeader secHeader, const SerializeIF& data) PusTmParams(PusTmSecHeader secHeader, const SerializeIF& data)
: secHeader(secHeader), sourceData(&data) {} : secHeader(secHeader), sourceData(&data) {}
PusTmParams(PusTmSecHeader secHeader, const uint8_t* data, size_t dataLen) PusTmParams(PusTmSecHeader secHeader, const uint8_t* data, size_t dataLen)

View File

@ -15,7 +15,7 @@ class GpioCookie;
*/ */
class GpioIF { class GpioIF {
public: public:
virtual ~GpioIF(){}; virtual ~GpioIF() {};
/** /**
* @brief Called by the GPIO using object. * @brief Called by the GPIO using object.

View File

@ -60,7 +60,7 @@ class GpioBase {
gpio::Levels initValue) gpio::Levels initValue)
: gpioType(gpioType), consumer(consumer), direction(direction), initValue(initValue) {} : gpioType(gpioType), consumer(consumer), direction(direction), initValue(initValue) {}
virtual ~GpioBase(){}; virtual ~GpioBase() {};
// Can be used to cast GpioBase to a concrete child implementation // Can be used to cast GpioBase to a concrete child implementation
gpio::GpioTypes gpioType = gpio::GpioTypes::NONE; gpio::GpioTypes gpioType = gpio::GpioTypes::NONE;

View File

@ -12,10 +12,10 @@ namespace stm32h7 {
* and the second entry is the pin number * and the second entry is the pin number
*/ */
struct GpioCfg { struct GpioCfg {
GpioCfg() : port(nullptr), pin(0), altFnc(0){}; GpioCfg() : port(nullptr), pin(0), altFnc(0) {};
GpioCfg(GPIO_TypeDef* port, uint16_t pin, uint8_t altFnc = 0) GpioCfg(GPIO_TypeDef* port, uint16_t pin, uint8_t altFnc = 0)
: port(port), pin(pin), altFnc(altFnc){}; : port(port), pin(pin), altFnc(altFnc) {};
GPIO_TypeDef* port; GPIO_TypeDef* port;
uint16_t pin; uint16_t pin;
uint8_t altFnc; uint8_t altFnc;

View File

@ -37,7 +37,7 @@ struct MspCfgBase {
}; };
struct MspPollingConfigStruct : public MspCfgBase { struct MspPollingConfigStruct : public MspCfgBase {
MspPollingConfigStruct() : MspCfgBase(){}; MspPollingConfigStruct() : MspCfgBase() {};
MspPollingConfigStruct(stm32h7::GpioCfg sck, stm32h7::GpioCfg mosi, stm32h7::GpioCfg miso, MspPollingConfigStruct(stm32h7::GpioCfg sck, stm32h7::GpioCfg mosi, stm32h7::GpioCfg miso,
mspCb cleanupCb = nullptr, mspCb setupCb = nullptr) mspCb cleanupCb = nullptr, mspCb setupCb = nullptr)
: MspCfgBase(sck, mosi, miso, cleanupCb, setupCb) {} : MspCfgBase(sck, mosi, miso, cleanupCb, setupCb) {}
@ -46,7 +46,7 @@ struct MspPollingConfigStruct : public MspCfgBase {
/* A valid instance of this struct must be passed to the MSP initialization function as a void* /* A valid instance of this struct must be passed to the MSP initialization function as a void*
argument */ argument */
struct MspIrqConfigStruct : public MspPollingConfigStruct { struct MspIrqConfigStruct : public MspPollingConfigStruct {
MspIrqConfigStruct() : MspPollingConfigStruct(){}; MspIrqConfigStruct() : MspPollingConfigStruct() {};
MspIrqConfigStruct(stm32h7::GpioCfg sck, stm32h7::GpioCfg mosi, stm32h7::GpioCfg miso, MspIrqConfigStruct(stm32h7::GpioCfg sck, stm32h7::GpioCfg mosi, stm32h7::GpioCfg miso,
mspCb cleanupCb = nullptr, mspCb setupCb = nullptr) mspCb cleanupCb = nullptr, mspCb setupCb = nullptr)
: MspPollingConfigStruct(sck, mosi, miso, cleanupCb, setupCb) {} : MspPollingConfigStruct(sck, mosi, miso, cleanupCb, setupCb) {}
@ -64,7 +64,7 @@ struct MspIrqConfigStruct : public MspPollingConfigStruct {
/* A valid instance of this struct must be passed to the MSP initialization function as a void* /* A valid instance of this struct must be passed to the MSP initialization function as a void*
argument */ argument */
struct MspDmaConfigStruct : public MspIrqConfigStruct { struct MspDmaConfigStruct : public MspIrqConfigStruct {
MspDmaConfigStruct() : MspIrqConfigStruct(){}; MspDmaConfigStruct() : MspIrqConfigStruct() {};
MspDmaConfigStruct(stm32h7::GpioCfg sck, stm32h7::GpioCfg mosi, stm32h7::GpioCfg miso, MspDmaConfigStruct(stm32h7::GpioCfg sck, stm32h7::GpioCfg mosi, stm32h7::GpioCfg miso,
mspCb cleanupCb = nullptr, mspCb setupCb = nullptr) mspCb cleanupCb = nullptr, mspCb setupCb = nullptr)
: MspIrqConfigStruct(sck, mosi, miso, cleanupCb, setupCb) {} : MspIrqConfigStruct(sck, mosi, miso, cleanupCb, setupCb) {}

View File

@ -13,8 +13,8 @@ TEST_CASE("Array List", "[containers]") {
ArrayList<uint16_t> list(20); ArrayList<uint16_t> list(20);
struct TestClass { struct TestClass {
public: public:
TestClass(){}; TestClass() {};
TestClass(uint32_t number1, uint64_t number2) : number1(number1), number2(number2){}; TestClass(uint32_t number1, uint64_t number2) : number1(number1), number2(number2) {};
uint32_t number1 = -1; uint32_t number1 = -1;
uint64_t number2 = -1; uint64_t number2 = -1;
bool operator==(const TestClass& other) { bool operator==(const TestClass& other) {

View File

@ -97,9 +97,9 @@ TEST_CASE("FixedOrderedMultimap Non Trivial Type", "[TestFixedOrderedMultimapNon
class TestClass { class TestClass {
public: public:
TestClass(){}; TestClass() {};
TestClass(uint32_t number1, uint64_t number2) : number1(number1), number2(number2){}; TestClass(uint32_t number1, uint64_t number2) : number1(number1), number2(number2) {};
~TestClass(){}; ~TestClass() {};
bool operator==(const TestClass& lhs) { bool operator==(const TestClass& lhs) {
return ((this->number1 == lhs.number1) and (this->number2 == lhs.number2)); return ((this->number1 == lhs.number1) and (this->number2 == lhs.number2));