Skip to content

Commit 56975a5

Browse files
jeromecoutantadbridge
jeromecoutant
authored and
adbridge
committed
TARGET_STM32F1 astyle
1 parent a497022 commit 56975a5

File tree

11 files changed

+125
-120
lines changed

11 files changed

+125
-120
lines changed

‎targets/TARGET_STM/TARGET_STM32F1/TARGET_BLUEPILL_F103C8/PeripheralPins.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,12 @@ const PinMap PinMap_SPI_SSEL[] = {
172172

173173
const PinMap PinMap_CAN_RD[] = {
174174
{PA_11, CAN_1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0)},
175-
{PB_8 , CAN_1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 1)},
175+
{PB_8, CAN_1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 1)},
176176
{NC, NC, 0}
177177
};
178178

179179
const PinMap PinMap_CAN_TD[] = {
180180
{PA_12, CAN_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, 0)},
181-
{PB_9 , CAN_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, 1)},
181+
{PB_9, CAN_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, 1)},
182182
{NC, NC, 0}
183183
};

‎targets/TARGET_STM/TARGET_STM32F1/TARGET_DISCO_F100RB/PeripheralNames.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ typedef enum {
4545
} DACName;
4646

4747
typedef enum {
48-
UART_1 = (int)USART1_BASE,
48+
UART_1 = (int)USART1_BASE,
4949
UART_2 = (int)USART2_BASE,
5050
UART_3 = (int)USART3_BASE
5151
} UARTName;

‎targets/TARGET_STM/TARGET_STM32F1/TARGET_DISCO_F100RB/PinNames.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,13 +174,13 @@ typedef enum {
174174
SPI_CS = PB_12,
175175
PWM_OUT = PB_8,
176176

177-
/**** OSCILLATOR pins ****/
177+
/**** OSCILLATOR pins ****/
178178
RCC_OSC32_IN = PC_14,
179179
RCC_OSC32_OUT = PC_15,
180180
RCC_OSC_IN = PD_0,
181181
RCC_OSC_OUT = PD_1,
182182

183-
/**** DEBUG pins ****/
183+
/**** DEBUG pins ****/
184184
SYS_JTCK_SWCLK = PA_14,
185185
SYS_JTDI = PA_15,
186186
SYS_JTDO_TRACESWO = PB_3,

‎targets/TARGET_STM/TARGET_STM32F1/TARGET_DISCO_F100RB/objects.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ struct gpio_irq_s {
4949
struct port_s {
5050
PortName port;
5151
uint32_t mask;
52-
PinDirection direction;
52+
PinDirection direction;
5353
__IO uint32_t *reg_in;
5454
__IO uint32_t *reg_out;
5555
};

‎targets/TARGET_STM/TARGET_STM32F1/TARGET_NUCLEO_F103RB/PeripheralPins.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ MBED_WEAK const PinMap PinMap_PWM[] = {
109109
{PA_10, PWM_1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, 0, 3, 0)}, // TIM1_CH3
110110
{PA_11, PWM_1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, 0, 4, 0)}, // TIM1_CH4
111111
{PA_15, PWM_2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, 8, 1, 0)}, // TIM2_CH1
112-
{PB_0 , PWM_3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, 0, 3, 0)}, // TIM3_CH3
113-
{PB_1 , PWM_3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, 0, 4, 0)}, // TIM3_CH4
112+
{PB_0, PWM_3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, 0, 3, 0)}, // TIM3_CH3
113+
{PB_1, PWM_3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, 0, 4, 0)}, // TIM3_CH4
114114
{PB_3, PWM_2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, 8, 2, 0)}, // TIM2_CH2 // Connected to SWO
115115
{PB_4, PWM_3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, 7, 1, 0)}, // TIM3_CH1
116116
{PB_5, PWM_3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, 7, 2, 0)}, // TIM3_CH2

