feat: AdcDmaMultiChannelStm implements new AdcMultiChannel interface (#…

…462) * Implement new AdcMultiChannel interface * Update hal_st/stm32fxxx/AdcDmaMultiChannelStm.hpp --------- Co-authored-by: Richard Peters <[email protected]>
philips-software · Dec 6, 2024 · bdd2507 · bdd2507
1 parent a967560
commit bdd2507
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/hal_st/stm32fxxx/AdcDmaMultiChannelStm.cpp b/hal_st/stm32fxxx/AdcDmaMultiChannelStm.cpp
@@ -31,14 +31,14 @@ namespace hal
         auto result = HAL_ADCEx_Calibration_Start(&adc.Handle(), ADC_SINGLE_ENDED);
         assert(result == HAL_OK);
 #elif defined(IS_ADC_CALFACT)
-        auto result = HAL_ADCEx_Calibration_Start(&adc.Handle());        
+        auto result = HAL_ADCEx_Calibration_Start(&adc.Handle());
         assert(result == HAL_OK);
 #endif
 
         LL_ADC_REG_SetDMATransfer(adc.Handle().Instance, LL_ADC_REG_DMA_TRANSFER_LIMITED);
     }
 
-    void AdcDmaMultiChannelStmBase::Measure(const infra::Function<void(infra::MemoryRange<uint16_t>)>& onDone)
+    void AdcDmaMultiChannelStmBase::Measure(const infra::Function<void(Samples)>& onDone)
     {
         this->onDone = onDone;
 

diff --git a/hal_st/stm32fxxx/AdcDmaMultiChannelStm.hpp b/hal_st/stm32fxxx/AdcDmaMultiChannelStm.hpp
@@ -1,23 +1,27 @@
 #ifndef HAL_ST_ADC_DMA_MULTI_CHANNEL_HPP
 #define HAL_ST_ADC_DMA_MULTI_CHANNEL_HPP
 
+#include "hal/interfaces/AdcMultiChannel.hpp"
 #include "hal_st/stm32fxxx/AnalogToDigitalPinStm.hpp"
 #include "hal_st/stm32fxxx/DmaStm.hpp"
 #include "hal_st/stm32fxxx/GpioStm.hpp"
 #include "infra/util/AutoResetFunction.hpp"
+#include <array>
+#include <cstddef>
 
 /// @brief This ADC implementation supports multiple channels with DMA transfer and software trigger.
 ///        DMA transfer is one shot mode.
 namespace hal
 {
     class AdcDmaMultiChannelStmBase
+        : public AdcMultiChannel
     {
     public:
         AdcDmaMultiChannelStmBase(
             infra::MemoryRange<uint16_t> buffer, infra::MemoryRange<AnalogPinStm> analogPins, AdcStm& adc,
             DmaStm::ReceiveStream& receiveStream);
 
-        void Measure(const infra::Function<void(infra::MemoryRange<uint16_t>)>& onDone);
+        void Measure(const infra::Function<void(Samples)>& onDone) override;
 
         constexpr static std::size_t MaxChannels{ 16 };
 
@@ -29,7 +33,7 @@ namespace hal
         infra::MemoryRange<AnalogPinStm> analogPins;
         AdcStm& adc;
         ReceiveDmaChannel dmaStream;
-        infra::AutoResetFunction<void(infra::MemoryRange<uint16_t>)> onDone;
+        infra::AutoResetFunction<void(Samples)> onDone;
 
         void TransferDone();
     };