From 7f56fa0aa326f9644d7b65b9eb3ba0c8db595a5a Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Fri, 6 Mar 2020 08:19:29 +0100 Subject: [PATCH] Gelsenwasser : Flowmeter number with diverter info. --- TBF/BenchControl/Elde/Diverter/Diverter.cs | 2 +- TBF/BenchControl/Elde/StartMeasurementOp.cs | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/TBF/BenchControl/Elde/Diverter/Diverter.cs b/TBF/BenchControl/Elde/Diverter/Diverter.cs index e91228d4e..309bd06df 100644 --- a/TBF/BenchControl/Elde/Diverter/Diverter.cs +++ b/TBF/BenchControl/Elde/Diverter/Diverter.cs @@ -134,7 +134,7 @@ namespace TBF.BenchControl.Elde.Diverter { default: case 1: flowMtrNr4Cmd = 1; break; - case 2: flowMtrNr4Cmd = 2; break; + case 2: flowMtrNr4Cmd = 0x12; break; case 3: flowMtrNr4Cmd = 3; break; case 4: flowMtrNr4Cmd = 5; break; } diff --git a/TBF/BenchControl/Elde/StartMeasurementOp.cs b/TBF/BenchControl/Elde/StartMeasurementOp.cs index 42212a5a3..228a638f8 100644 --- a/TBF/BenchControl/Elde/StartMeasurementOp.cs +++ b/TBF/BenchControl/Elde/StartMeasurementOp.cs @@ -119,6 +119,8 @@ namespace TBF.BenchControl.Elde int flowMeterIdxAndDiv = flowMeterNr + 8 * (diverterNr - 1); #elif FILIPINY_50 int flowMeterIdxAndDiv = flowMeterNr + ((flowMeterNr == 3) ? (4 * (diverterNr - 1)) : 0); +#elif GELSENWASSER + int flowMeterIdxAndDiv = flowMeterNr + ((diverterNr == 2) ? 16 : 0); #else int flowMeterIdxAndDiv = flowMeterNr; #endif