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

Changes for PETERSBURG_200, ver. 2.14.615

Browse Source
This commit is contained in:
Milan Hanajik
2017-07-21 11:08:16 +03:00
parent acc5b2fecd
commit b8ade55096
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs
+16 -6
View File
@@ -119,32 +119,42 @@ namespace TBF.BenchControl.Elde
/// Initialization data updated by constructors of children components
/// and sent to 'controlCom2panel' by SendCalibData() method.
///
public uint[,] RegValveCalib = new uint[8, 2];
public float[,] TempCalibData = new float[8, 5];
// Array length is the reference flowmeters count plus one
#if DN100 || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200 || PETERSBURG_200
public byte[] MeretRS485Address = new byte[4];
#if DN100 || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200
public uint[,] RegValveCalib = new uint[8, 2];
public byte[] MeretRS485Address = new byte[4];
public float[] EtCalib = new float[6] { 1, 1, 1, 1, 1, 1 };
#elif GENESIS || BERLIN
public uint[] DiverterEdge = new uint[2] { 50, 50 };
#elif GENESIS || BERLIN || PETERSBURG_200
public uint[,] RegValveCalib = new uint[16, 2];
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 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 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 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 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 };
#endif
public uint[] DiverterEdge = new uint[2] { 50, 50 };
public uint[] BalanceRange = new uint[2];
public uint[] BalanceRange = new uint[2];
///
TestBenchFramework/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.14.613.1")]
[assembly: AssemblyFileVersion("2.14.613.1")]
[assembly: AssemblyVersion("2.14.615.1")]
[assembly: AssemblyFileVersion("2.14.615.1")]