From 0fdcbffcae16196e39abb58d76349747a1e21370 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Tue, 26 Jan 2016 13:39:51 +0100 Subject: [PATCH] Minor changes: (1) introductory logging, (2) simulation for Badger velka trat. --- TestBenchFramework/BenchControl/TestBenchSim.cs | 16 +++++++++++++++- TestBenchFramework/Program.cs | 5 +++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/TestBenchFramework/BenchControl/TestBenchSim.cs b/TestBenchFramework/BenchControl/TestBenchSim.cs index 2a9e4d8ab..808388610 100644 --- a/TestBenchFramework/BenchControl/TestBenchSim.cs +++ b/TestBenchFramework/BenchControl/TestBenchSim.cs @@ -603,7 +603,7 @@ namespace TBF.BenchControl if (toTank) { throw (new Exception()); } break; } -#elif BADGER_MALA_TRAT || BADGER_VELKA_TRAT || TORINO50 +#elif BADGER_MALA_TRAT || TORINO50 switch (regulValveNo) { case 1: @@ -618,6 +618,20 @@ namespace TBF.BenchControl if (toTank) { throw (new Exception()); } break; } +#elif BADGER_VELKA_TRAT + switch (regulValveNo) + { + case 7: + case 2: + Div1sim = toTank; + break; + case 3: + Div2sim = toTank; + break; + default: + if (toTank) { throw (new Exception()); } + break; + } #elif CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 switch (regulValveNo) { diff --git a/TestBenchFramework/Program.cs b/TestBenchFramework/Program.cs index 9856c2ac0..9de75d50c 100644 --- a/TestBenchFramework/Program.cs +++ b/TestBenchFramework/Program.cs @@ -18,7 +18,7 @@ namespace TBF public const string HomeDir = "C:\\Tbf\\"; /// Contains subdirectories Results, Logs, Images, ... /// log4net - static readonly ILog log = LogManager.GetLogger(typeof(Program)); + static ILog log; const string log4netConfigFName = "log4netConfig.xml"; /// Program version string @@ -99,8 +99,9 @@ namespace TBF /// Configue and start logging log4net.Config.XmlConfigurator.Configure(new System.IO.FileInfo(locAppDataDir + log4netConfigFName)); + log = LogManager.GetLogger(typeof(Program)); log.Fatal("--------------------------------------------------------------------------------"); - log.Fatal(string.Format("Starting TBF ver.{0}", Version)); + log.Fatal(string.Format("TBF ver.{0}", Version)); /// /// Load the local settings