Skip to content

Commit 11cd9bb

Browse files
authored
Fix: align function naming style and file name for CAN. (#27)
No more mixed CamelCase and underscore_case mixed.
1 parent 9d0d1c9 commit 11cd9bb

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

include/can_api.h renamed to include/can.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ typedef enum {
7070
* FUNCTION DECLARATION
7171
**************************************************************************************/
7272

73-
void canInit();
73+
void can_init();
7474
void can_handle_data();
7575

76-
void can_init(FDCAN_HandleTypeDef * handle, CANName peripheral, CanNominalBitTimingResult const can_bit_timing);
76+
void can_init_device(FDCAN_HandleTypeDef * handle, CANName peripheral, CanNominalBitTimingResult const can_bit_timing);
7777
int can_frequency(FDCAN_HandleTypeDef * handle, uint32_t const can_bitrate);
7878

7979
void can_write(FDCAN_HandleTypeDef * handle, union x8h7_can_message const * msg);

src/can.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
#include <stdbool.h>
2424
#include <string.h>
2525
#include <stdio.h>
26-
#include "can_api.h"
26+
27+
#include "can.h"
2728
#include "stm32h7xx_ll_hsem.h"
2829
#include "system.h"
2930
#include "peripherals.h"
@@ -225,7 +226,7 @@ void fdcan2_handler(uint8_t opcode, uint8_t *data, uint16_t size) {
225226
}
226227

227228

228-
void canInit()
229+
void can_init()
229230
{
230231
CanNominalBitTimingResult default_can_bit_timing = {0};
231232

@@ -243,8 +244,8 @@ void canInit()
243244
return;
244245
}
245246

246-
can_init(&fdcan_1, CAN_1, default_can_bit_timing);
247-
can_init(&fdcan_2, CAN_2, default_can_bit_timing);
247+
can_init_device(&fdcan_1, CAN_1, default_can_bit_timing);
248+
can_init_device(&fdcan_2, CAN_2, default_can_bit_timing);
248249

249250
register_peripheral_callback(PERIPH_FDCAN1, &fdcan1_handler);
250251
register_peripheral_callback(PERIPH_FDCAN2, &fdcan2_handler);
@@ -294,7 +295,7 @@ int can_internal_init(FDCAN_HandleTypeDef * handle)
294295
return 1;
295296
}
296297

297-
void can_init(FDCAN_HandleTypeDef * handle, CANName peripheral, CanNominalBitTimingResult const can_bit_timing)
298+
void can_init_device(FDCAN_HandleTypeDef * handle, CANName peripheral, CanNominalBitTimingResult const can_bit_timing)
298299
{
299300
__HAL_RCC_FDCAN_CLK_ENABLE();
300301
HAL_RCC_FDCAN_CLK_ENABLED++;

src/main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include <stdio.h>
2727
#include "peripherals.h"
2828
#include "ringbuffer.h"
29-
#include "can_api.h"
29+
#include "can.h"
3030
#include "rpc.h"
3131
#include "adc.h"
3232
#include "uart.h"
@@ -67,7 +67,7 @@ void peripheral_init() {
6767

6868
adc_init();
6969

70-
canInit();
70+
can_init();
7171
}
7272

7373
void handle_data() {

src/system.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "adc.h"
2929
#include "pwm.h"
3030
#include "gpio.h"
31-
#include "can_api.h"
31+
#include "can.h"
3232
#include "rtc.h"
3333
#include "uart.h"
3434
#include "rpc.h"

0 commit comments

Comments
 (0)