diff --git a/src/shared/drivers/adc/InternalADC.cpp b/src/shared/drivers/adc/InternalADC.cpp index f87b6c91c63d6af58b9a9a6e4cfdbfddc222eb54..acfe5e21f31f2b8e394d516c4688086f8d351ddc 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 cc9a4ce025dba27666e020cc3d3cb393b28087c2..662419e817ef60eb8622b6326af3ad5f11bf3f72 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();