Fix log button. New version.

mattiasclaesson · Feb 10, 2016 · 943e976 · 943e976
1 parent 7c98b63
commit 943e976
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 67 deletions.
diff --git a/SetupCANFlash/SetupCANFlash.vdproj b/SetupCANFlash/SetupCANFlash.vdproj
@@ -22,37 +22,37 @@
         "Entry"
         {
         "MsmKey" = "8:_1CD663634790325E7A026BEAFF7B9EB4"
-        "OwnerKey" = "8:_BAFCC793B41C6A448DEA42B07F4E19EE"
+        "OwnerKey" = "8:_F1AEE1D0AEFF11C787AEC46C06417DBF"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_23B5D70299C2332EB74C0DD6053D7BDB"
-        "OwnerKey" = "8:_3C87B40D8D4F4B188624286CF0A35439"
+        "MsmKey" = "8:_3C87B40D8D4F4B188624286CF0A35439"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_23B5D70299C2332EB74C0DD6053D7BDB"
-        "OwnerKey" = "8:_BAFCC793B41C6A448DEA42B07F4E19EE"
+        "MsmKey" = "8:_5879D9CF7D1DBAFFFF4A4322A269CC00"
+        "OwnerKey" = "8:_3C87B40D8D4F4B188624286CF0A35439"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_3C87B40D8D4F4B188624286CF0A35439"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_5879D9CF7D1DBAFFFF4A4322A269CC00"
+        "OwnerKey" = "8:_F1AEE1D0AEFF11C787AEC46C06417DBF"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_67C8A3B4B33DC993F775EB8B685F49F7"
-        "OwnerKey" = "8:_3C87B40D8D4F4B188624286CF0A35439"
+        "MsmKey" = "8:_788CD0B4D54DDFA1DD325A7E543A21B4"
+        "OwnerKey" = "8:_D42D3477D8D2384CECF37D5EA679190F"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_67C8A3B4B33DC993F775EB8B685F49F7"
-        "OwnerKey" = "8:_BAFCC793B41C6A448DEA42B07F4E19EE"
+        "MsmKey" = "8:_788CD0B4D54DDFA1DD325A7E543A21B4"
+        "OwnerKey" = "8:_3C87B40D8D4F4B188624286CF0A35439"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -64,13 +64,13 @@
         "Entry"
         {
         "MsmKey" = "8:_7B58566DB4AE4974A67199ACD5BC18ED"
-        "OwnerKey" = "8:_BAFCC793B41C6A448DEA42B07F4E19EE"
+        "OwnerKey" = "8:_F1AEE1D0AEFF11C787AEC46C06417DBF"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_A437E1A2EF91AB37C80E69415C904FF6"
-        "OwnerKey" = "8:_23B5D70299C2332EB74C0DD6053D7BDB"
+        "OwnerKey" = "8:_D42D3477D8D2384CECF37D5EA679190F"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -81,25 +81,25 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_A783ECB6E78272932FA103FA11F74616"
-        "OwnerKey" = "8:_23B5D70299C2332EB74C0DD6053D7BDB"
+        "MsmKey" = "8:_B69D594B59284F939B1F4A00C77E172B"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_A783ECB6E78272932FA103FA11F74616"
+        "MsmKey" = "8:_D42D3477D8D2384CECF37D5EA679190F"
         "OwnerKey" = "8:_3C87B40D8D4F4B188624286CF0A35439"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_B69D594B59284F939B1F4A00C77E172B"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_D42D3477D8D2384CECF37D5EA679190F"
+        "OwnerKey" = "8:_F1AEE1D0AEFF11C787AEC46C06417DBF"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_BAFCC793B41C6A448DEA42B07F4E19EE"
+        "MsmKey" = "8:_F1AEE1D0AEFF11C787AEC46C06417DBF"
         "OwnerKey" = "8:_3C87B40D8D4F4B188624286CF0A35439"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -112,31 +112,31 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_BAFCC793B41C6A448DEA42B07F4E19EE"
+        "OwnerKey" = "8:_F1AEE1D0AEFF11C787AEC46C06417DBF"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_23B5D70299C2332EB74C0DD6053D7BDB"
+        "OwnerKey" = "8:_D42D3477D8D2384CECF37D5EA679190F"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_A783ECB6E78272932FA103FA11F74616"
+        "OwnerKey" = "8:_788CD0B4D54DDFA1DD325A7E543A21B4"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_A437E1A2EF91AB37C80E69415C904FF6"
+        "OwnerKey" = "8:_5879D9CF7D1DBAFFFF4A4322A269CC00"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_67C8A3B4B33DC993F775EB8B685F49F7"
+        "OwnerKey" = "8:_A437E1A2EF91AB37C80E69415C904FF6"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -297,20 +297,20 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_23B5D70299C2332EB74C0DD6053D7BDB"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5879D9CF7D1DBAFFFF4A4322A269CC00"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:combilib-net, Version=1.0.5571.38176, Culture=neutral, processorArchitecture=x86"
+            "AssemblyAsmDisplayName" = "8:canusbdrv_net, Version=2.0.0.1, Culture=neutral, processorArchitecture=x86"
                 "ScatterAssemblies"
                 {
-                    "_23B5D70299C2332EB74C0DD6053D7BDB"
+                    "_5879D9CF7D1DBAFFFF4A4322A269CC00"
                     {
-                    "Name" = "8:combilib-net.dll"
+                    "Name" = "8:canusbdrv_net.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:combilib-net.dll"
+            "SourcePath" = "8:canusbdrv_net.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_8A7D23B3CF51495AA0821C00BEC94ACD"
@@ -328,20 +328,20 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_67C8A3B4B33DC993F775EB8B685F49F7"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_788CD0B4D54DDFA1DD325A7E543A21B4"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:canusbdrv_net, Version=2.0.0.1, Culture=neutral, processorArchitecture=x86"
+            "AssemblyAsmDisplayName" = "8:LibUsbDotNet, Version=2.2.8.104, Culture=neutral, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_67C8A3B4B33DC993F775EB8B685F49F7"
+                    "_788CD0B4D54DDFA1DD325A7E543A21B4"
                     {
-                    "Name" = "8:canusbdrv_net.dll"
+                    "Name" = "8:LibUsbDotNet.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:canusbdrv_net.dll"
+            "SourcePath" = "8:LibUsbDotNet.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_8A7D23B3CF51495AA0821C00BEC94ACD"
@@ -421,21 +421,10 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A783ECB6E78272932FA103FA11F74616"
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B69D594B59284F939B1F4A00C77E172B"
             {
-            "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:LibUsbDotNet, Version=2.2.8.104, Culture=neutral, processorArchitecture=MSIL"
-                "ScatterAssemblies"
-                {
-                    "_A783ECB6E78272932FA103FA11F74616"
-                    {
-                    "Name" = "8:LibUsbDotNet.dll"
-                    "Attributes" = "3:512"
-                    }
-                }
-            "SourcePath" = "8:LibUsbDotNet.dll"
-            "TargetName" = "8:"
+            "SourcePath" = "8:..\\TrionicCANFlasher\\TrionicCanFlasher.ico"
+            "TargetName" = "8:TrionicCanFlasher.ico"
             "Tag" = "8:"
             "Folder" = "8:_8A7D23B3CF51495AA0821C00BEC94ACD"
             "Condition" = "8:"
@@ -449,13 +438,24 @@
             "PackageAs" = "3:1"
             "Register" = "3:1"
             "Exclude" = "11:FALSE"
-            "IsDependency" = "11:TRUE"
+            "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B69D594B59284F939B1F4A00C77E172B"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D42D3477D8D2384CECF37D5EA679190F"
             {
-            "SourcePath" = "8:..\\TrionicCANFlasher\\TrionicCanFlasher.ico"
-            "TargetName" = "8:TrionicCanFlasher.ico"
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:combilib-net, Version=1.0.5571.38176, Culture=neutral, processorArchitecture=x86"
+                "ScatterAssemblies"
+                {
+                    "_D42D3477D8D2384CECF37D5EA679190F"
+                    {
+                    "Name" = "8:combilib-net.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:combilib-net.dll"
+            "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_8A7D23B3CF51495AA0821C00BEC94ACD"
             "Condition" = "8:"
@@ -469,17 +469,17 @@
             "PackageAs" = "3:1"
             "Register" = "3:1"
             "Exclude" = "11:FALSE"
-            "IsDependency" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BAFCC793B41C6A448DEA42B07F4E19EE"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F1AEE1D0AEFF11C787AEC46C06417DBF"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:TrionicCANLib, Version=0.1.22.0, Culture=neutral, processorArchitecture=x86"
+            "AssemblyAsmDisplayName" = "8:TrionicCANLib, Version=0.1.23.0, Culture=neutral, processorArchitecture=x86"
                 "ScatterAssemblies"
                 {
-                    "_BAFCC793B41C6A448DEA42B07F4E19EE"
+                    "_F1AEE1D0AEFF11C787AEC46C06417DBF"
                     {
                     "Name" = "8:TrionicCANLib.dll"
                     "Attributes" = "3:512"
@@ -559,15 +559,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:TrionicCANFlash"
-        "ProductCode" = "8:{9268B1C0-1B9E-4E01-AB88-9421E7031C1D}"
-        "PackageCode" = "8:{A188AA30-433E-4D02-98CD-4B3C16DD47A8}"
+        "ProductCode" = "8:{7F245217-A670-4FE7-A2D5-4A5249FD6167}"
+        "PackageCode" = "8:{36B35CFD-81FA-4FF8-9E20-A0BF84882F81}"
         "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.32"
+        "ProductVersion" = "8:0.1.33"
         "Manufacturer" = "8:MattiasC"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://www.txsuite.org"
@@ -1109,7 +1109,7 @@
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_3C87B40D8D4F4B188624286CF0A35439"
             {
-            "SourcePath" = "8:..\\TrionicCANFlasher\\obj\\x86\\Debug\\TrionicCANFlasher.exe"
+            "SourcePath" = "8:..\\TrionicCANFlasher\\obj\\x86\\Release\\TrionicCANFlasher.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_8A7D23B3CF51495AA0821C00BEC94ACD"

diff --git a/SetupCANFlash/version.bat b/SetupCANFlash/version.bat
@@ -1,4 +1,4 @@
 @echo off
-set TrionicCANFlasher.version=0.1.32.0
-set TrionicCANLib.version=0.1.22.0
-set SetupCANFlash.version=0.1.32
+set TrionicCANFlasher.version=0.1.33.0
+set TrionicCANLib.version=0.1.23.0
+set SetupCANFlash.version=0.1.33
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.32.0")]
-[assembly: AssemblyFileVersion("0.1.32.0")]
+[assembly: AssemblyVersion("0.1.33.0")]
+[assembly: AssemblyFileVersion("0.1.33.0")]
diff --git a/TrionicCANFlasher/frmMain.cs b/TrionicCANFlasher/frmMain.cs
@@ -283,6 +283,7 @@ private void EnableUserInput(bool enable)
             btnEditParameters.Enabled = enable;
             btnReadECUcalibration.Enabled = enable;
             btnRestoreT8.Enabled = enable;
+            btnLogData.Enabled = enable;
 
             if (cbxAdapterType.SelectedIndex == (int)CANBusAdapter.ELM327 ||
                 cbxAdapterType.SelectedIndex == (int)CANBusAdapter.KVASER ||

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.22.0")]
-[assembly: AssemblyFileVersion("0.1.22.0")]
+[assembly: AssemblyVersion("0.1.23.0")]
+[assembly: AssemblyFileVersion("0.1.23.0")]