From d9ae2242fd993925235a5c887e23e7da9981a850 Mon Sep 17 00:00:00 2001
From: Daniel Joseph Antrim <daniel.joseph.antrim@cern.ch>
Date: Wed, 28 Apr 2021 13:37:04 -0700
Subject: [PATCH] rename enum from RegisterAddress simply to Address
---
src/libDevCom/ADS1015.cpp | 7 +++----
src/libDevCom/ADS1015.h | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/libDevCom/ADS1015.cpp b/src/libDevCom/ADS1015.cpp
index f5654d4c..0e385379 100644
--- a/src/libDevCom/ADS1015.cpp
+++ b/src/libDevCom/ADS1015.cpp
@@ -74,12 +74,11 @@ int32_t ADS1015::readCount(uint8_t channel) {
setStartConversion(config);
// configure the ADC for single shot conversion on the specified channel
- m_com->write_reg16(static_cast<uint16_t>(RegisterAddress::POINTER_CONFIG),
- config);
+ m_com->write_reg16(static_cast<uint16_t>(Address::POINTER_CONFIG), config);
std::this_thread::sleep_for(std::chrono::microseconds(1000));
- uint16_t result = m_com->read_reg16(
- static_cast<uint16_t>(RegisterAddress::POINTER_CONVERT));
+ uint16_t result =
+ m_com->read_reg16(static_cast<uint16_t>(Address::POINTER_CONVERT));
result = result >> 4;
return static_cast<int32_t>(result);
diff --git a/src/libDevCom/ADS1015.h b/src/libDevCom/ADS1015.h
index 65bc1661..d6a53b57 100644
--- a/src/libDevCom/ADS1015.h
+++ b/src/libDevCom/ADS1015.h
@@ -26,7 +26,7 @@ class ADS1015 : public ADCDevice {
private:
const std::vector<uint8_t> allowedAddresses{0x48, 0x49, 0x4A, 0x4B};
- enum class RegisterAddress : uint16_t {
+ enum class Address : uint16_t {
POINTER_CONVERT = 0x00,
POINTER_CONFIG = 0x01,
POINTER_LOWTHRESH = 0x02,
--
GitLab