From 5146999b44114642a5508d6fb05e94897e73b80b Mon Sep 17 00:00:00 2001 From: "@rakshita4" Date: Mon, 18 Nov 2024 14:03:45 +0530 Subject: [PATCH] feat(can): add default CAN speed of 500 if an invalid speed is entered --- .cproject | 4 +++- .settings/org.eclipse.core.resources.prefs | 23 ---------------------- Core/Source/ivec_mcal_mcan.c | 4 ++++ 3 files changed, 7 insertions(+), 24 deletions(-) diff --git a/.cproject b/.cproject index 9e01d05..d56f418 100644 --- a/.cproject +++ b/.cproject @@ -477,7 +477,9 @@ - + + + diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index 5aca734..651c549 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -57,26 +57,3 @@ encoding//Debug/subdir_rules.mk=UTF-8 encoding//Debug/subdir_vars.mk=UTF-8 encoding//Debug/utils/subdir_rules.mk=UTF-8 encoding//Debug/utils/subdir_vars.mk=UTF-8 -encoding//Test__GNU/Core/Source/subdir_rules.mk=UTF-8 -encoding//Test__GNU/Core/Source/subdir_vars.mk=UTF-8 -encoding//Test__GNU/Generated\ Codes/subdir_rules.mk=UTF-8 -encoding//Test__GNU/Generated\ Codes/subdir_vars.mk=UTF-8 -encoding//Test__GNU/TM1650_SDK/src/subdir_rules.mk=UTF-8 -encoding//Test__GNU/TM1650_SDK/src/subdir_vars.mk=UTF-8 -encoding//Test__GNU/ivec_APP/src/subdir_rules.mk=UTF-8 -encoding//Test__GNU/ivec_APP/src/subdir_vars.mk=UTF-8 -encoding//Test__GNU/ivec_ECU/ivec_ecu_can/src/subdir_rules.mk=UTF-8 -encoding//Test__GNU/ivec_ECU/ivec_ecu_can/src/subdir_vars.mk=UTF-8 -encoding//Test__GNU/ivec_ECU/ivec_ecu_common/src/subdir_rules.mk=UTF-8 -encoding//Test__GNU/ivec_ECU/ivec_ecu_common/src/subdir_vars.mk=UTF-8 -encoding//Test__GNU/ivec_ECU/ivec_ecu_uart/src/subdir_rules.mk=UTF-8 -encoding//Test__GNU/ivec_ECU/ivec_ecu_uart/src/subdir_vars.mk=UTF-8 -encoding//Test__GNU/ivec_RTE/src/subdir_rules.mk=UTF-8 -encoding//Test__GNU/ivec_RTE/src/subdir_vars.mk=UTF-8 -encoding//Test__GNU/makefile=UTF-8 -encoding//Test__GNU/objects.mk=UTF-8 -encoding//Test__GNU/sources.mk=UTF-8 -encoding//Test__GNU/subdir_rules.mk=UTF-8 -encoding//Test__GNU/subdir_vars.mk=UTF-8 -encoding//Test__GNU/utils/subdir_rules.mk=UTF-8 -encoding//Test__GNU/utils/subdir_vars.mk=UTF-8 diff --git a/Core/Source/ivec_mcal_mcan.c b/Core/Source/ivec_mcal_mcan.c index c54c717..b1dc66e 100644 --- a/Core/Source/ivec_mcal_mcan.c +++ b/Core/Source/ivec_mcal_mcan.c @@ -462,6 +462,10 @@ IVEC_McalStatus_e xMCAL_MCANInit(MCAN_Regs* MCAN, xCAN_baud_t BAUD) { DL_MCAN_setBitTime(MCAN, (DL_MCAN_BitTimingParams*) &gMCAN0BitTimes_250); } + else + { + DL_MCAN_setBitTime(MCAN, (DL_MCAN_BitTimingParams*) &gMCAN0BitTimes_500); + } /* Configure Message RAM Sections */ DL_MCAN_msgRAMConfig(MCAN, (DL_MCAN_MsgRAMConfigParams*) &gMCAN0MsgRAMConfigParams);