refactor: get timer channel function

Move from analog.* to timer.*.
Rename from get_pwm_channel to getTimerChannel.
Return -1 instead of 0 which was a valid value.

Signed-off-by: Frederic Pillon <[email protected]>

Author: fpistm

cores/arduino/stm32/analog.h

@@ -56,7 +56,6 @@ uint16_t adc_read_value(PinName pin, uint32_t resolution);
 void pwm_start(PinName pin, uint32_t clock_freq, uint32_t value, TimerCompareFormat_t resolution);
 void pwm_stop(PinName pin);
 #endif
-uint32_t get_pwm_channel(PinName pin);
 
 #ifdef __cplusplus
 }

cores/arduino/stm32/timer.h

@@ -284,6 +284,8 @@ uint8_t getTimerClkSrc(TIM_TypeDef *tim);
 IRQn_Type getTimerUpIrq(TIM_TypeDef *tim);
 IRQn_Type getTimerCCIrq(TIM_TypeDef *tim);
 
+uint32_t getTimerChannel(PinName pin);
+
 #endif /* HAL_TIM_MODULE_ENABLED && !HAL_TIM_MODULE_ONLY */
 
 #ifdef __cplusplus

libraries/SrcWrapper/src/HardwareTimer.cpp

@@ -740,7 +740,7 @@ void HardwareTimer::setMode(uint32_t channel, TimerModes_t mode, PinName pin)
   _ChannelMode[channel - 1] = mode;
 
   if (pin != NC) {
-    if ((int)get_pwm_channel(pin) == timChannel) {
+    if ((int)getTimerChannel(pin) == timChannel) {
       /* Configure PWM GPIO pins */
       pinmap_pinout(pin, PinMap_TIM);
 #if defined(STM32F1xx)

libraries/SrcWrapper/src/stm32/analog.cpp

@@ -270,32 +270,6 @@ static uint32_t get_adc_internal_channel(PinName pin)
 }
 #endif /* HAL_ADC_MODULE_ENABLED && !HAL_ADC_MODULE_ONLY */
 
-#if defined(HAL_TIM_MODULE_ENABLED) && !defined(HAL_TIM_MODULE_ONLY)
-uint32_t get_pwm_channel(PinName pin)
-{
-  uint32_t function = pinmap_function(pin, PinMap_TIM);
-  uint32_t channel = 0;
-  switch (STM_PIN_CHANNEL(function)) {
-    case 1:
-      channel = TIM_CHANNEL_1;
-      break;
-    case 2:
-      channel = TIM_CHANNEL_2;
-      break;
-    case 3:
-      channel = TIM_CHANNEL_3;
-      break;
-    case 4:
-      channel = TIM_CHANNEL_4;
-      break;
-    default:
-      channel = 0;
-      break;
-  }
-  return channel;
-}
-#endif /* HAL_TIM_MODULE_ENABLED && !HAL_TIM_MODULE_ONLY */
-
 #if defined(HAL_DAC_MODULE_ENABLED) && !defined(HAL_DAC_MODULE_ONLY)
 static uint32_t get_dac_channel(PinName pin)
 {

libraries/SrcWrapper/src/stm32/timer.c

@@ -715,7 +715,34 @@ uint8_t getTimerClkSrc(TIM_TypeDef *tim)
   return clkSrc;
 }
 
-
+/**
+  * @brief  Return timer HAL channel linked to a PinName
+  * @param  pin: PinName
+  * @retval HAL channel. return -1 if pin has no timer
+  */
+uint32_t getTimerChannel(PinName pin)
+{
+  uint32_t function = pinmap_function(pin, PinMap_TIM);
+  uint32_t channel = -1;
+  switch (STM_PIN_CHANNEL(function)) {
+    case 1:
+      channel = TIM_CHANNEL_1;
+      break;
+    case 2:
+      channel = TIM_CHANNEL_2;
+      break;
+    case 3:
+      channel = TIM_CHANNEL_3;
+      break;
+    case 4:
+      channel = TIM_CHANNEL_4;
+      break;
+    default:
+      channel = -1;
+      break;
+  }
+  return channel;
+}
 #endif /* HAL_TIM_MODULE_ENABLED && !HAL_TIM_MODULE_ONLY */
 
 #ifdef __cplusplus