From b64db66f82636b9b0e42bf6838b46ed2ce51ec95 Mon Sep 17 00:00:00 2001 From: croghostrider Date: Mon, 18 Apr 2022 13:30:54 +0200 Subject: [PATCH] removed redundant declaration --- src/knx/address_table_object.h | 2 +- src/knx/bau07B0.h | 8 ++++---- src/knx/bau091A.h | 10 +++++----- src/knx/bau27B0.h | 8 ++++---- src/knx/bau2920.h | 8 ++++---- src/knx/bau57B0.h | 8 ++++---- src/knx/bau_systemB_coupler.h | 8 ++++---- src/knx/bau_systemB_device.h | 8 ++++---- src/knx/data_property.h | 12 ++++++------ src/knx/interface_object.h | 6 +++--- src/knx/ip_data_link_layer.h | 2 +- src/knx/network_layer_coupler.h | 20 +++++++++---------- src/knx/network_layer_device.h | 20 +++++++++---------- src/knx/rf_data_link_layer.h | 2 +- src/knx/rf_physical_layer_cc1310.h | 6 +++--- src/knx/router_object.h | 4 ++-- src/knx/secure_application_layer.h | 30 ++++++++++++++--------------- src/knx/security_interface_object.h | 2 +- src/knx/tpuart_data_link_layer.h | 2 +- 19 files changed, 83 insertions(+), 83 deletions(-) diff --git a/src/knx/address_table_object.h b/src/knx/address_table_object.h index a8990c2..13b1ebb 100644 --- a/src/knx/address_table_object.h +++ b/src/knx/address_table_object.h @@ -50,7 +50,7 @@ class AddressTableObject : public TableObject bool contains(uint16_t groupAddress); protected: - virtual void beforeStateChange(LoadState& newState) override; + void beforeStateChange(LoadState& newState) override; private: uint16_t* _groupAddresses = 0; diff --git a/src/knx/bau07B0.h b/src/knx/bau07B0.h index 7828e41..3b29d72 100644 --- a/src/knx/bau07B0.h +++ b/src/knx/bau07B0.h @@ -12,16 +12,16 @@ class Bau07B0 : public BauSystemBDevice, public ITpUartCallBacks { public: Bau07B0(Platform& platform); - virtual void loop() override; - virtual bool enabled() override; - virtual void enabled(bool value) override; + void loop() override; + bool enabled() override; + void enabled(bool value) override; protected: InterfaceObject* getInterfaceObject(uint8_t idx); InterfaceObject* getInterfaceObject(ObjectType objectType, uint8_t objectInstance); // For TP1 only - virtual bool isAckRequired(uint16_t address, bool isGrpAddr) override; + bool isAckRequired(uint16_t address, bool isGrpAddr) override; private: TpUartDataLinkLayer _dlLayer; diff --git a/src/knx/bau091A.h b/src/knx/bau091A.h index 262055b..7c9b8e5 100644 --- a/src/knx/bau091A.h +++ b/src/knx/bau091A.h @@ -14,18 +14,18 @@ class Bau091A : public BauSystemBCoupler, public ITpUartCallBacks { public: Bau091A(Platform& platform); - virtual void loop() override; - virtual bool enabled() override; - virtual void enabled(bool value) override; + void loop() override; + bool enabled() override; + void enabled(bool value) override; protected: InterfaceObject* getInterfaceObject(uint8_t idx); InterfaceObject* getInterfaceObject(ObjectType objectType, uint8_t objectInstance); // For TP1 only - virtual bool isAckRequired(uint16_t address, bool isGrpAddr) override; + bool isAckRequired(uint16_t address, bool isGrpAddr) override; - virtual void doMasterReset(EraseCode eraseCode, uint8_t channel) override; + void doMasterReset(EraseCode eraseCode, uint8_t channel) override; private: RouterObject _routerObj; IpParameterObject _ipParameters; diff --git a/src/knx/bau27B0.h b/src/knx/bau27B0.h index 4d8b7fc..222a848 100644 --- a/src/knx/bau27B0.h +++ b/src/knx/bau27B0.h @@ -18,15 +18,15 @@ class Bau27B0 : public BauSystemBDevice { public: Bau27B0(Platform& platform); - virtual void loop() override; - virtual bool enabled() override; - virtual void enabled(bool value) override; + void loop() override; + bool enabled() override; + void enabled(bool value) override; protected: InterfaceObject* getInterfaceObject(uint8_t idx); InterfaceObject* getInterfaceObject(ObjectType objectType, uint8_t objectInstance); - virtual void doMasterReset(EraseCode eraseCode, uint8_t channel) override; + void doMasterReset(EraseCode eraseCode, uint8_t channel) override; private: RfDataLinkLayer _dlLayer; RfMediumObject _rfMediumObj; diff --git a/src/knx/bau2920.h b/src/knx/bau2920.h index 1b4a32e..43a5bc5 100644 --- a/src/knx/bau2920.h +++ b/src/knx/bau2920.h @@ -18,15 +18,15 @@ class Bau2920 : public BauSystemBCoupler { public: Bau2920(Platform& platform); - virtual void loop() override; - virtual bool enabled() override; - virtual void enabled(bool value) override; + void loop() override; + bool enabled() override; + void enabled(bool value) override; protected: InterfaceObject* getInterfaceObject(uint8_t idx); InterfaceObject* getInterfaceObject(ObjectType objectType, uint8_t objectInstance); - virtual void doMasterReset(EraseCode eraseCode, uint8_t channel) override; + void doMasterReset(EraseCode eraseCode, uint8_t channel) override; private: RouterObject _rtObjPrimary; RouterObject _rtObjSecondary; diff --git a/src/knx/bau57B0.h b/src/knx/bau57B0.h index 3c017c1..a381ebb 100644 --- a/src/knx/bau57B0.h +++ b/src/knx/bau57B0.h @@ -12,15 +12,15 @@ class Bau57B0 : public BauSystemBDevice { public: Bau57B0(Platform& platform); - virtual void loop() override; - virtual bool enabled() override; - virtual void enabled(bool value) override; + void loop() override; + bool enabled() override; + void enabled(bool value) override; protected: InterfaceObject* getInterfaceObject(uint8_t idx); InterfaceObject* getInterfaceObject(ObjectType objectType, uint8_t objectInstance); - virtual void doMasterReset(EraseCode eraseCode, uint8_t channel) override; + void doMasterReset(EraseCode eraseCode, uint8_t channel) override; private: IpParameterObject _ipParameters; IpDataLinkLayer _dlLayer; diff --git a/src/knx/bau_systemB_coupler.h b/src/knx/bau_systemB_coupler.h index f9dbacc..2cfc5be 100644 --- a/src/knx/bau_systemB_coupler.h +++ b/src/knx/bau_systemB_coupler.h @@ -18,13 +18,13 @@ class BauSystemBCoupler : public BauSystemB { public: BauSystemBCoupler(Platform& platform); - virtual void loop() override; - virtual bool configured() override; + void loop() override; + bool configured() override; protected: - virtual ApplicationLayer& applicationLayer() override; + ApplicationLayer& applicationLayer() override; - virtual void doMasterReset(EraseCode eraseCode, uint8_t channel) override; + void doMasterReset(EraseCode eraseCode, uint8_t channel) override; Platform& _platform; diff --git a/src/knx/bau_systemB_device.h b/src/knx/bau_systemB_device.h index ab645fe..1dadf87 100644 --- a/src/knx/bau_systemB_device.h +++ b/src/knx/bau_systemB_device.h @@ -20,12 +20,12 @@ class BauSystemBDevice : public BauSystemB { public: BauSystemBDevice(Platform& platform); - virtual void loop() override; - virtual bool configured() override; + void loop() override; + bool configured() override; GroupObjectTableObject& groupObjectTable(); protected: - virtual ApplicationLayer& applicationLayer() override; + ApplicationLayer& applicationLayer() override; void groupValueWriteLocalConfirm(AckType ack, uint16_t asap, Priority priority, HopCountType hopType, const SecurityControl &secCtrl, uint8_t* data, uint8_t dataLength, bool status) override; @@ -39,7 +39,7 @@ class BauSystemBDevice : public BauSystemB void sendNextGroupTelegram(); void updateGroupObject(GroupObject& go, uint8_t* data, uint8_t length); - virtual void doMasterReset(EraseCode eraseCode, uint8_t channel) override; + void doMasterReset(EraseCode eraseCode, uint8_t channel) override; AddressTableObject _addrTable; AssociationTableObject _assocTable; diff --git a/src/knx/data_property.h b/src/knx/data_property.h index 12c202f..03f344f 100644 --- a/src/knx/data_property.h +++ b/src/knx/data_property.h @@ -10,12 +10,12 @@ class DataProperty : public Property DataProperty(PropertyID id, bool writeEnable, PropertyDataType type, uint16_t maxElements, uint8_t access, uint16_t value); DataProperty(PropertyID id, bool writeEnable, PropertyDataType type, uint16_t maxElements, uint8_t access, uint32_t value); DataProperty(PropertyID id, bool writeEnable, PropertyDataType type, uint16_t maxElements, uint8_t access, const uint8_t* value); - virtual ~DataProperty() override; - virtual uint8_t read(uint16_t start, uint8_t count, uint8_t* data) const override; - virtual uint8_t write(uint16_t start, uint8_t count, const uint8_t* data) override; - virtual uint8_t* save(uint8_t* buffer) override; - virtual const uint8_t* restore(const uint8_t* buffer) override; - virtual uint16_t saveSize() override; + ~DataProperty() override; + uint8_t read(uint16_t start, uint8_t count, uint8_t* data) const override; + uint8_t write(uint16_t start, uint8_t count, const uint8_t* data) override; + uint8_t* save(uint8_t* buffer) override; + const uint8_t* restore(const uint8_t* buffer) override; + uint16_t saveSize() override; const uint8_t* data(); const uint8_t* data(uint16_t elementIndex); diff --git a/src/knx/interface_object.h b/src/knx/interface_object.h index b287735..302c9d4 100644 --- a/src/knx/interface_object.h +++ b/src/knx/interface_object.h @@ -183,9 +183,9 @@ class InterfaceObject : public SaveRestore */ const Property* property(PropertyID id) const; - virtual uint8_t* save(uint8_t* buffer) override; - virtual const uint8_t* restore(const uint8_t* buffer) override; - virtual uint16_t saveSize() override; + uint8_t* save(uint8_t* buffer) override; + const uint8_t* restore(const uint8_t* buffer) override; + uint16_t saveSize() override; protected: diff --git a/src/knx/ip_data_link_layer.h b/src/knx/ip_data_link_layer.h index 997a696..f8acae5 100644 --- a/src/knx/ip_data_link_layer.h +++ b/src/knx/ip_data_link_layer.h @@ -18,7 +18,7 @@ class IpDataLinkLayer : public DataLinkLayer void loop(); void enabled(bool value); bool enabled() const; - virtual DptMedium mediumType() const override; + DptMedium mediumType() const override; private: bool _enabled = false; diff --git a/src/knx/network_layer_coupler.h b/src/knx/network_layer_coupler.h index 47de6dc..b57f30a 100644 --- a/src/knx/network_layer_coupler.h +++ b/src/knx/network_layer_coupler.h @@ -27,10 +27,10 @@ class NetworkLayerCoupler : public NetworkLayer void rtObj(RouterObject& rtObj); // Coupler model 1.x // from transport layer - virtual void dataIndividualRequest(AckType ack, uint16_t destination, HopCountType hopType, Priority priority, TPDU& tpdu) override; - virtual void dataGroupRequest(AckType ack, uint16_t destination, HopCountType hopType, Priority priority, TPDU& tpdu) override; - virtual void dataBroadcastRequest(AckType ack, HopCountType hopType, Priority priority, TPDU& tpdu) override; - virtual void dataSystemBroadcastRequest(AckType ack, HopCountType hopType, Priority priority, TPDU& tpdu) override; + void dataIndividualRequest(AckType ack, uint16_t destination, HopCountType hopType, Priority priority, TPDU& tpdu) override; + void dataGroupRequest(AckType ack, uint16_t destination, HopCountType hopType, Priority priority, TPDU& tpdu) override; + void dataBroadcastRequest(AckType ack, HopCountType hopType, Priority priority, TPDU& tpdu) override; + void dataSystemBroadcastRequest(AckType ack, HopCountType hopType, Priority priority, TPDU& tpdu) override; private: enum CouplerType @@ -46,16 +46,16 @@ class NetworkLayerCoupler : public NetworkLayer static constexpr uint8_t kLocalIfIndex = 99; // from entities - virtual void dataIndication(AckType ack, AddressType addType, uint16_t destination, FrameFormat format, NPDU& npdu, + void dataIndication(AckType ack, AddressType addType, uint16_t destination, FrameFormat format, NPDU& npdu, Priority priority, uint16_t source, uint8_t srcIfIdx) override; - virtual void dataConfirm(AckType ack, AddressType addrType, uint16_t destination, FrameFormat format, Priority priority, + void dataConfirm(AckType ack, AddressType addrType, uint16_t destination, FrameFormat format, Priority priority, uint16_t source, NPDU& npdu, bool status, uint8_t srcIfIdx) override; - virtual void broadcastIndication(AckType ack, FrameFormat format, NPDU& npdu, + void broadcastIndication(AckType ack, FrameFormat format, NPDU& npdu, Priority priority, uint16_t source, uint8_t srcIfIdx) override; - virtual void broadcastConfirm(AckType ack, FrameFormat format, Priority priority, uint16_t source, NPDU& npdu, bool status, uint8_t srcIfIdx) override; - virtual void systemBroadcastIndication(AckType ack, FrameFormat format, NPDU& npdu, + void broadcastConfirm(AckType ack, FrameFormat format, Priority priority, uint16_t source, NPDU& npdu, bool status, uint8_t srcIfIdx) override; + void systemBroadcastIndication(AckType ack, FrameFormat format, NPDU& npdu, Priority priority, uint16_t source, uint8_t srcIfIdx) override; - virtual void systemBroadcastConfirm(AckType ack, FrameFormat format, Priority priority, uint16_t source, NPDU& npdu, bool status, uint8_t srcIfIdx) override; + void systemBroadcastConfirm(AckType ack, FrameFormat format, Priority priority, uint16_t source, NPDU& npdu, bool status, uint8_t srcIfIdx) override; void routeDataIndividual(AckType ack, uint16_t destination, NPDU& npdu, Priority priority, uint16_t source, uint8_t srcIfIndex); void sendMsgHopCount(AckType ack, AddressType addrType, uint16_t destination, NPDU& npdu, Priority priority, diff --git a/src/knx/network_layer_device.h b/src/knx/network_layer_device.h index ad7f70c..3fdd6b2 100644 --- a/src/knx/network_layer_device.h +++ b/src/knx/network_layer_device.h @@ -19,23 +19,23 @@ class NetworkLayerDevice : public NetworkLayer NetworkLayerEntity& getInterface(); // from transport layer - virtual void dataIndividualRequest(AckType ack, uint16_t destination, HopCountType hopType, Priority priority, TPDU& tpdu) override; - virtual void dataGroupRequest(AckType ack, uint16_t destination, HopCountType hopType, Priority priority, TPDU& tpdu) override; - virtual void dataBroadcastRequest(AckType ack, HopCountType hopType, Priority priority, TPDU& tpdu) override; - virtual void dataSystemBroadcastRequest(AckType ack, HopCountType hopType, Priority priority, TPDU& tpdu) override; + void dataIndividualRequest(AckType ack, uint16_t destination, HopCountType hopType, Priority priority, TPDU& tpdu) override; + void dataGroupRequest(AckType ack, uint16_t destination, HopCountType hopType, Priority priority, TPDU& tpdu) override; + void dataBroadcastRequest(AckType ack, HopCountType hopType, Priority priority, TPDU& tpdu) override; + void dataSystemBroadcastRequest(AckType ack, HopCountType hopType, Priority priority, TPDU& tpdu) override; private: // from entities - virtual void dataIndication(AckType ack, AddressType addType, uint16_t destination, FrameFormat format, NPDU& npdu, + void dataIndication(AckType ack, AddressType addType, uint16_t destination, FrameFormat format, NPDU& npdu, Priority priority, uint16_t source, uint8_t srcIfIdx) override; - virtual void dataConfirm(AckType ack, AddressType addrType, uint16_t destination, FrameFormat format, Priority priority, + void dataConfirm(AckType ack, AddressType addrType, uint16_t destination, FrameFormat format, Priority priority, uint16_t source, NPDU& npdu, bool status, uint8_t srcIfIdx) override; - virtual void broadcastIndication(AckType ack, FrameFormat format, NPDU& npdu, + void broadcastIndication(AckType ack, FrameFormat format, NPDU& npdu, Priority priority, uint16_t source, uint8_t srcIfIdx) override; - virtual void broadcastConfirm(AckType ack, FrameFormat format, Priority priority, uint16_t source, NPDU& npdu, bool status, uint8_t srcIfIdx) override; - virtual void systemBroadcastIndication(AckType ack, FrameFormat format, NPDU& npdu, + void broadcastConfirm(AckType ack, FrameFormat format, Priority priority, uint16_t source, NPDU& npdu, bool status, uint8_t srcIfIdx) override; + void systemBroadcastIndication(AckType ack, FrameFormat format, NPDU& npdu, Priority priority, uint16_t source, uint8_t srcIfIdx) override; - virtual void systemBroadcastConfirm(AckType ack, FrameFormat format, Priority priority, uint16_t source, NPDU& npdu, bool status, uint8_t srcIfIdx) override; + void systemBroadcastConfirm(AckType ack, FrameFormat format, Priority priority, uint16_t source, NPDU& npdu, bool status, uint8_t srcIfIdx) override; // Support only a single physical interface for normal devices NetworkLayerEntity _netLayerEntities[1]; diff --git a/src/knx/rf_data_link_layer.h b/src/knx/rf_data_link_layer.h index cdbd9dc..79dd28b 100644 --- a/src/knx/rf_data_link_layer.h +++ b/src/knx/rf_data_link_layer.h @@ -27,7 +27,7 @@ class RfDataLinkLayer : public DataLinkLayer void loop(); void enabled(bool value); bool enabled() const; - virtual DptMedium mediumType() const override; + DptMedium mediumType() const override; private: bool _enabled = false; diff --git a/src/knx/rf_physical_layer_cc1310.h b/src/knx/rf_physical_layer_cc1310.h index 80f0bd4..4dbc2e6 100644 --- a/src/knx/rf_physical_layer_cc1310.h +++ b/src/knx/rf_physical_layer_cc1310.h @@ -26,9 +26,9 @@ class RfPhysicalLayerCC1310 : public RfPhysicalLayer public: RfPhysicalLayerCC1310(RfDataLinkLayer& rfDataLinkLayer, Platform& platform); - virtual bool InitChip() override; - virtual void stopChip() override; - virtual void loop() override; + bool InitChip() override; + void stopChip() override; + void loop() override; void setOutputPowerLevel(int8_t dBm); diff --git a/src/knx/router_object.h b/src/knx/router_object.h index e43838d..0064a06 100644 --- a/src/knx/router_object.h +++ b/src/knx/router_object.h @@ -34,12 +34,12 @@ public: bool isRfSbcRoutingEnabled(); bool isIpSbcRoutingEnabled(); - virtual void masterReset(EraseCode eraseCode, uint8_t channel) override; + void masterReset(EraseCode eraseCode, uint8_t channel) override; const uint8_t* restore(const uint8_t* buffer) override; protected: - virtual void beforeStateChange(LoadState& newState) override; + void beforeStateChange(LoadState& newState) override; private: // Function properties diff --git a/src/knx/secure_application_layer.h b/src/knx/secure_application_layer.h index 39b5fc5..e3ebf05 100644 --- a/src/knx/secure_application_layer.h +++ b/src/knx/secure_application_layer.h @@ -33,27 +33,27 @@ class SecureApplicationLayer : public ApplicationLayer void groupAddressTable(AddressTableObject& addrTable); // from transport layer - virtual void dataGroupIndication(HopCountType hopType, Priority priority, uint16_t tsap, APDU& apdu) override; - virtual void dataGroupConfirm(AckType ack, HopCountType hopType, Priority priority, uint16_t tsap, + void dataGroupIndication(HopCountType hopType, Priority priority, uint16_t tsap, APDU& apdu) override; + void dataGroupConfirm(AckType ack, HopCountType hopType, Priority priority, uint16_t tsap, APDU& apdu, bool status) override; - virtual void dataBroadcastIndication(HopCountType hopType, Priority priority, uint16_t source, APDU& apdu) override; - virtual void dataBroadcastConfirm(AckType ack, HopCountType hopType, Priority priority, APDU& apdu, bool status) override; - virtual void dataSystemBroadcastIndication(HopCountType hopType, Priority priority, uint16_t source, APDU& apdu) override; - virtual void dataSystemBroadcastConfirm(HopCountType hopType, Priority priority, APDU& apdu, bool status) override; - virtual void dataIndividualIndication(HopCountType hopType, Priority priority, uint16_t source, APDU& apdu) override; - virtual void dataIndividualConfirm(AckType ack, HopCountType hopType, Priority priority, uint16_t tsap, APDU& apdu, bool status) override; - virtual void dataConnectedIndication(Priority priority, uint16_t tsap, APDU& apdu) override; - virtual void dataConnectedConfirm(uint16_t tsap) override; + void dataBroadcastIndication(HopCountType hopType, Priority priority, uint16_t source, APDU& apdu) override; + void dataBroadcastConfirm(AckType ack, HopCountType hopType, Priority priority, APDU& apdu, bool status) override; + void dataSystemBroadcastIndication(HopCountType hopType, Priority priority, uint16_t source, APDU& apdu) override; + void dataSystemBroadcastConfirm(HopCountType hopType, Priority priority, APDU& apdu, bool status) override; + void dataIndividualIndication(HopCountType hopType, Priority priority, uint16_t source, APDU& apdu) override; + void dataIndividualConfirm(AckType ack, HopCountType hopType, Priority priority, uint16_t tsap, APDU& apdu, bool status) override; + void dataConnectedIndication(Priority priority, uint16_t tsap, APDU& apdu) override; + void dataConnectedConfirm(uint16_t tsap) override; void loop(); protected: // to transport layer - virtual void dataGroupRequest(AckType ack, HopCountType hopType, Priority priority, uint16_t tsap, APDU& apdu, const SecurityControl& secCtrl) override; - virtual void dataBroadcastRequest(AckType ack, HopCountType hopType, Priority priority, APDU& apdu, const SecurityControl& secCtrl) override; - virtual void dataSystemBroadcastRequest(AckType ack, HopCountType hopType, Priority priority, APDU& apdu, const SecurityControl& secCtrl) override; - virtual void dataIndividualRequest(AckType ack, HopCountType hopType, Priority priority, uint16_t destination, APDU& apdu, const SecurityControl& secCtrl) override; - virtual void dataConnectedRequest(uint16_t tsap, Priority priority, APDU& apdu, const SecurityControl& secCtrl) override; // apdu must be valid until it was confirmed + void dataGroupRequest(AckType ack, HopCountType hopType, Priority priority, uint16_t tsap, APDU& apdu, const SecurityControl& secCtrl) override; + void dataBroadcastRequest(AckType ack, HopCountType hopType, Priority priority, APDU& apdu, const SecurityControl& secCtrl) override; + void dataSystemBroadcastRequest(AckType ack, HopCountType hopType, Priority priority, APDU& apdu, const SecurityControl& secCtrl) override; + void dataIndividualRequest(AckType ack, HopCountType hopType, Priority priority, uint16_t destination, APDU& apdu, const SecurityControl& secCtrl) override; + void dataConnectedRequest(uint16_t tsap, Priority priority, APDU& apdu, const SecurityControl& secCtrl) override; // apdu must be valid until it was confirmed private: diff --git a/src/knx/security_interface_object.h b/src/knx/security_interface_object.h index 53f5314..9a32896 100644 --- a/src/knx/security_interface_object.h +++ b/src/knx/security_interface_object.h @@ -11,7 +11,7 @@ class SecurityInterfaceObject: public InterfaceObject public: SecurityInterfaceObject(); - virtual void masterReset(EraseCode eraseCode, uint8_t channel) override; + void masterReset(EraseCode eraseCode, uint8_t channel) override; bool isSecurityModeEnabled(); diff --git a/src/knx/tpuart_data_link_layer.h b/src/knx/tpuart_data_link_layer.h index b371f7a..92332ad 100644 --- a/src/knx/tpuart_data_link_layer.h +++ b/src/knx/tpuart_data_link_layer.h @@ -27,7 +27,7 @@ class TpUartDataLinkLayer : public DataLinkLayer void loop(); void enabled(bool value); bool enabled() const; - virtual DptMedium mediumType() const override; + DptMedium mediumType() const override; private: bool _enabled = false;