From c8d0c647b718c3a3c96b75aebbb76ec48379b411 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Sat, 10 Dec 2016 06:51:28 +0100 Subject: [PATCH] Endurance : uint[3] cBrd.WMeterCont added, ver. 2.12.411 --- TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs | 1 + TestBenchFramework/BenchControl/Elde/ControlComSim.cs | 9 ++++++++- TestBenchFramework/BenchControl/Elde/ControlComWrap.cs | 6 ++++-- TestBenchFramework/BenchControl/Elde/IControlCom.cs | 1 + TestBenchFramework/Properties/AssemblyInfo.cs | 4 ++-- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs index 96a362931..92dac72e9 100644 --- a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs +++ b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs @@ -63,6 +63,7 @@ namespace TBF.BenchControl.Elde public float ReferenceVolume { get { return controlCom.TotalRefVolume; } } public float VyslExt(int wmNr0, int what) { return controlCom.VyslExt(wmNr0, what); } public uint[] CyclePar { get { return controlCom.CyclePar; } set { controlCom.CyclePar = value; } } + public uint[] WMeterCont { get { return controlCom.WMeterCont; } } /// 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 4f654061f..21dbc3a9a 100644 --- a/TestBenchFramework/BenchControl/Elde/ControlComSim.cs +++ b/TestBenchFramework/BenchControl/Elde/ControlComSim.cs @@ -69,7 +69,8 @@ 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[] CyclePar { get { return new uint[163]; } set { return; } } /// dummy + public uint[] CyclePar { get { return cyclePar; } set { cyclePar = value; } } /// dummy + public uint[] WMeterCont { get { return wMeterCont; } } /// dummy /// /// Private initialization data updated by contructors of children components @@ -82,6 +83,10 @@ namespace TBF.BenchControl.Elde uint[] diverterEdge; uint[] balanceRange; + + uint[] cyclePar; + uint[] wMeterCont; + /// /// Private values set by SendCommand() /// @@ -112,6 +117,8 @@ namespace TBF.BenchControl.Elde public ControlComSim() { rand = new Random(); + cyclePar = new uint[163]; + wMeterCont = new uint[3] { 1, 2, 3 }; } /// diff --git a/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs b/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs index 83dc07efe..3ffbe5fc8 100644 --- a/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs +++ b/TestBenchFramework/BenchControl/Elde/ControlComWrap.cs @@ -68,11 +68,13 @@ namespace TBF.BenchControl.Elde #if SLM_END || WARSAW_END public uint[] CyclePar { get { return ctrlBrdComponent.CyclePar; } set { ctrlBrdComponent.CyclePar = value; } } + public uint[] WMeterCont { get { return ctrlBrdComponent.wMeterCont; } } #else - public uint[] CyclePar { get { return new uint[163]; } set { return; }} /// Dummy + public uint[] CyclePar { get { return new uint[163]; } set { return; }} /// Dummy + public uint[] WMeterCont { get { return new uint[3]; } } /// Dummy #endif - public float VyslExt(int wmNr0, int what) { return ctrlBrdComponent.VyslExt[wmNr0, what]; } + public float VyslExt(int wmNr0, int what) { return ctrlBrdComponent.VyslExt[wmNr0, what]; } public void SetWeight(int pos, double mass) { ctrlBrdComponent.Weight[pos] = (float)mass; diff --git a/TestBenchFramework/BenchControl/Elde/IControlCom.cs b/TestBenchFramework/BenchControl/Elde/IControlCom.cs index 5fb937d7e..53aa835b4 100644 --- a/TestBenchFramework/BenchControl/Elde/IControlCom.cs +++ b/TestBenchFramework/BenchControl/Elde/IControlCom.cs @@ -32,6 +32,7 @@ namespace TBF.BenchControl.Elde float VyslExt(int wmNr0, int what); void SetWeight(int pos, double mass); uint[] CyclePar { get; set; } + uint[] WMeterCont { get; } /// /// Sends calibration and configuration data to the control board. diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index b969b98a9..161b96cbe 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.410.1")] -[assembly: AssemblyFileVersion("2.12.410.1")] +[assembly: AssemblyVersion("2.12.411.1")] +[assembly: AssemblyFileVersion("2.12.411.1")]