Merge pull request #5 from designer2k2/bring_all_values

Bring all values

README.md

@@ -115,12 +115,9 @@ struct emu_data_t {
   float Batt;  //V
   float IgnAngle;  //deg
   float pulseWidth;  //ms
-  float scondarypulseWidth;  //ms
   uint16_t Egt1;  //C
   uint16_t Egt2;  //C
-  float knockLevel;  //V
   float dwellTime;  //ms
-  float wboAFR;  //AFR
   int8_t gear;  //
   uint8_t Baro;  //kPa
   float analogIn1;  //V
@@ -129,21 +126,15 @@ struct emu_data_t {
   float analogIn4;  //V
   float analogIn5;  //V
   float analogIn6;  //V
-  float injDC;  //%
   int8_t emuTemp;  //C
   float oilPressure;  //Bar
   uint8_t oilTemperature;  //C
   float fuelPressure;  //Bar
   int16_t CLT;  //C
   float flexFuelEthanolContent;  //%
-  int8_t ffTemp;  //C
   float wboLambda;  //λ
   uint16_t vssSpeed;  //km/h
-  uint16_t deltaFPR;  //kPa
-  uint8_t fuelLevel;  //%
-  uint8_t tablesSet;  //
   float lambdaTarget;  //λ
-  float afrTarget;  //AFR
   uint16_t cel;  //
   float LambdaCorrection; //%
   uint8_t flags1; //Flags 1
@@ -155,6 +146,13 @@ struct emu_data_t {
   uint16_t boostTarget; //kPa
   uint8_t pwm2; //%
   float fuel_used; //L
+  uint8_t DSGmode; //DSG mode
+  float DBWpos; //%
+  float DBWtarget; //%
+  uint16_t TCdrpmRaw; //
+  uint16_t TCdrpm; //
+  uint8_t TCtorqueReduction; //%
+  uint8_t PitLimitTorqueReduction; //%
 };
 ```
 

library.json

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

library.properties

@@ -1,5 +1,5 @@
 name=EMUcan
-version=1.0.6
+version=1.0.7
 author=Stephan M. <[email protected]>
 maintainer=Stephan M. <[email protected]>
 sentence=ECUMaster EMU CAN Stream Reader Arduino Library

src/EMUcan.cpp

@@ -153,6 +153,21 @@ bool EMUcan::decodeEmuFrame(struct can_frame *msg) {
     //7 ETHANOL %
     emu_data.flexFuelEthanolContent = msg->data[7];
   }
+  //Base +5:
+  if (msg->can_id == _EMUbase + 5) {
+    //0 DBW Pos 0.5%
+    emu_data.DBWpos = msg->data[0] * 0.5;
+    //1 DBW Target 0.5%
+    emu_data.DBWtarget = msg->data[1] * 0.5;
+    //2-3 TC DRPM RAW 16bit  1/bit
+    emu_data.TCdrpmRaw = ((msg->data[3] << 8) + msg->data[2]);
+    //4-5 TC DRPM 16bit  1/bit
+    emu_data.TCdrpm = ((msg->data[5] << 8) + msg->data[4]);
+    //6 TC Torque reduction %
+    emu_data.TCtorqueReduction = msg->data[6];
+    //7 Pit Limit Torque reduction %
+    emu_data.PitLimitTorqueReduction = msg->data[7];
+  }
   //Base +6:
   if (msg->can_id == _EMUbase + 6) {
     //AIN in 16Bit unsigned  0.0048828125 V/bit
@@ -169,6 +184,8 @@ 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];
+    //3 DSG mode 2=P 3=R 4=N 5=D 6=S 7=M 15=fault
+    emu_data.DSGmode = msg->data[3];
     if (msg->can_dlc == 8) {
       //4 Lambda target 8bit 0.01%/bit
       emu_data.lambdaTarget = msg->data[4] * 0.01;

src/EMUcan.h

@@ -26,7 +26,7 @@
 
 #include <mcp2515.h>
 
-#define EMUCAN_LIB_VERSION               (F("1.0.6"))
+#define EMUCAN_LIB_VERSION               (F("1.0.7"))
 
 // Available data
 struct emu_data_t {
@@ -37,12 +37,9 @@ struct emu_data_t {
   float Batt;  //V
   float IgnAngle;  //deg
   float pulseWidth;  //ms
-  float scondarypulseWidth;  //ms
   uint16_t Egt1;  //C
   uint16_t Egt2;  //C
-  float knockLevel;  //V
   float dwellTime;  //ms
-  float wboAFR;  //AFR
   int8_t gear;  //
   uint8_t Baro;  //kPa
   float analogIn1;  //V
@@ -51,21 +48,15 @@ struct emu_data_t {
   float analogIn4;  //V
   float analogIn5;  //V
   float analogIn6;  //V
-  float injDC;  //%
   int8_t emuTemp;  //C
   float oilPressure;  //Bar
   uint8_t oilTemperature;  //C
   float fuelPressure;  //Bar
   int16_t CLT;  //C
   float flexFuelEthanolContent;  //%
-  int8_t ffTemp;  //C
   float wboLambda;  //λ
   uint16_t vssSpeed;  //km/h
-  uint16_t deltaFPR;  //kPa
-  uint8_t fuelLevel;  //%
-  uint8_t tablesSet;  //
   float lambdaTarget;  //λ
-  float afrTarget;  //AFR
   uint16_t cel;  //
   float LambdaCorrection; //%
   uint8_t flags1; //Flags 1
@@ -77,6 +68,13 @@ struct emu_data_t {
   uint16_t boostTarget; //kPa
   uint8_t pwm2; //%
   float fuel_used; //L
+  uint8_t DSGmode; //DSG mode
+  float DBWpos; //%
+  float DBWtarget; //%
+  uint16_t TCdrpmRaw; //
+  uint16_t TCdrpm; //
+  uint8_t TCtorqueReduction; //%
+  uint8_t PitLimitTorqueReduction; //%
 };
 
 enum EMUcan_STATUS {