fix: prescaler for ADC (#347)

Fix prescaler for ADC
philips-software · Jun 28, 2024 · 0d083aa · 0d083aa
1 parent 8629391
commit 0d083aa
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/hal_st/stm32fxxx/AnalogToDigitalPinStm.cpp b/hal_st/stm32fxxx/AnalogToDigitalPinStm.cpp
@@ -118,7 +118,7 @@ namespace hal
         adc.Measure(onDone);
     }
 
-    AdcStm::AdcStm(uint8_t oneBasedIndex)
+    AdcStm::AdcStm(uint8_t oneBasedIndex, const Config& config)
         : index(oneBasedIndex - 1)
 #if defined(STM32WB) || defined(STM32G0)
         , interruptHandler(ADC1_IRQn, [this]()
@@ -136,11 +136,7 @@ namespace hal
         EnableClockAdc(index);
 
         handle.Instance = peripheralAdc[index];
-#ifdef ADC_CLOCK_ASYNC_DIV4
-        handle.Init.ClockPrescaler = ADC_CLOCK_ASYNC_DIV4;
-#else
-        handle.Init.ClockPrescaler = ADC_CLOCKPRESCALER_PCLK_DIV4;
-#endif
+        handle.Init.ClockPrescaler = config.clockPrescaler;
         handle.Init.Resolution = ADC_RESOLUTION_12B;
         handle.Init.ScanConvMode = DISABLE;
         handle.Init.ContinuousConvMode = DISABLE;

diff --git a/hal_st/stm32fxxx/AnalogToDigitalPinStm.hpp b/hal_st/stm32fxxx/AnalogToDigitalPinStm.hpp
@@ -19,6 +19,15 @@ namespace hal
             uint32_t samplingTime{ ADC_SAMPLETIME_3CYCLES_5 };
 #else
             uint32_t samplingTime{ ADC_SAMPLETIME_3CYCLES };
+#endif
+        };
+
+        struct AdcStmConfig
+        {
+#ifdef STM32WBA
+            uint32_t clockPrescaler{ ADC_CLOCK_ASYNC_DIV4 };
+#else
+            uint32_t clockPrescaler{ ADC_CLOCKPRESCALER_PCLK_DIV4 };
 #endif
         };
     }
@@ -61,7 +70,9 @@ namespace hal
     class AdcStm
     {
     public:
-        explicit AdcStm(uint8_t adcIndex);
+        using Config = detail::AdcStmConfig;
+
+        explicit AdcStm(uint8_t adcIndex, const Config& config = Config());
         ~AdcStm();
 
     protected: