Baudrates 5k, 10k, 20k, 50k, 100k, 125k, 250k, 500k, & 1000k are now supported

Suxsem · Suxsem · commit 97f4d866ff6a · 2016-03-07T15:05:17.000+01:00
diff --git a/examples/SparkFun_CAN_Demo/SparkFun_CAN_Demo.ino b/examples/SparkFun_CAN_Demo/SparkFun_CAN_Demo.ino
@@ -38,7 +38,7 @@ void setup(){
 Serial.begin(9600);
 Serial.println("CAN-Bus Demo");
 
-if(Canbus.init(CANSPEED_500))  /* Initialise MCP2515 CAN controller at the specified speed */
+if(Canbus.init(CAN_500KBPS))  /* Initialise MCP2515 CAN controller at the specified speed */
   {
     Serial.println("CAN Init ok");
   } else
diff --git a/examples/SparkFun_ECU_Demo/SparkFun_ECU_Demo.ino b/examples/SparkFun_ECU_Demo/SparkFun_ECU_Demo.ino
@@ -122,7 +122,7 @@ void setup() {
   digitalWrite(LED3, LOW);
   
   //Initialize CAN Controller 
-  if(Canbus.init(CANSPEED_500))  /* Initialize MCP2515 CAN controller at the specified speed */
+  if(Canbus.init(CAN_500KBPS))  /* Initialize MCP2515 CAN controller at the specified speed */
   {
     clear_lcd();
     lcd.print("CAN Init ok");
diff --git a/src/Canbus.h b/src/Canbus.h
@@ -7,10 +7,7 @@
 #ifndef canbus__h
 #define canbus__h
 
-#define CANSPEED_125 	7		// CAN speed at 125 kbps
-#define CANSPEED_250  	3		// CAN speed at 250 kbps
-#define CANSPEED_500	1		// CAN speed at 500 kbps
-
+#include "speeds.h"
 
 #define ENGINE_COOLANT_TEMP 0x05
 #define ENGINE_RPM          0x0C
diff --git a/src/mcp2515.c b/src/mcp2515.c
@@ -120,6 +120,90 @@ uint8_t mcp2515_read_status(uint8_t type)
 uint8_t mcp2515_init(uint8_t speed)
 {
 		
+	uint8_t cfg1, cfg2, cfg3;
+    switch (speed) 
+    {
+        case (CAN_5KBPS):
+        cfg1 = MCP_16MHz_5kBPS_CFG1;
+        cfg2 = MCP_16MHz_5kBPS_CFG2;
+        cfg3 = MCP_16MHz_5kBPS_CFG3;
+        break;
+
+        case (CAN_10KBPS):
+        cfg1 = MCP_16MHz_10kBPS_CFG1;
+        cfg2 = MCP_16MHz_10kBPS_CFG2;
+        cfg3 = MCP_16MHz_10kBPS_CFG3;
+        break;
+
+        case (CAN_20KBPS):
+        cfg1 = MCP_16MHz_20kBPS_CFG1;
+        cfg2 = MCP_16MHz_20kBPS_CFG2;
+        cfg3 = MCP_16MHz_20kBPS_CFG3;
+        break;
+        
+        case (CAN_31K25BPS):
+        cfg1 = MCP_16MHz_31k25BPS_CFG1;
+        cfg2 = MCP_16MHz_31k25BPS_CFG2;
+        cfg3 = MCP_16MHz_31k25BPS_CFG3;
+        break;
+
+        case (CAN_40KBPS):
+        cfg1 = MCP_16MHz_40kBPS_CFG1;
+        cfg2 = MCP_16MHz_40kBPS_CFG2;
+        cfg3 = MCP_16MHz_40kBPS_CFG3;
+        break;
+
+        case (CAN_50KBPS):
+        cfg1 = MCP_16MHz_50kBPS_CFG1;
+        cfg2 = MCP_16MHz_50kBPS_CFG2;
+        cfg3 = MCP_16MHz_50kBPS_CFG3;
+        break;
+
+        case (CAN_80KBPS):
+        cfg1 = MCP_16MHz_80kBPS_CFG1;
+        cfg2 = MCP_16MHz_80kBPS_CFG2;
+        cfg3 = MCP_16MHz_80kBPS_CFG3;
+        break;
+
+        case (CAN_100KBPS):
+        cfg1 = MCP_16MHz_100kBPS_CFG1;
+        cfg2 = MCP_16MHz_100kBPS_CFG2;
+        cfg3 = MCP_16MHz_100kBPS_CFG3;
+        break;
+
+        case (CAN_125KBPS):
+        cfg1 = MCP_16MHz_125kBPS_CFG1;
+        cfg2 = MCP_16MHz_125kBPS_CFG2;
+        cfg3 = MCP_16MHz_125kBPS_CFG3;
+        break;
+
+        case (CAN_200KBPS):
+        cfg1 = MCP_16MHz_200kBPS_CFG1;
+        cfg2 = MCP_16MHz_200kBPS_CFG2;
+        cfg3 = MCP_16MHz_200kBPS_CFG3;
+        break;
+
+        case (CAN_250KBPS):
+        cfg1 = MCP_16MHz_250kBPS_CFG1;
+        cfg2 = MCP_16MHz_250kBPS_CFG2;
+        cfg3 = MCP_16MHz_250kBPS_CFG3;
+        break;
+
+        case (CAN_500KBPS):
+        cfg1 = MCP_16MHz_500kBPS_CFG1;
+        cfg2 = MCP_16MHz_500kBPS_CFG2;
+        cfg3 = MCP_16MHz_500kBPS_CFG3;
+        break;
+        
+        case (CAN_1000KBPS):
+        cfg1 = MCP_16MHz_1000kBPS_CFG1;
+        cfg2 = MCP_16MHz_1000kBPS_CFG2;
+        cfg3 = MCP_16MHz_1000kBPS_CFG3;
+        break;  
+
+        default:
+        break;
+    }
 	
 	SET(MCP2515_CS);
 	SET_OUTPUT(MCP2515_CS);
@@ -162,11 +246,17 @@ uint8_t mcp2515_init(uint8_t speed)
 	spi_putc((1<<BTLMODE)|(1<<PHSEG11));
 	spi_putc((1<<BRP1)|(1<<BRP0));
 */	
+/*
 	spi_putc((1<<PHSEG21));		// Bitrate 250 kbps at 16 MHz
 	spi_putc((1<<BTLMODE)|(1<<PHSEG11));
 	//spi_putc(1<<BRP0);
     spi_putc(speed);
+*/
 
+	spi_putc(cfg3);
+	spi_putc(cfg2);
+	spi_putc(cfg1);
+	
 	// activate interrupts
 	spi_putc((1<<RX1IE)|(1<<RX0IE));
 	SET(MCP2515_CS);
diff --git a/src/mcp2515.h b/src/mcp2515.h
@@ -32,6 +32,7 @@
 #include <inttypes.h>
 
 #include "mcp2515_defs.h"
+#include "speeds.h"
 #include "global.h"
 #ifdef __cplusplus
 
diff --git a/src/mcp2515_defs.h b/src/mcp2515_defs.h
@@ -276,5 +276,59 @@
 #define	DLC1		1
 #define DLC0		0
 
+ /** \brief speed 16M */
+ 
+#define MCP_16MHz_1000kBPS_CFG1 (0x00)
+#define MCP_16MHz_1000kBPS_CFG2 (0xD0)
+#define MCP_16MHz_1000kBPS_CFG3 (0x82)
+
+#define MCP_16MHz_500kBPS_CFG1 (0x00)
+#define MCP_16MHz_500kBPS_CFG2 (0xF0)
+#define MCP_16MHz_500kBPS_CFG3 (0x86)
+
+#define MCP_16MHz_250kBPS_CFG1 (0x41)
+#define MCP_16MHz_250kBPS_CFG2 (0xF1)
+#define MCP_16MHz_250kBPS_CFG3 (0x85)
+
+#define MCP_16MHz_200kBPS_CFG1 (0x01)
+#define MCP_16MHz_200kBPS_CFG2 (0xFA)
+#define MCP_16MHz_200kBPS_CFG3 (0x87)
+
+#define MCP_16MHz_125kBPS_CFG1 (0x03)
+#define MCP_16MHz_125kBPS_CFG2 (0xF0)
+#define MCP_16MHz_125kBPS_CFG3 (0x86)
+
+#define MCP_16MHz_100kBPS_CFG1 (0x03)
+#define MCP_16MHz_100kBPS_CFG2 (0xFA)
+#define MCP_16MHz_100kBPS_CFG3 (0x87)
+
+#define MCP_16MHz_80kBPS_CFG1 (0x03)
+#define MCP_16MHz_80kBPS_CFG2 (0xFF)
+#define MCP_16MHz_80kBPS_CFG3 (0x87)
+
+#define MCP_16MHz_50kBPS_CFG1 (0x07)
+#define MCP_16MHz_50kBPS_CFG2 (0xFA)
+#define MCP_16MHz_50kBPS_CFG3 (0x87)
+
+#define MCP_16MHz_40kBPS_CFG1 (0x07)
+#define MCP_16MHz_40kBPS_CFG2 (0xFF)
+#define MCP_16MHz_40kBPS_CFG3 (0x87)
+
+#define MCP_16MHz_31k25BPS_CFG1 (0x0F)
+#define MCP_16MHz_31k25BPS_CFG2 (0xF1)
+#define MCP_16MHz_31k25BPS_CFG3 (0x85)
+
+#define MCP_16MHz_20kBPS_CFG1 (0x0F)
+#define MCP_16MHz_20kBPS_CFG2 (0xFF)
+#define MCP_16MHz_20kBPS_CFG3 (0x87)
+
+#define MCP_16MHz_10kBPS_CFG1 (0x1F)
+#define MCP_16MHz_10kBPS_CFG2 (0xFF)
+#define MCP_16MHz_10kBPS_CFG3 (0x87)
+
+#define MCP_16MHz_5kBPS_CFG1 (0x3F)
+#define MCP_16MHz_5kBPS_CFG2 (0xFF)
+#define MCP_16MHz_5kBPS_CFG3 (0x87)
+
 /*@}*/
 #endif	// MCP2515_DEFS_H
diff --git a/src/speeds.h b/src/speeds.h
@@ -0,0 +1,20 @@
+#ifndef	SPEEDS_H
+#define	SPEEDS_H
+
+/** \brief can speed */
+
+#define CAN_5KBPS    1
+#define CAN_10KBPS   2
+#define CAN_20KBPS   3
+#define CAN_31K25BPS 4
+#define CAN_40KBPS   5
+#define CAN_50KBPS   6
+#define CAN_80KBPS   7
+#define CAN_100KBPS  8
+#define CAN_125KBPS  9
+#define CAN_200KBPS  10
+#define CAN_250KBPS  11
+#define CAN_500KBPS  12
+#define CAN_1000KBPS 13
+
+#endif	// SPEEDS

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ void setup(){`
`38`	`38`	`Serial.begin(9600);`
`39`	`39`	`Serial.println("CAN-Bus Demo");`
`40`	`40`
`41`		`-if(Canbus.init(CANSPEED_500)) /* Initialise MCP2515 CAN controller at the specified speed */`
	`41`	`+if(Canbus.init(CAN_500KBPS)) /* Initialise MCP2515 CAN controller at the specified speed */`
`42`	`42`	`{`
`43`	`43`	`Serial.println("CAN Init ok");`
`44`	`44`	`} else`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ void setup() {`
`122`	`122`	`digitalWrite(LED3, LOW);`
`123`	`123`
`124`	`124`	`//Initialize CAN Controller`
`125`		`- if(Canbus.init(CANSPEED_500)) /* Initialize MCP2515 CAN controller at the specified speed */`
	`125`	`+ if(Canbus.init(CAN_500KBPS)) /* Initialize MCP2515 CAN controller at the specified speed */`
`126`	`126`	`{`
`127`	`127`	`clear_lcd();`
`128`	`128`	`lcd.print("CAN Init ok");`