diff --git a/src/fsfw/cfdp/VarLenFields.h b/src/fsfw/cfdp/VarLenFields.h index 37602c75..2758dc67 100644 --- a/src/fsfw/cfdp/VarLenFields.h +++ b/src/fsfw/cfdp/VarLenFields.h @@ -51,8 +51,9 @@ class VarLenField : public SerializeIF { return os; } #endif - private: + using SerializeIF::deSerialize; // we overloaded above, so this is needed to uncofuse the + // compiler ReturnValue_t deSerialize(const uint8_t **buffer, size_t *size, Endianness streamEndianness) override; diff --git a/src/fsfw/cfdp/tlv/EntityIdTlv.h b/src/fsfw/cfdp/tlv/EntityIdTlv.h index ac310899..30ef97ff 100644 --- a/src/fsfw/cfdp/tlv/EntityIdTlv.h +++ b/src/fsfw/cfdp/tlv/EntityIdTlv.h @@ -23,6 +23,8 @@ class EntityIdTlv : public TlvIF { */ ReturnValue_t deSerialize(cfdp::Tlv& tlv, Endianness endianness); + using SerializeIF::deSerialize; // we overloaded this function, so this is needed to unconfuse + // the compiler ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size, Endianness streamEndianness) override; diff --git a/src/fsfw/cfdp/tlv/FilestoreResponseTlv.h b/src/fsfw/cfdp/tlv/FilestoreResponseTlv.h index 110f1bb4..d5c805be 100644 --- a/src/fsfw/cfdp/tlv/FilestoreResponseTlv.h +++ b/src/fsfw/cfdp/tlv/FilestoreResponseTlv.h @@ -29,6 +29,8 @@ class FilestoreResponseTlv : public cfdp::FilestoreTlvBase { */ ReturnValue_t deSerialize(const cfdp::Tlv& tlv, Endianness endianness); + using SerializeIF::deSerialize; // we overloaded this function, so this is needed to unconfuse + // the compiler ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size, Endianness streamEndianness) override; diff --git a/src/fsfw/container/FixedMap.h b/src/fsfw/container/FixedMap.h index ce90d814..01d2a6ea 100644 --- a/src/fsfw/container/FixedMap.h +++ b/src/fsfw/container/FixedMap.h @@ -155,8 +155,8 @@ class FixedMap : public SerializeIF { uint32_t maxSize() const { return theMap.maxSize(); } - virtual ReturnValue_t serialize(uint8_t** buffer, size_t* size, size_t maxSize, - Endianness streamEndianness) const { + ReturnValue_t serialize(uint8_t** buffer, size_t* size, size_t maxSize, + Endianness streamEndianness) const override { ReturnValue_t result = SerializeAdapter::serialize(&this->_size, buffer, size, maxSize, streamEndianness); uint32_t i = 0; @@ -170,7 +170,7 @@ class FixedMap : public SerializeIF { return result; } - virtual size_t getSerializedSize() const { + size_t getSerializedSize() const override { uint32_t printSize = sizeof(_size); uint32_t i = 0; @@ -182,8 +182,8 @@ class FixedMap : public SerializeIF { return printSize; } - virtual ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size, - Endianness streamEndianness) { + ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size, + Endianness streamEndianness) override { ReturnValue_t result = SerializeAdapter::deSerialize(&this->_size, buffer, size, streamEndianness); if (this->_size > theMap.maxSize()) { diff --git a/src/fsfw/datapool/PoolDataSetBase.h b/src/fsfw/datapool/PoolDataSetBase.h index 3e7e30c5..621dd8cc 100644 --- a/src/fsfw/datapool/PoolDataSetBase.h +++ b/src/fsfw/datapool/PoolDataSetBase.h @@ -64,8 +64,8 @@ class PoolDataSetBase : public PoolDataSetIF, public SerializeIF { * - @c SET_WAS_ALREADY_READ if read() is called twice without calling * commit() in between */ - virtual ReturnValue_t read(MutexIF::TimeoutType timeoutType = MutexIF::TimeoutType::WAITING, - uint32_t lockTimeout = 20) override; + ReturnValue_t read(MutexIF::TimeoutType timeoutType = MutexIF::TimeoutType::WAITING, + uint32_t lockTimeout = 20) override; /** * @brief The commit call initializes writing back the registered variables. * @details @@ -84,15 +84,15 @@ class PoolDataSetBase : public PoolDataSetIF, public SerializeIF { * - @c COMMITING_WITHOUT_READING if set was not read yet and * contains non write-only variables */ - virtual ReturnValue_t commit(MutexIF::TimeoutType timeoutType = MutexIF::TimeoutType::WAITING, - uint32_t lockTimeout = 20) override; + ReturnValue_t commit(MutexIF::TimeoutType timeoutType = MutexIF::TimeoutType::WAITING, + uint32_t lockTimeout = 20) override; /** * Register the passed pool variable instance into the data set. * @param variable * @return */ - virtual ReturnValue_t registerVariable(PoolVariableIF* variable) override; + ReturnValue_t registerVariable(PoolVariableIF* variable) override; /** * Provides the means to lock the underlying data structure to ensure diff --git a/src/fsfw/datapoollocal/LocalPoolVariable.h b/src/fsfw/datapoollocal/LocalPoolVariable.h index 818e4883..76b36503 100644 --- a/src/fsfw/datapoollocal/LocalPoolVariable.h +++ b/src/fsfw/datapoollocal/LocalPoolVariable.h @@ -87,9 +87,9 @@ class LocalPoolVariable : public LocalPoolObjectBase { ReturnValue_t serialize(uint8_t** buffer, size_t* size, size_t maxSize, SerializeIF::Endianness streamEndianness) const override; - virtual size_t getSerializedSize() const override; - virtual ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size, - SerializeIF::Endianness streamEndianness) override; + size_t getSerializedSize() const override; + ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size, + SerializeIF::Endianness streamEndianness) override; /** * @brief This is a call to read the array's values diff --git a/src/fsfw/datapoollocal/LocalPoolVector.h b/src/fsfw/datapoollocal/LocalPoolVector.h index aaaa051d..d340f2de 100644 --- a/src/fsfw/datapoollocal/LocalPoolVector.h +++ b/src/fsfw/datapoollocal/LocalPoolVector.h @@ -98,11 +98,11 @@ class LocalPoolVector : public LocalPoolObjectBase { T& operator[](size_t i); const T& operator[](size_t i) const; - virtual ReturnValue_t serialize(uint8_t** buffer, size_t* size, const size_t maxSize, - SerializeIF::Endianness streamEndiannes) const override; - virtual size_t getSerializedSize() const override; - virtual ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size, - SerializeIF::Endianness streamEndianness) override; + ReturnValue_t serialize(uint8_t** buffer, size_t* size, const size_t maxSize, + SerializeIF::Endianness streamEndiannes) const override; + size_t getSerializedSize() const override; + ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size, + SerializeIF::Endianness streamEndianness) override; /** * @brief This is a call to read the array's values diff --git a/src/fsfw/events/EventManager.h b/src/fsfw/events/EventManager.h index 10ab5d4b..90f97f70 100644 --- a/src/fsfw/events/EventManager.h +++ b/src/fsfw/events/EventManager.h @@ -21,7 +21,6 @@ extern const char* translateEvents(Event event); class EventManager : public EventManagerIF, public ExecutableObjectIF, public SystemObject { public: - EventManager(object_id_t setObjectId, uint32_t eventQueueDepth); virtual ~EventManager(); diff --git a/src/fsfw/globalfunctions/Type.h b/src/fsfw/globalfunctions/Type.h index 918ba4e8..d716c223 100644 --- a/src/fsfw/globalfunctions/Type.h +++ b/src/fsfw/globalfunctions/Type.h @@ -44,13 +44,13 @@ class Type : public SerializeIF { static ActualType_t getActualType(uint8_t ptc, uint8_t pfc); - virtual ReturnValue_t serialize(uint8_t **buffer, size_t *size, size_t maxSize, - Endianness streamEndianness) const override; + ReturnValue_t serialize(uint8_t **buffer, size_t *size, size_t maxSize, + Endianness streamEndianness) const override; - virtual size_t getSerializedSize() const override; + size_t getSerializedSize() const override; - virtual ReturnValue_t deSerialize(const uint8_t **buffer, size_t *size, - Endianness streamEndianness) override; + ReturnValue_t deSerialize(const uint8_t **buffer, size_t *size, + Endianness streamEndianness) override; private: ActualType_t actualType; diff --git a/src/fsfw/housekeeping/HousekeepingSnapshot.h b/src/fsfw/housekeeping/HousekeepingSnapshot.h index fe9d3617..9807795d 100644 --- a/src/fsfw/housekeeping/HousekeepingSnapshot.h +++ b/src/fsfw/housekeeping/HousekeepingSnapshot.h @@ -54,8 +54,8 @@ class HousekeepingSnapshot : public SerializeIF { HousekeepingSnapshot(uint8_t* timeStamp, size_t timeStampSize, LocalPoolObjectBase* dataSetPtr) : timeStamp(timeStamp), timeStampSize(timeStampSize), updateData(dataSetPtr){}; - virtual ReturnValue_t serialize(uint8_t** buffer, size_t* size, size_t maxSize, - Endianness streamEndianness) const { + ReturnValue_t serialize(uint8_t** buffer, size_t* size, size_t maxSize, + Endianness streamEndianness) const { if (timeStamp != nullptr) { /* Endianness will always be MACHINE, so we can simply use memcpy here. */ @@ -70,15 +70,15 @@ class HousekeepingSnapshot : public SerializeIF { return updateData->serialize(buffer, size, maxSize, streamEndianness); } - virtual size_t getSerializedSize() const { + size_t getSerializedSize() const { if (updateData == nullptr) { return 0; } return timeStampSize + updateData->getSerializedSize(); } - virtual ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size, - SerializeIF::Endianness streamEndianness) override { + ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size, + SerializeIF::Endianness streamEndianness) override { if (*size < timeStampSize) { return SerializeIF::STREAM_TOO_SHORT; } diff --git a/src/fsfw/monitoring/AbsLimitMonitor.h b/src/fsfw/monitoring/AbsLimitMonitor.h index 790808ee..159a3d2a 100644 --- a/src/fsfw/monitoring/AbsLimitMonitor.h +++ b/src/fsfw/monitoring/AbsLimitMonitor.h @@ -32,9 +32,9 @@ class AbsLimitMonitor : public MonitorBase { return returnvalue::OK; // We're not out of range. } - virtual ReturnValue_t getParameter(uint8_t domainId, uint16_t parameterId, - ParameterWrapper *parameterWrapper, - const ParameterWrapper *newValues, uint16_t startAtIndex) { + ReturnValue_t getParameter(uint8_t domainId, uint8_t parameterId, + ParameterWrapper *parameterWrapper, const ParameterWrapper *newValues, + uint16_t startAtIndex) override { ReturnValue_t result = this->MonitorBase::getParameter( domainId, parameterId, parameterWrapper, newValues, startAtIndex); // We'll reuse the DOMAIN_ID of MonitorReporter, diff --git a/src/fsfw/monitoring/MonitoringMessage.h b/src/fsfw/monitoring/MonitoringMessage.h index 9695120b..4fa1c759 100644 --- a/src/fsfw/monitoring/MonitoringMessage.h +++ b/src/fsfw/monitoring/MonitoringMessage.h @@ -13,6 +13,7 @@ class MonitoringMessage : public CommandMessage { static const Command_t LIMIT_VIOLATION_REPORT = MAKE_COMMAND_ID(10); virtual ~MonitoringMessage(); static void setLimitViolationReport(CommandMessage* message, store_address_t storeId); + using CommandMessage::clear; static void clear(CommandMessage* message); static store_address_t getStoreId(const CommandMessage* message); static void setTypicalMessage(CommandMessage* message, Command_t type, store_address_t storeId); diff --git a/src/fsfw/osal/rtems/CpuUsage.h b/src/fsfw/osal/rtems/CpuUsage.h index fdba689e..55a55143 100644 --- a/src/fsfw/osal/rtems/CpuUsage.h +++ b/src/fsfw/osal/rtems/CpuUsage.h @@ -19,13 +19,13 @@ class CpuUsage : public SerializeIF { float timeRunning; float percentUsage; - virtual ReturnValue_t serialize(uint8_t** buffer, size_t* size, size_t maxSize, - Endianness streamEndianness) const override; + ReturnValue_t serialize(uint8_t** buffer, size_t* size, size_t maxSize, + Endianness streamEndianness) const override; - virtual size_t getSerializedSize() const override; + size_t getSerializedSize() const override; - virtual ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size, - Endianness streamEndianness) override; + ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size, + Endianness streamEndianness) override; }; CpuUsage(); diff --git a/src/fsfw/parameters/ParameterWrapper.h b/src/fsfw/parameters/ParameterWrapper.h index 7767255e..05251b8a 100644 --- a/src/fsfw/parameters/ParameterWrapper.h +++ b/src/fsfw/parameters/ParameterWrapper.h @@ -40,13 +40,15 @@ class ParameterWrapper : public SerializeIF { ParameterWrapper(Type type, uint8_t rows, uint8_t columns, const void *data); virtual ~ParameterWrapper(); - virtual ReturnValue_t serialize(uint8_t **buffer, size_t *size, size_t maxSize, - Endianness streamEndianness) const override; + ReturnValue_t serialize(uint8_t **buffer, size_t *size, size_t maxSize, + Endianness streamEndianness) const override; - virtual size_t getSerializedSize() const override; + size_t getSerializedSize() const override; - virtual ReturnValue_t deSerialize(const uint8_t **buffer, size_t *size, - Endianness streamEndianness) override; + using SerializeIF::deSerialize; // we overloaded this function, so this is needed to unconfuse + // the compiler + ReturnValue_t deSerialize(const uint8_t **buffer, size_t *size, + Endianness streamEndianness) override; virtual ReturnValue_t deSerialize(const uint8_t **buffer, size_t *size, Endianness streamEndianness, uint16_t startWritingAtIndex = 0); diff --git a/src/fsfw/pus/servicepackets/Service5Packets.h b/src/fsfw/pus/servicepackets/Service5Packets.h index 05d92674..1357b3c0 100644 --- a/src/fsfw/pus/servicepackets/Service5Packets.h +++ b/src/fsfw/pus/servicepackets/Service5Packets.h @@ -24,8 +24,8 @@ class EventReport : public SerializeIF { //!< [EXPORT] : [SUBSERVICE] 1, 2, 3, parameter1(parameter1_), parameter2(parameter2_) {} - virtual ReturnValue_t serialize(uint8_t** buffer, size_t* size, size_t maxSize, - SerializeIF::Endianness streamEndianness) const override { + ReturnValue_t serialize(uint8_t** buffer, size_t* size, size_t maxSize, + SerializeIF::Endianness streamEndianness) const override { ReturnValue_t result = SerializeAdapter::serialize(&reportId, buffer, size, maxSize, streamEndianness); if (result != returnvalue::OK) { @@ -46,7 +46,7 @@ class EventReport : public SerializeIF { //!< [EXPORT] : [SUBSERVICE] 1, 2, 3, return result; } - virtual size_t getSerializedSize() const override { + size_t getSerializedSize() const override { uint32_t size = 0; size += SerializeAdapter::getSerializedSize(&reportId); size += SerializeAdapter::getSerializedSize(&objectId); @@ -55,8 +55,8 @@ class EventReport : public SerializeIF { //!< [EXPORT] : [SUBSERVICE] 1, 2, 3, return size; } - virtual ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size, - SerializeIF::Endianness streamEndianness) override { + ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size, + SerializeIF::Endianness streamEndianness) override { return returnvalue::FAILED; } diff --git a/src/fsfw/serialize/SerialArrayListAdapter.h b/src/fsfw/serialize/SerialArrayListAdapter.h index fa87ddbe..670eb700 100644 --- a/src/fsfw/serialize/SerialArrayListAdapter.h +++ b/src/fsfw/serialize/SerialArrayListAdapter.h @@ -16,8 +16,10 @@ class SerialArrayListAdapter : public SerializeIF { public: SerialArrayListAdapter(ArrayList* adaptee) : adaptee(adaptee) {} - virtual ReturnValue_t serialize(uint8_t** buffer, size_t* size, size_t maxSize, - Endianness streamEndianness) const { + using SerializeIF::serialize; // we overload this function as well, so this is needed to uncofuse + // the compiler + ReturnValue_t serialize(uint8_t** buffer, size_t* size, size_t maxSize, + Endianness streamEndianness) const override { return serialize(adaptee, buffer, size, maxSize, streamEndianness); } @@ -34,7 +36,7 @@ class SerialArrayListAdapter : public SerializeIF { return result; } - virtual size_t getSerializedSize() const { return getSerializedSize(adaptee); } + size_t getSerializedSize() const override { return getSerializedSize(adaptee); } static uint32_t getSerializedSize(const ArrayList* list) { uint32_t printSize = sizeof(count_t); @@ -47,8 +49,10 @@ class SerialArrayListAdapter : public SerializeIF { return printSize; } - virtual ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size, - Endianness streamEndianness) { + using SerializeIF::deSerialize; // we overload this function as well, so this is needed to + // uncofuse the compiler + ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size, + Endianness streamEndianness) override { return deSerialize(adaptee, buffer, size, streamEndianness); } diff --git a/src/fsfw/serialize/SerialLinkedListAdapter.h b/src/fsfw/serialize/SerialLinkedListAdapter.h index 6c2fb7df..b37320ff 100644 --- a/src/fsfw/serialize/SerialLinkedListAdapter.h +++ b/src/fsfw/serialize/SerialLinkedListAdapter.h @@ -45,8 +45,10 @@ class SerialLinkedListAdapter : public SinglyLinkedList, public SerializeIF { SerialLinkedListAdapter(bool printCount = false) : SinglyLinkedList(), printCount(printCount) {} - virtual ReturnValue_t serialize(uint8_t** buffer, size_t* size, size_t maxSize, - Endianness streamEndianness) const override { + using SerializeIF::serialize; // we overloaded this function, so this is needed to unconfuse the + // compiler + ReturnValue_t serialize(uint8_t** buffer, size_t* size, size_t maxSize, + Endianness streamEndianness) const override { if (printCount) { count_t mySize = SinglyLinkedList::getSize(); ReturnValue_t result = @@ -68,7 +70,7 @@ class SerialLinkedListAdapter : public SinglyLinkedList, public SerializeIF { return result; } - virtual size_t getSerializedSize() const override { + size_t getSerializedSize() const override { if (printCount) { return SerialLinkedListAdapter::getSerializedSize() + sizeof(count_t); } else { @@ -76,6 +78,8 @@ class SerialLinkedListAdapter : public SinglyLinkedList, public SerializeIF { } } + using SerializeIF::deSerialize; // we overloaded this function, so this is needed to unconfuse + // the compiler static size_t getSerializedSize(const LinkedElement* element) { size_t size = 0; while (element != nullptr) { @@ -85,8 +89,8 @@ class SerialLinkedListAdapter : public SinglyLinkedList, public SerializeIF { return size; } - virtual ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size, - Endianness streamEndianness) override { + ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size, + Endianness streamEndianness) override { return deSerialize(SinglyLinkedList::start, buffer, size, streamEndianness); } diff --git a/src/fsfw/serialize/SerializeElement.h b/src/fsfw/serialize/SerializeElement.h index 07f3fea9..01b339f7 100644 --- a/src/fsfw/serialize/SerializeElement.h +++ b/src/fsfw/serialize/SerializeElement.h @@ -32,8 +32,8 @@ class SerializeElement : public SerializeIF, public LinkedElement { size_t getSerializedSize() const override { return SerializeAdapter::getSerializedSize(&entry); } - virtual ReturnValue_t deSerialize(const uint8_t **buffer, size_t *size, - Endianness streamEndianness) override { + ReturnValue_t deSerialize(const uint8_t **buffer, size_t *size, + Endianness streamEndianness) override { return SerializeAdapter::deSerialize(&entry, buffer, size, streamEndianness); } diff --git a/src/fsfw/subsystem/modes/ModeDefinitions.h b/src/fsfw/subsystem/modes/ModeDefinitions.h index d22bcd95..d37baa3b 100644 --- a/src/fsfw/subsystem/modes/ModeDefinitions.h +++ b/src/fsfw/subsystem/modes/ModeDefinitions.h @@ -15,8 +15,8 @@ class ModeListEntry : public SerializeIF, public LinkedElement { uint8_t value3 = 0; uint8_t value4 = 0; - virtual ReturnValue_t serialize(uint8_t** buffer, size_t* size, size_t maxSize, - Endianness streamEndianness) const { + ReturnValue_t serialize(uint8_t** buffer, size_t* size, size_t maxSize, + Endianness streamEndianness) const override { ReturnValue_t result; result = SerializeAdapter::serialize(&value1, buffer, size, maxSize, streamEndianness); @@ -40,12 +40,12 @@ class ModeListEntry : public SerializeIF, public LinkedElement { return result; } - virtual size_t getSerializedSize() const { + size_t getSerializedSize() const override { return sizeof(value1) + sizeof(value2) + sizeof(value3) + sizeof(value4); } - virtual ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size, - Endianness streamEndianness) { + ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size, + Endianness streamEndianness) override { ReturnValue_t result; result = SerializeAdapter::deSerialize(&value1, buffer, size, streamEndianness);