From ce799d12ff2f2369cf485a891d105b8233b7eed1 Mon Sep 17 00:00:00 2001
From: Alberto Nidasio <alberto.nidasio@skywarder.eu>
Date: Thu, 19 May 2022 14:14:37 +0200
Subject: [PATCH] [InternalADC] Implemented InternalADCData insted of ADCData
---
src/shared/drivers/adc/InternalADC.cpp | 6 +++---
src/shared/drivers/adc/InternalADC.h | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/shared/drivers/adc/InternalADC.cpp b/src/shared/drivers/adc/InternalADC.cpp
index f87b6c91c..acfe5e21f 100644
--- a/src/shared/drivers/adc/InternalADC.cpp
+++ b/src/shared/drivers/adc/InternalADC.cpp
@@ -168,7 +168,7 @@ bool InternalADC::enableChannel(Channel channel, SampleTime sampleTime)
return true;
}
-ADCData InternalADC::getVoltage(Channel channel)
+InternalADCData InternalADC::getVoltage(Channel channel)
{
float voltage = 0;
@@ -177,7 +177,7 @@ ADCData InternalADC::getVoltage(Channel channel)
voltage = values[indexMap[channel]] * supplyVoltage / RESOLUTION;
}
- return ADCData{timestamp, (uint8_t)channel, voltage};
+ return InternalADCData{timestamp, (uint8_t)channel, voltage};
}
bool InternalADC::selfTest()
@@ -193,7 +193,7 @@ bool InternalADC::selfTest()
return true;
}
-ADCData InternalADC::sampleImpl()
+InternalADCData InternalADC::sampleImpl()
{
if (!isUsingDMA)
{
diff --git a/src/shared/drivers/adc/InternalADC.h b/src/shared/drivers/adc/InternalADC.h
index cc9a4ce02..662419e81 100644
--- a/src/shared/drivers/adc/InternalADC.h
+++ b/src/shared/drivers/adc/InternalADC.h
@@ -66,7 +66,7 @@ namespace Boardcore
* timers and multi adc mode.
* This features are not implemented to keep the driver simple.
*/
-class InternalADC : public Sensor<ADCData>
+class InternalADC : public Sensor<InternalADCData>
{
public:
/**
@@ -131,11 +131,11 @@ public:
bool enableChannel(Channel channel, SampleTime sampleTime);
- ADCData getVoltage(Channel channel);
+ InternalADCData getVoltage(Channel channel);
bool selfTest() override;
- ADCData sampleImpl() override;
+ InternalADCData sampleImpl() override;
private:
inline void resetRegisters();
--
GitLab