Merge pull request #4 from designer2k2/signed_int_bugfix

Signed int bugfix

Author: designer2k2

library.json

@@ -11,7 +11,7 @@
 		"type": "git",
 		"url": "https://github.com/designer2k2/EMUcan"
 	},
-	"version": "1.0.5",
+	"version": "1.0.6",
 	"license": "GPL-3.0-only",
 	"frameworks": "arduino",
 	"platforms": "*",

library.properties

@@ -1,10 +1,11 @@
 name=EMUcan
-version=1.0.5
+version=1.0.6
 author=Stephan M. <designer2k2@gmail.com>
 maintainer=Stephan M. <designer2k2@gmail.com>
 sentence=ECUMaster EMU CAN Stream Reader Arduino Library
 paragraph=Library to read and decode the ECUMaster default CAN Stream with a MCP2515. It can also send data to the EMU.
 category=Communication
 url=https://github.com/designer2k2/EMUcan
 architectures=*
-includes=EMUcan.h
+includes=EMUcan.h
+depends=autowp-mcp2515

src/EMUcan.cpp

@@ -92,9 +92,9 @@ bool EMUcan::decodeEmuFrame(struct can_frame *msg) {
     //0-1 RPM in 16Bit unsigned
     emu_data.RPM = (msg->data[1] << 8) + msg->data[0];
     //2 TPS in /2 %
-    emu_data.TPS = msg->data[2] / 2;
+    emu_data.TPS = msg->data[2] * 0.5;
     //3 IAT 8bit signed -40-127°C
-    emu_data.IAT = msg->data[3];
+    emu_data.IAT = int8_t(msg->data[3]);
     //4-5 MAP 16Bit 0-600kpa
     emu_data.MAP = (msg->data[5] << 8) + msg->data[4];
     //6-7 INJPW 0-50 0.016129ms
@@ -110,29 +110,29 @@ bool EMUcan::decodeEmuFrame(struct can_frame *msg) {
   }
   //Base +2:
   if (msg->can_id == _EMUbase + 2) {
-    //0-1 VSPD in 16Bit unsigned
+    //0-1 VSPD in 16Bit unsigned 1 kmh/h / bit
     emu_data.vssSpeed = (msg->data[1] << 8) + msg->data[0];
-    //2 BARO kPa
+    //2 BARO 50-130 kPa
     emu_data.Baro = msg->data[2];
     //3 OILT 0-160°C
     emu_data.oilTemperature = msg->data[3];
-    //4 OILP BAR 0.0625
+    //4 OILP BAR 0.0625 bar/bit
     emu_data.oilPressure = msg->data[4] * 0.0625;
-    //5 FUELP BAR 0.0625
+    //5 FUELP BAR 0.0625 bar/bit
     emu_data.fuelPressure = msg->data[5] * 0.0625;
-    //6-7 CLT 16bit Signed 0.016129ms
-    emu_data.CLT = ((msg->data[7] << 8) + msg->data[6]);
+    //6-7 CLT 16bit Signed -40-250 1 C/bit
+    emu_data.CLT = int16_t(((msg->data[7] << 8) + msg->data[6]));
   }
   //Base +3:
   if (msg->can_id == _EMUbase + 3) {
     //0 IGNANG in 8Bit signed    -60 60  0.5deg/bit
-    emu_data.IgnAngle = msg->data[0] / 2;
+    emu_data.IgnAngle = int8_t(msg->data[0]) * 0.5;
     //1 DWELL 0-10ms 0.05ms/bit
     emu_data.dwellTime = msg->data[1] * 0.05;
     //2 LAMBDA 8bit 0-2 0.0078125 L/bit
     emu_data.wboLambda = msg->data[2] * 0.0078125;
     //3 LAMBDACORR 75-125 0.5%
-    emu_data.LambdaCorrection = msg->data[3] / 2;
+    emu_data.LambdaCorrection = msg->data[3] * 0.5;
     //4-5 EGT1 16bit °C
     emu_data.Egt1 = ((msg->data[5] << 8) + msg->data[4]);
     //6-7 EGT2 16bit °C
@@ -169,14 +169,14 @@ bool EMUcan::decodeEmuFrame(struct can_frame *msg) {
     emu_data.boostTarget = ((msg->data[1] << 8) + msg->data[0]);
     //2 PWM#1 DC 1%/bit
     emu_data.pwm1 = msg->data[2];
-	if (msg->can_dlc == 8) {
-		//4 Lambda target 8bit 0.01%/bit 
-		emu_data.lambdaTarget = msg->buf[4] / 100.0;
-		//5 PWM#2 DC 1%/bit
-		emu_data.pwm2 = msg->buf[5];
-		//6-7 Fuel used 16bit 0.01L/bit 
-		emu_data.fuel_used = ((msg->buf[7] << 8) + msg->buf[6]) / 100.0; 
-	}
+    if (msg->can_dlc == 8) {
+      //4 Lambda target 8bit 0.01%/bit
+      emu_data.lambdaTarget = msg->data[4] * 0.01;
+      //5 PWM#2 DC 1%/bit
+      emu_data.pwm2 = msg->data[5];
+      //6-7 Fuel used 16bit 0.01L/bit
+      emu_data.fuel_used = ((msg->data[7] << 8) + msg->data[6]) * 0.01;
+    }
   }
   return true;
 }

src/EMUcan.h

@@ -26,7 +26,7 @@
 
 #include <mcp2515.h>
 
-#define EMUCAN_LIB_VERSION               (F("1.0.5"))
+#define EMUCAN_LIB_VERSION               (F("1.0.6"))
 
 // Available data
 struct emu_data_t {
@@ -100,7 +100,7 @@ class EMUcan {
     bool sendFrame(const struct can_frame *);
     bool CanCheckError();
     uint8_t CanErrorCounter(bool RXorTX);
-	
+
     // Data
     struct emu_data_t emu_data;
 
@@ -185,7 +185,7 @@ class EMUcan {
     enum EMUcan_STATUS EMUcan_Status = EMUcan_FRESH;
     MCP2515 *getMcp2515();
 
-    void ReturnAllFrames (ReturnAllFramesFunction response); 
+    void ReturnAllFrames (ReturnAllFramesFunction response);
     void ReturnAllFramesStop();
 
     // Privates
@@ -206,4 +206,4 @@ class EMUcan {
     unsigned long _previousMillis = 0;
 
 };
-#endif
+#endif