diff --git a/.cproject b/.cproject index a448313..817c6a7 100644 --- a/.cproject +++ b/.cproject @@ -2,116 +2,79 @@ - + - - - + - + - - - + @@ -481,6 +444,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index c08c524..4bba75d 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -26,6 +26,10 @@ encoding//AAR/subdir_rules.mk=UTF-8 encoding//AAR/subdir_vars.mk=UTF-8 encoding//AAR/utils/subdir_rules.mk=UTF-8 encoding//AAR/utils/subdir_vars.mk=UTF-8 +encoding//Debug/Core/Source/subdir_rules.mk=UTF-8 +encoding//Debug/Core/Source/subdir_vars.mk=UTF-8 +encoding//Debug/Generated\ Codes/subdir_rules.mk=UTF-8 +encoding//Debug/Generated\ Codes/subdir_vars.mk=UTF-8 encoding//Debug/LCD_1604/interface/subdir_rules.mk=UTF-8 encoding//Debug/LCD_1604/interface/subdir_vars.mk=UTF-8 encoding//Debug/LCD_1604/subdir_rules.mk=UTF-8 @@ -36,8 +40,73 @@ encoding//Debug/NOR_FLASH/platform/subdir_rules.mk=UTF-8 encoding//Debug/NOR_FLASH/platform/subdir_vars.mk=UTF-8 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/src/subdir_rules.mk=UTF-8 +encoding//Debug/ivec_APP/src/subdir_vars.mk=UTF-8 +encoding//Debug/ivec_ECU/ivec_ecu_can/src/subdir_rules.mk=UTF-8 +encoding//Debug/ivec_ECU/ivec_ecu_can/src/subdir_vars.mk=UTF-8 +encoding//Debug/ivec_ECU/ivec_ecu_common/src/subdir_rules.mk=UTF-8 +encoding//Debug/ivec_ECU/ivec_ecu_common/src/subdir_vars.mk=UTF-8 +encoding//Debug/ivec_ECU/ivec_ecu_uart/src/subdir_rules.mk=UTF-8 +encoding//Debug/ivec_ECU/ivec_ecu_uart/src/subdir_vars.mk=UTF-8 +encoding//Debug/ivec_RTE/src/subdir_rules.mk=UTF-8 +encoding//Debug/ivec_RTE/src/subdir_vars.mk=UTF-8 encoding//Debug/ivec_cmplx_gptimer/src/subdir_rules.mk=UTF-8 encoding//Debug/ivec_cmplx_gptimer/src/subdir_vars.mk=UTF-8 +encoding//Debug/makefile=UTF-8 +encoding//Debug/objects.mk=UTF-8 +encoding//Debug/sources.mk=UTF-8 +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 diff --git a/Core/Source/ivec_mcal_mcan.c b/Core/Source/ivec_mcal_mcan.c index 4245168..e29ecac 100644 --- a/Core/Source/ivec_mcal_mcan.c +++ b/Core/Source/ivec_mcal_mcan.c @@ -26,6 +26,7 @@ volatile uint8_t u8CallBack_buff[8]={0}; volatile IVEC_McalStatus_e l_statusFlag = IVEC_MCAL_STATUS_SUCCESS; extern volatile uint8_t u8CANDataAct; /*REQUIRED MCAN CONFIGS*/ +#define MCAN_FILTER_SIZE 2u __attribute__((weak)) void mcu_FDCAN_RxFifo_Callback(uint32_t Identifier, uint8_t *data, uint16_t DataLength) @@ -71,59 +72,60 @@ static DL_MCAN_ConfigParams gMCAN0ConfigParams={ .timeoutCntEnable = false, .filterConfig.rrfs = false, .filterConfig.rrfe = false, - .filterConfig.anfe = 0, - .filterConfig.anfs = 0, + .filterConfig.anfe = 3, + .filterConfig.anfs = 3, }; static DL_MCAN_MsgRAMConfigParams gMCAN0MsgRAMConfigParams ={ - /* Standard ID Filter List Start Address. */ - .flssa = 0 , - /* List Size: Standard ID. */ - .lss = 0 , - /* Extended ID Filter List Start Address. */ - .flesa = 0 , - /* List Size: Extended ID. */ - .lse = 0 , - /* Tx Buffers Start Address. */ - .txStartAddr = 10 , - /* Number of Dedicated Transmit Buffers. */ - .txBufNum = 10 , - .txFIFOSize = 10, - /* Tx Buffer Element Size. */ - .txBufMode = 0, - .txBufElemSize = DL_MCAN_ELEM_SIZE_8BYTES, - /* Tx Event FIFO Start Address. */ - .txEventFIFOStartAddr = 640 , - /* Event FIFO Size. */ - .txEventFIFOSize = 10 , - /* Level for Tx Event FIFO watermark interrupt. */ - .txEventFIFOWaterMark = 0, - /* Rx FIFO0 Start Address. */ - .rxFIFO0startAddr = 172 , - /* Number of Rx FIFO elements. */ - .rxFIFO0size = 64 , - /* Rx FIFO0 Watermark. */ - .rxFIFO0waterMark = 0, - .rxFIFO0OpMode = 0, - /* Rx FIFO1 Start Address. */ - .rxFIFO1startAddr = 192 , - /* Number of Rx FIFO elements. */ - .rxFIFO1size = 64 , - /* Level for Rx FIFO 1 watermark interrupt. */ - .rxFIFO1waterMark = 10, - /* FIFO blocking mode. */ - .rxFIFO1OpMode = 0, - /* Rx Buffer Start Address. */ - .rxBufStartAddr = 208 , - /* Rx Buffer Element Size. */ - .rxBufElemSize = DL_MCAN_ELEM_SIZE_8BYTES, - /* Rx FIFO0 Element Size. */ - .rxFIFO0ElemSize = DL_MCAN_ELEM_SIZE_8BYTES, - /* Rx FIFO1 Element Size. */ - .rxFIFO1ElemSize = DL_MCAN_ELEM_SIZE_8BYTES, + /* Standard ID Filter List Start Address. */ + .flssa = 1, + /* List Size: Standard ID. */ + .lss = MCAN_FILTER_SIZE, + /* Extended ID Filter List Start Address. */ + .flesa = 48 , + /* List Size: Extended ID. */ + .lse = 2 , + /* Tx Buffers Start Address. */ + .txStartAddr = 10 , + /* Number of Dedicated Transmit Buffers. */ + .txBufNum = 10 , + .txFIFOSize = 10, + /* Tx Buffer Element Size. */ + .txBufMode = 0, + .txBufElemSize = DL_MCAN_ELEM_SIZE_8BYTES, + /* Tx Event FIFO Start Address. */ + .txEventFIFOStartAddr = 640 , + /* Event FIFO Size. */ + .txEventFIFOSize = 10 , + /* Level for Tx Event FIFO watermark interrupt. */ + .txEventFIFOWaterMark = 0, + /* Rx FIFO0 Start Address. */ + .rxFIFO0startAddr = 170 , + /* Number of Rx FIFO elements. */ + .rxFIFO0size = 10 , + /* Rx FIFO0 Watermark. */ + .rxFIFO0waterMark = 0, + .rxFIFO0OpMode = 0, + /* Rx FIFO1 Start Address. */ + .rxFIFO1startAddr = 190 , + /* Number of Rx FIFO elements. */ + .rxFIFO1size = 10 , + /* Level for Rx FIFO 1 watermark interrupt. */ + .rxFIFO1waterMark = 10, + /* FIFO blocking mode. */ + .rxFIFO1OpMode = 0, + /* Rx Buffer Start Address. */ + .rxBufStartAddr = 208 , + /* Rx Buffer Element Size. */ + .rxBufElemSize = DL_MCAN_ELEM_SIZE_8BYTES, + /* Rx FIFO0 Element Size. */ + .rxFIFO0ElemSize = DL_MCAN_ELEM_SIZE_8BYTES, + /* Rx FIFO1 Element Size. */ + .rxFIFO1ElemSize = DL_MCAN_ELEM_SIZE_8BYTES, }; + static DL_MCAN_BitTimingParams gMCAN0BitTimes_500 = { /* Arbitration Baud Rate Pre-scaler. */ .nomRatePrescalar = 0, @@ -164,17 +166,17 @@ static DL_MCAN_BitTimingParams gMCAN0BitTimes_250 = { static const DL_MCAN_StdMsgIDFilterElement gMCAN0StdFiltelem1 = { - .sfec = 0x1, - .sft = 0x01, - .sfid1 = 0x1AE, - .sfid2 = 0x520, + .sfec = 001, + .sft = 0x00, + .sfid1 = 0, + .sfid2 = 1280, }; static const DL_MCAN_StdMsgIDFilterElement gMCAN0StdFiltelem2 = { .sfec = 0x1, .sft = 0x00, - .sfid1 = 0xBB, - .sfid2 = 0xBB, + .sfid1 = 1536, + .sfid2 = 2046, }; static const DL_MCAN_StdMsgIDFilterElement gMCAN0StdFiltelem3 = { @@ -201,15 +203,16 @@ static const DL_MCAN_StdMsgIDFilterElement gMCAN0StdFiltelem5 = { static const DL_MCAN_ExtMsgIDFilterElement gMCAN0ExtFiltelem1 = { .efec = 0x1, .eft = 0x0, - .efid1 = 0x18904001, - .efid2 = 0x18904001, + .efid1 = 2047, + .efid2 = 33554431, }; + static const DL_MCAN_ExtMsgIDFilterElement gMCAN0ExtFiltelem2 = { .efec = 0x1, .eft = 0x0, - .efid1 = 0x1CECFF23, - .efid2 = 0x1CECFF23, + .efid1 = 2047, + .efid2 = 33554431, }; static const DL_MCAN_ExtMsgIDFilterElement gMCAN0ExtFiltelem3 = { @@ -385,9 +388,9 @@ IVEC_McalStatus_e xMCAL_MCANInit(MCAN_Regs* MCAN, xCAN_baud_t BAUD) DL_MCAN_msgRAMConfig(MCAN, (DL_MCAN_MsgRAMConfigParams*) &gMCAN0MsgRAMConfigParams); /* Configure Standard ID filter element */ -// DL_MCAN_addStdMsgIDFilter(MCAN, 0U, (DL_MCAN_StdMsgIDFilterElement *) &gMCAN0StdFiltelem1); + DL_MCAN_addStdMsgIDFilter(MCAN, 0U, (DL_MCAN_StdMsgIDFilterElement *) &gMCAN0StdFiltelem1); // -// DL_MCAN_addStdMsgIDFilter(MCAN, 1U, (DL_MCAN_StdMsgIDFilterElement *) &gMCAN0StdFiltelem2); + DL_MCAN_addStdMsgIDFilter(MCAN, 1U, (DL_MCAN_StdMsgIDFilterElement *) &gMCAN0StdFiltelem2); // // DL_MCAN_addStdMsgIDFilter(MCAN, 2U, (DL_MCAN_StdMsgIDFilterElement *) &gMCAN0StdFiltelem3); // @@ -395,9 +398,9 @@ IVEC_McalStatus_e xMCAL_MCANInit(MCAN_Regs* MCAN, xCAN_baud_t BAUD) // // DL_MCAN_addStdMsgIDFilter(MCAN, 4U, (DL_MCAN_StdMsgIDFilterElement *) &gMCAN0StdFiltelem5); // -// DL_MCAN_addExtMsgIDFilter(MCAN, 0U,(DL_MCAN_ExtMsgIDFilterElement *)&gMCAN0ExtFiltelem1); + //DL_MCAN_addExtMsgIDFilter(MCAN, 0U,(DL_MCAN_ExtMsgIDFilterElement *)&gMCAN0ExtFiltelem1); // -// DL_MCAN_addExtMsgIDFilter(MCAN, 1U,(DL_MCAN_ExtMsgIDFilterElement *)&gMCAN0ExtFiltelem2); + DL_MCAN_addExtMsgIDFilter(MCAN, 1U,(DL_MCAN_ExtMsgIDFilterElement *)&gMCAN0ExtFiltelem2); // // DL_MCAN_addExtMsgIDFilter(MCAN, 2U,(DL_MCAN_ExtMsgIDFilterElement *)&gMCAN0ExtFiltelem3); 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))