ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #15082 from jeromecoutant/PR_STM32F1_AF 

STM32F1: add more alternate functions
pull/15120/head
Martin Kojtal 2021-09-29 15:31:10 +01:00 committed by GitHub
parent 0b9a7740d5 a3d21b7672
commit bc01a4e063
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 50 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
targets/TARGET_STM/PeripheralPins.h
View File

@ -34,6 +34,27 @@
#include "pinmap.h" #include "pinmap.h"
#include "PeripheralNames.h" #include "PeripheralNames.h"
#if TARGET_STM32F1
#define AFIO_NONE 0
#define AFIO_REMAP_SPI1_ENABLE 1
#define AFIO_REMAP_I2C1_ENABLE 2
#define AFIO_REMAP_USART1_ENABLE 3
#define AFIO_REMAP_USART2_ENABLE 4
#define AFIO_REMAP_USART3_PARTIAL 5
#define AFIO_REMAP_TIM1_PARTIAL 6
#define AFIO_REMAP_TIM3_PARTIAL 7
#define AFIO_REMAP_TIM2_ENABLE 8
#define AFIO_REMAP_TIM3_ENABLE 9
#define AFIO_REMAP_CAN1_2 10
#define AFIO_REMAP_TIM1_ENABLE 11
#define AFIO_REMAP_USART3_ENABLE 12
#define AFIO_REMAP_CAN1_3 13
#define AFIO_REMAP_TIM2_PARTIAL_1 14
#define AFIO_REMAP_TIM2_PARTIAL_2 15
#define AFIO_REMAP_TIM4_ENABLE 16
#endif
//*** GPIO *** //*** GPIO ***
#if GPIO_PINMAP_READY #if GPIO_PINMAP_READY
/* If this macro is defined, then PinMap_GPIO is present in PeripheralPins.c */ /* If this macro is defined, then PinMap_GPIO is present in PeripheralPins.c */

39
targets/TARGET_STM/TARGET_STM32F1/pin_device.h
View File

@ -32,6 +32,7 @@
#include "cmsis.h" #include "cmsis.h"
#include "stm32f1xx_ll_gpio.h" #include "stm32f1xx_ll_gpio.h"
#include "PeripheralPins.h"
extern const uint32_t ll_pin_defines[16]; extern const uint32_t ll_pin_defines[16];
@ -58,38 +59,56 @@ static inline void stm_pin_SetAFPin(GPIO_TypeDef *gpio, PinName pin, uint32_t af
if (afnum > 0) { if (afnum > 0) {
switch (afnum) { switch (afnum) {
case 1: // Remap SPI1 case AFIO_REMAP_SPI1_ENABLE:
__HAL_AFIO_REMAP_SPI1_ENABLE(); __HAL_AFIO_REMAP_SPI1_ENABLE();
break; break;
case 2: // Remap I2C1 case AFIO_REMAP_I2C1_ENABLE:
__HAL_AFIO_REMAP_I2C1_ENABLE(); __HAL_AFIO_REMAP_I2C1_ENABLE();
break; break;
case 3: // Remap USART1 case AFIO_REMAP_USART1_ENABLE:
__HAL_AFIO_REMAP_USART1_ENABLE(); __HAL_AFIO_REMAP_USART1_ENABLE();
break; break;
case 4: // Remap USART2 case AFIO_REMAP_USART2_ENABLE:
__HAL_AFIO_REMAP_USART2_ENABLE(); __HAL_AFIO_REMAP_USART2_ENABLE();
break; break;
case 5: // Partial Remap USART3 case AFIO_REMAP_USART3_PARTIAL:
__HAL_AFIO_REMAP_USART3_PARTIAL(); __HAL_AFIO_REMAP_USART3_PARTIAL();
break; break;
case 6: // Partial Remap TIM1 case AFIO_REMAP_TIM1_PARTIAL:
__HAL_AFIO_REMAP_TIM1_PARTIAL(); __HAL_AFIO_REMAP_TIM1_PARTIAL();
break; break;
case 7: // Partial Remap TIM3 case AFIO_REMAP_TIM3_PARTIAL:
__HAL_AFIO_REMAP_TIM3_PARTIAL(); __HAL_AFIO_REMAP_TIM3_PARTIAL();
break; break;
case 8: // Full Remap TIM2 case AFIO_REMAP_TIM2_ENABLE:
__HAL_AFIO_REMAP_TIM2_ENABLE(); __HAL_AFIO_REMAP_TIM2_ENABLE();
break; break;
case 9: // Full Remap TIM3 case AFIO_REMAP_TIM3_ENABLE:
__HAL_AFIO_REMAP_TIM3_ENABLE(); __HAL_AFIO_REMAP_TIM3_ENABLE();
break; break;
#if defined(AFIO_MAPR_CAN_REMAP_REMAP1) #if defined(AFIO_MAPR_CAN_REMAP_REMAP1)
case 10: // CAN_RX mapped to PB8, CAN_TX mapped to PB9 case AFIO_REMAP_CAN1_2:
__HAL_AFIO_REMAP_CAN1_2(); __HAL_AFIO_REMAP_CAN1_2();
break; break;
#endif #endif
case AFIO_REMAP_TIM1_ENABLE:
__HAL_AFIO_REMAP_TIM1_ENABLE();
break;
case AFIO_REMAP_USART3_ENABLE:
__HAL_AFIO_REMAP_USART3_ENABLE();
break;
case AFIO_REMAP_CAN1_3:
__HAL_AFIO_REMAP_CAN1_3();
break;
case AFIO_REMAP_TIM2_PARTIAL_1:
__HAL_AFIO_REMAP_TIM2_PARTIAL_1();
break;
case AFIO_REMAP_TIM2_PARTIAL_2:
__HAL_AFIO_REMAP_TIM2_PARTIAL_2();
break;
case AFIO_REMAP_TIM4_ENABLE:
__HAL_AFIO_REMAP_TIM4_ENABLE();
break;
default: default:
break; break;
} }