f1 update

Author: askuric

src/current_sense/hardware_specific/stm32/stm32_adc_utils.cpp

@@ -1,6 +1,6 @@
 #include "stm32_adc_utils.h"
 
-#if defined(_STM32_DEF_)
+#if defined(_STM32_DEF_) 
 
 // for searching the best ADCs, we need to know the number of ADCs 
 // it might be better to use some HAL variable for example ADC_COUNT

src/current_sense/hardware_specific/stm32/stm32f1/stm32f1_hal.cpp

@@ -3,42 +3,9 @@
 #if defined(STM32F1xx)  
 
 #include "../../../../communication/SimpleFOCDebug.h"
+#include "../stm32_adc_utils.h"
 #define _TRGO_NOT_AVAILABLE 12345
 
-// timer to injected TRGO
-// https://github.com/stm32duino/Arduino_Core_STM32/blob/e156c32db24d69cb4818208ccc28894e2f427cfa/system/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc_ex.h#L215
-uint32_t _timerToInjectedTRGO(TIM_HandleTypeDef* timer){
-  if(timer->Instance == TIM1)  
-    return ADC_EXTERNALTRIGINJECCONV_T1_TRGO;
-#ifdef TIM2 // if defined timer 2
-  else if(timer->Instance == TIM2) 
-    return ADC_EXTERNALTRIGINJECCONV_T2_TRGO;
-#endif
-#ifdef TIM4 // if defined timer 4
-  else if(timer->Instance == TIM4) 
-    return ADC_EXTERNALTRIGINJECCONV_T4_TRGO;
-#endif
-#ifdef TIM5 // if defined timer 5
-  else if(timer->Instance == TIM5) 
-    return ADC_EXTERNALTRIGINJECCONV_T5_TRGO;
-#endif
-  else
-    return _TRGO_NOT_AVAILABLE;
-}
-
-// timer to regular TRGO
-// https://github.com/stm32duino/Arduino_Core_STM32/blob/e156c32db24d69cb4818208ccc28894e2f427cfa/system/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc_ex.h#L215
-uint32_t _timerToRegularTRGO(TIM_HandleTypeDef* timer){
-  if(timer->Instance == TIM3) 
-    return ADC_EXTERNALTRIGCONV_T3_TRGO;
-#ifdef TIM8 // if defined timer 8
-  else if(timer->Instance == TIM8) 
-    return ADC_EXTERNALTRIGCONV_T8_TRGO;
-#endif
-  else
-    return _TRGO_NOT_AVAILABLE;
-}
-
 ADC_HandleTypeDef hadc;
 
 /**

src/current_sense/hardware_specific/stm32/stm32f1/stm32f1_utils.cpp

@@ -0,0 +1,40 @@
+#include "../stm32_adc_utils.h"
+
+#if defined(STM32F1xx)
+
+
+// timer to injected TRGO
+// https://github.com/stm32duino/Arduino_Core_STM32/blob/e156c32db24d69cb4818208ccc28894e2f427cfa/system/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc_ex.h#L215
+uint32_t _timerToInjectedTRGO(TIM_HandleTypeDef* timer){
+  if(timer->Instance == TIM1)  
+    return ADC_EXTERNALTRIGINJECCONV_T1_TRGO;
+#ifdef TIM2 // if defined timer 2
+  else if(timer->Instance == TIM2) 
+    return ADC_EXTERNALTRIGINJECCONV_T2_TRGO;
+#endif
+#ifdef TIM4 // if defined timer 4
+  else if(timer->Instance == TIM4) 
+    return ADC_EXTERNALTRIGINJECCONV_T4_TRGO;
+#endif
+#ifdef TIM5 // if defined timer 5
+  else if(timer->Instance == TIM5) 
+    return ADC_EXTERNALTRIGINJECCONV_T5_TRGO;
+#endif
+  else
+    return _TRGO_NOT_AVAILABLE;
+}
+
+// timer to regular TRGO
+// https://github.com/stm32duino/Arduino_Core_STM32/blob/e156c32db24d69cb4818208ccc28894e2f427cfa/system/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc_ex.h#L215
+uint32_t _timerToRegularTRGO(TIM_HandleTypeDef* timer){
+  if(timer->Instance == TIM3) 
+    return ADC_EXTERNALTRIGCONV_T3_TRGO;
+#ifdef TIM8 // if defined timer 8
+  else if(timer->Instance == TIM8) 
+    return ADC_EXTERNALTRIGCONV_T8_TRGO;
+#endif
+  else
+    return _TRGO_NOT_AVAILABLE;
+}
+
+#endif