DB.SensusOracle.Database : (1) Procedure params., (2) S620 support, (3) SensusTestInfo for 620.

2020-11-06 14:33:32 +01:00
parent 1f581a72c1
commit 705f4de0b0
11 changed files with 587 additions and 297 deletions
@@ -567,10 +567,6 @@ namespace TBF.BenchControl.Sequences
            int[] waterMeterParts = new int[waterMetersCount];
            for (int wmNr = 0; wmNr < waterMetersCount; wmNr++)
            {
-                /// WR10 .. WR15 configuration specific code (iPerl head component name)
-                TBF.BenchControl.TestMethods.iPerlCommunication.iPerlHead.IperlHead iHead =
-                    TbfComponents.FindComponent(string.Format("iPerl{0}", wmNr + 1)) as TBF.BenchControl.TestMethods.iPerlCommunication.iPerlHead.IperlHead;
-
                int ix = compound ? (2 * wmNr) : wmNr;
                if (WaterMeters.Count > ix)
                {
@@ -610,7 +606,7 @@ namespace TBF.BenchControl.Sequences
                        Compound = compound,
                        HeatMeter = heatMeters,
 #if ORACLE_DB
-                            WMTypeId = (iHead != null) ? iHead.WMType_ID : 0,
+                        WMTypeId = (ProcessData.OracleDB != null) ? ProcessData.OracleDB.WMTypeId : 0,
 #endif
                    };
                }