Fixed ME9.6 read on combi and ELM. New versions.

mattiasclaesson · May 30, 2015 · 166c366 · 166c366
1 parent 9e9b173
commit 166c366
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/SetupCANFlash/SetupCANFlash.vdproj b/SetupCANFlash/SetupCANFlash.vdproj
@@ -492,7 +492,7 @@
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:TrionicCANLib, Version=0.1.9.0, Culture=neutral, processorArchitecture=x86"
+            "AssemblyAsmDisplayName" = "8:TrionicCANLib, Version=0.1.10.0, Culture=neutral, processorArchitecture=x86"
                 "ScatterAssemblies"
                 {
                     "_BAFCC793B41C6A448DEA42B07F4E19EE"
@@ -575,15 +575,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:TrionicCANFlash"
-        "ProductCode" = "8:{25546350-3C24-410E-820E-530D432D7031}"
-        "PackageCode" = "8:{D1170CC9-6646-41F8-A05D-88CCD9BDE0F8}"
+        "ProductCode" = "8:{12542A42-9F54-4CB4-9217-BE6662500838}"
+        "PackageCode" = "8:{0B201820-655F-4052-92BB-2013731C1D23}"
         "UpgradeCode" = "8:{9B523E43-7324-4DF0-A1DE-8493B57D1915}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:0.1.11"
+        "ProductVersion" = "8:0.1.12"
         "Manufacturer" = "8:MattiasC"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"

diff --git a/SetupCANFlash/version.bat b/SetupCANFlash/version.bat
@@ -1,4 +1,4 @@
 @echo off
-set TrionicCANFlasher.version=0.1.11.0
-set TrionicCANLib.version=0.1.9.0
-set SetupCANFlash.version=0.1.11
+set TrionicCANFlasher.version=0.1.12.0
+set TrionicCANLib.version=0.1.10.0
+set SetupCANFlash.version=0.1.12
diff --git a/TrionicCANFlasher/Properties/AssemblyInfo.cs b/TrionicCANFlasher/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.1.11.0")]
-[assembly: AssemblyFileVersion("0.1.11.0")]
+[assembly: AssemblyVersion("0.1.12.0")]
+[assembly: AssemblyFileVersion("0.1.12.0")]
diff --git a/TrionicCANLib/Properties/AssemblyInfo.cs b/TrionicCANLib/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.1.9.0")]
-[assembly: AssemblyFileVersion("0.1.9.0")]
+[assembly: AssemblyVersion("0.1.10.0")]
+[assembly: AssemblyFileVersion("0.1.10.0")]
diff --git a/TrionicCANLib/Trionic8.cs b/TrionicCANLib/Trionic8.cs
@@ -3101,7 +3101,7 @@ public bool TestCIMAccess()
 
         private void SendDeviceControlMessageWithCode(byte command, string secretcode /*ulong code*/)
         {
-            CANMessage msg = new CANMessage(0x7E0, 0, 7);
+            CANMessage msg = new CANMessage(0x7E0, 0, 8);
             ulong cmd = 0x000000000000AE07;
             ulong lcommand = command;
             cmd |= (lcommand * 0x10000);
@@ -3130,7 +3130,7 @@ private void SendDeviceControlMessageWithCode(byte command, string secretcode /*
         private bool ReadDataByPacketIdentifier(byte command, uint responseID)
         {
             //SendCommandNoResponse(0x7E0, 0x000000006201AA03);
-            CANMessage msg = new CANMessage(0x7E0, 0, 3);
+            CANMessage msg = new CANMessage(0x7E0, 0, 4);
             ulong cmd = 0x000000000001AA03;
             ulong lcommand = command;
             cmd |= (lcommand * 0x1000000);
@@ -5006,7 +5006,7 @@ private byte[] sendReadCommandME96(int address, int length, out bool success)
             byte[] retData = new byte[length];
             if (!canUsbDevice.isOpen()) return retData;
 
-            CANMessage msg = new CANMessage(0x7E0, 0, 7);
+            CANMessage msg = new CANMessage(0x7E0, 0, 8);
             //optimize reading speed for ELM
             if (length <= 3)
                 msg.elmExpectedResponses = 1;
@@ -5023,7 +5023,7 @@ private byte[] sendReadCommandME96(int address, int length, out bool success)
             cmd |= (addressLow * 0x10000000000);
             cmd |= (addressMiddle * 0x100000000);
             cmd |= (addressHigh * 0x1000000);
-            cmd |= (len * 0x1000000000000);
+            cmd |= (len * 0x100000000000000);
             //Console.WriteLine("send: " + cmd.ToString("X16"));
             /*cmd |= (ulong)(byte)(address & 0x000000FF) << 4 * 8;
             cmd |= (ulong)(byte)((address & 0x0000FF00) >> 8) << 3 * 8;