Updated project to latest Arduino sketch specification

README.md

@@ -1,6 +1,6 @@
 # Slcanuino
 
-This is an Arduino sketch which makes a CAN-BUS shield into a CAN-USB adapter for Linux SocketCAN(can-utils). Library files under Canbus folder originaly comes from 'CAN-BUS ECU Reader demo sketch v4' on skpang and were modified. The files should be copied under ~/Arduino/libraries/ to compile the sketch file:'slcan.ino'.
+This is an Arduino sketch which makes a CAN-BUS shield into a CAN-USB adapter for Linux SocketCAN(can-utils). Library files under Canbus folder originaly comes from 'CAN-BUS ECU Reader demo sketch v4' on skpang and were modified.
 
 http://skpang.co.uk/catalog/arduino-canbus-shield-with-usd-card-holder-p-706.html
 
@@ -30,7 +30,7 @@ or just install can-utils package.
     $ sudo apt install can-utils
 
 ## Setup
-Please replace ttyUSB with ttyACM in case of using Arduino Uno.
+Please replace ttyUSB0 with ttyACM0 in case of using Arduino Uno.
 
     $ sudo slcan_attach -f -s6 -o /dev/ttyUSB0  
     $ sudo slcand -S 1000000 ttyUSB0 can0  

slcan.ino → slcanuino.ino

@@ -1,8 +1,8 @@
-#include <mcp2515_defs.h>
-#include <mcp2515.h>
-#include <defaults.h>
-#include <global.h>
-#include <Canbus.h>
+#include "src/canbus/mcp2515_defs.h"
+#include "src/canbus/mcp2515.h"
+#include "src/canbus/defaults.h"
+#include "src/canbus/global.h"
+#include "src/canbus/Canbus.h"
 
 #define LED_OPEN 7
 #define LED_ERR 8

Canbus/Canbus.cpp → src/canbus/Canbus.cpp

@@ -150,58 +150,53 @@ char CanbusClass::ecu_req(unsigned char pid,  char *buffer)
 	while(timeout < 4000)
 	{
 		timeout++;
-				if (mcp2515_check_message()) 
+		if (mcp2515_check_message()) 
+		{
+			if (mcp2515_get_message(&message)) 
+			{
+				if((message.id == PID_REPLY) && (message.data[2] == pid))	// Check message is the reply and its the right PID
 				{
-
-					if (mcp2515_get_message(&message)) 
-					{
-							if((message.id == PID_REPLY) && (message.data[2] == pid))	// Check message is the reply and its the right PID
-							{
-								switch(message.data[2])
-								{   /* Details from http://en.wikipedia.org/wiki/OBD-II_PIDs */
-									case ENGINE_RPM:  			//   ((A*256)+B)/4    [RPM]
-									engine_data =  ((message.data[3]*256) + message.data[4])/4;
-									sprintf(buffer,"%d rpm ",(int) engine_data);
-									break;
-
-									case ENGINE_COOLANT_TEMP: 	// 	A-40			  [degree C]
-									engine_data =  message.data[3] - 40;
-									sprintf(buffer,"%d degC",(int) engine_data);
-
-									break;
-
-									case VEHICLE_SPEED: 		// A				  [km]
-									engine_data =  message.data[3];
-									sprintf(buffer,"%d km ",(int) engine_data);
-
-									break;
-
-									case MAF_SENSOR:   			// ((256*A)+B) / 100  [g/s]
-									engine_data =  ((message.data[3]*256) + message.data[4])/100;
-									sprintf(buffer,"%d g/s",(int) engine_data);
-
-									break;
-
-									case O2_VOLTAGE:    		// A * 0.005   (B-128) * 100/128 (if B==0xFF, sensor is not used in trim calc)
-									engine_data = message.data[3]*0.005;
-									sprintf(buffer,"%d v",(int) engine_data);
-
-									case THROTTLE:				// Throttle Position
-									engine_data = (message.data[3]*100)/255;
-									sprintf(buffer,"%d %% ",(int) engine_data);
-									break;
-
-								}
-								message_ok = 1;
-							}
-
+					switch(message.data[2])
+					{   
+						/* Details from http://en.wikipedia.org/wiki/OBD-II_PIDs */
+						case ENGINE_RPM:  			//   ((A*256)+B)/4    [RPM]
+						engine_data =  ((message.data[3]*256) + message.data[4])/4;
+						sprintf(buffer,"%d rpm ",(int) engine_data);
+						break;
+
+						case ENGINE_COOLANT_TEMP: 	// 	A-40			  [degree C]
+						engine_data =  message.data[3] - 40;
+						sprintf(buffer,"%d degC",(int) engine_data);
+						break;
+
+						case VEHICLE_SPEED: 		// A				  [km]
+						engine_data =  message.data[3];
+						sprintf(buffer,"%d km ",(int) engine_data);
+						break;
+
+						case MAF_SENSOR:   			// ((256*A)+B) / 100  [g/s]
+						engine_data =  ((message.data[3]*256) + message.data[4])/100;
+						sprintf(buffer,"%d g/s",(int) engine_data);
+						break;
+
+						case O2_VOLTAGE:    		// A * 0.005   (B-128) * 100/128 (if B==0xFF, sensor is not used in trim calc)
+						engine_data = message.data[3]*0.005;
+						sprintf(buffer,"%d v",(int) engine_data);
+						break;
+
+						case THROTTLE:				// Throttle Position
+						engine_data = (message.data[3]*100)/255;
+						sprintf(buffer,"%d %% ",(int) engine_data);
+						break;
+
 					}
+					message_ok = 1;
 				}
-				if(message_ok == 1) return 1;
+			}
+		}
 	}
 
-
- 	return 0;
+ 	return message_ok;
 }