Revert "Add PureAnalogPin support in AdvancedADC"

Author: CyberCastle

src/AdvancedADC.cpp

@@ -20,17 +20,6 @@
 #include "Arduino.h"
 #include "HALConfig.h"
 #include "AdvancedADC.h"
-#if __has_include("pure_analog_pins.h")
-#include "pure_analog_pins.h"
-#endif
-
-#if __has_include("pure_analog_pins.h")
-template <>
-PinName AdvancedADC::_toPinName(PureAnalogPin p) {
-    extern AnalogPinDescription g_pureAAnalogPinDescription[];
-    return g_pureAAnalogPinDescription[p.get()].name;
-}
-#endif
 
 #define ADC_NP  ((ADCName) NC)
 #define ADC_PIN_ALT_MASK    (uint32_t) (ALT0 | ALT1 )
@@ -248,23 +237,6 @@ int AdvancedADC::begin(uint32_t resolution, uint32_t sample_rate, size_t n_sampl
     return 1;
 }
 
-#if __has_include("pure_analog_pins.h")
-int AdvancedADC::begin(uint32_t resolution, uint32_t sample_rate, size_t n_samples,
-                       size_t n_buffers, size_t n_pins, PureAnalogPin *pins,
-                       bool start, adc_sample_time_t sample_time) {
-    if (n_pins > AN_MAX_ADC_CHANNELS) {
-        n_pins = AN_MAX_ADC_CHANNELS;
-    }
-
-    for (size_t i = 0; i < n_pins; ++i) {
-        adc_pins[i] = _toPinName(pins[i]);
-    }
-
-    n_channels = n_pins;
-    return begin(resolution, sample_rate, n_samples, n_buffers, start, sample_time);
-}
-#endif
-
 int AdvancedADC::start(uint32_t sample_rate){
     // Initialize and configure the ADC timer.
     hal_tim_config(&descr->tim, sample_rate);

src/AdvancedADC.h

@@ -49,7 +49,10 @@ class AdvancedADC {
             return analogPinToPinName(p);
         }
 #if __has_include("pure_analog_pins.h")
-        static PinName _toPinName(PureAnalogPin p);
+        static inline PinName _toPinName(PureAnalogPin p) {
+            extern AnalogPinDescription g_pureAAnalogPinDescription[];
+            return g_pureAAnalogPinDescription[p.get()].name;
+        }
 #endif
 
     public:
@@ -86,7 +89,17 @@ class AdvancedADC {
 #if __has_include("pure_analog_pins.h")
         int begin(uint32_t resolution, uint32_t sample_rate, size_t n_samples,
                   size_t n_buffers, size_t n_pins, PureAnalogPin *pins, bool start=true,
-                  adc_sample_time_t sample_time=AN_ADC_SAMPLETIME_8_5);
+                  adc_sample_time_t sample_time=AN_ADC_SAMPLETIME_8_5) {
+            if (n_pins > AN_MAX_ADC_CHANNELS) {
+                n_pins = AN_MAX_ADC_CHANNELS;
+            }
+            for (size_t i = 0; i < n_pins; ++i) {
+                adc_pins[i] = _toPinName(pins[i]);
+            }
+
+            n_channels = n_pins;
+            return begin(resolution, sample_rate, n_samples, n_buffers, start, sample_time);
+        }
 #endif
         int start(uint32_t sample_rate);
         int stop();