Rename PinMap_PWM to PinMap_TIM

Define PinMap_PWM as PinMap_TIM for backward compatibility as
several libraries use it. They should be updated to use the new
name.

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

Author: fpistm

cores/arduino/HardwareTimer.cpp

@@ -698,7 +698,7 @@ void HardwareTimer::setMode(uint32_t channel, TimerModes_t mode, PinName pin)
   if (pin != NC) {
     if ((int)get_pwm_channel(pin) == timChannel) {
       /* Configure PWM GPIO pins */
-      pinmap_pinout(pin, PinMap_PWM);
+      pinmap_pinout(pin, PinMap_TIM);
 #if defined(STM32F1xx)
       if ((mode == TIMER_INPUT_CAPTURE_RISING) || (mode == TIMER_INPUT_CAPTURE_FALLING) \
           || (mode == TIMER_INPUT_CAPTURE_BOTHEDGE) || (mode == TIMER_INPUT_FREQ_DUTY_MEASUREMENT)) {
@@ -712,7 +712,7 @@ void HardwareTimer::setMode(uint32_t channel, TimerModes_t mode, PinName pin)
     }
 
 #if defined(TIM_CCER_CC1NE)
-    isComplementaryChannel[channel - 1] = STM_PIN_INVERTED(pinmap_function(pin, PinMap_PWM));
+    isComplementaryChannel[channel - 1] = STM_PIN_INVERTED(pinmap_function(pin, PinMap_TIM));
 #endif
   }
 }

cores/arduino/pins_arduino.h

@@ -281,7 +281,7 @@ PinName analogInputToPinName(uint32_t pin);
 
 #define digitalPinHasI2C(p)         (pin_in_pinmap(digitalPinToPinName(p), PinMap_I2C_SDA) ||\
                                      pin_in_pinmap(digitalPinToPinName(p), PinMap_I2C_SCL))
-#define digitalPinHasPWM(p)         (pin_in_pinmap(digitalPinToPinName(p), PinMap_PWM))
+#define digitalPinHasPWM(p)         (pin_in_pinmap(digitalPinToPinName(p), PinMap_TIM))
 #define digitalPinHasSerial(p)      (pin_in_pinmap(digitalPinToPinName(p), PinMap_UART_RX) ||\
                                      pin_in_pinmap(digitalPinToPinName(p), PinMap_UART_TX))
 #define digitalPinHasSPI(p)         (pin_in_pinmap(digitalPinToPinName(p), PinMap_SPI_MOSI) ||\

cores/arduino/stm32/PeripheralPins.h

@@ -46,8 +46,10 @@ extern const PinMap PinMap_DAC[];
 extern const PinMap PinMap_I2C_SDA[];
 extern const PinMap PinMap_I2C_SCL[];
 
-//*** PWM ***
-extern const PinMap PinMap_PWM[];
+//*** TIM ***
+/* For backward compatibilty */
+#define PinMap_PWM PinMap_TIM
+extern const PinMap PinMap_TIM[];
 
 //*** SERIAL ***
 extern const PinMap PinMap_UART_TX[];

cores/arduino/wiring_analog.c

@@ -197,7 +197,7 @@ void analogWrite(uint32_t ulPin, uint32_t ulValue)
     } else
 #endif //HAL_DAC_MODULE_ENABLED && !HAL_DAC_MODULE_ONLY
 #if defined(HAL_TIM_MODULE_ENABLED) && !defined(HAL_TIM_MODULE_ONLY)
