Index: firmware/HD.dil =================================================================== diff -u -rc48ea51c06c9d002f1b9b6a1d7b72d69756f183d -r27eb0bf7706076503c31aa87d3f6fbc8cef39801 --- firmware/HD.dil (.../HD.dil) (revision c48ea51c06c9d002f1b9b6a1d7b72d69756f183d) +++ firmware/HD.dil (.../HD.dil) (revision 27eb0bf7706076503c31aa87d3f6fbc8cef39801) @@ -1,4 +1,4 @@ -# RM46L852PGE 07/02/21 10:37:28 +# RM46L852PGE 07/07/21 09:03:08 # ARCH=RM46L852PGE # @@ -117,7 +117,7 @@ DRIVER.SYSTEM.VAR.VIM_CHANNEL_76_INT_ENABLE.VALUE=0 DRIVER.SYSTEM.VAR.VIM_CHANNEL_68_INT_ENABLE.VALUE=0 DRIVER.SYSTEM.VAR.CAN3_ENABLE.VALUE=1 -DRIVER.SYSTEM.VAR.CLKT_AVCLK1_SOURCE.VALUE=VCLK +DRIVER.SYSTEM.VAR.CLKT_AVCLK1_SOURCE.VALUE=OSC DRIVER.SYSTEM.VAR.CORE_MPU_REGION_6_SUB_5_DISABLE.VALUE=0 DRIVER.SYSTEM.VAR.ETPWM4_ENABLE.VALUE=1 DRIVER.SYSTEM.VAR.DCC2_ENABLE.VALUE=1 @@ -543,7 +543,7 @@ DRIVER.SYSTEM.VAR.SAFETY_INIT_MIBSPI5_DP_PBISTCHECK_ENA.VALUE=0x00000100 DRIVER.SYSTEM.VAR.CLKT_PLL2_RESET_ON_SLIP.VALUE=0x00000000 DRIVER.SYSTEM.VAR.ECLK_FREQ.VALUE=13.000 -DRIVER.SYSTEM.VAR.CLKT_AVCLK1_FREQ.VALUE=104.000 +DRIVER.SYSTEM.VAR.CLKT_AVCLK1_FREQ.VALUE=16.000 DRIVER.SYSTEM.VAR.VIM_CHANNEL_100_MAPPING.VALUE=100 DRIVER.SYSTEM.VAR.VIM_CHANNEL_93_NAME.VALUE=etpwm2TripZoneInterrupt DRIVER.SYSTEM.VAR.VIM_CHANNEL_85_NAME.VALUE=phantomInterrupt @@ -3522,7 +3522,7 @@ DRIVER.CAN.VAR.CAN_2_MESSAGE_11_ENA.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_2_MESSAGE_6_ENA.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_2_MESSAGE_4_INT_ENA.VALUE=0x00000000 -DRIVER.CAN.VAR.CAN_1_PROP_SEG.VALUE=3 +DRIVER.CAN.VAR.CAN_1_PROP_SEG.VALUE=7 DRIVER.CAN.VAR.CAN_3_MESSAGE_1_ID.VALUE=1 DRIVER.CAN.VAR.CAN_2_MESSAGE_64_INT_LEVEL.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_2_MESSAGE_56_INT_LEVEL.VALUE=0x00000000 @@ -3787,7 +3787,7 @@ DRIVER.CAN.VAR.CAN_1_MESSAGE_45_MASK.VALUE=0x000007FF DRIVER.CAN.VAR.CAN_1_MESSAGE_37_MASK.VALUE=0x000007FF DRIVER.CAN.VAR.CAN_1_MESSAGE_29_MASK.VALUE=0x000007FF -DRIVER.CAN.VAR.CAN_1_TQ.VALUE=500.000 +DRIVER.CAN.VAR.CAN_1_TQ.VALUE=250.000 DRIVER.CAN.VAR.CAN_3_MESSAGE_63_RTR.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_3_MESSAGE_55_RTR.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_3_MESSAGE_47_RTR.VALUE=0x00000000 @@ -3956,7 +3956,7 @@ DRIVER.CAN.VAR.CAN_3_MESSAGE_11_DLC.VALUE=8 DRIVER.CAN.VAR.CAN_1_MESSAGE_3_DLC.VALUE=8 DRIVER.CAN.VAR.CAN_1_SAMPLE_POINT_REFERENCE.VALUE=75 -DRIVER.CAN.VAR.CAN_1_PROPAGATION_DELAY.VALUE=1050 +DRIVER.CAN.VAR.CAN_1_PROPAGATION_DELAY.VALUE=1600 DRIVER.CAN.VAR.CAN_1_MESSAGE_51_EOB.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_1_MESSAGE_51_DIR.VALUE=0x20000000 DRIVER.CAN.VAR.CAN_1_MESSAGE_50_INT_ENA_REF.VALUE=0x00000000 @@ -3982,7 +3982,7 @@ DRIVER.CAN.VAR.CAN_2_MESSAGE_5_RTR.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_2_MESSAGE_1_INT_LEVEL.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_1_MESSAGE_11_ID.VALUE=0x400 -DRIVER.CAN.VAR.CAN_1_NOMINAL_BIT_TIME.VALUE=8 +DRIVER.CAN.VAR.CAN_1_NOMINAL_BIT_TIME.VALUE=16 DRIVER.CAN.VAR.CAN_3_MESSAGE_61_INT_ENA_REF.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_3_MESSAGE_53_INT_ENA_REF.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_3_MESSAGE_45_INT_ENA_REF.VALUE=0x00000000 @@ -4148,8 +4148,8 @@ DRIVER.CAN.VAR.CAN_1_MESSAGE_45_DLC.VALUE=8 DRIVER.CAN.VAR.CAN_1_MESSAGE_37_DLC.VALUE=8 DRIVER.CAN.VAR.CAN_1_MESSAGE_29_DLC.VALUE=8 -DRIVER.CAN.VAR.CAN_1_BRPE_FREQ.VALUE=2.000 -DRIVER.CAN.VAR.CAN_1_BRP_FREQ.VALUE=2.000 +DRIVER.CAN.VAR.CAN_1_BRPE_FREQ.VALUE=4.000 +DRIVER.CAN.VAR.CAN_1_BRP_FREQ.VALUE=4.000 DRIVER.CAN.VAR.CAN_3_MESSAGE_20_EOB.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_3_MESSAGE_20_DIR.VALUE=0x20000000 DRIVER.CAN.VAR.CAN_3_MESSAGE_12_EOB.VALUE=0x00000000 @@ -4420,7 +4420,7 @@ DRIVER.CAN.VAR.CAN_2_MESSAGE_19_DLC.VALUE=8 DRIVER.CAN.VAR.CAN_3_MESSAGE_2_EOB.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_3_MESSAGE_2_DIR.VALUE=0x20000000 -DRIVER.CAN.VAR.CAN_1_BRP.VALUE=51 +DRIVER.CAN.VAR.CAN_1_BRP.VALUE=3 DRIVER.CAN.VAR.CAN_3_MESSAGE_7_BOOL_ENA.VALUE=0 DRIVER.CAN.VAR.CAN_3_PROP_SEG.VALUE=3 DRIVER.CAN.VAR.CAN_2_MESSAGE_21_INT_ENA.VALUE=0x00000000 @@ -4554,7 +4554,7 @@ DRIVER.CAN.VAR.CAN_3_MESSAGE_3_EOB.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_3_MESSAGE_3_DIR.VALUE=0x20000000 DRIVER.CAN.VAR.CAN_2_MESSAGE_58_INT_ENA_REF.VALUE=0x00000000 -DRIVER.CAN.VAR.CAN_2_BRP.VALUE=25 +DRIVER.CAN.VAR.CAN_2_BRP.VALUE=3 DRIVER.CAN.VAR.CAN_3_MESSAGE_57_MASK.VALUE=0x000007FF DRIVER.CAN.VAR.CAN_3_MESSAGE_49_MASK.VALUE=0x000007FF DRIVER.CAN.VAR.CAN_2_PORT_RX_PULDIS.VALUE=0 @@ -4691,7 +4691,7 @@ DRIVER.CAN.VAR.CAN_2_MESSAGE_29_DLC.VALUE=8 DRIVER.CAN.VAR.CAN_3_MESSAGE_4_EOB.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_3_MESSAGE_4_DIR.VALUE=0x20000000 -DRIVER.CAN.VAR.CAN_3_BRP.VALUE=25 +DRIVER.CAN.VAR.CAN_3_BRP.VALUE=3 DRIVER.CAN.VAR.CAN_1_MESSAGE_60_INT_ENA_REF.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_1_MESSAGE_52_INT_ENA_REF.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_1_MESSAGE_44_INT_ENA_REF.VALUE=0x00000000 @@ -4706,7 +4706,7 @@ DRIVER.CAN.VAR.CAN_2_MESSAGE_6_MASK.VALUE=0x000007FF DRIVER.CAN.VAR.CAN_1_MESSAGE_57_ENA.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_1_MESSAGE_49_ENA.VALUE=0x00000000 -DRIVER.CAN.VAR.CAN_1_PHASE_SEG.VALUE=2 +DRIVER.CAN.VAR.CAN_1_PHASE_SEG.VALUE=4 DRIVER.CAN.VAR.CAN_3_MESSAGE_30_ID.VALUE=30 DRIVER.CAN.VAR.CAN_3_MESSAGE_22_ID.VALUE=22 DRIVER.CAN.VAR.CAN_3_MESSAGE_14_ID.VALUE=14 @@ -4931,7 +4931,7 @@ DRIVER.CAN.VAR.CAN_1_MESSAGE_9_ID.VALUE=0x100 DRIVER.CAN.VAR.CAN_1_MESSAGE_5_RTR.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_1_MESSAGE_59_DLC.VALUE=8 -DRIVER.CAN.VAR.CAN_1_SJW.VALUE=2 +DRIVER.CAN.VAR.CAN_1_SJW.VALUE=4 DRIVER.CAN.VAR.CAN_3_MESSAGE_50_EOB.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_3_MESSAGE_50_DIR.VALUE=0x20000000 DRIVER.CAN.VAR.CAN_3_MESSAGE_42_EOB.VALUE=0x00000000 Index: firmware/include/can.h =================================================================== diff -u -rc48ea51c06c9d002f1b9b6a1d7b72d69756f183d -r27eb0bf7706076503c31aa87d3f6fbc8cef39801 --- firmware/include/can.h (.../can.h) (revision c48ea51c06c9d002f1b9b6a1d7b72d69756f183d) +++ firmware/include/can.h (.../can.h) (revision 27eb0bf7706076503c31aa87d3f6fbc8cef39801) @@ -635,9 +635,9 @@ | (uint32)((uint32)0x0000000AU << 10U) | 0x00020002U) #define CAN1_ES_CONFIGVALUE 0x00000007U #define CAN1_BTR_CONFIGVALUE ((uint32)((uint32)0U << 16U) \ - | (uint32)((uint32)(2U - 1U) << 12U) \ - | (uint32)((uint32)((3U + 2U) - 1U) << 8U) \ - | (uint32)((uint32)(2U - 1U) << 6U) | (uint32)51U) + | (uint32)((uint32)(4U - 1U) << 12U) \ + | (uint32)((uint32)((7U + 4U) - 1U) << 8U) \ + | (uint32)((uint32)(4U - 1U) << 6U) | (uint32)3U) #define CAN1_TEST_CONFIGVALUE 0x00000080U #define CAN1_ABOTR_CONFIGVALUE ((uint32)(1040000U)) #define CAN1_INTMUX0_CONFIGVALUE ((uint32)0x00000000U \ @@ -730,7 +730,7 @@ #define CAN2_BTR_CONFIGVALUE ((uint32)((uint32)0U << 16U) \ | (uint32)((uint32)(2U - 1U) << 12U) \ | (uint32)((uint32)((3U + 2U) - 1U) << 8U) \ - | (uint32)((uint32)(2U - 1U) << 6U) | (uint32)25U) + | (uint32)((uint32)(2U - 1U) << 6U) | (uint32)3U) #define CAN2_TEST_CONFIGVALUE 0x00000080U #define CAN2_ABOTR_CONFIGVALUE ((uint32)(0U)) #define CAN2_INTMUX0_CONFIGVALUE ((uint32)0x00000000U \ @@ -822,7 +822,7 @@ #define CAN3_BTR_CONFIGVALUE ((uint32)((uint32)0U << 16U) \ | (uint32)((uint32)(2U - 1U) << 12U) \ | (uint32)((uint32)((3U + 2U) - 1U) << 8U) \ - | (uint32)((uint32)(2U - 1U) << 6U) | (uint32)25U) + | (uint32)((uint32)(2U - 1U) << 6U) | (uint32)3U) #define CAN3_TEST_CONFIGVALUE 0x00000080U #define CAN3_ABOTR_CONFIGVALUE ((uint32)(0U)) #define CAN3_INTMUX0_CONFIGVALUE ((uint32)0x00000000U \ Index: firmware/include/system.h =================================================================== diff -u -r172b320a1007769c7452fe3f1cc7ac85b016f89a -r27eb0bf7706076503c31aa87d3f6fbc8cef39801 --- firmware/include/system.h (.../system.h) (revision 172b320a1007769c7452fe3f1cc7ac85b016f89a) +++ firmware/include/system.h (.../system.h) (revision 27eb0bf7706076503c31aa87d3f6fbc8cef39801) @@ -164,7 +164,7 @@ * * AVCLK Domain frequency exported from HALCoGen GUI */ -#define AVCLK1_FREQ 104.000F +#define AVCLK1_FREQ 16.000F /** @def AVCLK2_FREQ * @brief AVCLK2 Domain frequency exported from HALCoGen GUI @@ -319,7 +319,7 @@ | (uint32)((uint32)SYS_PLL1 << 0U) ) #define SYS_VCLKASRC_CONFIGVALUE ( (uint32)((uint32)SYS_VCLK << 8U)\ - | (uint32)((uint32)SYS_VCLK << 0U) ) + | (uint32)((uint32)SYS_OSC << 0U) ) #define SYS_RCLKSRC_CONFIGVALUE ( (uint32)((uint32)1U << 24U)\ | (uint32)((uint32)SYS_VCLK << 16U)\ Index: firmware/source/can.c =================================================================== diff -u -rc48ea51c06c9d002f1b9b6a1d7b72d69756f183d -r27eb0bf7706076503c31aa87d3f6fbc8cef39801 --- firmware/source/can.c (.../can.c) (revision c48ea51c06c9d002f1b9b6a1d7b72d69756f183d) +++ firmware/source/can.c (.../can.c) (revision 27eb0bf7706076503c31aa87d3f6fbc8cef39801) @@ -439,10 +439,10 @@ * - Setup baud rate prescaler */ canREG1->BTR = (uint32)((uint32)0U << 16U) | - (uint32)((uint32)(2U - 1U) << 12U) | - (uint32)((uint32)((3U + 2U) - 1U) << 8U) | - (uint32)((uint32)(2U - 1U) << 6U) | - (uint32)51U; + (uint32)((uint32)(4U - 1U) << 12U) | + (uint32)((uint32)((7U + 4U) - 1U) << 8U) | + (uint32)((uint32)(4U - 1U) << 6U) | + (uint32)3U; /** - CAN1 Port output values */ Index: firmware/source/system.c =================================================================== diff -u -r172b320a1007769c7452fe3f1cc7ac85b016f89a -r27eb0bf7706076503c31aa87d3f6fbc8cef39801 --- firmware/source/system.c (.../system.c) (revision 172b320a1007769c7452fe3f1cc7ac85b016f89a) +++ firmware/source/system.c (.../system.c) (revision 27eb0bf7706076503c31aa87d3f6fbc8cef39801) @@ -305,7 +305,7 @@ /** - Setup asynchronous peripheral clock sources for AVCLK1 and AVCLK2 */ systemREG1->VCLKASRC = (uint32)((uint32)SYS_VCLK << 8U) - | (uint32)((uint32)SYS_VCLK << 0U); + | (uint32)((uint32)SYS_OSC << 0U); /** - Setup synchronous peripheral clock dividers for VCLK1, VCLK2, VCLK3 */ systemREG1->CLKCNTL = (systemREG1->CLKCNTL & 0xF0FFFFFFU)