From cf9716231c6282672a598c07506b9a86166c6a98 Mon Sep 17 00:00:00 2001 From: DanielGuramulta Date: Tue, 23 Feb 2021 13:34:50 +0200 Subject: [PATCH 1/2] M2kCalibrationImpl: add missing override keyword Signed-off-by: DanielGuramulta --- src/m2kcalibration_impl.hpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/m2kcalibration_impl.hpp b/src/m2kcalibration_impl.hpp index f45e02a6..4b0c96aa 100644 --- a/src/m2kcalibration_impl.hpp +++ b/src/m2kcalibration_impl.hpp @@ -42,38 +42,38 @@ class M2kCalibrationImpl : public M2kCalibration libm2k::analog::M2kAnalogOut* analogOut); virtual ~M2kCalibrationImpl(); - bool initialize(); - bool isInitialized() const; + bool initialize() override; + bool isInitialized() const override; void setAdcInCalibMode(); void setDacInCalibMode(); void restoreAdcFromCalibMode(); void restoreDacFromCalibMode(); - bool calibrateAll(); - bool calibrateADC(); + bool calibrateAll() override; + bool calibrateADC() override; bool calibrateADCoffset(); bool calibrateADCgain(); - bool calibrateDAC(); + bool calibrateDAC() override; bool calibrateDACoffset(); bool calibrateDACgain(); - void cancelCalibration(); + void cancelCalibration() override; - int getAdcOffset(unsigned int channel); - int getDacOffset(unsigned int channel); - double getAdcGain(unsigned int channel); - double getDacGain(unsigned int channel); + int getAdcOffset(unsigned int channel) override; + int getDacOffset(unsigned int channel) override; + double getAdcGain(unsigned int channel) override; + double getDacGain(unsigned int channel) override; - bool resetCalibration(); + bool resetCalibration() override; void updateAdcCorrections(); void updateDacCorrections(); bool setCalibrationMode(int); - void setDacGain(unsigned int chn, double gain); - void setDacOffset(unsigned int chn, int offset); - void setAdcOffset(unsigned int chn, int offset); - void setAdcGain(unsigned int chn, double gain); + void setDacGain(unsigned int chn, double gain) override; + void setDacOffset(unsigned int chn, int offset) override; + void setAdcOffset(unsigned int chn, int offset) override; + void setAdcGain(unsigned int chn, double gain) override; bool getAdcCalibrated() const override; bool getDacCalibrated() const override; From 89221d8305c60d2f355b4b16a6dc1204d143dae6 Mon Sep 17 00:00:00 2001 From: DanielGuramulta Date: Tue, 23 Feb 2021 13:35:23 +0200 Subject: [PATCH 2/2] GenericAnalogInImpl: remove unused private members Signed-off-by: DanielGuramulta --- src/analog/generic/genericanalogin_impl.hpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/analog/generic/genericanalogin_impl.hpp b/src/analog/generic/genericanalogin_impl.hpp index cee8901e..9c42b964 100644 --- a/src/analog/generic/genericanalogin_impl.hpp +++ b/src/analog/generic/genericanalogin_impl.hpp @@ -56,8 +56,6 @@ class GenericAnalogInImpl : public GenericAnalogIn { private: std::vector> m_devices_in; std::string m_dev_name; - unsigned int m_nb_channels; - bool m_cyclic; std::shared_ptr getAdcDevice(unsigned int index); static double processSample(int16_t sample, unsigned int channel); };