Skip to content

Commit 78410e7

Browse files
jeromecoutantjeromecoutant
committed
TARGET_STM32L4 astyle
1 parent ecffec8 commit 78410e7

File tree

38 files changed

+968
-944
lines changed

38 files changed

+968
-944
lines changed

‎targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L432xC/TARGET_NUCLEO_L432KC/PeripheralPins.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,14 +145,14 @@ MBED_WEAK const PinMap PinMap_UART_RX[] = {
145145
MBED_WEAK const PinMap PinMap_UART_RTS[] = {
146146
{PA_1, UART_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
147147
{PA_12, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
148-
{PB_1, LPUART_1,STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
148+
{PB_1, LPUART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
149149
{PB_3, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)}, // Connected to LED
150150
{NC, NC, 0}
151151
};
152152

153153
MBED_WEAK const PinMap PinMap_UART_CTS[] = {
154154
{PA_0, UART_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
155-
{PA_6, LPUART_1,STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
155+
{PA_6, LPUART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
156156
{PA_11, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
157157
{PB_4, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
158158
{NC, NC, 0}

‎targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L432xC/TARGET_NUCLEO_L432KC/PinNames.h

Lines changed: 84 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -46,70 +46,70 @@ typedef enum {
4646
} ALTx;
4747

4848
typedef enum {
49-
PA_0 = 0x00,
50-
PA_1 = 0x01,
51-
PA_2 = 0x02,
52-
PA_2_ALT0 = PA_2|ALT0,
53-
PA_3 = 0x03,
54-
PA_3_ALT0 = PA_3|ALT0,
55-
PA_4 = 0x04,
56-
PA_4_ALT0 = PA_4|ALT0,
57-
PA_5 = 0x05,
58-
PA_6 = 0x06,
59-
PA_7 = 0x07,
60-
PA_8 = 0x08,
61-
PA_9 = 0x09,
62-
PA_10 = 0x0A,
63-
PA_11 = 0x0B,
64-
PA_12 = 0x0C,
65-
PA_13 = 0x0D,
66-
PA_14 = 0x0E,
67-
PA_15 = 0x0F,
68-
PA_15_ALT0 = PA_15|ALT0,
69-
70-
PB_0 = 0x10,
71-
PB_1 = 0x11,
72-
PB_2 = 0x12,
73-
PB_3 = 0x13,
74-
PB_3_ALT0 = PB_3|ALT0,
75-
PB_4 = 0x14,
76-
PB_4_ALT0 = PB_4|ALT0,
77-
PB_5 = 0x15,
78-
PB_5_ALT0 = PB_5|ALT0,
79-
PB_6 = 0x16,
80-
PB_7 = 0x17,
81-
82-
PC_14 = 0x2E,
83-
PC_15 = 0x2F,
84-
85-
// ADC internal channels
86-
ADC_TEMP = 0xF0,
87-
ADC_VREF = 0xF1,
88-
ADC_VBAT = 0xF2,
89-
90-
// Arduino connector namings
91-
A0 = PA_0,
92-
A1 = PA_1,
93-
A2 = PA_3,
94-
A3 = PA_4,
95-
A4 = PA_5,
96-
A5 = PA_6,
97-
A6 = PA_7,
98-
A7 = PA_2,
99-
D0 = PA_10,
100-
D1 = PA_9,
101-
D2 = PA_12,
102-
D3 = PB_0,
103-
D4 = PB_7,
104-
D5 = PB_6,
105-
D6 = PB_1,
106-
D7 = PC_14,
107-
D8 = PC_15,
108-
D9 = PA_8,
109-
D10 = PA_11,
110-
D11 = PB_5,
111-
D12 = PB_4,
112-
D13 = PB_3,
49+
PA_0 = 0x00,
50+
PA_1 = 0x01,
51+
PA_2 = 0x02,
52+
PA_2_ALT0 = PA_2 | ALT0,
53+
PA_3 = 0x03,
54+
PA_3_ALT0 = PA_3 | ALT0,
55+
PA_4 = 0x04,
56+
PA_4_ALT0 = PA_4 | ALT0,
57+
PA_5 = 0x05,
58+
PA_6 = 0x06,
59+
PA_7 = 0x07,
60+
PA_8 = 0x08,
61+
PA_9 = 0x09,
62+
PA_10 = 0x0A,
63+
PA_11 = 0x0B,
64+
PA_12 = 0x0C,
65+
PA_13 = 0x0D,
66+
PA_14 = 0x0E,
67+
PA_15 = 0x0F,
68+
PA_15_ALT0 = PA_15 | ALT0,
69+
70+
PB_0 = 0x10,
71+
PB_1 = 0x11,
72+
PB_2 = 0x12,
73+
PB_3 = 0x13,
74+
PB_3_ALT0 = PB_3 | ALT0,
75+
PB_4 = 0x14,
76+
PB_4_ALT0 = PB_4 | ALT0,
77+
PB_5 = 0x15,
78+
PB_5_ALT0 = PB_5 | ALT0,
79+
PB_6 = 0x16,
80+
PB_7 = 0x17,
81+
82+
PC_14 = 0x2E,
83+
PC_15 = 0x2F,
84+
85+
// ADC internal channels
86+
ADC_TEMP = 0xF0,
87+
ADC_VREF = 0xF1,
88+
ADC_VBAT = 0xF2,
89+
90+
// Arduino connector namings
91+
A0 = PA_0,
92+
A1 = PA_1,
93+
A2 = PA_3,
94+
A3 = PA_4,
95+
A4 = PA_5,
96+
A5 = PA_6,
97+
A6 = PA_7,
98+
A7 = PA_2,
99+
D0 = PA_10,
100+
D1 = PA_9,
101+
D2 = PA_12,
102+
D3 = PB_0,
103+
D4 = PB_7,
104+
D5 = PB_6,
105+
D6 = PB_1,
106+
D7 = PC_14,
107+
D8 = PC_15,
108+
D9 = PA_8,
109+
D10 = PA_11,
110+
D11 = PB_5,
111+
D12 = PB_4,
112+
D13 = PB_3,
113113

114114
// STDIO for console print
115115
#ifdef MBED_CONF_TARGET_STDIO_UART_TX
@@ -123,33 +123,33 @@ typedef enum {
123123
STDIO_UART_RX = PA_15,
124124
#endif
125125

126-
// Generic signals namings
127-
LED1 = PB_3,
128-
LED2 = PB_3,
129-
LED3 = PB_3,
130-
LED4 = PB_3,
131-
SERIAL_TX = STDIO_UART_TX,
132-
SERIAL_RX = STDIO_UART_RX,
133-
USBTX = STDIO_UART_TX,
134-
USBRX = STDIO_UART_RX,
135-
I2C_SCL = PB_6,
136-
I2C_SDA = PB_7,
137-
SPI_MOSI = PB_5,
138-
SPI_MISO = PB_4,
139-
SPI_SCK = PB_3,
140-
SPI_CS = PA_11,
141-
PWM_OUT = PB_0,
142-
143-
/**** USB pins ****/
126+
// Generic signals namings
127+
LED1 = PB_3,
128+
LED2 = PB_3,
129+
LED3 = PB_3,
130+
LED4 = PB_3,
131+
SERIAL_TX = STDIO_UART_TX,
132+
SERIAL_RX = STDIO_UART_RX,
133+
USBTX = STDIO_UART_TX,
134+
USBRX = STDIO_UART_RX,
135+
I2C_SCL = PB_6,
136+
I2C_SDA = PB_7,
137+
SPI_MOSI = PB_5,
138+
SPI_MISO = PB_4,
139+
SPI_SCK = PB_3,
140+
SPI_CS = PA_11,
141+
PWM_OUT = PB_0,
142+
143+
/**** USB pins ****/
144144
USB_DM = PA_11,
145145
USB_DP = PA_12,
146146
USB_NOE = PA_13,
147147

148-
/**** OSCILLATOR pins ****/
148+
/**** OSCILLATOR pins ****/
149149
RCC_OSC32_IN = PC_14,
150150
RCC_OSC32_OUT = PC_15,
151151

152-
/**** DEBUG pins ****/
152+
/**** DEBUG pins ****/
153153
SYS_JTCK_SWCLK = PA_14,
154154
SYS_JTDI = PA_15,
155155
SYS_JTDO_SWO = PB_3,

‎targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L432xC/TARGET_NUCLEO_L432KC/system_clock.c

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ void SystemInit(void)
8585
{
8686
/* FPU settings ------------------------------------------------------------*/
8787
#if (__FPU_PRESENT == 1) && (__FPU_USED == 1)
88-
SCB->CPACR |= ((3UL << 10*2)|(3UL << 11*2)); /* set CP10 and CP11 Full Access */
88+
SCB->CPACR |= ((3UL << 10 * 2) | (3UL << 11 * 2)); /* set CP10 and CP11 Full Access */
8989
#endif
9090
/* Reset the RCC clock configuration to the default reset state ------------*/
9191
/* Set MSION bit */
@@ -139,15 +139,15 @@ void SetSysClock(void)
139139
{
140140
#if ((CLOCK_SOURCE) & USE_PLL_HSI)
141141
/* 3- If fail start with HSI clock */
142-
if (SetSysClock_PLL_HSI()==0)
142+
if (SetSysClock_PLL_HSI() == 0)
143143
#endif
144144
{
145145
#if ((CLOCK_SOURCE) & USE_PLL_MSI)
146146
/* 4- If fail start with MSI clock */
147147
if (SetSysClock_PLL_MSI() == 0)
148148
#endif
149149
{
150-
while(1) {
150+
while (1) {
151151
MBED_ASSERT(1);
152152
}
153153
}
@@ -232,10 +232,11 @@ uint8_t SetSysClock_PLL_HSE(uint8_t bypass)
232232

233233
// Output clock on MCO1 pin(PA8) for debugging purpose
234234
#if DEBUG_MCO == 2
235-
if (bypass == 0)
236-
HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_HSE, RCC_MCODIV_2); // 4 MHz
237-
else
238-
HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_HSE, RCC_MCODIV_1); // 8 MHz
235+
if (bypass == 0) {
236+
HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_HSE, RCC_MCODIV_2); // 4 MHz
237+
} else {
238+
HAL_RCC_MCOConfig(RCC_MCO1, RCC_MCO1SOURCE_HSE, RCC_MCODIV_1); // 8 MHz
239+
}
239240
#endif
240241

241242
return 1; // OK

‎targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L433xC/TARGET_NUCLEO_L433RC_P/PeripheralPins.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -150,12 +150,12 @@ MBED_WEAK const PinMap PinMap_PWM[] = {
150150

151151
MBED_WEAK const PinMap PinMap_UART_TX[] = {
152152
{PA_2, UART_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, // Connected to STDIO_UART_TX
153-
{PA_2_ALT0, LPUART_1,STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)}, // Connected to STDIO_UART_TX
153+
{PA_2_ALT0, LPUART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)}, // Connected to STDIO_UART_TX
154154
{PA_9, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
155155
{PB_6, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
156156
{PB_10, UART_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
157-
{PB_11, LPUART_1,STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
158-
{PC_1, LPUART_1,STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
157+
{PB_11, LPUART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
158+
{PC_1, LPUART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
159159
{PC_4, UART_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
160160
{PC_5, UART_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, // Only STM32L433RC, not STM32L433RC-P
161161
{PC_10, UART_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
@@ -164,13 +164,13 @@ MBED_WEAK const PinMap PinMap_UART_TX[] = {
164164

165165
MBED_WEAK const PinMap PinMap_UART_RX[] = {
166166
{PA_3, UART_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, // Connected to STDIO_UART_RX
167-
{PA_3_ALT0, LPUART_1,STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)}, // Connected to STDIO_UART_RX
167+
{PA_3_ALT0, LPUART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)}, // Connected to STDIO_UART_RX
168168
{PA_10, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
169169
{PA_15, UART_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_USART2)},
170170
{PB_7, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
171-
{PB_10, LPUART_1,STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
171+
{PB_10, LPUART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
172172
{PB_11, UART_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
173-
{PC_0, LPUART_1,STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
173+
{PC_0, LPUART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
174174
{PC_5, UART_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, // Only STM32L433RC, not STM32L433RC-P
175175
{PC_11, UART_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
176176
{NC, NC, 0}
@@ -181,9 +181,9 @@ MBED_WEAK const PinMap PinMap_UART_RTS[] = {
181181
{PA_12, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
182182
{PA_15, UART_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
183183
{PB_1, UART_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
184-
{PB_1_ALT0, LPUART_1,STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
184+
{PB_1_ALT0, LPUART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
185185
{PB_3, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
186-
{PB_12, LPUART_1,STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
186+
{PB_12, LPUART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)},
187187
{PB_14, UART_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
188188
{PD_2, UART_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, // Only STM32L433RC, not STM32L433RC-P
189189
{NC, NC, 0}
@@ -192,11 +192,11 @@ MBED_WEAK const PinMap PinMap_UART_RTS[] = {
192192
MBED_WEAK const PinMap PinMap_UART_CTS[] = {
193193
{PA_0, UART_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
194194
{PA_6, UART_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, // Connected to SMPS_PG [ADP5301ACBZ_OUTOK]
195-
{PA_6_ALT0, LPUART_1,STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)}, // Connected to SMPS_PG [ADP5301ACBZ_OUTOK]
195+
{PA_6_ALT0, LPUART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)}, // Connected to SMPS_PG [ADP5301ACBZ_OUTOK]
196196
{PA_11, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
197197
{PB_4, UART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
198198
{PB_13, UART_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, // Connected to LD4 [green Led]
199-
{PB_13_ALT0, LPUART_1,STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)}, // Connected to LD4 [green Led]
199+
{PB_13_ALT0, LPUART_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_LPUART1)}, // Connected to LD4 [green Led]
200200
{NC, NC, 0}
201201
};
202202

0 commit comments

Comments
 (0)