aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Esden-Tempski2010-12-23 21:53:02 +0100
committerPiotr Esden-Tempski2010-12-23 21:53:02 +0100
commitc6e86901e80cd5846f4591953699733bddccfe82 (patch)
treed43c12296eabce08c501dbd1b30fc5f03bd94fd8
parent1471b6d297e9e06f067afdd6e624a341cc010bac (diff)
Fixed timing settings. Now CAN test code works!!!
-rw-r--r--examples/obldc/can/can.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/obldc/can/can.c b/examples/obldc/can/can.c
index 959408a..d81eeb9 100644
--- a/examples/obldc/can/can.c
+++ b/examples/obldc/can/can.c
@@ -144,9 +144,9 @@ void can_setup()
/* Set bit timings */
CAN_BTR(CAN1) = 0x00000000 |
CAN_BTR_SJW_1TQ |
- CAN_BTR_TS2_3TQ |
CAN_BTR_TS2_4TQ |
- (u32)(CAN_BTR_BRP_MASK & 12);
+ CAN_BTR_TS1_3TQ |
+ (u32)(CAN_BTR_BRP_MASK & (12 - 1));
/* Request initialization "leave" */
CAN_MCR(CAN1) &= ~CAN_MCR_INRQ;