From cca505fc2cbc9ddc8a8a4edb4a97b9af0d498eed Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Fri, 3 Jul 2015 16:52:36 +0200 Subject: [PATCH] Last minute changes --- TODO.txt | 5 +++++ .../BenchControl/Elde/RegulValve/RegulValve.cs | 11 +++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/TODO.txt b/TODO.txt index 016809313..3d7f913cd 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,3 +1,8 @@ +- ak sa skusa s pevnym startom treba merat priemerny prietok az po uplynuti + urcitej doby inak bude vzdy nizsi ako ma byt - rozbeh +- bude potrebne doregulovavat pocas merania, Jano poslal moznosti - inak nam + nebudu vychadzat E hlasenia +- zapiska Torun - vysledky z Logs do Results (podla rokov/mesiacov) - dokoncenie process obrazovky + rozsirenie pre 12 a 24 meracov diff --git a/TestBenchFramework/BenchControl/Elde/RegulValve/RegulValve.cs b/TestBenchFramework/BenchControl/Elde/RegulValve/RegulValve.cs index 2257ad2f8..8ed2b55e1 100644 --- a/TestBenchFramework/BenchControl/Elde/RegulValve/RegulValve.cs +++ b/TestBenchFramework/BenchControl/Elde/RegulValve/RegulValve.cs @@ -14,6 +14,10 @@ namespace TBF.BenchControl.Elde.RegulValve private static readonly ILog log = LogManager.GetLogger(typeof(RegulValve)); public override string ToString() { return string.Format("RegulValve({0})", Cfg.ToString(1)); } + + const int COAX_IDX = 7; /// COAX has always Idx1 = 7 + + public readonly RegulValveCfg RegulValveCfg; IDictionary dict; @@ -94,8 +98,11 @@ namespace TBF.BenchControl.Elde.RegulValve this.dict = new Dictionary(); - this.ControlBoard.RegValveCalib[Idx1 - 1, 0] = (uint)DacValueClosed; - this.ControlBoard.RegValveCalib[Idx1 - 1, 1] = (uint)DacValueOpen; + if (Idx1 != COAX_IDX) + { + this.ControlBoard.RegValveCalib[Idx1 - 1, 0] = (uint)DacValueClosed; + this.ControlBoard.RegValveCalib[Idx1 - 1, 1] = (uint)DacValueOpen; + } log.Debug(this.ToString()); }