Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Warnings #231

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Warnings #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf97162
M2kCalibrationImpl: add missing override keyword
DanielGuramulta Feb 23, 2021
89221d8
GenericAnalogInImpl: remove unused private members
DanielGuramulta Feb 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/analog/generic/genericanalogin_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ class GenericAnalogInImpl : public GenericAnalogIn {
private:
std::vector<std::shared_ptr<libm2k::utils::DeviceIn>> m_devices_in;
std::string m_dev_name;
unsigned int m_nb_channels;
bool m_cyclic;
std::shared_ptr<libm2k::utils::DeviceIn> getAdcDevice(unsigned int index);
static double processSample(int16_t sample, unsigned int channel);
};
Expand Down
30 changes: 15 additions & 15 deletions src/m2kcalibration_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down