-      if (pin_in_pinmap(p, PinMap_PWM)) {
+      if (pin_in_pinmap(p, PinMap_TIM)) {
         if (is_pin_configured(p, g_anOutputPinConfigured) == false) {
           set_pin_configured(p, g_anOutputPinConfigured);
         }

cores/arduino/wiring_digital.c

@@ -41,7 +41,7 @@ void pinMode(uint32_t ulPin, uint32_t ulMode)
       } else
 #endif //HAL_DAC_MODULE_ENABLED && !HAL_DAC_MODULE_ONLY
 #if defined(HAL_TIM_MODULE_ENABLED) && !defined(HAL_TIM_MODULE_ONLY)
-        if (pin_in_pinmap(p, PinMap_PWM)) {
+        if (pin_in_pinmap(p, PinMap_TIM)) {
           pwm_stop(p);
         }
 #endif //HAL_TIM_MODULE_ENABLED && !HAL_TIM_MODULE_ONLY

libraries/SrcWrapper/src/stm32/analog.cpp

@@ -274,7 +274,7 @@ static uint32_t get_adc_internal_channel(PinName pin)
 #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_PWM);
+  uint32_t function = pinmap_function(pin, PinMap_TIM);
   uint32_t channel = 0;
   switch (STM_PIN_CHANNEL(function)) {
     case 1:
@@ -1026,17 +1026,17 @@ uint16_t adc_read_value(PinName pin, uint32_t resolution)
   */
 void pwm_start(PinName pin, uint32_t PWM_freq, uint32_t value, TimerCompareFormat_t resolution)
 {
-  TIM_TypeDef *Instance = (TIM_TypeDef *)pinmap_peripheral(pin, PinMap_PWM);
+  TIM_TypeDef *Instance = (TIM_TypeDef *)pinmap_peripheral(pin, PinMap_TIM);
   HardwareTimer *HT;
   TimerModes_t previousMode;
   uint32_t index = get_timer_index(Instance);
   if (HardwareTimer_Handle[index] == NULL) {
-    HardwareTimer_Handle[index]->__this = new HardwareTimer((TIM_TypeDef *)pinmap_peripheral(pin, PinMap_PWM));
+    HardwareTimer_Handle[index]->__this = new HardwareTimer((TIM_TypeDef *)pinmap_peripheral(pin, PinMap_TIM));
   }
 
   HT = (HardwareTimer *)(HardwareTimer_Handle[index]->__this);
 
-  uint32_t channel = STM_PIN_CHANNEL(pinmap_function(pin, PinMap_PWM));
+  uint32_t channel = STM_PIN_CHANNEL(pinmap_function(pin, PinMap_TIM));
 
   previousMode = HT->getMode(channel);
   if (previousMode != TIMER_OUTPUT_COMPARE_PWM1) {
@@ -1056,11 +1056,11 @@ void pwm_start(PinName pin, uint32_t PWM_freq, uint32_t value, TimerCompareForma
   */
 void pwm_stop(PinName pin)
 {
-  TIM_TypeDef *Instance = (TIM_TypeDef *)pinmap_peripheral(pin, PinMap_PWM);
+  TIM_TypeDef *Instance = (TIM_TypeDef *)pinmap_peripheral(pin, PinMap_TIM);
   HardwareTimer *HT;
   uint32_t index = get_timer_index(Instance);
   if (HardwareTimer_Handle[index] == NULL) {
-    HardwareTimer_Handle[index]->__this = new HardwareTimer((TIM_TypeDef *)pinmap_peripheral(pin, PinMap_PWM));
+    HardwareTimer_Handle[index]->__this = new HardwareTimer((TIM_TypeDef *)pinmap_peripheral(pin, PinMap_TIM));
   }
 
   HT = (HardwareTimer *)(HardwareTimer_Handle[index]->__this);

variants/STM32F4xx/FYSETC_S6/variant.h

@@ -129,7 +129,7 @@ extern "C" {
 #define PIN_WIRE_SCL            PB8
 
 // Timer Definitions
-// Do not use timer used by PWM pin. See PinMap_PWM.
+// Do not use timer used by PWM pin. See PinMap_TIM.
 #define TIMER_TONE              TIM6
 #define TIMER_SERVO             TIM2
 #define TIMER_SERIAL            TIM7

variants/STM32MP1xx/STM32MP157_DK/variant.h

@@ -122,7 +122,7 @@ extern "C" {
 #define USER_BTN                USER1_BTN
 
 // Timer Definitions (optional)
-//Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
+//Do not use timer used by PWM pins when possible. See PinMap_TIM in PeripheralPins.c
 // Unused Timers: TIM6, TIM7 (Those are basic timers usually for DACs, not capable to PWM)
 //                LPTIM[1:5]
 #define TIMER_TONE              TIM7