Skip to content

Commit c070829

Browse files
Stanimir-PetevStanimir-Petev
committed
Fixed AStyle
Fixed files to meet the AStyle checks of the stm32duino repository.
1 parent cc0cf6c commit c070829

File tree

3 files changed

+155
-158
lines changed

3 files changed

+155
-158
lines changed

‎variants/Olimexino-STM32F3/PeripheralPins.c

+12-12
Original file line numberDiff line numberDiff line change
@@ -176,24 +176,24 @@ WEAK const PinMap PinMap_PWM[] = {
176176

177177
#ifdef HAL_UART_MODULE_ENABLED
178178
WEAK const PinMap PinMap_UART_TX[] = {
179-
{PA_2, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, // D1
180-
{PA_9, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)}, // D6
181-
//{PA_14, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, // TCK_SWCLK
182-
//{PB_3, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, // TDO_SWO
183-
{PB_6, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)}, // D5
184-
{PB_10, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, // UEXT5 I2C_SCL
179+
{PA_2, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, // D1
180+
{PA_9, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)}, // D6
181+
//{PA_14, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, // TCK_SWCLK
182+
//{PB_3, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, // TDO_SWO
183+
{PB_6, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)}, // D5
184+
{PB_10, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, // UEXT5 I2C_SCL
185185
{NC, NP, 0}
186186
};
187187
#endif
188188

189189
#ifdef HAL_UART_MODULE_ENABLED
190190
WEAK const PinMap PinMap_UART_RX[] = {
191-
{PA_3, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, // D0
192-
{PA_10, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)}, // D8
193-
//{PA_15, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, // TCK_SWCLK
194-
//{PB_4, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, // TRST
195-
{PB_7, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)}, // D9
196-
{PB_11, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, // UEXT6 I2C_SDA
191+
{PA_3, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, // D0
192+
{PA_10, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)}, // D8
193+
//{PA_15, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, // TCK_SWCLK
194+
//{PB_4, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, // TRST
195+
{PB_7, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)}, // D9
196+
{PB_11, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, // UEXT6 I2C_SDA
197197
{NC, NP, 0}
198198
};
199199
#endif

‎variants/Olimexino-STM32F3/variant.cpp

+49-52
Original file line numberDiff line numberDiff line change
@@ -34,52 +34,52 @@ extern "C" {
3434
#endif
3535

3636
// Pin number
37-
const PinName digitalPin[] =
38-
{
39-
PA_3, //D0 - RX2
40-
PA_2, //D1 - TX2
41-
PA_0, //D2
42-
PA_1, //D3 - LED2 (yellow)
43-
PB_5, //D4
44-
PB_6, //D5 - TX1
45-
PA_8, //D6
46-
PA_9, //D7 - I2C2 SCL
47-
48-
PA_10, //D8 - I2C2 SDA
49-
PB_7, //D9 - RX1
50-
PA_4, //D10 - SS1
51-
PA_7, //D11 - MOSI1
52-
PA_6, //D12 - MISO1
53-
PA_5, //D13 - SCK1, LED1 (green)
54-
PB_8, //D14 - CAN_RX
55-
56-
PC_0, //D15 - A0
57-
PC_1, //D16 - A1
58-
PC_2, //D17 - A2
59-
PC_3, //D18 - A3
60-
PC_4, //D19 - A4
61-
PC_5, //D20 - A5
62-
63-
PC_13, //D21
64-
PC_9, //D22 - Button (not an actual D pin)
65-
66-
PC_15, //D23
67-
PB_9, //D24 - CAN_TX
68-
PD_2, //D25 - MMC_CS
69-
PC_10, //D26
70-
PB_0, //D27
71-
PB_1, //D28
72-
PB_10, //D29 - TX3
73-
PB_11, //D30 - RX3
74-
PB_12, //D31 - #SS2
75-
PB_13, //D32 - SCK2
76-
PB_14, //D33 - MISO2
77-
PB_15, //D34 - MOSI2
78-
PC_6, //D35
79-
PC_7, //D36
80-
PC_8, //D37
81-
82-
PF_4, //D38 - UEXT_PWR (not actual D pin)
37+
- PF_4, //D38 - UEXT_PWR (not actual D pin)
38+
const PinName digitalPin[] = {
39+
PA_3, //D0 - RX2
40+
PA_2, //D1 - TX2
41+
PA_0, //D2
42+
PA_1, //D3 - LED2 (yellow)
43+
PB_5, //D4
44+
PB_6, //D5 - TX1
45+
PA_8, //D6
46+
PA_9, //D7 - I2C2 SCL
47+
48+
PA_10, //D8 - I2C2 SDA
49+
PB_7, //D9 - RX1
50+
PA_4, //D10 - SS1
51+
PA_7, //D11 - MOSI1
52+
PA_6, //D12 - MISO1
53+
PA_5, //D13 - SCK1, LED1 (green)
54+
PB_8, //D14 - CAN_RX
55+
56+
PC_0, //D15 - A0
57+
PC_1, //D16 - A1
58+
PC_2, //D17 - A2
59+
PC_3, //D18 - A3
60+
PC_4, //D19 - A4
61+
PC_5, //D20 - A5
62+
63+
PC_13, //D21
64+
PC_9, //D22 - Button (not an actual D pin)
65+
66+
PC_15, //D23
67+
PB_9, //D24 - CAN_TX
68+
PD_2, //D25 - MMC_CS
69+
PC_10, //D26
70+
PB_0, //D27
71+
PB_1, //D28
72+
PB_10, //D29 - TX3
73+
PB_11, //D30 - RX3
74+
PB_12, //D31 - #SS2
75+
PB_13, //D32 - SCK2
76+
PB_14, //D33 - MISO2
77+
PB_15, //D34 - MOSI2
78+
PC_6, //D35
79+
PC_7, //D36
80+
PC_8, //D37
81+
82+
PF_4, //D38 - UEXT_PWR (not actual D pin)
8383
};
8484

8585
#ifdef __cplusplus
@@ -106,8 +106,7 @@ WEAK void SystemClock_Config(void)
106106
RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
107107
RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
108108
RCC_OscInitStruct.PLL.PLLMUL = RCC_PLL_MUL9;
109-
if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
110-
{
109+
if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
111110
Error_Handler();
112111
}
113112
/* Initializes the CPU, AHB and APB busses clocks */
@@ -118,14 +117,12 @@ WEAK void SystemClock_Config(void)
118117
RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV2;
119118
RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
120119

121-
if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK)
122-
{
120+
if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK) {
123121
Error_Handler();
124122
}
125123
PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USB;
126124
PeriphClkInit.USBClockSelection = RCC_USBCLKSOURCE_PLL_DIV1_5;
127-
if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK)
128-
{
125+
if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK) {
129126
Error_Handler();
130127
}
131128
}

