Fix

Author: Candas1

src/current_sense/hardware_specific/stm32/README.md

@@ -27,12 +27,15 @@ This can help reduce the sampling time.
 Injected ADC is used for sampling that requires a critical timing (e.g. low side current sensing).<BR>
 The driver picks some of the shortest sampling time available on your STM32 chip.<BR>
 You can force a specific sampling time with the ADC_SAMPLINGTIME_INJ build flag (e.g. ADC_SAMPLINGTIME_INJ=ADC_SAMPLETIME_1CYCLE_5).<BR>
+Up to 4 injected channels can be sampled per ADC, you will get an error message beyond that.<BR>
 
 ### Regular ADC
 Regular ADC is used for less critical sampling.<BR>
 It uses DMA to copy ADC samples to a buffer.<BR>
 If not triggered by a timer, it will sample in continuous mode.<BR>
 You can force a specific sampling time with the ADC_SAMPLINGTIME build flag (e.g. ADC_SAMPLINGTIME=ADC_SAMPLETIME_8CYCLES_5).<BR>
+Up to 16 inected channels can be sampled per ADC, you will get an error message beyond that.<BR>
+If many ADCs are available, this can lead to a lot of RAM usage. You can use the MAX_REG_ADC_CHANNELS build flag to reduce this. (e.g. MAX_REG_ADC_CHANNELS=4).<BR>
 
 ### Internal channels
 You can now sample internal channels (VREF,VBAT,TEMP).<BR>
@@ -43,5 +46,3 @@ You can force a specific sampling time with the ADC_SAMPLINGTIME_INTERNAL build
 An interrupt is used with low side current sensing if the timer used to trigger the ADC has no repetition counter, which is used to make sure the low side mosfets are ON.<BR>
 You can force the use of an interrupt if needed with the SIMPLEFOC_STM32_ADC_INTERRUPT build flag.
 
-
-

src/current_sense/hardware_specific/stm32/stm32_adc.cpp

@@ -25,23 +25,18 @@ ADC_HandleTypeDef *interrupt_adc = NP;
 
 ADC_HandleTypeDef *_get_ADC_handle(ADC_TypeDef* Instance){
 
-  #ifdef ADC
-  // Some families have a single ADC without a number
-  if (Instance == ADC) return &hadc1;
-  #else 
-    if (Instance == ADC1) return &hadc1;
-    #ifdef ADC2
-    else if (Instance == ADC2) return &hadc2; 
-    #endif
-    #ifdef ADC3
-    else if (Instance == ADC3) return &hadc3;
-    #endif
-    #ifdef ADC4
-    else if (Instance == ADC4) return &hadc4;
-    #endif
-    #ifdef ADC5
-    else if (Instance == ADC5) return &hadc5;
-    #endif
+  if (Instance == ADC1) return &hadc1;
+  #ifdef ADC2
+  else if (Instance == ADC2) return &hadc2; 
+  #endif
+  #ifdef ADC3
+  else if (Instance == ADC3) return &hadc3;
+  #endif
+  #ifdef ADC4
+  else if (Instance == ADC4) return &hadc4;
+  #endif
+  #ifdef ADC5
+  else if (Instance == ADC5) return &hadc5;
   #endif
   else return nullptr;
 }
@@ -223,7 +218,7 @@ int _init_ADC(Stm32ADCSample sample)
   sample.handle->Init.DataAlign = ADC_DATAALIGN_RIGHT;
   #endif
   #if !defined(STM32F0xx) && !defined(STM32L0xx)
-  sample.handle->Init.NbrOfConversion = max(1,ADCEngine.reg_channel_count[sample.adc_index]); // Minimum 1 for analogread to work
+  sample.handle->Init.NbrOfConversion = ADCEngine.reg_channel_count[sample.adc_index]; // Minimum 1 for analogread to work
   #endif
   #if !defined(STM32F1xx) && !defined(STM32H7xx) && !defined(STM32MP1xx) && \
       !defined(ADC1_V2_5)

src/current_sense/hardware_specific/stm32/stm32_adc.h

@@ -42,7 +42,9 @@
 
 #define ADC_COUNT (ADC1_COUNT + ADC2_COUNT + ADC3_COUNT + ADC4_COUNT + ADC5_COUNT)
 
+#ifndef MAX_REG_ADC_CHANNELS
 #define MAX_REG_ADC_CHANNELS 16 // Maximum number of samples for Regular ADC
+#endif
 #define MAX_INJ_ADC_CHANNELS 4  // Maximum number of samples for Injected ADC
 
 #ifndef ADC_SAMPLINGTIME_INJ

src/current_sense/hardware_specific/stm32/stm32_dma.cpp

@@ -18,23 +18,19 @@ extern Stm32ADCEngine ADCEngine;
 uint16_t adc_dma_buf[ADC_COUNT][MAX_REG_ADC_CHANNELS]={0};
 
 DMA_HandleTypeDef *_get_DMA_handle(ADC_TypeDef* Instance){
-  #ifdef ADC
-  // Some families have a single ADC without a number
-  if (Instance == ADC) return &hdma_adc1;
-  #else
-    if (Instance == ADC1) return &hdma_adc1;
-    #ifdef ADC2
-    else if (Instance == ADC2) return &hdma_adc2; 
-    #endif
-    #ifdef ADC3
-    else if (Instance == ADC3) return &hdma_adc3;
-    #endif
-    #ifdef ADC4
-    else if (Instance == ADC4) return &hdma_adc4;
-    #endif
-    #ifdef ADC5
-    else if (Instance == ADC5) return &hdma_adc5;
-    #endif
+  
+  if (Instance == ADC1) return &hdma_adc1;
+  #ifdef ADC2
+  else if (Instance == ADC2) return &hdma_adc2; 
+  #endif
+  #ifdef ADC3
+  else if (Instance == ADC3) return &hdma_adc3;
+  #endif
+  #ifdef ADC4
+  else if (Instance == ADC4) return &hdma_adc4;
+  #endif
+  #ifdef ADC5
+  else if (Instance == ADC5) return &hdma_adc5;
   #endif
   else return nullptr;
 }