diff --git a/Common/packages.config b/Common/packages.config index 763478d98..0a62bdde1 100644 --- a/Common/packages.config +++ b/Common/packages.config @@ -1,9 +1,9 @@  + - diff --git a/Config/packages.config b/Config/packages.config index 763478d98..0a62bdde1 100644 --- a/Config/packages.config +++ b/Config/packages.config @@ -1,9 +1,9 @@  + - diff --git a/DataStreamInterface/packages.config b/DataStreamInterface/packages.config index 763478d98..0a62bdde1 100644 --- a/DataStreamInterface/packages.config +++ b/DataStreamInterface/packages.config @@ -1,9 +1,9 @@  + - diff --git a/DataStreamInterfaceTest/packages.config b/DataStreamInterfaceTest/packages.config index 763478d98..0a62bdde1 100644 --- a/DataStreamInterfaceTest/packages.config +++ b/DataStreamInterfaceTest/packages.config @@ -1,9 +1,9 @@  + - diff --git a/DataStreamMeter/packages.config b/DataStreamMeter/packages.config index 763478d98..0a62bdde1 100644 --- a/DataStreamMeter/packages.config +++ b/DataStreamMeter/packages.config @@ -1,9 +1,9 @@  + - diff --git a/Decrypt/packages.config b/Decrypt/packages.config index 763478d98..0a62bdde1 100644 --- a/Decrypt/packages.config +++ b/Decrypt/packages.config @@ -1,9 +1,9 @@  + - diff --git a/DeviceTest/packages.config b/DeviceTest/packages.config index 763478d98..0a62bdde1 100644 --- a/DeviceTest/packages.config +++ b/DeviceTest/packages.config @@ -1,9 +1,9 @@  + - diff --git a/Dirichlet.Numerics/packages.config b/Dirichlet.Numerics/packages.config index 763478d98..0a62bdde1 100644 --- a/Dirichlet.Numerics/packages.config +++ b/Dirichlet.Numerics/packages.config @@ -1,9 +1,9 @@  + - diff --git a/Encrypt/packages.config b/Encrypt/packages.config index 763478d98..0a62bdde1 100644 --- a/Encrypt/packages.config +++ b/Encrypt/packages.config @@ -1,9 +1,9 @@  + - diff --git a/EventViewer/packages.config b/EventViewer/packages.config index 763478d98..0a62bdde1 100644 --- a/EventViewer/packages.config +++ b/EventViewer/packages.config @@ -1,9 +1,9 @@  + - diff --git a/Events/packages.config b/Events/packages.config index 763478d98..0a62bdde1 100644 --- a/Events/packages.config +++ b/Events/packages.config @@ -1,9 +1,9 @@  + - diff --git a/FeatureVectorCalculator/packages.config b/FeatureVectorCalculator/packages.config index 763478d98..0a62bdde1 100644 --- a/FeatureVectorCalculator/packages.config +++ b/FeatureVectorCalculator/packages.config @@ -1,9 +1,9 @@  + - diff --git a/GemCard/packages.config b/GemCard/packages.config index 763478d98..0a62bdde1 100644 --- a/GemCard/packages.config +++ b/GemCard/packages.config @@ -1,9 +1,9 @@  + - diff --git a/GenCode128/packages.config b/GenCode128/packages.config index 763478d98..0a62bdde1 100644 --- a/GenCode128/packages.config +++ b/GenCode128/packages.config @@ -1,9 +1,9 @@  + - diff --git a/GraphLib/packages.config b/GraphLib/packages.config index 763478d98..0a62bdde1 100644 --- a/GraphLib/packages.config +++ b/GraphLib/packages.config @@ -1,9 +1,9 @@  + - diff --git a/MergeResultsDBs/packages.config b/MergeResultsDBs/packages.config index 763478d98..0a62bdde1 100644 --- a/MergeResultsDBs/packages.config +++ b/MergeResultsDBs/packages.config @@ -1,9 +1,9 @@  + - diff --git a/ResetBatchNr/packages.config b/ResetBatchNr/packages.config index 763478d98..0a62bdde1 100644 --- a/ResetBatchNr/packages.config +++ b/ResetBatchNr/packages.config @@ -1,9 +1,9 @@  + - diff --git a/RestClient/packages.config b/RestClient/packages.config index 58c59a0b4..a20edfbf6 100644 --- a/RestClient/packages.config +++ b/RestClient/packages.config @@ -1,9 +1,9 @@  + - diff --git a/Results/packages.config b/Results/packages.config index 763478d98..0a62bdde1 100644 --- a/Results/packages.config +++ b/Results/packages.config @@ -1,9 +1,9 @@  + - diff --git a/ResultsBrowser/packages.config b/ResultsBrowser/packages.config index 763478d98..0a62bdde1 100644 --- a/ResultsBrowser/packages.config +++ b/ResultsBrowser/packages.config @@ -1,9 +1,9 @@  + - diff --git a/ResultsParser/packages.config b/ResultsParser/packages.config index 763478d98..0a62bdde1 100644 --- a/ResultsParser/packages.config +++ b/ResultsParser/packages.config @@ -1,9 +1,9 @@  + - diff --git a/Statistics/packages.config b/Statistics/packages.config index 763478d98..0a62bdde1 100644 --- a/Statistics/packages.config +++ b/Statistics/packages.config @@ -1,9 +1,9 @@  + - diff --git a/TBF.sln b/TBF.sln index 57f17157d..22ea523fd 100644 --- a/TBF.sln +++ b/TBF.sln @@ -94,8 +94,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FeatureVectorCalculator", " EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResultsParser", "ResultsParser\ResultsParser.csproj", "{2E08C19B-C0A9-4056-8564-E5B74477959D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sensus.iPerl.RfidCom", "..\iPerlHead\Sensus.iPerl.RfidCom\Sensus.iPerl.RfidCom.csproj", "{A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NfcS5_DLL", "..\NfcS5_DLL\NfcS5_DLL.csproj", "{34F6AA20-3BEC-44B4-9D18-DC66BAB79A83}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sensus.iPerl.RfidCom", "..\iPerlHead\Sensus.iPerl.RfidCom\Sensus.iPerl.RfidCom.csproj", "{A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}" @@ -394,18 +392,6 @@ Global {2E08C19B-C0A9-4056-8564-E5B74477959D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {2E08C19B-C0A9-4056-8564-E5B74477959D}.Release|Mixed Platforms.Build.0 = Release|Any CPU {2E08C19B-C0A9-4056-8564-E5B74477959D}.Release|x86.ActiveCfg = Release|Any CPU - {A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Debug|x86.ActiveCfg = Debug|Any CPU - {A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Debug|x86.Build.0 = Debug|Any CPU - {A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Release|Any CPU.Build.0 = Release|Any CPU - {A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Release|x86.ActiveCfg = Release|Any CPU - {A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Release|x86.Build.0 = Release|Any CPU {34F6AA20-3BEC-44B4-9D18-DC66BAB79A83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {34F6AA20-3BEC-44B4-9D18-DC66BAB79A83}.Debug|Any CPU.Build.0 = Debug|Any CPU {34F6AA20-3BEC-44B4-9D18-DC66BAB79A83}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -418,6 +404,18 @@ Global {34F6AA20-3BEC-44B4-9D18-DC66BAB79A83}.Release|Mixed Platforms.Build.0 = Release|Any CPU {34F6AA20-3BEC-44B4-9D18-DC66BAB79A83}.Release|x86.ActiveCfg = Release|Any CPU {34F6AA20-3BEC-44B4-9D18-DC66BAB79A83}.Release|x86.Build.0 = Release|Any CPU + {A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Debug|x86.ActiveCfg = Debug|Any CPU + {A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Debug|x86.Build.0 = Debug|Any CPU + {A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Release|Any CPU.Build.0 = Release|Any CPU + {A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Release|x86.ActiveCfg = Release|Any CPU + {A3E14180-7F00-42E5-94A9-8DB62EAD6EE8}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/TBF/Rig/Modbus/TempControl/Novus/TControl.cs b/TBF/Rig/Modbus/TempControl/Novus/TControl.cs index af3d577be..20b00513d 100644 --- a/TBF/Rig/Modbus/TempControl/Novus/TControl.cs +++ b/TBF/Rig/Modbus/TempControl/Novus/TControl.cs @@ -3,6 +3,7 @@ /// using System; using System.Collections.Generic; +using System.Diagnostics; using System.Drawing; using log4net; using Common; @@ -216,6 +217,9 @@ namespace TBF.Rig.Modbus.TempControl.Novus StateMachine.ControlBoard.SetReservoirTemp(2 * (novusCfg.ReservoirNr - 1), temperatureStr, Convert.ToSingle(actualTemperature)); StateMachine.ControlBoard.SetReservoirTemp(2 * (novusCfg.ReservoirNr - 1) + 1, setpointStr, Convert.ToSingle(temperatureSetpoint)); + string trace = string.Format("[{0}] setpoint = {1} temperature = {2}", Name, + temperatureSetpoint, actualTemperature); + Trace.WriteLine(trace); log.InfoFormat("[{0}] setpoint = {1} temperature = {2}", Name, temperatureSetpoint, actualTemperature); log.InfoFormat("[{0}] s1=0x{1} s2=0x{2} fw={3} id={4}", Name, status1.ToString("X4"), status2.ToString("X4"), fwVersion, diff --git a/TBF/packages.config b/TBF/packages.config index 82e6fbaad..2d520f0c8 100644 --- a/TBF/packages.config +++ b/TBF/packages.config @@ -1,9 +1,9 @@  + - diff --git a/ToFirstMonitor/packages.config b/ToFirstMonitor/packages.config index 763478d98..0a62bdde1 100644 --- a/ToFirstMonitor/packages.config +++ b/ToFirstMonitor/packages.config @@ -1,9 +1,9 @@  + - diff --git a/ToSecondMonitor/packages.config b/ToSecondMonitor/packages.config index 763478d98..0a62bdde1 100644 --- a/ToSecondMonitor/packages.config +++ b/ToSecondMonitor/packages.config @@ -1,9 +1,9 @@  + - diff --git a/TracingDB/packages.config b/TracingDB/packages.config index 763478d98..0a62bdde1 100644 --- a/TracingDB/packages.config +++ b/TracingDB/packages.config @@ -1,9 +1,9 @@  + - diff --git a/UserManagement/packages.config b/UserManagement/packages.config index 763478d98..0a62bdde1 100644 --- a/UserManagement/packages.config +++ b/UserManagement/packages.config @@ -1,9 +1,9 @@  + - diff --git a/Users/packages.config b/Users/packages.config index 763478d98..0a62bdde1 100644 --- a/Users/packages.config +++ b/Users/packages.config @@ -1,9 +1,9 @@  + -