Skip to content

Commit 1fdf77f

Browse files
seeersseeers
committed
Style cleanup
1 parent 240b1ca commit 1fdf77f

File tree

3 files changed

+98
-99
lines changed

3 files changed

+98
-99
lines changed

‎variants/Generic_F042Cx/PinNamesVar.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
#endif
2626
/* USB */
2727
#ifdef USBCON
28-
// USB_NOE = PA_4,
28+
// USB_NOE = PA_4,
2929
USB_DM = PA_11,
3030
USB_DP = PA_12,
31-
// USB_NOE = PA_13,
32-
// USB_NOE = PA_15,
31+
// USB_NOE = PA_13,
32+
// USB_NOE = PA_15,
3333
#endif

‎variants/Generic_F042Cx/variant.cpp

+76-77
Original file line numberDiff line numberDiff line change
@@ -21,57 +21,57 @@ extern "C" {
2121
// This array allows to wrap Arduino pin number(Dx or x)
2222
// to STM32 PinName (PX_n)
2323
const PinName digitalPin[] = {
24-
PC_13, //
25-
PF_0, // I2C1_SDA CRS_SYNC I2C1_SDA
26-
PF_1, // I2C1_SCL I2C1_SCL
27-
PA_0, // USART2_CTS TIM2_CH1/TIM2_ETR TSC_G1_IO1
28-
PA_1, // EVENTOUT USART2_DE/USART2_RTS TIM2_CH2 TSC_G1_IO2
29-
PA_2, // USART2_TX TIM2_CH3 TSC_G1_IO3
30-
PA_3, // USART2_RX TIM2_CH4 TSC_G1_IO4
31-
PA_4, // I2S1_WS/SPI1_NSS USART2_CK USB_NOE TSC_G2_IO1 TIM14_CH1
32-
PA_5, // I2S1_CK/SPI1_SCK CEC TIM2_CH1/TIM2_ETR TSC_G2_IO2
33-
PA_6, // I2S1_MCK/SPI1_MISO TIM3_CH1 TIM1_BKIN TSC_G2_IO3 TIM16_CH1
34-
PA_7, // I2S1_SD/SPI1_MOSI TIM3_CH2 TIM1_CH1N TSC_G2_IO4 TIM14_CH1 TIM17_CH1
35-
PB_0, // EVENTOUT TIM3_CH3 TIM1_CH2N TSC_G3_IO2
36-
PB_1, // TIM14_CH1 TIM3_CH4 TIM1_CH3N TSC_G3_IO3
37-
PB_2, // TSC_G3_IO4
38-
PB_10, // CEC I2C1_SCL TIM2_CH3 TSC_SYNC SPI2_SCK
39-
PB_11, // EVENTOUT I2C1_SDA TIM2_CH4
40-
PB_12, // SPI2_NSS EVENTOUT TIM1_BKIN
41-
PB_13, // SPI2_SCK TIM1_CH1N
42-
PB_14, // SPI2_MISO TIM1_CH2N
43-
PB_15, // SPI2_MOSI TIM1_CH3N
44-
PA_8, // RCC_MCO USART1_CK TIM1_CH1 EVENTOUT CRS_SYNC
45-
PA_9, // USART1_TX TIM1_CH2 TSC_G4_IO1 I2C1_SCL
46-
PA_10, // TIM17_BKIN USART1_RX TIM1_CH3 TSC_G4_IO2 I2C1_SDA
47-
PA_11, // USB_DM EVENTOUT USART1_CTS TIM1_CH4 TSC_G4_IO3 CAN_RX I2C1_SCL
48-
PA_12, // USB_DP EVENTOUT USART1_DE/USART1_RTS TIM1_ETR TSC_G4_IO4 CAN_TX I2C1_SDA
49-
PA_13, // SYS_SWDIO IR_OUT USB_NOE
50-
PA_14, // SYS_SWCLK USART2_TX
51-
PA_15, // I2S1_WS/SPI1_NSS USART2_RX TIM2_CH1/TIM2_ETR EVENTOUT USB_NOE
52-
PB_3, // I2S1_CK/SPI1_SCK EVENTOUT TIM2_CH2 TSC_G5_IO1
53-
PB_4, // I2S1_MCK/SPI1_MISO TIM3_CH1 EVENTOUT TSC_G5_IO2 TIM17_BKIN
54-
PB_5, // I2S1_SD/SPI1_MOSI TIM3_CH2 TIM16_BKIN I2C1_SMBA
55-
PB_6, // USART1_TX I2C1_SCL TIM16_CH1N TSC_G5_IO3
56-
PB_7, // USART1_RX I2C1_SDA TIM17_CH1N TSC_G5_IO4
57-
PF_11, //
58-
PB_8, // CEC I2C1_SCL TIM16_CH1 TSC_SYNC CAN_RX
59-
PB_9 // IR_OUT I2C1_SDA TIM17_CH1 EVENTOUT CAN_TX SPI2_NSS
24+
PC_13, //
25+
PF_0, // I2C1_SDA CRS_SYNC I2C1_SDA
26+
PF_1, // I2C1_SCL I2C1_SCL
27+
PA_0, // USART2_CTS TIM2_CH1/TIM2_ETR TSC_G1_IO1
28+
PA_1, // EVENTOUT USART2_DE/USART2_RTS TIM2_CH2 TSC_G1_IO2
29+
PA_2, // USART2_TX TIM2_CH3 TSC_G1_IO3
30+
PA_3, // USART2_RX TIM2_CH4 TSC_G1_IO4
31+
PA_4, // I2S1_WS/SPI1_NSS USART2_CK USB_NOE TSC_G2_IO1 TIM14_CH1
32+
PA_5, // I2S1_CK/SPI1_SCK CEC TIM2_CH1/TIM2_ETR TSC_G2_IO2
33+
PA_6, // I2S1_MCK/SPI1_MISO TIM3_CH1 TIM1_BKIN TSC_G2_IO3 TIM16_CH1
34+
PA_7, // I2S1_SD/SPI1_MOSI TIM3_CH2 TIM1_CH1N TSC_G2_IO4 TIM14_CH1 TIM17_CH1
35+
PB_0, // EVENTOUT TIM3_CH3 TIM1_CH2N TSC_G3_IO2
36+
PB_1, // TIM14_CH1 TIM3_CH4 TIM1_CH3N TSC_G3_IO3
37+
PB_2, // TSC_G3_IO4
38+
PB_10, // CEC I2C1_SCL TIM2_CH3 TSC_SYNC SPI2_SCK
39+
PB_11, // EVENTOUT I2C1_SDA TIM2_CH4
40+
PB_12, // SPI2_NSS EVENTOUT TIM1_BKIN
41+
PB_13, // SPI2_SCK TIM1_CH1N
42+
PB_14, // SPI2_MISO TIM1_CH2N
43+
PB_15, // SPI2_MOSI TIM1_CH3N
44+
PA_8, // RCC_MCO USART1_CK TIM1_CH1 EVENTOUT CRS_SYNC
45+
PA_9, // USART1_TX TIM1_CH2 TSC_G4_IO1 I2C1_SCL
46+
PA_10, // TIM17_BKIN USART1_RX TIM1_CH3 TSC_G4_IO2 I2C1_SDA
47+
PA_11, // USB_DM EVENTOUT USART1_CTS TIM1_CH4 TSC_G4_IO3 CAN_RX I2C1_SCL
48+
PA_12, // USB_DP EVENTOUT USART1_DE/USART1_RTS TIM1_ETR TSC_G4_IO4 CAN_TX I2C1_SDA
49+
PA_13, // SYS_SWDIO IR_OUT USB_NOE
50+
PA_14, // SYS_SWCLK USART2_TX
51+
PA_15, // I2S1_WS/SPI1_NSS USART2_RX TIM2_CH1/TIM2_ETR EVENTOUT USB_NOE
52+
PB_3, // I2S1_CK/SPI1_SCK EVENTOUT TIM2_CH2 TSC_G5_IO1
53+
PB_4, // I2S1_MCK/SPI1_MISO TIM3_CH1 EVENTOUT TSC_G5_IO2 TIM17_BKIN
54+
PB_5, // I2S1_SD/SPI1_MOSI TIM3_CH2 TIM16_BKIN I2C1_SMBA
55+
PB_6, // USART1_TX I2C1_SCL TIM16_CH1N TSC_G5_IO3
56+
PB_7, // USART1_RX I2C1_SDA TIM17_CH1N TSC_G5_IO4
57+
PF_11, //
58+
PB_8, // CEC I2C1_SCL TIM16_CH1 TSC_SYNC CAN_RX
59+
PB_9 // IR_OUT I2C1_SDA TIM17_CH1 EVENTOUT CAN_TX SPI2_NSS
6060
};
6161

6262
// If analog pins are not contiguous in the digitalPin array:
6363
// Add the analogInputPin array without defining NUM_ANALOG_FIRST
6464
// Analog (Ax) pin number array
6565
// where x is the index to retrieve the digital pin number
6666
const uint32_t analogInputPin[] = {
67-
3,
68-
4,
67+
3,
68+
4,
6969
5,
7070
6,
7171
7,
72-
8,
72+
8,
7373
9,
74-
10
74+
10
7575
};
7676

7777
#ifdef __cplusplus
@@ -91,43 +91,42 @@ extern "C" {
9191
*/
9292
WEAK void SystemClock_Config(void)
9393
{
94-
RCC_OscInitTypeDef RCC_OscInitStruct;
95-
RCC_ClkInitTypeDef RCC_ClkInitStruct;
96-
RCC_PeriphCLKInitTypeDef PeriphClkInit;
97-
RCC_CRSInitTypeDef RCC_CRSInitStruct;
98-
99-
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI48;
100-
RCC_OscInitStruct.HSI48State = RCC_HSI48_ON;
101-
RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
102-
HAL_RCC_OscConfig(&RCC_OscInitStruct);
103-
104-
RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
105-
|RCC_CLOCKTYPE_PCLK1;
106-
RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_HSI48;
107-
RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
108-
RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
109-
HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_1);
110-
111-
PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USB;
112-
PeriphClkInit.UsbClockSelection = RCC_USBCLKSOURCE_HSI48;
113-
HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit);
114-
115-
__HAL_RCC_CRS_CLK_ENABLE();
116-
117-
RCC_CRSInitStruct.Prescaler = RCC_CRS_SYNC_DIV1;
118-
RCC_CRSInitStruct.Source = RCC_CRS_SYNC_SOURCE_USB;
119-
RCC_CRSInitStruct.Polarity = RCC_CRS_SYNC_POLARITY_RISING;
120-
RCC_CRSInitStruct.ReloadValue = __HAL_RCC_CRS_RELOADVALUE_CALCULATE(48000000,1000);
121-
RCC_CRSInitStruct.ErrorLimitValue = 34;
122-
RCC_CRSInitStruct.HSI48CalibrationValue = 32;
123-
HAL_RCCEx_CRSConfig(&RCC_CRSInitStruct);
124-
125-
HAL_SYSTICK_Config(HAL_RCC_GetHCLKFreq()/1000);
126-
127-
HAL_SYSTICK_CLKSourceConfig(SYSTICK_CLKSOURCE_HCLK);
128-
129-
/* SysTick_IRQn interrupt configuration */
130-
HAL_NVIC_SetPriority(SysTick_IRQn, 0, 0);
94+
RCC_OscInitTypeDef RCC_OscInitStruct;
95+
RCC_ClkInitTypeDef RCC_ClkInitStruct;
96+
RCC_PeriphCLKInitTypeDef PeriphClkInit;
97+
RCC_CRSInitTypeDef RCC_CRSInitStruct;
98+
99+
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI48;
100+
RCC_OscInitStruct.HSI48State = RCC_HSI48_ON;
101+
RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
102+
HAL_RCC_OscConfig(&RCC_OscInitStruct);
103+
104+
RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK|RCC_CLOCKTYPE_PCLK1;
105+
RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_HSI48;
106+
RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
107+
RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
108+
HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_1);
109+
110+
PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USB;
111+
PeriphClkInit.UsbClockSelection = RCC_USBCLKSOURCE_HSI48;
112+
HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit);
113+
114+
__HAL_RCC_CRS_CLK_ENABLE();
115+
116+
RCC_CRSInitStruct.Prescaler = RCC_CRS_SYNC_DIV1;
117+
RCC_CRSInitStruct.Source = RCC_CRS_SYNC_SOURCE_USB;
118+
RCC_CRSInitStruct.Polarity = RCC_CRS_SYNC_POLARITY_RISING;
119+
RCC_CRSInitStruct.ReloadValue = __HAL_RCC_CRS_RELOADVALUE_CALCULATE(48000000,1000);
120+
RCC_CRSInitStruct.ErrorLimitValue = 34;
121+
RCC_CRSInitStruct.HSI48CalibrationValue = 32;
122+
HAL_RCCEx_CRSConfig(&RCC_CRSInitStruct);
123+
124+
HAL_SYSTICK_Config(HAL_RCC_GetHCLKFreq()/1000);
125+
126+
HAL_SYSTICK_CLKSourceConfig(SYSTICK_CLKSOURCE_HCLK);
127+
128+
/* SysTick_IRQn interrupt configuration */
129+
HAL_NVIC_SetPriority(SysTick_IRQn, 0, 0);
131130
}
132131