‎variants/Olimexino-STM32F3/variant.h

+94-94
Original file line numberDiff line numberDiff line change
@@ -39,82 +39,82 @@ extern "C" {
3939
*----------------------------------------------------------------------------*/
4040

4141
// Digital connector 1
42-
#define PA3 0
43-
#define PA2 1
44-
#define PA0 2
45-
#define PA1 3
46-
#define PB5 4
47-
#define PB6 5
48-
#define PA8 6
49-
#define PA9 7
42+
#define PA3 0
43+
#define PA2 1
44+
#define PA0 2
45+
#define PA1 3
46+
#define PB5 4
47+
#define PB6 5
48+
#define PA8 6
49+
#define PA9 7
5050

5151
// Digital connector 2
52-
#define PA10 8
53-
#define PB7 9
54-
#define PA4 10
55-
#define PA7 11
56-
#define PA6 12
57-
#define PA5 13
58-
#define PB8 14
52+
#define PA10 8
53+
#define PB7 9
54+
#define PA4 10
55+
#define PA7 11
56+
#define PA6 12
57+
#define PA5 13
58+
#define PB8 14
5959

6060
// Analog connector
61-
#define PC0 15
62-
#define PC1 16
63-
#define PC2 17
64-
#define PC3 18
65-
#define PC4 19
66-
#define PC5 20
61+
#define PC0 15
62+
#define PC1 16
63+
#define PC2 17
64+
#define PC3 18
65+
#define PC4 19
66+
#define PC5 20
6767

68-
#define PC13 21
68+
#define PC13 21
6969

7070
// GPIO extention
71-
#define PC15 23
72-
#define PB9 24
73-
#define PD2 25
74-
#define PC10 26
75-
#define PB0 27
76-
#define PB1 28
77-
#define PB10 29
78-
#define PB11 30
79-
#define PB12 31
80-
#define PB13 32
81-
#define PB14 33
82-
#define PB15 34
83-
#define PC6 35
84-
#define PC7 36
85-
#define PC8 37
71+
#define PC15 23
72+
#define PB9 24
73+
#define PD2 25
74+
#define PC10 26
75+
#define PB0 27
76+
#define PB1 28
77+
#define PB10 29
78+
#define PB11 30
79+
#define PB12 31
80+
#define PB13 32
81+
#define PB14 33
82+
#define PB15 34
83+
#define PC6 35
84+
#define PC7 36
85+
#define PC8 37
8686

8787
// UEXT_PWR
88-
#define PF4 38
88+
#define PF4 38
8989

9090
// GPIO extention
91-
#define GPIO1 23
92-
#define GPIO2 24
93-
#define GPIO3 25
94-
#define GPIO4 26
95-
#define GPIO5 27
96-
#define GPIO6 28
97-
#define GPIO7 29
98-
#define GPIO8 30
99-
#define GPIO9 31
100-
#define GPIO10 32
101-
#define GPIO11 33
102-
#define GPIO12 34
103-
#define GPIO13 35
104-
#define GPIO14 36
105-
#define GPIO15 37
91+
#define GPIO1 23
92+
#define GPIO2 24
93+
#define GPIO3 25
94+
#define GPIO4 26
95+
#define GPIO5 27
96+
#define GPIO6 28
97+
#define GPIO7 29
98+
#define GPIO8 30
99+
#define GPIO9 31
100+
#define GPIO10 32
101+
#define GPIO11 33
102+
#define GPIO12 34
103+
#define GPIO13 35
104+
#define GPIO14 36
105+
#define GPIO15 37
106106

107107
// UEXT
108-
#define UEXTPWR 38
109-
#define UEXT3 29
110-
#define UEXT4 30
111-
#define UEXT5 7
112-
#define UEXT6 8
113-
#define UEXT7 12
114-
#define UEXT8 11
115-
#define UEXT9 13
116-
#define UEXT10 4
117-
//#define UEXT10 10
108+
#define UEXTPWR 38
109+
#define UEXT3 29
110+
#define UEXT4 30
111+
#define UEXT5 7
112+
#define UEXT6 8
113+
#define UEXT7 12
114+
#define UEXT8 11
115+
#define UEXT9 13
116+
#define UEXT10 4
117+
//#define UEXT10 10
118118

119119

120120
// This must be a literal
@@ -124,39 +124,39 @@ extern "C" {
124124
#define NUM_ANALOG_FIRST 15
125125

126126
// On-board LED pin number
127-
#define LED1 13
128-
#define LED_GREEN LED1
129-
#define LED2 3
130-
#define LED_YELLOW LED2
127+
#define LED1 13
128+
#define LED_GREEN LED1
129+
#define LED2 3
130+
#define LED_YELLOW LED2
131131

132132
// On-board button pin button
133-
#define BUTTON 22
133+
#define BUTTON 22
134134

135135
// SPI Definitions
136136
// SPI1
137-
#define PIN_SPI_SS PA4 // D10
138-
#define PIN_SPI_SCK PA5 // D13
139-
#define PIN_SPI_MISO PA6 // D12
140-
#define PIN_SPI_MOSI PA7 // D11
137+
#define PIN_SPI_SS PA4 // D10
138+
#define PIN_SPI_SCK PA5 // D13
139+
#define PIN_SPI_MISO PA6 // D12
140+
#define PIN_SPI_MOSI PA7 // D11
141141

142142
// SPI2
143-
#define PIN_SPI2_SS PB12 // D31
144-
#define PIN_SPI2_SCK PB13 // D32
145-
#define PIN_SPI2_MISO PB14 // D33
146-
#define PIN_SPI2_MOSI PB15 // D34
143+
#define PIN_SPI2_SS PB12 // D31
144+
#define PIN_SPI2_SCK PB13 // D32
145+
#define PIN_SPI2_MISO PB14 // D33
146+
#define PIN_SPI2_MOSI PB15 // D34
147147

148148
// SPI3
149-
// #define PIN_SPI3_SS -1 // PA_15
150-
// #define PIN_SPI3_SCK -1 // PB_3
151-
// #define PIN_SPI3_MISO -1 // PB_4
152-
// #define PIN_SPI3_MOSI -1 // PB_5
149+
// #define PIN_SPI3_SS -1 // PA_15
150+
// #define PIN_SPI3_SCK -1 // PB_3
151+
// #define PIN_SPI3_MISO -1 // PB_4
152+
// #define PIN_SPI3_MOSI -1 // PB_5
153153

154154
// SD card SPI2 definitions
155-
#define SDCARD_SPI SPI_2
156-
#define SDCARD_SS_PIN PIN_SPI2_SS // D31 SPI2_#SS
157-
#define SDCARD_SCK_PIN PIN_SPI2_SCK // D32
158-
#define SDCARD_MISO_PIN PIN_SPI2_MISO // D33
159-
#define SDCARD_MOSI_PIN PIN_SPI2_MOSI // D34
155+
#define SDCARD_SPI SPI_2
156+
#define SDCARD_SS_PIN PIN_SPI2_SS // D31 SPI2_#SS
157+
#define SDCARD_SCK_PIN PIN_SPI2_SCK // D32
158+
#define SDCARD_MISO_PIN PIN_SPI2_MISO // D33
159+
#define SDCARD_MOSI_PIN PIN_SPI2_MOSI // D34
160160

161161
// I2C Definitions
162162
#define PIN_WIRE_SDA PA10
@@ -168,17 +168,17 @@ extern "C" {
168168
#define TIMER_SERVO TIM2
169169

170170
// UART Definitions
171-
#define HAVE_HWSERIAL1
172-
#define PIN_SERIAL1_TX PB6 // D5
173-
#define PIN_SERIAL1_RX PB7 // D9
171+
#define HAVE_HWSERIAL1
172+
#define PIN_SERIAL1_TX PB6 // D5
173+
#define PIN_SERIAL1_RX PB7 // D9
174174

175-
#define HAVE_HWSERIAL2
176-
#define PIN_SERIAL2_TX PA2 // D1
177-
#define PIN_SERIAL2_RX PA3 // D0
175+
#define HAVE_HWSERIAL2
176+
#define PIN_SERIAL2_TX PA2 // D1
177+
#define PIN_SERIAL2_RX PA3 // D0
178178

179-
#define HAVE_HWSERIAL3
180-
#define PIN_SERIAL3_TX PB10 // TX GPIO29
181-
#define PIN_SERIAL3_RX PB11 // RX GPIO30
179+
#define HAVE_HWSERIAL3
180+
#define PIN_SERIAL3_TX PB10 // TX GPIO29
181+
#define PIN_SERIAL3_RX PB11 // RX GPIO30
182182

183183
/* Extra HAL modules */
184184
#define HAL_DAC_MODULE_ENABLED

0 commit comments

Comments
 (0)