diff --git a/Core/Src/can.c b/Core/Src/can.c index 3ade804..a7f4fc4 100644 --- a/Core/Src/can.c +++ b/Core/Src/can.c @@ -38,11 +38,11 @@ void MX_CAN1_Init(void) /* USER CODE END CAN1_Init 1 */ hcan1.Instance = CAN1; - hcan1.Init.Prescaler = 21; + hcan1.Init.Prescaler = 2; hcan1.Init.Mode = CAN_MODE_NORMAL; - hcan1.Init.SyncJumpWidth = CAN_SJW_1TQ; - hcan1.Init.TimeSeg1 = CAN_BS1_6TQ; - hcan1.Init.TimeSeg2 = CAN_BS2_1TQ; + hcan1.Init.SyncJumpWidth = CAN_SJW_2TQ; + hcan1.Init.TimeSeg1 = CAN_BS1_16TQ; + hcan1.Init.TimeSeg2 = CAN_BS2_4TQ; hcan1.Init.TimeTriggeredMode = DISABLE; hcan1.Init.AutoBusOff = DISABLE; hcan1.Init.AutoWakeUp = DISABLE; diff --git a/FDR-Core.ioc b/FDR-Core.ioc index b2fced0..3e46d50 100644 --- a/FDR-Core.ioc +++ b/FDR-Core.ioc @@ -2,12 +2,14 @@ CAD.formats= CAD.pinconfig= CAD.provider= -CAN1.BS1=CAN_BS1_6TQ -CAN1.CalculateBaudRate=250000 -CAN1.CalculateTimeBit=4000 -CAN1.CalculateTimeQuantum=500.0 -CAN1.IPParameters=CalculateTimeQuantum,CalculateTimeBit,CalculateBaudRate,Prescaler,BS1 -CAN1.Prescaler=21 +CAN1.BS1=CAN_BS1_16TQ +CAN1.BS2=CAN_BS2_4TQ +CAN1.CalculateBaudRate=1000000 +CAN1.CalculateTimeBit=1000 +CAN1.CalculateTimeQuantum=47.61904761904762 +CAN1.IPParameters=CalculateTimeQuantum,CalculateTimeBit,CalculateBaudRate,Prescaler,BS1,BS2,SJW +CAN1.Prescaler=2 +CAN1.SJW=CAN_SJW_2TQ File.Version=6 GPIO.groupedBy= KeepUserPlacement=false