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

Changes in 'master' for Malta-WSD25, ver. 2.10.353

Browse Source
This commit is contained in:
Milan Hanajik
2016-10-06 11:54:38 +02:00
parent c497c02ef9
commit dff3a1aff7
10 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/TestBenchSim.cs
+4 -4
View File
@@ -313,7 +313,7 @@ namespace TBF.BenchControl
const ulong Path3 = VI33;
const ulong Path4 = VI34;
const ulong Path5 = 0;
#elif CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || SLM_50
#elif CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || SLM_50 || MALTA_WSD25
const ulong VL11 = (1L << 0);
const ulong VL13 = (1L << 1);
const ulong VL18 = (1L << 2);
@@ -491,7 +491,7 @@ namespace TBF.BenchControl
const ulong Path4 = 0;
const ulong Path5 = 0;
#endif
/// <summary>Run this device</summary>
/// <summary>Run this device</summary>
public static void RunDevice(int regulValveNo, int refFlowmtrNo, Elde.StatusP statusP)
{
TestBenchSim.regulValveNo = regulValveNo;
@@ -540,7 +540,7 @@ namespace TBF.BenchControl
if (Div1sim && (SimRoute & Path2) == Path2) Mass1sim += DiffKg(Flow2sim, time);
if (Div2sim && (SimRoute & Path3) == Path3) Mass2sim += DiffKg(Flow3sim, time);
if (Div2sim && (SimRoute & Path4) == Path4) Mass2sim += DiffKg(Flow4sim, time);
#elif CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || SLM_50 /// Path1,2,3 do WT1
#elif CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || SLM_50 || MALTA_WSD25 /// Path1,2,3 do WT1
if (Div1sim && (SimRoute & Path1) == Path1) Mass1sim += DiffKg(Flow1sim, time);
if (Div1sim && (SimRoute & Path2) == Path2) Mass1sim += DiffKg(Flow2sim, time);
if (Div1sim && (SimRoute & Path3) == Path3) Mass1sim += DiffKg(Flow3sim, time);
@@ -682,7 +682,7 @@ namespace TBF.BenchControl
if (toTank) { throw (new Exception()); }
break;
}
#elif CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || SLM_50
#elif CEVAK_PT40_272 || MURES_PT40 || FUZHOU_40 || SLM_50 || MALTA_WSD25
switch (regulValveNo)
{
case 1: