michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(1) RegValveCalib array pre-initialized, (2) Test ID column supressed in ResultsArrangementDlg, (3) ValveEx fixed, ver. 2.14.616

Browse Source
This commit is contained in:
Milan Hanajik 2017-07-21 14:26:26 +03:00
parent b8ade55096
commit ae0ebd15f7
4 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs
View File

@ -123,32 +123,35 @@ namespace TBF.BenchControl.Elde
// Array length is the reference flowmeters count plus one
#if DN100 || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200
public uint[,] RegValveCalib = new uint[8, 2];
public uint[,] RegValveCalib = new uint[8,2] {{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500}};
public byte[] MeretRS485Address = new byte[4];
public float[] EtCalib = new float[6] { 1, 1, 1, 1, 1, 1 };
public uint[] DiverterEdge = new uint[2] { 50, 50 };
#elif GENESIS || BERLIN || PETERSBURG_200
public uint[,] RegValveCalib = new uint[16, 2];
public uint[,] RegValveCalib = new uint[16, 2] { {100,500}, {100,500}, {100,500}, {100,500},
{100,500}, {100,500}, {100,500}, {100,500},
{100,500}, {100,500}, {100,500}, {100,500},
{100,500}, {100,500}, {100,500}, {100,500} };
public byte[] MeretRS485Address = new byte[4];
public float[] EtCalib = new float[7] { 1, 1, 1, 1, 1, 1, 1 };
public uint[] DiverterEdge = new uint[6] { 50, 50, 50, 50, 50, 50 };
#elif MUNICH || TORINO50 || BADGER_MALA_TRAT || TORUN_PT50_2015 || CEVAK_PT40_272 || TURA_IPERL || TURA_SPECIAL || MURES_PT40 || FUZHOU_40 || SLM_50 || SLM_150 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50
public uint[,] RegValveCalib = new uint[8, 2];
public byte[] MeretRS485Address = new byte[4];
public uint[,] RegValveCalib = new uint[8,2] {{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500}};
public byte[] MeretRS485Address = new byte[4];
public float[] EtCalib = new float[5] { 1, 1, 1, 1, 1 };
public uint[] DiverterEdge = new uint[2] { 50, 50 };
#elif SLM_END || WARSAW_END
public uint[,] RegValveCalib = new uint[8, 2];
public uint[,] RegValveCalib = new uint[8,2] {{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500}};
public byte[] MeretRS485Address = new byte[4];
public float[] EtCalib = new float[5] { 1, 1, 1, 1, 1 };
public uint[] DiverterEdge = new uint[2] { 50, 50 };
#elif MALTA_WSD25
public uint[,] RegValveCalib = new uint[8, 2];
public uint[,] RegValveCalib = new uint[8,2] {{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500}};
public byte[] MeretRS485Address = new byte[12];
public float[] EtCalib = new float[9] { 1, 1, 1, 1, 1, 1, 1, 1, 1 };
public uint[] DiverterEdge = new uint[2] { 50, 50 };
#elif BADGER_VELKA_TRAT
public uint[,] RegValveCalib = new uint[8, 2];
public uint[,] RegValveCalib = new uint[8,2] {{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500}};
public byte[] MeretRS485Address = new byte[4];
public float[] EtCalib = new float[8] { 1, 1, 1, 1, 1, 1, 1, 1 };
public uint[] DiverterEdge = new uint[2] { 50, 50 };

8
TestBenchFramework/BenchControl/Elde/ValveEx/ValveCfgCtrl.cs
View File

@ -57,8 +57,12 @@ namespace TBF.BenchControl.Elde.ValveEx
{
foreach (var cmpntEntity in components)
{
IComponent comp = TbfComponents.CmpntFactoryFromClassName(cmpntEntity.ClassName).DummyComponent();
if (comp is GenericDevices.IValve )
IComponentFactory fac = TbfComponents.CmpntFactoryFromClassName(cmpntEntity.ClassName);
if (fac is Elde.Valve.ValveFactory || /// IValve component factories
fac is Elde.Pump.PumpFactory ||
fac is Danfoss.VLT2800.PumpFactory ||
fac is Elde.PumpWithFM.PumpFactory)
{
combo.Items.Add(cmpntEntity.Name);
}

1
TestBenchFramework/Forms/ResultsArrangementDlg.cs
View File

@ -44,6 +44,7 @@ namespace TBF.Forms
public ResultsArrangementDlg()
{
InitializeComponent();
resultsConfigCtrl.SupressTestIDColumn = true;
Unlocked = false;
cancelButton.Visible = false;

4
TestBenchFramework/Properties/AssemblyInfo.cs
View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.14.615.1")]
[assembly: AssemblyFileVersion("2.14.615.1")]
[assembly: AssemblyVersion("2.14.616.1")]
[assembly: AssemblyFileVersion("2.14.616.1")]