diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index 651c549..97a4270 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -38,6 +38,52 @@ encoding//Debug/SDK/drivers/Src/timers/subdir_rules.mk=UTF-8 encoding//Debug/SDK/drivers/Src/timers/subdir_vars.mk=UTF-8 encoding//Debug/TM1650_SDK/src/subdir_rules.mk=UTF-8 encoding//Debug/TM1650_SDK/src/subdir_vars.mk=UTF-8 +encoding//Debug/driverlib/lib/gcc/m0p/mspm0c110x/subdir_rules.mk=UTF-8 +encoding//Debug/driverlib/lib/gcc/m0p/mspm0c110x/subdir_vars.mk=UTF-8 +encoding//Debug/driverlib/lib/gcc/m0p/mspm0g1x0x_g3x0x/subdir_rules.mk=UTF-8 +encoding//Debug/driverlib/lib/gcc/m0p/mspm0g1x0x_g3x0x/subdir_vars.mk=UTF-8 +encoding//Debug/driverlib/lib/gcc/m0p/mspm0gx51x/subdir_rules.mk=UTF-8 +encoding//Debug/driverlib/lib/gcc/m0p/mspm0gx51x/subdir_vars.mk=UTF-8 +encoding//Debug/driverlib/lib/gcc/m0p/mspm0l11xx_l13xx/subdir_rules.mk=UTF-8 +encoding//Debug/driverlib/lib/gcc/m0p/mspm0l11xx_l13xx/subdir_vars.mk=UTF-8 +encoding//Debug/driverlib/lib/gcc/m0p/mspm0l122x_l222x/subdir_rules.mk=UTF-8 +encoding//Debug/driverlib/lib/gcc/m0p/mspm0l122x_l222x/subdir_vars.mk=UTF-8 +encoding//Debug/driverlib/lib/iar/m0p/mspm0c110x/subdir_rules.mk=UTF-8 +encoding//Debug/driverlib/lib/iar/m0p/mspm0c110x/subdir_vars.mk=UTF-8 +encoding//Debug/driverlib/lib/iar/m0p/mspm0g1x0x_g3x0x/subdir_rules.mk=UTF-8 +encoding//Debug/driverlib/lib/iar/m0p/mspm0g1x0x_g3x0x/subdir_vars.mk=UTF-8 +encoding//Debug/driverlib/lib/iar/m0p/mspm0gx51x/subdir_rules.mk=UTF-8 +encoding//Debug/driverlib/lib/iar/m0p/mspm0gx51x/subdir_vars.mk=UTF-8 +encoding//Debug/driverlib/lib/iar/m0p/mspm0l11xx_l13xx/subdir_rules.mk=UTF-8 +encoding//Debug/driverlib/lib/iar/m0p/mspm0l11xx_l13xx/subdir_vars.mk=UTF-8 +encoding//Debug/driverlib/lib/iar/m0p/mspm0l122x_l222x/subdir_rules.mk=UTF-8 +encoding//Debug/driverlib/lib/iar/m0p/mspm0l122x_l222x/subdir_vars.mk=UTF-8 +encoding//Debug/driverlib/lib/keil/m0p/mspm0c110x/subdir_rules.mk=UTF-8 +encoding//Debug/driverlib/lib/keil/m0p/mspm0c110x/subdir_vars.mk=UTF-8 +encoding//Debug/driverlib/lib/keil/m0p/mspm0g1x0x_g3x0x/subdir_rules.mk=UTF-8 +encoding//Debug/driverlib/lib/keil/m0p/mspm0g1x0x_g3x0x/subdir_vars.mk=UTF-8 +encoding//Debug/driverlib/lib/keil/m0p/mspm0gx51x/subdir_rules.mk=UTF-8 +encoding//Debug/driverlib/lib/keil/m0p/mspm0gx51x/subdir_vars.mk=UTF-8 +encoding//Debug/driverlib/lib/keil/m0p/mspm0l11xx_l13xx/subdir_rules.mk=UTF-8 +encoding//Debug/driverlib/lib/keil/m0p/mspm0l11xx_l13xx/subdir_vars.mk=UTF-8 +encoding//Debug/driverlib/lib/keil/m0p/mspm0l122x_l222x/subdir_rules.mk=UTF-8 +encoding//Debug/driverlib/lib/keil/m0p/mspm0l122x_l222x/subdir_vars.mk=UTF-8 +encoding//Debug/driverlib/lib/ticlang/m0p/mspm0c110x/subdir_rules.mk=UTF-8 +encoding//Debug/driverlib/lib/ticlang/m0p/mspm0c110x/subdir_vars.mk=UTF-8 +encoding//Debug/driverlib/lib/ticlang/m0p/mspm0g1x0x_g3x0x/subdir_rules.mk=UTF-8 +encoding//Debug/driverlib/lib/ticlang/m0p/mspm0g1x0x_g3x0x/subdir_vars.mk=UTF-8 +encoding//Debug/driverlib/lib/ticlang/m0p/mspm0gx51x/subdir_rules.mk=UTF-8 +encoding//Debug/driverlib/lib/ticlang/m0p/mspm0gx51x/subdir_vars.mk=UTF-8 +encoding//Debug/driverlib/lib/ticlang/m0p/mspm0l11xx_l13xx/subdir_rules.mk=UTF-8 +encoding//Debug/driverlib/lib/ticlang/m0p/mspm0l11xx_l13xx/subdir_vars.mk=UTF-8 +encoding//Debug/driverlib/lib/ticlang/m0p/mspm0l122x_l222x/subdir_rules.mk=UTF-8 +encoding//Debug/driverlib/lib/ticlang/m0p/mspm0l122x_l222x/subdir_vars.mk=UTF-8 +encoding//Debug/driverlib/m0p/subdir_rules.mk=UTF-8 +encoding//Debug/driverlib/m0p/subdir_vars.mk=UTF-8 +encoding//Debug/driverlib/m0p/sysctl/subdir_rules.mk=UTF-8 +encoding//Debug/driverlib/m0p/sysctl/subdir_vars.mk=UTF-8 +encoding//Debug/driverlib/subdir_rules.mk=UTF-8 +encoding//Debug/driverlib/subdir_vars.mk=UTF-8 encoding//Debug/ivec_APP/ivec_cmplx_gptimer/src/subdir_rules.mk=UTF-8 encoding//Debug/ivec_APP/ivec_cmplx_gptimer/src/subdir_vars.mk=UTF-8 encoding//Debug/ivec_APP/src/subdir_rules.mk=UTF-8 @@ -57,3 +103,70 @@ 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/driverlib/lib/gcc/m0p/mspm0c110x/subdir_rules.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/gcc/m0p/mspm0c110x/subdir_vars.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/gcc/m0p/mspm0g1x0x_g3x0x/subdir_rules.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/gcc/m0p/mspm0g1x0x_g3x0x/subdir_vars.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/gcc/m0p/mspm0gx51x/subdir_rules.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/gcc/m0p/mspm0gx51x/subdir_vars.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/gcc/m0p/mspm0l11xx_l13xx/subdir_rules.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/gcc/m0p/mspm0l11xx_l13xx/subdir_vars.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/gcc/m0p/mspm0l122x_l222x/subdir_rules.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/gcc/m0p/mspm0l122x_l222x/subdir_vars.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/iar/m0p/mspm0c110x/subdir_rules.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/iar/m0p/mspm0c110x/subdir_vars.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/iar/m0p/mspm0g1x0x_g3x0x/subdir_rules.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/iar/m0p/mspm0g1x0x_g3x0x/subdir_vars.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/iar/m0p/mspm0gx51x/subdir_rules.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/iar/m0p/mspm0gx51x/subdir_vars.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/iar/m0p/mspm0l11xx_l13xx/subdir_rules.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/iar/m0p/mspm0l11xx_l13xx/subdir_vars.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/iar/m0p/mspm0l122x_l222x/subdir_rules.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/iar/m0p/mspm0l122x_l222x/subdir_vars.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/keil/m0p/mspm0c110x/subdir_rules.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/keil/m0p/mspm0c110x/subdir_vars.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/keil/m0p/mspm0g1x0x_g3x0x/subdir_rules.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/keil/m0p/mspm0g1x0x_g3x0x/subdir_vars.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/keil/m0p/mspm0gx51x/subdir_rules.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/keil/m0p/mspm0gx51x/subdir_vars.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/keil/m0p/mspm0l11xx_l13xx/subdir_rules.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/keil/m0p/mspm0l11xx_l13xx/subdir_vars.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/keil/m0p/mspm0l122x_l222x/subdir_rules.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/keil/m0p/mspm0l122x_l222x/subdir_vars.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/ticlang/m0p/mspm0c110x/subdir_rules.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/ticlang/m0p/mspm0c110x/subdir_vars.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/ticlang/m0p/mspm0g1x0x_g3x0x/subdir_rules.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/ticlang/m0p/mspm0g1x0x_g3x0x/subdir_vars.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/ticlang/m0p/mspm0gx51x/subdir_rules.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/ticlang/m0p/mspm0gx51x/subdir_vars.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/ticlang/m0p/mspm0l11xx_l13xx/subdir_rules.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/ticlang/m0p/mspm0l11xx_l13xx/subdir_vars.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/ticlang/m0p/mspm0l122x_l222x/subdir_rules.mk=UTF-8 +encoding//Test__GNU/driverlib/lib/ticlang/m0p/mspm0l122x_l222x/subdir_vars.mk=UTF-8 +encoding//Test__GNU/driverlib/m0p/subdir_rules.mk=UTF-8 +encoding//Test__GNU/driverlib/m0p/subdir_vars.mk=UTF-8 +encoding//Test__GNU/driverlib/m0p/sysctl/subdir_rules.mk=UTF-8 +encoding//Test__GNU/driverlib/m0p/sysctl/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 1dce87d..9b1abf4 100644 --- a/Core/Source/ivec_mcal_mcan.c +++ b/Core/Source/ivec_mcal_mcan.c @@ -27,7 +27,7 @@ volatile IVEC_McalStatus_e l_statusFlag = IVEC_MCAL_STATUS_SUCCESS; extern volatile uint8_t u8CANDataAct; #define MCAN_FILTER_SIZE 0u /*REQUIRED MCAN CONFIGS*/ -#define MCAN_FILTER_SIZE 2u +#define MCAN_FILTER_SIZE 0u __attribute__((weak)) void mcu_FDCAN_RxFifo_Callback(uint32_t Identifier, uint8_t *data, uint16_t DataLength) diff --git a/Core/Source/ivec_mcal_uart.c b/Core/Source/ivec_mcal_uart.c index db7f0fc..f7e388f 100644 --- a/Core/Source/ivec_mcal_uart.c +++ b/Core/Source/ivec_mcal_uart.c @@ -305,11 +305,11 @@ exit: ///////////////////////////////////////////////////////////////////////////////////// static xCoreStatus_t uart_init(McalUartHandle_s* pxUartHandle, McalUartBaudRate_e xBaud) { - DL_GPIO_initPeripheralOutputFunction(IOMUX_PINCM32, IOMUX_PINCM32_PF_UART2_TX); - DL_GPIO_initPeripheralInputFunction(IOMUX_PINCM33, IOMUX_PINCM33_PF_UART2_RX); +// DL_GPIO_initPeripheralOutputFunction(IOMUX_PINCM32, IOMUX_PINCM32_PF_UART2_TX); +// DL_GPIO_initPeripheralInputFunction(IOMUX_PINCM33, IOMUX_PINCM33_PF_UART2_RX); -// DL_GPIO_initPeripheralOutputFunction(IOMUX_PINCM19, IOMUX_PINCM19_PF_UART1_TX); -// DL_GPIO_initPeripheralInputFunction(IOMUX_PINCM20, IOMUX_PINCM20_PF_UART1_RX); + DL_GPIO_initPeripheralOutputFunction(IOMUX_PINCM19, IOMUX_PINCM19_PF_UART1_TX); + DL_GPIO_initPeripheralInputFunction(IOMUX_PINCM20, IOMUX_PINCM20_PF_UART1_RX); // Get the UART instance based on the port number in the handle UART_Regs* uart_inst = GetUartInstance(pxUartHandle->eUartPortNumber); diff --git a/ivec_ECU/ivec_ecu_uart/src/ivec_ecu_uart.c b/ivec_ECU/ivec_ecu_uart/src/ivec_ecu_uart.c index 645e643..c68c6f0 100644 --- a/ivec_ECU/ivec_ecu_uart/src/ivec_ecu_uart.c +++ b/ivec_ECU/ivec_ecu_uart/src/ivec_ecu_uart.c @@ -72,7 +72,7 @@ IVEC_EcuCommonErr_e xECU_UARTInit(McalUartHandle_s* prvUartHandle, uint32_t spee } IVEC_ECU_LOG(LOG_STRING, "Initilising UART"); - prvUartHandle->eUartPortNumber = mcalUART_PORT3; + prvUartHandle->eUartPortNumber = mcalUART_PORT2; prvUartHandle->pvUartRecvCallback = __prv_vEcu_CANOverUartMsgCallback; prvUartHandle->xUartConfig.eUartBaudrate = speed; prvUartHandle->xUartConfig.eUartFlowCtrl = mcalUART_FC_NONE; diff --git a/ivec_RTE/src/ivec_rte.c b/ivec_RTE/src/ivec_rte.c index 900bb74..6b3fb86 100644 --- a/ivec_RTE/src/ivec_rte.c +++ b/ivec_RTE/src/ivec_rte.c @@ -336,6 +336,8 @@ void vCanConfigFilter() { extFilterElement.efec = 001; extFilterElement.eft = 10; DL_MCAN_addExtMsgIDFilter(CANFD0, extendedFilterNumber, (DL_MCAN_StdMsgIDFilterElement *) &extFilterElement); + filterValues[i] = 0; + maskValues[i] = 0; extendedFilterNumber++; } @@ -347,6 +349,8 @@ void vCanConfigFilter() { stdFilterElement.sfec = 001; stdFilterElement.sft = 10; DL_MCAN_addStdMsgIDFilter(CANFD0, stadardFilterNumber,(DL_MCAN_StdMsgIDFilterElement *) &stdFilterElement); + filterValues[i] = 0; + maskValues[i] = 0; stadardFilterNumber++; } @@ -361,8 +365,6 @@ void vCanConfigFilter() { // Reset counters after applying filters maskCount = 0; filterCount = 0; - extendedFilterNumber = 0; - stadardFilterNumber = 0; extendedFilter = 0; standardFilter = 0; @@ -396,13 +398,13 @@ void vRTE_UARTDataProcess(void) else if( mode == 2 ) { - if( pucBuf[PKT_HEADER+1] != 0 ){//22(20+2) rx filter available send each id in a frame + if( g_pu8Buf[PKT_HEADER+1] != 0 ){//22(20+2) rx filter available send each id in a frame uint32_t filterId = 0; - memcpy(&filterId, &pucBuf[PKT_HEADER+3], sizeof(uint32_t)); + memcpy(&filterId, &g_pu8Buf[PKT_HEADER+3], sizeof(uint32_t)); bool isExtended = 0; isExtended = (filterId > 0x7FF); // Standard IDs are <= 0x7FF - vCanFilterSaveVal((pucBuf[PKT_HEADER+1] - 1), filterId, isExtended); - if( pucBuf[PKT_HEADER+2] )//All filter received. Trigger Filter Settings + vCanFilterSaveVal((g_pu8Buf[PKT_HEADER+1] - 1), filterId, isExtended); + if( g_pu8Buf[PKT_HEADER+2] )//All filter received. Trigger Filter Settings { vCanFilterReset(); vCanConfigFilter(); @@ -417,13 +419,13 @@ void vRTE_UARTDataProcess(void) } else if ( mode == 3 ) { - if( (pucBuf[PKT_HEADER+1] < 1) || (pucBuf[PKT_HEADER+1] > 8) )//0-7 maximum received pkts + if( (g_pu8Buf[PKT_HEADER+1] < 1) || (g_pu8Buf[PKT_HEADER+1] > 8) )//0-7 maximum received pkts return; uint32_t maskId = 0; - memcpy(&maskId, &pucBuf[PKT_HEADER+3], sizeof(uint32_t)); + memcpy(&maskId, &g_pu8Buf[PKT_HEADER+3], sizeof(uint32_t)); bool isExtended = 0; isExtended = (maskId > 0x7FF); // Standard IDs are <= 0x7FF - vCanFilterMaskSaveVal((pucBuf[PKT_HEADER+1] - 1), maskId, isExtended); + vCanFilterMaskSaveVal((g_pu8Buf[PKT_HEADER+1] - 1), maskId, isExtended); } else if (mode == 100) { diff --git a/mspm0g3507.lds b/mspm0g3507.lds index ccb3787..97562bf 100644 --- a/mspm0g3507.lds +++ b/mspm0g3507.lds @@ -7,7 +7,7 @@ _Min_Stack_Size = 0x000012E8; /* required amount of stack */ /* Specify the memory areas */ MEMORY { - FLASH (RX) : ORIGIN = 0x00008000, LENGTH = 0x00018000 + FLASH (RX) : ORIGIN = 0x00000000, LENGTH = 0x00020000 SRAM (RWX) : ORIGIN = 0x20200000, LENGTH = 0x00008000 BCR_CONFIG (R) : ORIGIN = 0x41C00000, LENGTH = 0x00000080 BSL_CONFIG (R) : ORIGIN = 0x41C00100, LENGTH = 0x00000080 @@ -33,7 +33,7 @@ SECTIONS { /* section for the interrupt vector area */ PROVIDE (_intvecs_base_address = - DEFINED(_intvecs_base_address) ? _intvecs_base_address : 0x00008000); + DEFINED(_intvecs_base_address) ? _intvecs_base_address : 0x00000000); .intvecs (_intvecs_base_address) : AT (_intvecs_base_address) { KEEP (*(.intvecs)) diff --git a/utils/utils.c b/utils/utils.c index 79a01b3..6cec2d9 100644 --- a/utils/utils.c +++ b/utils/utils.c @@ -235,8 +235,8 @@ void vMCAL_DelayTicks(int i32Delay_ms) void xMCAL_McuInit() { SYSCFG_DL_initPower(); -// DL_UART_Main_reset(UART1); -// DL_UART_Main_enablePower(UART1); + DL_UART_Main_reset(UART1); + DL_UART_Main_enablePower(UART1); SYSCFG_DL_GPIO_init(); }