andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CAN configs are platform specific 

Move STM32's configs to stm32_can.cpp
Create AT32's configs in at32_can.cpp
This commit is contained in:
Andrey Gusakov 2023-11-19 23:42:48 +03:00 committed by rusefillc
parent 84cb2aee8d
commit c9c7adbdbc
3 changed files with 267 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

198
firmware/hw_layer/drivers/can/can_hw.cpp
View File

@ -26,176 +26,18 @@ static bool isCanEnabled = false;
#if EFI_PROD_CODE #if EFI_PROD_CODE
// Values below calculated with http://www.bittiming.can-wiki.info/ extern const CANConfig *findCanConfig(can_baudrate_e rate);
// Pick ST micro bxCAN
// Clock rate of 42mhz for f4, 54mhz for f7, 80mhz for h7
#ifdef STM32F4XX
// These have an 85.7% sample point
#define CAN_BTR_50 (CAN_BTR_SJW(0) | CAN_BTR_BRP(59) | CAN_BTR_TS1(10) | CAN_BTR_TS2(1))
#define CAN_BTR_83 (CAN_BTR_SJW(0) | CAN_BTR_BRP(35) | CAN_BTR_TS1(10) | CAN_BTR_TS2(1))
#define CAN_BTR_100 (CAN_BTR_SJW(0) | CAN_BTR_BRP(29) | CAN_BTR_TS1(10) | CAN_BTR_TS2(1))
#define CAN_BTR_125 (CAN_BTR_SJW(0) | CAN_BTR_BRP(23) | CAN_BTR_TS1(10) | CAN_BTR_TS2(1))
#define CAN_BTR_250 (CAN_BTR_SJW(0) | CAN_BTR_BRP(11) | CAN_BTR_TS1(10) | CAN_BTR_TS2(1))
#define CAN_BTR_500 (CAN_BTR_SJW(0) | CAN_BTR_BRP(5) | CAN_BTR_TS1(10) | CAN_BTR_TS2(1))
#define CAN_BTR_1k0 (CAN_BTR_SJW(0) | CAN_BTR_BRP(2) | CAN_BTR_TS1(10) | CAN_BTR_TS2(1))
#elif defined(STM32F7XX)
// These have an 88.9% sample point
#define CAN_BTR_50 (CAN_BTR_SJW(0) | CAN_BTR_BRP(59) | CAN_BTR_TS1(14) | CAN_BTR_TS2(1))
#define CAN_BTR_83 (CAN_BTR_SJW(0) | CAN_BTR_BRP(35) | CAN_BTR_TS1(14) | CAN_BTR_TS2(1))
#define CAN_BTR_100 (CAN_BTR_SJW(0) | CAN_BTR_BRP(29) | CAN_BTR_TS1(14) | CAN_BTR_TS2(1))
#define CAN_BTR_125 (CAN_BTR_SJW(0) | CAN_BTR_BRP(23) | CAN_BTR_TS1(14) | CAN_BTR_TS2(1))
#define CAN_BTR_250 (CAN_BTR_SJW(0) | CAN_BTR_BRP(11) | CAN_BTR_TS1(14) | CAN_BTR_TS2(1))
#define CAN_BTR_500 (CAN_BTR_SJW(0) | CAN_BTR_BRP(5) | CAN_BTR_TS1(14) | CAN_BTR_TS2(1))
#define CAN_BTR_1k0 (CAN_BTR_SJW(0) | CAN_BTR_BRP(2) | CAN_BTR_TS1(14) | CAN_BTR_TS2(1))
#elif defined(STM32H7XX)
// FDCAN driver has different bit timing registers (yes, different format)
// for the arbitration and data phases
// 66% sample point, not ideal but best we can do without changing CAN clock
#define CAN_NBTP_50 0x061F1F10
#define CAN_DBTP_50 0x001F2003
// 86.7% sample point
#define CAN_NBTP_83 0x061F1803
#define CAN_DBTP_83 0x001F1833
// 88.0% sample point
#define CAN_NBTP_100 0x061F1402
#define CAN_DBTP_100 0x001F1423
// 85.0% sample point
#define CAN_NBTP_125 0x061F0F02
#define CAN_DBTP_125 0x001F0F23
// These have an 87.5% sample point
#define CAN_NBTP_250 0x06130C01
#define CAN_DBTP_250 0x00130C13
#define CAN_NBTP_500 0x06090C01
#define CAN_DBTP_500 0x00090C13
#define CAN_NBTP_1k0 0x06040C01
#define CAN_DBTP_1k0 0x00040C13
#else
#error Please define CAN BTR settings for your MCU!
#endif
/*
* 500KBaud
* automatic wakeup
* automatic recover from abort mode
* See section 22.7.7 on the STM32 reference manual.
*
* 29 bit would be CAN_TI0R_EXID (?) but we do not mention it here
* CAN_TI0R_STID "Standard Identifier or Extended Identifier"? not mentioned as well
*/
#if defined(STM32F4XX) || defined(STM32F7XX)
#define STM32FxMCR (CAN_MCR_ABOM | CAN_MCR_AWUM | CAN_MCR_TXFP)
static const CANConfig canConfig50 = {
.mcr = STM32FxMCR,
.btr = CAN_BTR_50
};
static const CANConfig canConfig83 = {
.mcr = STM32FxMCR,
.btr = CAN_BTR_83
};
static const CANConfig canConfig100 = {
.mcr = STM32FxMCR,
.btr = CAN_BTR_100
};
static const CANConfig canConfig125 = {
.mcr = STM32FxMCR,
.btr = CAN_BTR_125
};
static const CANConfig canConfig250 = {
.mcr = STM32FxMCR,
.btr = CAN_BTR_250
};
static const CANConfig canConfig500 = {
.mcr = STM32FxMCR,
.btr = CAN_BTR_500
};
static const CANConfig canConfig1000 = {
.mcr = STM32FxMCR,
.btr = CAN_BTR_1k0
};
#elif defined(STM32H7XX)
static const CANConfig canConfig50 = {
.NBTP = CAN_NBTP_50,
.DBTP = CAN_DBTP_50,
.CCCR = 0,
.TEST = 0,
.RXGFC = 0,
};
static const CANConfig canConfig83 = {
.NBTP = CAN_NBTP_83,
.DBTP = CAN_DBTP_83,
.CCCR = 0,
.TEST = 0,
.RXGFC = 0,
};
static const CANConfig canConfig100 = {
.NBTP = CAN_NBTP_100,
.DBTP = CAN_DBTP_100,
.CCCR = 0,
.TEST = 0,
.RXGFC = 0,
};
static const CANConfig canConfig125 = {
.NBTP = CAN_NBTP_125,
.DBTP = CAN_DBTP_125,
.CCCR = 0,
.TEST = 0,
.RXGFC = 0,
};
static const CANConfig canConfig250 = {
.NBTP = CAN_NBTP_250,
.DBTP = CAN_DBTP_250,
.CCCR = 0,
.TEST = 0,
.RXGFC = 0,
};
static const CANConfig canConfig500 = {
.NBTP = CAN_NBTP_500,
.DBTP = CAN_DBTP_500,
.CCCR = 0,
.TEST = 0,
.RXGFC = 0,
};
static const CANConfig canConfig1000 = {
.NBTP = CAN_NBTP_1k0,
.DBTP = CAN_DBTP_1k0,
.CCCR = 0,
.TEST = 0,
.RXGFC = 0,
};
#endif
#else // not EFI_PROD_CODE #else // not EFI_PROD_CODE
// Nothing to actually set for the simulator's CAN config. // Nothing to actually set for the simulator's CAN config.
// It's impossible to set CAN bitrate from userspace, so we can't set it. // It's impossible to set CAN bitrate from userspace, so we can't set it.
static const CANConfig canConfig50; static const CANConfig canConfig_dummy;
static const CANConfig canConfig83;
static const CANConfig canConfig100; static const CANConfig * findCanConfig(can_baudrate_e rate)
static const CANConfig canConfig125; {
static const CANConfig canConfig250; return &canConfig_dummy;
static const CANConfig canConfig500; }
static const CANConfig canConfig1000;
#endif #endif
class CanRead final : protected ThreadController<UTILITY_THREAD_STACK_SIZE> { class CanRead final : protected ThreadController<UTILITY_THREAD_STACK_SIZE> {
@ -319,26 +161,6 @@ void startCanPins() {
#endif // EFI_PROD_CODE #endif // EFI_PROD_CODE
} }
static const CANConfig * findConfig(can_baudrate_e rate) {
switch (rate) {
case B50KBPS:
return &canConfig50;
case B83KBPS:
return &canConfig83;
case B100KBPS:
return &canConfig100;
case B125KBPS:
return &canConfig125;
case B250KBPS:
return &canConfig250;
case B1MBPS:
return &canConfig1000;
case B500KBPS:
default:
return &canConfig500;
}
}
static void applyListenOnly(CANConfig* canConfig, bool isListenOnly) { static void applyListenOnly(CANConfig* canConfig, bool isListenOnly) {
#if defined(STM32F4XX) || defined(STM32F7XX) #if defined(STM32F4XX) || defined(STM32F7XX)
if (isListenOnly) if (isListenOnly)
@ -378,14 +200,14 @@ void initCan() {
if (device1) { if (device1) {
// Config based on baud rate // Config based on baud rate
CANConfig canConfig; CANConfig canConfig;
memcpy(&canConfig, findConfig(engineConfiguration->canBaudRate), sizeof(canConfig)); memcpy(&canConfig, findCanConfig(engineConfiguration->canBaudRate), sizeof(canConfig));
applyListenOnly(&canConfig, engineConfiguration->can1ListenMode); applyListenOnly(&canConfig, engineConfiguration->can1ListenMode);
canStart(device1, &canConfig); canStart(device1, &canConfig);
} }
if (device2) { if (device2) {
CANConfig canConfig; CANConfig canConfig;
memcpy(&canConfig, findConfig(engineConfiguration->can2BaudRate), sizeof(canConfig)); memcpy(&canConfig, findCanConfig(engineConfiguration->can2BaudRate), sizeof(canConfig));
applyListenOnly(&canConfig, engineConfiguration->can2ListenMode); applyListenOnly(&canConfig, engineConfiguration->can2ListenMode);
canStart(device2, &canConfig); canStart(device2, &canConfig);
} }

76
firmware/hw_layer/ports/at32/at32_can.cpp
View File

@ -10,6 +10,62 @@
#if EFI_CAN_SUPPORT #if EFI_CAN_SUPPORT
// Values below calculated with http://www.bittiming.can-wiki.info/
// Pick ST micro bxCAN
#if (STM32_PCLK1 == 144000000)
// Clock rate of 144mhz for AT32F435
// These have an 85.7% sample point
// CAN_BTR_BRP - Baud Rate Prescaler
// CAN_BTR_SJW - Resynchronization Jump Width
// CAN_BTR_TS1 - Time Segment 1
// CAN_BTR_TS2 - Time Segment 2
#define CAN_BTR_50 (CAN_BTR_BRP(160 - 1) | CAN_BTR_SJW(18 - 1) | CAN_BTR_TS1(15 - 1) | CAN_BTR_TS2(2 - 1))
#define CAN_BTR_83 (CAN_BTR_BRP(96 - 1) | CAN_BTR_SJW(18 - 1) | CAN_BTR_TS1(15 - 1) | CAN_BTR_TS2(2 - 1)) /* not accurate */
#define CAN_BTR_100 (CAN_BTR_BRP(80 - 1) | CAN_BTR_SJW(18 - 1) | CAN_BTR_TS1(15 - 1) | CAN_BTR_TS2(2 - 1))
#define CAN_BTR_125 (CAN_BTR_BRP(64 - 1) | CAN_BTR_SJW(18 - 1) | CAN_BTR_TS1(15 - 1) | CAN_BTR_TS2(2 - 1))
#define CAN_BTR_250 (CAN_BTR_BRP(32 - 1) | CAN_BTR_SJW(18 - 1) | CAN_BTR_TS1(15 - 1) | CAN_BTR_TS2(2 - 1))
#define CAN_BTR_500 (CAN_BTR_BRP(16 - 1) | CAN_BTR_SJW(18 - 1) | CAN_BTR_TS1(15 - 1) | CAN_BTR_TS2(2 - 1))
#define CAN_BTR_1k0 (CAN_BTR_BRP(8 - 1) | CAN_BTR_SJW(18 - 1) | CAN_BTR_TS1(15 - 1) | CAN_BTR_TS2(2 - 1))
#endif
#define STM32FxMCR (CAN_MCR_ABOM | CAN_MCR_AWUM | CAN_MCR_TXFP)
static const CANConfig canConfig50 = {
.mcr = STM32FxMCR,
.btr = CAN_BTR_50
};
static const CANConfig canConfig83 = {
.mcr = STM32FxMCR,
.btr = CAN_BTR_83
};
static const CANConfig canConfig100 = {
.mcr = STM32FxMCR,
.btr = CAN_BTR_100
};
static const CANConfig canConfig125 = {
.mcr = STM32FxMCR,
.btr = CAN_BTR_125
};
static const CANConfig canConfig250 = {
.mcr = STM32FxMCR,
.btr = CAN_BTR_250
};
static const CANConfig canConfig500 = {
.mcr = STM32FxMCR,
.btr = CAN_BTR_500
};
static const CANConfig canConfig1000 = {
.mcr = STM32FxMCR,
.btr = CAN_BTR_1k0
};
static bool isValidCan1RxPin(brain_pin_e pin) { static bool isValidCan1RxPin(brain_pin_e pin) {
return pin == Gpio::A11 || pin == Gpio::B8 || pin == Gpio::D0 || pin == Gpio::G0; return pin == Gpio::A11 || pin == Gpio::B8 || pin == Gpio::D0 || pin == Gpio::G0;
} }
@ -50,4 +106,24 @@ CANDriver* detectCanDevice(brain_pin_e pinRx, brain_pin_e pinTx) {
return nullptr; return nullptr;
} }
const CANConfig * findCanConfig(can_baudrate_e rate) {
switch (rate) {
case B50KBPS:
return &canConfig50;
case B83KBPS:
return &canConfig83;
case B100KBPS:
return &canConfig100;
case B125KBPS:
return &canConfig125;
case B250KBPS:
return &canConfig250;
case B1MBPS:
return &canConfig1000;
case B500KBPS:
default:
return &canConfig500;
}
}
#endif /* EFI_CAN_SUPPORT */ #endif /* EFI_CAN_SUPPORT */

181
firmware/hw_layer/ports/stm32/stm32_can.cpp
View File

@ -10,6 +10,167 @@
#if EFI_CAN_SUPPORT #if EFI_CAN_SUPPORT
// Values below calculated with http://www.bittiming.can-wiki.info/
// Pick ST micro bxCAN
// Clock rate of 42mhz for f4, 54mhz for f7, 80mhz for h7
#ifdef STM32F4XX
// These have an 85.7% sample point
#define CAN_BTR_50 (CAN_BTR_SJW(0) | CAN_BTR_BRP(59) | CAN_BTR_TS1(10) | CAN_BTR_TS2(1))
#define CAN_BTR_83 (CAN_BTR_SJW(0) | CAN_BTR_BRP(35) | CAN_BTR_TS1(10) | CAN_BTR_TS2(1))
#define CAN_BTR_100 (CAN_BTR_SJW(0) | CAN_BTR_BRP(29) | CAN_BTR_TS1(10) | CAN_BTR_TS2(1))
#define CAN_BTR_125 (CAN_BTR_SJW(0) | CAN_BTR_BRP(23) | CAN_BTR_TS1(10) | CAN_BTR_TS2(1))
#define CAN_BTR_250 (CAN_BTR_SJW(0) | CAN_BTR_BRP(11) | CAN_BTR_TS1(10) | CAN_BTR_TS2(1))
#define CAN_BTR_500 (CAN_BTR_SJW(0) | CAN_BTR_BRP(5) | CAN_BTR_TS1(10) | CAN_BTR_TS2(1))
#define CAN_BTR_1k0 (CAN_BTR_SJW(0) | CAN_BTR_BRP(2) | CAN_BTR_TS1(10) | CAN_BTR_TS2(1))
#elif defined(STM32F7XX)
// These have an 88.9% sample point
#define CAN_BTR_50 (CAN_BTR_SJW(0) | CAN_BTR_BRP(59) | CAN_BTR_TS1(14) | CAN_BTR_TS2(1))
#define CAN_BTR_83 (CAN_BTR_SJW(0) | CAN_BTR_BRP(35) | CAN_BTR_TS1(14) | CAN_BTR_TS2(1))
#define CAN_BTR_100 (CAN_BTR_SJW(0) | CAN_BTR_BRP(29) | CAN_BTR_TS1(14) | CAN_BTR_TS2(1))
#define CAN_BTR_125 (CAN_BTR_SJW(0) | CAN_BTR_BRP(23) | CAN_BTR_TS1(14) | CAN_BTR_TS2(1))
#define CAN_BTR_250 (CAN_BTR_SJW(0) | CAN_BTR_BRP(11) | CAN_BTR_TS1(14) | CAN_BTR_TS2(1))
#define CAN_BTR_500 (CAN_BTR_SJW(0) | CAN_BTR_BRP(5) | CAN_BTR_TS1(14) | CAN_BTR_TS2(1))
#define CAN_BTR_1k0 (CAN_BTR_SJW(0) | CAN_BTR_BRP(2) | CAN_BTR_TS1(14) | CAN_BTR_TS2(1))
#elif defined(STM32H7XX)
// FDCAN driver has different bit timing registers (yes, different format)
// for the arbitration and data phases
// 66% sample point, not ideal but best we can do without changing CAN clock
#define CAN_NBTP_50 0x061F1F10
#define CAN_DBTP_50 0x001F2003
// 86.7% sample point
#define CAN_NBTP_83 0x061F1803
#define CAN_DBTP_83 0x001F1833
// 88.0% sample point
#define CAN_NBTP_100 0x061F1402
#define CAN_DBTP_100 0x001F1423
// 85.0% sample point
#define CAN_NBTP_125 0x061F0F02
#define CAN_DBTP_125 0x001F0F23
// These have an 87.5% sample point
#define CAN_NBTP_250 0x06130C01
#define CAN_DBTP_250 0x00130C13
#define CAN_NBTP_500 0x06090C01
#define CAN_DBTP_500 0x00090C13
#define CAN_NBTP_1k0 0x06040C01
#define CAN_DBTP_1k0 0x00040C13
#else
#error Please define CAN BTR settings for your MCU!
#endif
/*
* 500KBaud
* automatic wakeup
* automatic recover from abort mode
* See section 22.7.7 on the STM32 reference manual.
*
* 29 bit would be CAN_TI0R_EXID (?) but we do not mention it here
* CAN_TI0R_STID "Standard Identifier or Extended Identifier"? not mentioned as well
*/
#if defined(STM32F4XX) || defined(STM32F7XX)
#define STM32FxMCR (CAN_MCR_ABOM | CAN_MCR_AWUM | CAN_MCR_TXFP)
static const CANConfig canConfig50 = {
.mcr = STM32FxMCR,
.btr = CAN_BTR_50
};
static const CANConfig canConfig83 = {
.mcr = STM32FxMCR,
.btr = CAN_BTR_83
};
static const CANConfig canConfig100 = {
.mcr = STM32FxMCR,
.btr = CAN_BTR_100
};
static const CANConfig canConfig125 = {
.mcr = STM32FxMCR,
.btr = CAN_BTR_125
};
static const CANConfig canConfig250 = {
.mcr = STM32FxMCR,
.btr = CAN_BTR_250
};
static const CANConfig canConfig500 = {
.mcr = STM32FxMCR,
.btr = CAN_BTR_500
};
static const CANConfig canConfig1000 = {
.mcr = STM32FxMCR,
.btr = CAN_BTR_1k0
};
#elif defined(STM32H7XX)
static const CANConfig canConfig50 = {
.NBTP = CAN_NBTP_50,
.DBTP = CAN_DBTP_50,
.CCCR = 0,
.TEST = 0,
.RXGFC = 0,
};
static const CANConfig canConfig83 = {
.NBTP = CAN_NBTP_83,
.DBTP = CAN_DBTP_83,
.CCCR = 0,
.TEST = 0,
.RXGFC = 0,
};
static const CANConfig canConfig100 = {
.NBTP = CAN_NBTP_100,
.DBTP = CAN_DBTP_100,
.CCCR = 0,
.TEST = 0,
.RXGFC = 0,
};
static const CANConfig canConfig125 = {
.NBTP = CAN_NBTP_125,
.DBTP = CAN_DBTP_125,
.CCCR = 0,
.TEST = 0,
.RXGFC = 0,
};
static const CANConfig canConfig250 = {
.NBTP = CAN_NBTP_250,
.DBTP = CAN_DBTP_250,
.CCCR = 0,
.TEST = 0,
.RXGFC = 0,
};
static const CANConfig canConfig500 = {
.NBTP = CAN_NBTP_500,
.DBTP = CAN_DBTP_500,
.CCCR = 0,
.TEST = 0,
.RXGFC = 0,
};
static const CANConfig canConfig1000 = {
.NBTP = CAN_NBTP_1k0,
.DBTP = CAN_DBTP_1k0,
.CCCR = 0,
.TEST = 0,
.RXGFC = 0,
};
#endif
static bool isValidCan1RxPin(brain_pin_e pin) { static bool isValidCan1RxPin(brain_pin_e pin) {
return pin == Gpio::A11 || pin == Gpio::B8 || pin == Gpio::D0; return pin == Gpio::A11 || pin == Gpio::B8 || pin == Gpio::D0;
} }
@ -50,4 +211,24 @@ CANDriver* detectCanDevice(brain_pin_e pinRx, brain_pin_e pinTx) {
return nullptr; return nullptr;
} }
const CANConfig * findCanConfig(can_baudrate_e rate) {
switch (rate) {
case B50KBPS:
return &canConfig50;
case B83KBPS:
return &canConfig83;
case B100KBPS:
return &canConfig100;
case B125KBPS:
return &canConfig125;
case B250KBPS:
return &canConfig250;
case B1MBPS:
return &canConfig1000;
case B500KBPS:
default:
return &canConfig500;
}
}
#endif /* EFI_CAN_SUPPORT */ #endif /* EFI_CAN_SUPPORT */