extract PortPrepareAnalogSampling

mck1117 · Jan 28, 2025 · 2374ac7 · 2374ac7
1 parent aa23d10
commit 2374ac7
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 1 deletion.
diff --git a/firmware/boards/f0_module/port.cpp b/firmware/boards/f0_module/port.cpp
@@ -7,6 +7,11 @@
 
 #define ADC_CHANNEL_COUNT 3
 
+void PortPrepareAnalogSampling()
+{
+    adcStart(&ADCD1, nullptr);
+}
+
 static adcsample_t adcBuffer[ADC_CHANNEL_COUNT * ADC_OVERSAMPLE];
 
 const ADCConversionGroup convGroup =

diff --git a/firmware/boards/f1_dual/port.cpp b/firmware/boards/f1_dual/port.cpp
@@ -5,6 +5,11 @@
 
 #include "hal.h"
 
+void PortPrepareAnalogSampling()
+{
+    adcStart(&ADCD1, nullptr);
+}
+
 #define ADC_CHANNEL_COUNT 8
 #define ADC_SAMPLE ADC_SAMPLE_7P5
 

diff --git a/firmware/boards/f1_dual_rev1/port.cpp b/firmware/boards/f1_dual_rev1/port.cpp
@@ -5,6 +5,11 @@
 
 #include "hal.h"
 
+void PortPrepareAnalogSampling()
+{
+    adcStart(&ADCD1, nullptr);
+}
+
 #define ADC_CHANNEL_COUNT 10
 #define ADC_SAMPLE ADC_SAMPLE_7P5
 

diff --git a/firmware/boards/f1_rev2/port.cpp b/firmware/boards/f1_rev2/port.cpp
@@ -5,6 +5,11 @@
 
 #include "hal.h"
 
+void PortPrepareAnalogSampling()
+{
+    adcStart(&ADCD1, nullptr);
+}
+
 #define ADC_CHANNEL_COUNT 5
 #define ADC_SAMPLE ADC_SAMPLE_7P5
 

diff --git a/firmware/boards/f1_rev3/port.cpp b/firmware/boards/f1_rev3/port.cpp
@@ -2,6 +2,11 @@
 
 #include "wideband_config.h"
 
+void PortPrepareAnalogSampling()
+{
+    adcStart(&ADCD1, nullptr);
+}
+
 #define ADC_CHANNEL_COUNT 5
 #define ADC_SAMPLE ADC_SAMPLE_7P5
 

diff --git a/firmware/boards/port.h b/firmware/boards/port.h
@@ -25,6 +25,8 @@ struct AnalogResult
     #endif
 };
 
+// Enable ADCs, configure pins, etc
+void PortPrepareAnalogSampling();
 AnalogResult AnalogSample();
 
 enum class SensorType : uint8_t {

diff --git a/firmware/sampling_thread.cpp b/firmware/sampling_thread.cpp
@@ -64,6 +64,7 @@ void StartSampling()
         samplers[i].Init();
     }
 
-    adcStart(&ADCD1, nullptr);
+    PortPrepareAnalogSampling();
+
     chThdCreateStatic(waSamplingThread, sizeof(waSamplingThread), NORMALPRIO + 5, SamplingThread, nullptr);
 }