diff --git a/include/icsneo/device/neoobd2pro/neoobd2pro.h b/include/icsneo/device/neoobd2pro/neoobd2pro.h index 9e9a2f9..093a372 100644 --- a/include/icsneo/device/neoobd2pro/neoobd2pro.h +++ b/include/icsneo/device/neoobd2pro/neoobd2pro.h @@ -36,13 +36,13 @@ private: productId = PRODUCT_ID; } - virtual void setupSupportedRXNetworks(std::vector& rxNetworks) override { + void setupSupportedRXNetworks(std::vector& rxNetworks) override { for(auto& netid : GetSupportedNetworks()) rxNetworks.emplace_back(netid); } // The supported TX networks are the same as the supported RX networks for this device - virtual void setupSupportedTXNetworks(std::vector& txNetworks) override { setupSupportedRXNetworks(txNetworks); } + void setupSupportedTXNetworks(std::vector& txNetworks) override { setupSupportedRXNetworks(txNetworks); } }; } diff --git a/include/icsneo/device/neoobd2sim/neoobd2sim.h b/include/icsneo/device/neoobd2sim/neoobd2sim.h index 909d03b..026bef3 100644 --- a/include/icsneo/device/neoobd2sim/neoobd2sim.h +++ b/include/icsneo/device/neoobd2sim/neoobd2sim.h @@ -36,13 +36,13 @@ private: productId = PRODUCT_ID; } - virtual void setupSupportedRXNetworks(std::vector& rxNetworks) override { + void setupSupportedRXNetworks(std::vector& rxNetworks) override { for(auto& netid : GetSupportedNetworks()) rxNetworks.emplace_back(netid); } // The supported TX networks are the same as the supported RX networks for this device - virtual void setupSupportedTXNetworks(std::vector& txNetworks) override { setupSupportedRXNetworks(txNetworks); } + void setupSupportedTXNetworks(std::vector& txNetworks) override { setupSupportedRXNetworks(txNetworks); } }; } diff --git a/include/icsneo/device/neovifire/neovifire.h b/include/icsneo/device/neovifire/neovifire.h index 3d9da93..f43dd69 100644 --- a/include/icsneo/device/neovifire/neovifire.h +++ b/include/icsneo/device/neovifire/neovifire.h @@ -77,13 +77,13 @@ private: productId = PRODUCT_ID; } - virtual void setupSupportedRXNetworks(std::vector& rxNetworks) override { + void setupSupportedRXNetworks(std::vector& rxNetworks) override { for(auto& netid : GetSupportedNetworks()) rxNetworks.emplace_back(netid); } // The supported TX networks are the same as the supported RX networks for this device - virtual void setupSupportedTXNetworks(std::vector& txNetworks) override { setupSupportedRXNetworks(txNetworks); } + void setupSupportedTXNetworks(std::vector& txNetworks) override { setupSupportedRXNetworks(txNetworks); } }; } diff --git a/include/icsneo/device/neovifire2/neovifire2eth.h b/include/icsneo/device/neovifire2/neovifire2eth.h index 13fcb89..454f7ce 100644 --- a/include/icsneo/device/neovifire2/neovifire2eth.h +++ b/include/icsneo/device/neovifire2/neovifire2eth.h @@ -49,9 +49,9 @@ public: } protected: - virtual void setupSettings(IDeviceSettings* ssettings) { + void setupSettings(IDeviceSettings& ssettings) override { // TODO Check firmware version, old firmwares will reset Ethernet settings on settings send - ssettings->readonly = true; + ssettings.readonly = true; } }; diff --git a/include/icsneo/device/radgalaxy/radgalaxy.h b/include/icsneo/device/radgalaxy/radgalaxy.h index 9b8319b..40174d3 100644 --- a/include/icsneo/device/radgalaxy/radgalaxy.h +++ b/include/icsneo/device/radgalaxy/radgalaxy.h @@ -102,13 +102,13 @@ protected: decoder.timestampResolution = 10; // Timestamps are in 10ns increments instead of the usual 25ns } - virtual void setupSupportedRXNetworks(std::vector& rxNetworks) override { + void setupSupportedRXNetworks(std::vector& rxNetworks) override { for(auto& netid : GetSupportedNetworks()) rxNetworks.emplace_back(netid); } // The supported TX networks are the same as the supported RX networks for this device - virtual void setupSupportedTXNetworks(std::vector& txNetworks) override { setupSupportedRXNetworks(txNetworks); } + void setupSupportedTXNetworks(std::vector& txNetworks) override { setupSupportedRXNetworks(txNetworks); } }; } diff --git a/include/icsneo/device/radpluto/radpluto.h b/include/icsneo/device/radpluto/radpluto.h index 5a51061..4464ad5 100644 --- a/include/icsneo/device/radpluto/radpluto.h +++ b/include/icsneo/device/radpluto/radpluto.h @@ -87,13 +87,13 @@ protected: decoder.timestampResolution = 10; // Timestamps are in 10ns increments instead of the usual 25ns } - virtual void setupSupportedRXNetworks(std::vector& rxNetworks) override { + void setupSupportedRXNetworks(std::vector& rxNetworks) override { for(auto& netid : GetSupportedNetworks()) rxNetworks.emplace_back(netid); } // The supported TX networks are the same as the supported RX networks for this device - virtual void setupSupportedTXNetworks(std::vector& txNetworks) override { setupSupportedRXNetworks(txNetworks); } + void setupSupportedTXNetworks(std::vector& txNetworks) override { setupSupportedRXNetworks(txNetworks); } }; } diff --git a/include/icsneo/device/radstar2/radstar2.h b/include/icsneo/device/radstar2/radstar2.h index 19450bf..577e372 100644 --- a/include/icsneo/device/radstar2/radstar2.h +++ b/include/icsneo/device/radstar2/radstar2.h @@ -44,13 +44,13 @@ protected: decoder.timestampResolution = 10; // Timestamps are in 10ns increments instead of the usual 25ns } - virtual void setupSupportedRXNetworks(std::vector& rxNetworks) override { + void setupSupportedRXNetworks(std::vector& rxNetworks) override { for(auto& netid : GetSupportedNetworks()) rxNetworks.emplace_back(netid); } // The supported TX networks are the same as the supported RX networks for this device - virtual void setupSupportedTXNetworks(std::vector& txNetworks) override { setupSupportedRXNetworks(txNetworks); } + void setupSupportedTXNetworks(std::vector& txNetworks) override { setupSupportedRXNetworks(txNetworks); } RADStar2(neodevice_t neodevice) : Device(neodevice) { getWritableNeoDevice().type = DEVICE_TYPE; diff --git a/include/icsneo/device/valuecan3/valuecan3.h b/include/icsneo/device/valuecan3/valuecan3.h index 87d87ed..83beba5 100644 --- a/include/icsneo/device/valuecan3/valuecan3.h +++ b/include/icsneo/device/valuecan3/valuecan3.h @@ -36,13 +36,13 @@ private: productId = PRODUCT_ID; } - virtual void setupSupportedRXNetworks(std::vector& rxNetworks) override { + void setupSupportedRXNetworks(std::vector& rxNetworks) override { for(auto& netid : GetSupportedNetworks()) rxNetworks.emplace_back(netid); } // The supported TX networks are the same as the supported RX networks for this device - virtual void setupSupportedTXNetworks(std::vector& txNetworks) override { setupSupportedRXNetworks(txNetworks); } + void setupSupportedTXNetworks(std::vector& txNetworks) override { setupSupportedRXNetworks(txNetworks); } }; } diff --git a/include/icsneo/device/valuecan4/valuecan4-1.h b/include/icsneo/device/valuecan4/valuecan4-1.h index f4da67a..61e9195 100644 --- a/include/icsneo/device/valuecan4/valuecan4-1.h +++ b/include/icsneo/device/valuecan4/valuecan4-1.h @@ -35,13 +35,13 @@ protected: encoder.supportCANFD = false; // VCAN 4-1 does not support CAN FD } - virtual void setupSupportedRXNetworks(std::vector& rxNetworks) override { + void setupSupportedRXNetworks(std::vector& rxNetworks) override { for(auto& netid : GetSupportedNetworks()) rxNetworks.emplace_back(netid); } // The supported TX networks are the same as the supported RX networks for this device - virtual void setupSupportedTXNetworks(std::vector& txNetworks) override { setupSupportedRXNetworks(txNetworks); } + void setupSupportedTXNetworks(std::vector& txNetworks) override { setupSupportedRXNetworks(txNetworks); } private: ValueCAN4_1(neodevice_t neodevice) : ValueCAN4(neodevice) { diff --git a/include/icsneo/device/valuecan4/valuecan4-2.h b/include/icsneo/device/valuecan4/valuecan4-2.h index d3adc2f..5f06fa6 100644 --- a/include/icsneo/device/valuecan4/valuecan4-2.h +++ b/include/icsneo/device/valuecan4/valuecan4-2.h @@ -31,13 +31,13 @@ public: } protected: - virtual void setupSupportedRXNetworks(std::vector& rxNetworks) override { + void setupSupportedRXNetworks(std::vector& rxNetworks) override { for(auto& netid : GetSupportedNetworks()) rxNetworks.emplace_back(netid); } // The supported TX networks are the same as the supported RX networks for this device - virtual void setupSupportedTXNetworks(std::vector& txNetworks) override { setupSupportedRXNetworks(txNetworks); } + void setupSupportedTXNetworks(std::vector& txNetworks) override { setupSupportedRXNetworks(txNetworks); } private: ValueCAN4_2(neodevice_t neodevice) : ValueCAN4(neodevice) { diff --git a/include/icsneo/device/valuecan4/valuecan4-2el.h b/include/icsneo/device/valuecan4/valuecan4-2el.h index 55d2409..41fc5fe 100644 --- a/include/icsneo/device/valuecan4/valuecan4-2el.h +++ b/include/icsneo/device/valuecan4/valuecan4-2el.h @@ -33,13 +33,13 @@ public: } protected: - virtual void setupSupportedRXNetworks(std::vector& rxNetworks) override { + void setupSupportedRXNetworks(std::vector& rxNetworks) override { for(auto& netid : GetSupportedNetworks()) rxNetworks.emplace_back(netid); } // The supported TX networks are the same as the supported RX networks for this device - virtual void setupSupportedTXNetworks(std::vector& txNetworks) override { setupSupportedRXNetworks(txNetworks); } + void setupSupportedTXNetworks(std::vector& txNetworks) override { setupSupportedRXNetworks(txNetworks); } private: ValueCAN4_2EL(neodevice_t neodevice) : ValueCAN4(neodevice) { diff --git a/include/icsneo/device/valuecan4/valuecan4-4.h b/include/icsneo/device/valuecan4/valuecan4-4.h index 0959062..8e1a9fd 100644 --- a/include/icsneo/device/valuecan4/valuecan4-4.h +++ b/include/icsneo/device/valuecan4/valuecan4-4.h @@ -33,13 +33,13 @@ public: } protected: - virtual void setupSupportedRXNetworks(std::vector& rxNetworks) override { + void setupSupportedRXNetworks(std::vector& rxNetworks) override { for(auto& netid : GetSupportedNetworks()) rxNetworks.emplace_back(netid); } // The supported TX networks are the same as the supported RX networks for this device - virtual void setupSupportedTXNetworks(std::vector& txNetworks) override { setupSupportedRXNetworks(txNetworks); } + void setupSupportedTXNetworks(std::vector& txNetworks) override { setupSupportedRXNetworks(txNetworks); } private: ValueCAN4_4(neodevice_t neodevice) : ValueCAN4(neodevice) {