From 58a3340f5303cafc949ff295bd2de8702744136d Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Fri, 9 Dec 2016 16:37:25 +0100 Subject: [PATCH] Endurance : cBrd.CyclePar usage change, ver. 2.12.407 --- .../BenchControl/Elde/ControlBoardDev.cs | 3 +-- .../BenchControl/Elde/ControlComSim.cs | 3 +-- .../BenchControl/Elde/ControlComWrap.cs | 6 ++---- .../BenchControl/Elde/IControlCom.cs | 3 +-- .../TestMethods/Endurance/EnduranceSeq.cs | 16 ++++++++++------ TestBenchFramework/Properties/AssemblyInfo.cs | 4 ++-- 6 files changed, 17 insertions(+), 18 deletions(-) diff --git a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs index bfe1de905..96a362931 100644 --- a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs +++ b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs @@ -62,8 +62,7 @@ namespace TBF.BenchControl.Elde public uint AnalogInputRaw(int adcNr0, int bank) { return controlCom.AnalogInputRaw(adcNr0, bank); } /// adcNr0: 0=RV1, 1=RV2,... bank: 0=RV, 1=Temp public float ReferenceVolume { get { return controlCom.TotalRefVolume; } } public float VyslExt(int wmNr0, int what) { return controlCom.VyslExt(wmNr0, what); } - public uint GetCyclePar(int ix) { return controlCom.GetCyclePar(ix); } - public void SetCyclePar(int ix, uint val) { controlCom.SetCyclePar(ix, val); return; } + public uint[] CyclePar { get { return controlCom.CyclePar; } set { controlCom.CyclePar = value; } } /// Extracted from the StatusP in RunDeviceBefore public bool EmergencyStop { get { return emergencyStop; } } diff --git a/TestBenchFramework/BenchControl/Elde/ControlComSim.cs b/TestBenchFramework/BenchControl/Elde/ControlComSim.cs index 4e69fb3f4..4f654061f 100644 --- a/TestBenchFramework/BenchControl/Elde/ControlComSim.cs +++ b/TestBenchFramework/BenchControl/Elde/ControlComSim.cs @@ -69,8 +69,7 @@ namespace TBF.BenchControl.Elde public float VyslExt(int wmNr0, int what) { return 0; } public void SetWeight(int pos, double mass) { return; } /// not available in sim. mode - public uint GetCyclePar(int ix) { return 0; } /// dummy - public void SetCyclePar(int ix, uint value) { return; } /// dummy + public uint[] CyclePar { get { return new uint[163]; } set { return; } } /// dummy /// /// Private initialization data updated by contructors of children components diff --git a/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs b/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs index ba9d776e6..83dc07efe 100644 --- a/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs +++ b/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs @@ -67,11 +67,9 @@ namespace TBF.BenchControl.Elde #endif #if SLM_END || WARSAW_END - public uint GetCyclePar(int ix) { return ctrlBrdComponent.CyclePar[ix]; } - public void SetCyclePar(int ix, uint val) { ctrlBrdComponent.CyclePar[ix] = val; } + public uint[] CyclePar { get { return ctrlBrdComponent.CyclePar; } set { ctrlBrdComponent.CyclePar = value; } } #else - public uint GetCyclePar(int ix) { return 0; } /// Dummy - public void SetCyclePar(int ix, uint val) { return; } /// Dummy + public uint[] CyclePar { get { return new uint[163]; } set { return; }} /// Dummy #endif public float VyslExt(int wmNr0, int what) { return ctrlBrdComponent.VyslExt[wmNr0, what]; } diff --git a/TestBenchFramework/BenchControl/Elde/IControlCom.cs b/TestBenchFramework/BenchControl/Elde/IControlCom.cs index 8fb8a8112..5fb937d7e 100644 --- a/TestBenchFramework/BenchControl/Elde/IControlCom.cs +++ b/TestBenchFramework/BenchControl/Elde/IControlCom.cs @@ -31,8 +31,7 @@ namespace TBF.BenchControl.Elde float TotalRefVolume { get; } float VyslExt(int wmNr0, int what); void SetWeight(int pos, double mass); - uint GetCyclePar(int ix); - void SetCyclePar(int ix, uint value); + uint[] CyclePar { get; set; } /// /// Sends calibration and configuration data to the control board. diff --git a/TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs b/TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs index 4270bbb4e..0d141eb20 100644 --- a/TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs @@ -405,21 +405,25 @@ namespace TBF.BenchControl.TestMethods.Endurance int stepsCount = Math.Min(enduranceCycle.Count, 80); /// uint[] cyclePar = new uint[2 * stepsCount + 3]; - uint duration = 0; + uint duration = 10; uint state = 0; for (int i = 0; i < stepsCount; i++) { state = state | enduranceCycle[i].ValvesOpen; state = state & (~enduranceCycle[i].ValvesClose); - cBrd.SetCyclePar(2 * i + 1, duration / 10); - cBrd.SetCyclePar(2 * i + 2, state); + cyclePar[2 * i + 1] = duration / 10; + cyclePar[2 * i + 2] = state; duration += enduranceCycle[i].Duration; } - cBrd.SetCyclePar(2 * stepsCount + 1, 0); - cBrd.SetCyclePar(2 * stepsCount + 2, 0); - cBrd.SetCyclePar(0, duration / 10); + cyclePar[2 * stepsCount + 1] = 0; + cyclePar[2 * stepsCount + 2] = 0; + cyclePar[0] = duration / 10; + + uint[] originalCyclePar = cBrd.CyclePar; + + cBrd.CyclePar = cyclePar; //------------------------------------------------ diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 76eacc5f5..a7e1cf4a9 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.12.406.1")] -[assembly: AssemblyFileVersion("2.12.406.1")] +[assembly: AssemblyVersion("2.12.407.1")] +[assembly: AssemblyFileVersion("2.12.407.1")]