Skip to content

Commit 25ab735

Browse files
authored
Cleanup: remove clutter-up of comments that no one needs. (#14)
1 parent 665930e commit 25ab735

File tree

1 file changed

+24
-71
lines changed

1 file changed

+24
-71
lines changed

src/can.c

Lines changed: 24 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -88,117 +88,70 @@ can_t fdcan_2;
8888

8989
static uint32_t HAL_RCC_FDCAN_CLK_ENABLED = 0;
9090

91-
/**
92-
* @brief FDCAN MSP Initialization
93-
* This function configures the hardware resources used in this example
94-
* @param hfdcan: FDCAN handle pointer
95-
* @retval None
96-
*/
97-
void HAL_FDCAN_MspInit(FDCAN_HandleTypeDef *hfdcan) {
91+
void HAL_FDCAN_MspInit(FDCAN_HandleTypeDef *hfdcan)
92+
{
9893
GPIO_InitTypeDef GPIO_InitStruct = {0};
99-
if (hfdcan->Instance == FDCAN1) {
100-
/* USER CODE BEGIN FDCAN1_MspInit 0 */
101-
102-
/* USER CODE END FDCAN1_MspInit 0 */
10394

95+
if (hfdcan->Instance == FDCAN1)
96+
{
10497
__HAL_RCC_GPIOD_CLK_ENABLE();
105-
/**FDCAN1 GPIO Configuration
106-
PD1 ------> FDCAN1_TX
107-
PD0 ------> FDCAN1_RX
108-
*/
98+
/*
99+
* FDCAN1 GPIO Configuration
100+
* PD1 ------> FDCAN1_TX
101+
* PD0 ------> FDCAN1_RX
102+
*/
109103
GPIO_InitStruct.Pin = GPIO_PIN_1 | GPIO_PIN_0;
110104
GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
111105
GPIO_InitStruct.Pull = GPIO_PULLUP;
112106
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
113107
GPIO_InitStruct.Alternate = GPIO_AF9_FDCAN1;
114108
HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);
115109

116-
/* FDCAN1 interrupt Init */
117110
HAL_NVIC_SetPriority(FDCAN1_IT0_IRQn, 2, 0);
118111
HAL_NVIC_EnableIRQ(FDCAN1_IT0_IRQn);
119-
/* USER CODE BEGIN FDCAN1_MspInit 1 */
120-
121-
/* USER CODE END FDCAN1_MspInit 1 */
122-
} else if (hfdcan->Instance == FDCAN2) {
123-
/* USER CODE BEGIN FDCAN2_MspInit 0 */
124-
125-
/* USER CODE END FDCAN2_MspInit 0 */
126-
/* Peripheral clock enable */
127-
112+
}
113+
else if (hfdcan->Instance == FDCAN2)
114+
{
128115
__HAL_RCC_GPIOB_CLK_ENABLE();
129-
/**FDCAN2 GPIO Configuration
130-
PB5 ------> FDCAN2_RX
131-
PB6 ------> FDCAN2_TX
132-
*/
116+
/*
117+
* FDCAN2 GPIO Configuration
118+
* PB5 ------> FDCAN2_RX
119+
* PB6 ------> FDCAN2_TX
120+
*/
133121
GPIO_InitStruct.Pin = GPIO_PIN_5 | GPIO_PIN_6;
134122
GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
135123
GPIO_InitStruct.Pull = GPIO_PULLUP;
136124
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
137125
GPIO_InitStruct.Alternate = GPIO_AF9_FDCAN2;
138126
HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
139127

140-
/* FDCAN2 interrupt Init */
141128
HAL_NVIC_SetPriority(FDCAN2_IT0_IRQn, 2, 0);
142129
HAL_NVIC_EnableIRQ(FDCAN2_IT0_IRQn);
143-
/* USER CODE BEGIN FDCAN2_MspInit 1 */
144-
145-
/* USER CODE END FDCAN2_MspInit 1 */
146130
}
147131
}
148132

149-
/**
150-
* @brief FDCAN MSP De-Initialization
151-
* This function freeze the hardware resources used in this example
152-
* @param hfdcan: FDCAN handle pointer
153-
* @retval None
154-
*/
155-
void HAL_FDCAN_MspDeInit(FDCAN_HandleTypeDef *hfdcan) {
156-
if (hfdcan->Instance == FDCAN1) {
157-
/* USER CODE BEGIN FDCAN1_MspDeInit 0 */
158-
159-
/* USER CODE END FDCAN1_MspDeInit 0 */
160-
/* Peripheral clock disable */
133+
void HAL_FDCAN_MspDeInit(FDCAN_HandleTypeDef *hfdcan)
134+
{
135+
if (hfdcan->Instance == FDCAN1)
136+
{
161137
HAL_RCC_FDCAN_CLK_ENABLED--;
162138
if (HAL_RCC_FDCAN_CLK_ENABLED == 0) {
163139
__HAL_RCC_FDCAN_CLK_DISABLE();
164140
}
165-
166-
/**FDCAN1 GPIO Configuration
167-
PD1 ------> FDCAN1_TX
168-
PD0 ------> FDCAN1_RX
169-
*/
170141
HAL_GPIO_DeInit(GPIOD, GPIO_PIN_1 | GPIO_PIN_0);
171-
172-
/* FDCAN1 interrupt DeInit */
173142
HAL_NVIC_DisableIRQ(FDCAN1_IT0_IRQn);
174-
/* USER CODE BEGIN FDCAN1_MspDeInit 1 */
175-
176-
/* USER CODE END FDCAN1_MspDeInit 1 */
177-
} else if (hfdcan->Instance == FDCAN2) {
178-
/* USER CODE BEGIN FDCAN2_MspDeInit 0 */
179-
180-
/* USER CODE END FDCAN2_MspDeInit 0 */
181-
/* Peripheral clock disable */
143+
}
144+
else if (hfdcan->Instance == FDCAN2)
145+
{
182146
HAL_RCC_FDCAN_CLK_ENABLED--;
183147
if (HAL_RCC_FDCAN_CLK_ENABLED == 0) {
184148
__HAL_RCC_FDCAN_CLK_DISABLE();
185149
}
186-
187-
/**FDCAN2 GPIO Configuration
188-
PB5 ------> FDCAN2_RX
189-
PB6 ------> FDCAN2_TX
190-
*/
191150
HAL_GPIO_DeInit(GPIOB, GPIO_PIN_5 | GPIO_PIN_6);
192-
193-
/* FDCAN2 interrupt DeInit */
194151
HAL_NVIC_DisableIRQ(FDCAN2_IT0_IRQn);
195-
/* USER CODE BEGIN FDCAN2_MspDeInit 1 */
196-
197-
/* USER CODE END FDCAN2_MspDeInit 1 */
198152
}
199153
}
200154

201-
202155
static void error(char* string) {
203156
printf(string);
204157
while (1);

0 commit comments

Comments
 (0)