‎targets/TARGET_STM/TARGET_STM32F1/TARGET_NUCLEO_F103RB/PinNames.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,17 +154,17 @@ typedef enum {
154154
SPI_CS = PB_6,
155155
PWM_OUT = PB_3,
156156

157-
/**** USB pins ****/
157+
/**** USB pins ****/
158158
USB_DM = PA_11,
159159
USB_DP = PA_12,
160160

161-
/**** OSCILLATOR pins ****/
161+
/**** OSCILLATOR pins ****/
162162
RCC_OSC32_IN = PC_14,
163163
RCC_OSC32_OUT = PC_15,
164164
RCC_OSC_IN = PD_0,
165165
RCC_OSC_OUT = PD_1,
166166

167-
/**** DEBUG pins ****/
167+
/**** DEBUG pins ****/
168168
SYS_JTCK_SWCLK = PA_14,
169169
SYS_JTDI = PA_15,
170170
SYS_JTDO_TRACESWO = PB_3,

‎targets/TARGET_STM/TARGET_STM32F1/flash_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ int32_t flash_program_page(flash_t *obj, uint32_t address, const uint8_t *data,
134134
}
135135
} else { /* case where data is aligned, so let's avoid any copy */
136136
while ((address < (StartAddress + size)) && (status == 0)) {
137-
if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_WORD, address, *((uint32_t*) data)) == HAL_OK) {
137+
if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_WORD, address, *((uint32_t *) data)) == HAL_OK) {
138138
address = address + MIN_PROG_SIZE;
139139
data = data + MIN_PROG_SIZE;
140140
} else {

‎targets/TARGET_STM/TARGET_STM32F1/pin_device.h

Lines changed: 38 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -58,40 +58,40 @@ static inline void stm_pin_SetAFPin(GPIO_TypeDef *gpio, PinName pin, uint32_t af
5858

5959
if (afnum > 0) {
6060
switch (afnum) {
61-
case 1: // Remap SPI1
62-
__HAL_AFIO_REMAP_SPI1_ENABLE();
63-
break;
64-
case 2: // Remap I2C1
65-
__HAL_AFIO_REMAP_I2C1_ENABLE();
66-
break;
67-
case 3: // Remap USART1
68-
__HAL_AFIO_REMAP_USART1_ENABLE();
69-
break;
70-
case 4: // Remap USART2
71-
__HAL_AFIO_REMAP_USART2_ENABLE();
72-
break;
73-
case 5: // Partial Remap USART3
74-
__HAL_AFIO_REMAP_USART3_PARTIAL();
75-
break;
76-
case 6: // Partial Remap TIM1
77-
__HAL_AFIO_REMAP_TIM1_PARTIAL();
78-
break;
79-
case 7: // Partial Remap TIM3
80-
__HAL_AFIO_REMAP_TIM3_PARTIAL();
81-
break;
82-
case 8: // Full Remap TIM2
83-
__HAL_AFIO_REMAP_TIM2_ENABLE();
84-
break;
85-
case 9: // Full Remap TIM3
86-
__HAL_AFIO_REMAP_TIM3_ENABLE();
87-
break;
61+
case 1: // Remap SPI1
62+
__HAL_AFIO_REMAP_SPI1_ENABLE();
63+
break;
64+
case 2: // Remap I2C1
65+
__HAL_AFIO_REMAP_I2C1_ENABLE();
66+
break;
67+
case 3: // Remap USART1
68+
__HAL_AFIO_REMAP_USART1_ENABLE();
69+
break;
70+
case 4: // Remap USART2
71+
__HAL_AFIO_REMAP_USART2_ENABLE();
72+
break;
73+
case 5: // Partial Remap USART3
74+
__HAL_AFIO_REMAP_USART3_PARTIAL();
75+
break;
76+
case 6: // Partial Remap TIM1
77+
__HAL_AFIO_REMAP_TIM1_PARTIAL();
78+
break;
79+
case 7: // Partial Remap TIM3
80+
__HAL_AFIO_REMAP_TIM3_PARTIAL();
81+
break;
82+
case 8: // Full Remap TIM2
83+
__HAL_AFIO_REMAP_TIM2_ENABLE();
84+
break;
85+
case 9: // Full Remap TIM3
86+
__HAL_AFIO_REMAP_TIM3_ENABLE();
87+
break;
8888
#if defined(AFIO_MAPR_CAN_REMAP_REMAP1)
89-
case 10: // CAN_RX mapped to PB8, CAN_TX mapped to PB9
90-
__HAL_AFIO_REMAP_CAN1_2();
91-
break;
89+
case 10: // CAN_RX mapped to PB8, CAN_TX mapped to PB9
90+
__HAL_AFIO_REMAP_CAN1_2();
91+
break;
9292
#endif
93-
default:
94-
break;
93+
default:
94+
break;
9595
}
9696
}
9797
}
@@ -102,19 +102,22 @@ static inline void stm_pin_PullConfig(GPIO_TypeDef *gpio, uint32_t ll_pin, uint3
102102

103103
switch (pull_config) {
104104
case GPIO_PULLUP:
105-
if (function == LL_GPIO_MODE_FLOATING)
105+
if (function == LL_GPIO_MODE_FLOATING) {
106106
LL_GPIO_SetPinMode(gpio, ll_pin, LL_GPIO_MODE_INPUT);
107+
}
107108
LL_GPIO_SetPinPull(gpio, ll_pin, LL_GPIO_PULL_UP);
108109
break;
109110
case GPIO_PULLDOWN:
110-
if (function == LL_GPIO_MODE_FLOATING)
111+
if (function == LL_GPIO_MODE_FLOATING) {
111112
LL_GPIO_SetPinMode(gpio, ll_pin, LL_GPIO_MODE_INPUT);
113+
}
112114
LL_GPIO_SetPinPull(gpio, ll_pin, LL_GPIO_PULL_DOWN);
113115
break;
114116
default:
115117
/* Input+NoPull = Floating for F1 family */
116-
if (function == LL_GPIO_MODE_INPUT)
118+
if (function == LL_GPIO_MODE_INPUT) {
117119
LL_GPIO_SetPinMode(gpio, ll_pin, LL_GPIO_MODE_FLOATING);
120+
}
118121
break;
119122
}
120123
}

‎targets/TARGET_STM/TARGET_STM32F1/pwmout_device.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@
3333

3434
#ifdef DEVICE_PWMOUT
3535

36-
const pwm_apb_map_t pwm_apb_map_table[] =
37-
{
36+
const pwm_apb_map_t pwm_apb_map_table[] = {
3837
#if defined(TIM1_BASE)
3938
{PWM_1, PWMOUT_ON_APB2},
4039
#endif

0 commit comments

Comments
 (0)