bugfixes and handling only one adc nad no timer 8

Author: askuric

src/current_sense/hardware_specific/stm32/stm32_mcu.h

@@ -4,10 +4,7 @@
 #include "../../hardware_api.h"
 #include "../../../common/foc_utils.h"
 
-#if defined(_STM32_DEF_) and !defined(ARDUINO_B_G431B_ESC1) 
-
-#define _ADC_VOLTAGE 3.3f
-#define _ADC_RESOLUTION 1024.0f
+#if defined(_STM32_DEF_) 
 
 // generic implementation of the hardware specific structure
 // containing all the necessary current sense parameters

src/current_sense/hardware_specific/stm32/stm32f4/stm32f4_hal.cpp

@@ -9,11 +9,15 @@ uint32_t _timerToInjectedTRGO(HardwareTimer* timer){
   if(timer->getHandle()->Instance == TIM1)  
     return ADC_EXTERNALTRIGINJECCONV_T1_TRGO;
   else if(timer->getHandle()->Instance == TIM2) 
+#ifdef TIM2 // if defined timer 2
     return ADC_EXTERNALTRIGINJECCONV_T2_TRGO;
   else if(timer->getHandle()->Instance == TIM4) 
     return ADC_EXTERNALTRIGINJECCONV_T4_TRGO;
+#endif
+#ifdef TIM5 // if defined timer 5
   else if(timer->getHandle()->Instance == TIM5) 
     return ADC_EXTERNALTRIGINJECCONV_T5_TRGO;
+#endif
   else
     return 0;
 }
@@ -23,10 +27,14 @@ uint32_t _timerToInjectedTRGO(HardwareTimer* timer){
 uint32_t _timerToRegularTRGO(HardwareTimer* timer){
   if(timer->getHandle()->Instance == TIM2)  
     return ADC_EXTERNALTRIGCONV_T2_TRGO;
+#ifdef TIM3 // if defined timer 3
   else if(timer->getHandle()->Instance == TIM3) 
     return ADC_EXTERNALTRIGCONV_T3_TRGO;
+#endif
+#ifdef TIM8 // if defined timer 8
   else if(timer->getHandle()->Instance == TIM8) 
     return ADC_EXTERNALTRIGCONV_T8_TRGO;
+#endif
   else
     return 0;
 }
@@ -42,8 +50,13 @@ void _adc_init(Stm32CurrentSenseParams* cs_params, const STM32DriverParams* driv
   hadc.Instance = (ADC_TypeDef *)pinmap_peripheral(analogInputToPinName(cs_params->pins[0]), PinMap_ADC);
 
   if(hadc.Instance == ADC1) __HAL_RCC_ADC1_CLK_ENABLE();
+#ifdef ADC2  // if defined ADC2
   else if(hadc.Instance == ADC2) __HAL_RCC_ADC2_CLK_ENABLE();
+#endif
+#ifdef ADC3  // if defined ADC3
   else if(hadc.Instance == ADC3) __HAL_RCC_ADC3_CLK_ENABLE();
+#endif
+  else return; // error not a valid ADC instance
 
   hadc.Init.ClockPrescaler = ADC_CLOCK_SYNC_PCLK_DIV4;
   hadc.Init.Resolution = ADC_RESOLUTION_12B;

src/current_sense/hardware_specific/stm32/stm32f4/stm32f4_hal.h

@@ -5,7 +5,6 @@
 
 #if defined(STM32F4xx)
 #include "stm32f4xx_hal.h"
-#include "stm32f4xx_hal_adc.h"
 #include "../../../../common/foc_utils.h"
 #include "../../../../drivers/hardware_specific/stm32_mcu.h"
 #include "../stm32_mcu.h"

src/current_sense/hardware_specific/stm32/stm32f4/stm32f4_mcu.cpp

@@ -18,8 +18,12 @@ uint16_t adc_channel_number[3]={0};
 
 int _adcToIndex(ADC_HandleTypeDef *AdcHandle){
   if(AdcHandle->Instance == ADC1) return 0;
+#ifdef ADC2 // if ADC2 exists
   else if(AdcHandle->Instance == ADC2) return 1;
+#endif
+#ifdef ADC3 // if ADC3 exists
   else if(AdcHandle->Instance == ADC3) return 2;
+#endif
   return 0;
 }