Skip to content
Snippets Groups Projects
Commit 8f110115 authored by Daniel Joseph Antrim's avatar Daniel Joseph Antrim
Browse files

run clang format

parent 0c776b5a
No related branches found
No related tags found
6 merge requests!308Bring main and devel back in sync,!300playing with fixing divergence between devel and main,!287Updates for Julabo Chiller,!285Julabo Chiller Added with Fixed Pipeline Compatibility,!269Merge devel into main: largest change is code formatting checker and enforcement in CI,!225Add support for 4-channel 12-bit ADC ADS1015
Pipeline #2626440 passed
...@@ -18,7 +18,7 @@ REGISTER_DEVCOM(ADS1015, ADCDevice) ...@@ -18,7 +18,7 @@ REGISTER_DEVCOM(ADS1015, ADCDevice)
const std::map<ADS1015::FullScaleRange, double> ADS1015::fsrToValMap = { const std::map<ADS1015::FullScaleRange, double> ADS1015::fsrToValMap = {
{ADS1015::FullScaleRange::FSR_6_144, 6.144}, {ADS1015::FullScaleRange::FSR_6_144, 6.144},
{ADS1015::FullScaleRange::FSR_4_096, 4.096}, {ADS1015::FullScaleRange::FSR_4_096, 4.096},
{ADS1015::FullScaleRange::FSR_2_048, 2.048}, // device default {ADS1015::FullScaleRange::FSR_2_048, 2.048}, // device default
{ADS1015::FullScaleRange::FSR_1_024, 1.024}, {ADS1015::FullScaleRange::FSR_1_024, 1.024},
{ADS1015::FullScaleRange::FSR_0_512, 0.512}, {ADS1015::FullScaleRange::FSR_0_512, 0.512},
{ADS1015::FullScaleRange::FSR_0_256, 0.256}}; {ADS1015::FullScaleRange::FSR_0_256, 0.256}};
...@@ -26,7 +26,8 @@ const std::map<ADS1015::FullScaleRange, double> ADS1015::fsrToValMap = { ...@@ -26,7 +26,8 @@ const std::map<ADS1015::FullScaleRange, double> ADS1015::fsrToValMap = {
const std::map<ADS1015::Gain, ADS1015::FullScaleRange> ADS1015::gainToFSRMap = { const std::map<ADS1015::Gain, ADS1015::FullScaleRange> ADS1015::gainToFSRMap = {
{ADS1015::Gain::xTWOTHIRDS, ADS1015::FullScaleRange::FSR_6_144}, {ADS1015::Gain::xTWOTHIRDS, ADS1015::FullScaleRange::FSR_6_144},
{ADS1015::Gain::xONE, ADS1015::FullScaleRange::FSR_4_096}, {ADS1015::Gain::xONE, ADS1015::FullScaleRange::FSR_4_096},
{ADS1015::Gain::xTWO, ADS1015::FullScaleRange::FSR_2_048}, // device default {ADS1015::Gain::xTWO,
ADS1015::FullScaleRange::FSR_2_048}, // device default
{ADS1015::Gain::xFOUR, ADS1015::FullScaleRange::FSR_1_024}, {ADS1015::Gain::xFOUR, ADS1015::FullScaleRange::FSR_1_024},
{ADS1015::Gain::xEIGHT, ADS1015::FullScaleRange::FSR_0_512}, {ADS1015::Gain::xEIGHT, ADS1015::FullScaleRange::FSR_0_512},
{ADS1015::Gain::xSIXTEEN, ADS1015::FullScaleRange::FSR_0_256}}; {ADS1015::Gain::xSIXTEEN, ADS1015::FullScaleRange::FSR_0_256}};
...@@ -37,8 +38,7 @@ const std::map<ADS1015::Gain, ADS1015::Config> ADS1015::gainToConfigMap = { ...@@ -37,8 +38,7 @@ const std::map<ADS1015::Gain, ADS1015::Config> ADS1015::gainToConfigMap = {
{ADS1015::Gain::xTWO, ADS1015::Config::CONFIG_PGA_2}, // device default {ADS1015::Gain::xTWO, ADS1015::Config::CONFIG_PGA_2}, // device default
{ADS1015::Gain::xFOUR, ADS1015::Config::CONFIG_PGA_4}, {ADS1015::Gain::xFOUR, ADS1015::Config::CONFIG_PGA_4},
{ADS1015::Gain::xEIGHT, ADS1015::Config::CONFIG_PGA_8}, {ADS1015::Gain::xEIGHT, ADS1015::Config::CONFIG_PGA_8},
{ADS1015::Gain::xSIXTEEN, ADS1015::Config::CONFIG_PGA_16} {ADS1015::Gain::xSIXTEEN, ADS1015::Config::CONFIG_PGA_16}};
};
ADS1015::ADS1015(std::shared_ptr<I2CCom> com) ADS1015::ADS1015(std::shared_ptr<I2CCom> com)
: ADCDevice(std::make_shared<LinearCalibration>( : ADCDevice(std::make_shared<LinearCalibration>(
...@@ -46,9 +46,7 @@ ADS1015::ADS1015(std::shared_ptr<I2CCom> com) ...@@ -46,9 +46,7 @@ ADS1015::ADS1015(std::shared_ptr<I2CCom> com)
m_com = com; m_com = com;
} }
void ADS1015::setGain(Gain gain) { void ADS1015::setGain(Gain gain) { setFullScaleRange(gainToFSRMap.at(gain)); }
setFullScaleRange(gainToFSRMap.at(gain));
}
void ADS1015::setFullScaleRange(FullScaleRange range) { void ADS1015::setFullScaleRange(FullScaleRange range) {
double full_scale_range = fsrToValMap.at(range); double full_scale_range = fsrToValMap.at(range);
...@@ -57,9 +55,7 @@ void ADS1015::setFullScaleRange(FullScaleRange range) { ...@@ -57,9 +55,7 @@ void ADS1015::setFullScaleRange(FullScaleRange range) {
std::make_shared<LinearCalibration>(full_scale_range, m_maxValue)); std::make_shared<LinearCalibration>(full_scale_range, m_maxValue));
} }
void ADS1015::setChannelMode(ChannelMode mode) { void ADS1015::setChannelMode(ChannelMode mode) { m_channelMode = mode; }
m_channelMode = mode;
}
int32_t ADS1015::readCount() { int32_t ADS1015::readCount() {
// set channel to default channel // set channel to default channel
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment