Skip to content

Commit c31b9fb

Browse files
Pillar1989Pillar1989
committed
use MCP2518FD_BITTIME_SETUP to mark mcp2518fd's bittime
1 parent 7d08979 commit c31b9fb

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

‎src/mcp2518fd_can.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -936,7 +936,7 @@ int8_t mcp2518fd::mcp2518fd_FilterToFifoLink(
936936
return spiTransferError;
937937
}
938938

939-
int8_t mcp2518fd::mcp2518fd_BitTimeConfigureNominal40MHz(CAN_BITTIME_SETUP bitTime)
939+
int8_t mcp2518fd::mcp2518fd_BitTimeConfigureNominal40MHz(MCP2518FD_BITTIME_SETUP bitTime)
940940
{
941941
int8_t spiTransferError = 0;
942942
REG_CiNBTCFG ciNbtcfg;
@@ -1001,7 +1001,7 @@ int8_t mcp2518fd::mcp2518fd_BitTimeConfigureNominal40MHz(CAN_BITTIME_SETUP bitTi
10011001
return spiTransferError;
10021002
}
10031003

1004-
int8_t mcp2518fd::mcp2518fd_BitTimeConfigureData40MHz(CAN_BITTIME_SETUP bitTime, CAN_SSP_MODE sspMode)
1004+
int8_t mcp2518fd::mcp2518fd_BitTimeConfigureData40MHz(MCP2518FD_BITTIME_SETUP bitTime, CAN_SSP_MODE sspMode)
10051005
{
10061006
int8_t spiTransferError = 0;
10071007
REG_CiDBTCFG ciDbtcfg;
@@ -1195,7 +1195,7 @@ int8_t mcp2518fd::mcp2518fd_BitTimeConfigureData40MHz(CAN_BITTIME_SETUP bitTime,
11951195
return spiTransferError;
11961196
}
11971197

1198-
int8_t mcp2518fd::mcp2518fd_BitTimeConfigureNominal20MHz(CAN_BITTIME_SETUP bitTime)
1198+
int8_t mcp2518fd::mcp2518fd_BitTimeConfigureNominal20MHz(MCP2518FD_BITTIME_SETUP bitTime)
11991199
{
12001200
int8_t spiTransferError = 0;
12011201
REG_CiNBTCFG ciNbtcfg;
@@ -1263,7 +1263,7 @@ int8_t mcp2518fd::mcp2518fd_BitTimeConfigureNominal20MHz(CAN_BITTIME_SETUP bitTi
12631263
return spiTransferError;
12641264
}
12651265

1266-
int8_t mcp2518fd::mcp2518fd_BitTimeConfigureData20MHz(CAN_BITTIME_SETUP bitTime, CAN_SSP_MODE sspMode)
1266+
int8_t mcp2518fd::mcp2518fd_BitTimeConfigureData20MHz(MCP2518FD_BITTIME_SETUP bitTime, CAN_SSP_MODE sspMode)
12671267
{
12681268
int8_t spiTransferError = 0;
12691269
REG_CiDBTCFG ciDbtcfg;
@@ -1418,7 +1418,7 @@ int8_t mcp2518fd::mcp2518fd_BitTimeConfigureData20MHz(CAN_BITTIME_SETUP bitTime,
14181418
return spiTransferError;
14191419
}
14201420

1421-
int8_t mcp2518fd::mcp2518fd_BitTimeConfigureNominal10MHz(CAN_BITTIME_SETUP bitTime)
1421+
int8_t mcp2518fd::mcp2518fd_BitTimeConfigureNominal10MHz(MCP2518FD_BITTIME_SETUP bitTime)
14221422
{
14231423
int8_t spiTransferError = 0;
14241424
REG_CiNBTCFG ciNbtcfg;
@@ -1486,7 +1486,7 @@ int8_t mcp2518fd::mcp2518fd_BitTimeConfigureNominal10MHz(CAN_BITTIME_SETUP bitTi
14861486
return spiTransferError;
14871487
}
14881488

1489-
int8_t mcp2518fd::mcp2518fd_BitTimeConfigureData10MHz(CAN_BITTIME_SETUP bitTime, CAN_SSP_MODE sspMode)
1489+
int8_t mcp2518fd::mcp2518fd_BitTimeConfigureData10MHz(MCP2518FD_BITTIME_SETUP bitTime, CAN_SSP_MODE sspMode)
14901490
{
14911491
int8_t spiTransferError = 0;
14921492
REG_CiDBTCFG ciDbtcfg;
@@ -1610,7 +1610,7 @@ int8_t mcp2518fd::mcp2518fd_BitTimeConfigureData10MHz(CAN_BITTIME_SETUP bitTime,
16101610
}
16111611

16121612
int8_t mcp2518fd::mcp2518fd_BitTimeConfigure(
1613-
CAN_BITTIME_SETUP bitTime, CAN_SSP_MODE sspMode,
1613+
MCP2518FD_BITTIME_SETUP bitTime, CAN_SSP_MODE sspMode,
16141614
CAN_SYSCLK_SPEED clk)
16151615
{
16161616
int8_t spiTransferError = 0;
@@ -2525,7 +2525,7 @@ uint8_t mcp2518fd::mcp2518fd_init(byte speedset,const byte clock)
25252525
mcp2518fd_FilterToFifoLink(CAN_FILTER0, APP_RX_FIFO, true);
25262526

25272527
// Setup Bit Time
2528-
mcp2518fd_BitTimeConfigure((CAN_BITTIME_SETUP)speedset, CAN_SSP_MODE_AUTO, CAN_SYSCLK_40M);
2528+
mcp2518fd_BitTimeConfigure((MCP2518FD_BITTIME_SETUP)speedset, CAN_SSP_MODE_AUTO, CAN_SYSCLK_40M);
25292529

25302530
// Setup Transmit and Receive Interrupts
25312531
mcp2518fd_GpioModeConfigure(GPIO_MODE_INT, GPIO_MODE_INT);

‎src/mcp2518fd_can.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ class mcp2518fd : public MCP_CAN
158158
int8_t mcp2518fd_FilterObjectConfigure(CAN_FILTER filter, CAN_FILTEROBJ_ID* id);
159159
int8_t mcp2518fd_FilterMaskConfigure(CAN_FILTER filter, CAN_MASKOBJ_ID* mask);
160160
int8_t mcp2518fd_FilterToFifoLink(CAN_FILTER filter, CAN_FIFO_CHANNEL channel, bool enable);
161-
int8_t mcp2518fd_BitTimeConfigure(CAN_BITTIME_SETUP bitTime, CAN_SSP_MODE sspMode,CAN_SYSCLK_SPEED clk);
161+
int8_t mcp2518fd_BitTimeConfigure(MCP2518FD_BITTIME_SETUP bitTime, CAN_SSP_MODE sspMode,CAN_SYSCLK_SPEED clk);
162162
int8_t mcp2518fd_GpioModeConfigure(GPIO_PIN_MODE gpio0, GPIO_PIN_MODE gpio1);
163163
int8_t mcp2518fd_TransmitChannelEventEnable(CAN_FIFO_CHANNEL channel, CAN_TX_FIFO_EVENT flags);
164164
int8_t mcp2518fd_ReceiveChannelEventEnable(CAN_FIFO_CHANNEL channel, CAN_RX_FIFO_EVENT flags);
@@ -198,12 +198,12 @@ class mcp2518fd : public MCP_CAN
198198
int8_t mcp2518fd_WriteWordArray(uint16_t address,uint32_t *txd, uint16_t nWords);
199199

200200
private:
201-
int8_t mcp2518fd_BitTimeConfigureNominal40MHz(CAN_BITTIME_SETUP bitTime);
202-
int8_t mcp2518fd_BitTimeConfigureData40MHz(CAN_BITTIME_SETUP bitTime, CAN_SSP_MODE sspMode);
203-
int8_t mcp2518fd_BitTimeConfigureNominal20MHz(CAN_BITTIME_SETUP bitTime);
204-
int8_t mcp2518fd_BitTimeConfigureData20MHz(CAN_BITTIME_SETUP bitTime, CAN_SSP_MODE sspMode);
205-
int8_t mcp2518fd_BitTimeConfigureNominal10MHz(CAN_BITTIME_SETUP bitTime);
206-
int8_t mcp2518fd_BitTimeConfigureData10MHz(CAN_BITTIME_SETUP bitTime, CAN_SSP_MODE sspMode);
201+
int8_t mcp2518fd_BitTimeConfigureNominal40MHz(MCP2518FD_BITTIME_SETUP bitTime);
202+
int8_t mcp2518fd_BitTimeConfigureData40MHz(MCP2518FD_BITTIME_SETUP bitTime, CAN_SSP_MODE sspMode);
203+
int8_t mcp2518fd_BitTimeConfigureNominal20MHz(MCP2518FD_BITTIME_SETUP bitTime);
204+
int8_t mcp2518fd_BitTimeConfigureData20MHz(MCP2518FD_BITTIME_SETUP bitTime, CAN_SSP_MODE sspMode);
205+
int8_t mcp2518fd_BitTimeConfigureNominal10MHz(MCP2518FD_BITTIME_SETUP bitTime);
206+
int8_t mcp2518fd_BitTimeConfigureData10MHz(MCP2518FD_BITTIME_SETUP bitTime, CAN_SSP_MODE sspMode);
207207

208208
byte ext_flg; // identifier xxxID
209209
// either extended (the 29 LSB) or standard (the 11 LSB)

‎src/mcp2518fd_can_dfs.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@ typedef enum {
607607
CAN_1000K_4M, // 0x0f
608608
CAN_1000K_8M,
609609
CAN_125K_500K // 0x11
610-
} CAN_BITTIME_SETUP;
610+
} MCP2518FD_BITTIME_SETUP;
611611

612612
//! CAN Nominal Bit Time Setup
613613

0 commit comments

Comments
 (0)