133132
#ifdef __cplusplus

‎variants/Generic_F042Cx/variant.h

+19-19
Original file line numberDiff line numberDiff line change
@@ -25,38 +25,38 @@ extern "C" {
2525
#define PC13 0
2626
#define PF0 1
2727
#define PF1 2
28-
#define PA0 A0
29-
#define PA1 A1
30-
#define PA2 A2
31-
#define PA3 A3
32-
#define PA4 A4
33-
#define PA5 A5
34-
#define PA6 A6
35-
#define PA7 A7
36-
#define PB0 11
37-
#define PB1 12
38-
#define PB2 13
28+
#define PA0 A0
29+
#define PA1 A1
30+
#define PA2 A2
31+
#define PA3 A3
32+
#define PA4 A4
33+
#define PA5 A5
34+
#define PA6 A6
35+
#define PA7 A7
36+
#define PB0 11
37+
#define PB1 12
38+
#define PB2 13
3939
#define PB10 14
4040
#define PB11 15
4141
#define PB12 16
4242
#define PB13 17
4343
#define PB14 18
4444
#define PB15 19
45-
#define PA8 20
46-
#define PA9 21
45+
#define PA8 20
46+
#define PA9 21
4747
#define PA10 22
4848
#define PA11 23
4949
#define PA12 24
5050
#define PA13 25
5151
#define PA14 26
5252
#define PA15 27
53-
#define PB3 28
54-
#define PB4 29
55-
#define PB5 30
56-
#define PB6 31
57-
#define PB7 32
53+
#define PB3 28
54+
#define PB4 29
55+
#define PB5 30
56+
#define PB6 31
57+
#define PB7 32
5858
#define PF11 33
59-
#define PB8 34
59+
#define PB8 34
6060
#define PB9 35
6161

6262
// This must be a literal

0 commit comments

Comments
 (0)