diff --git a/TestBenchFramework/Entities/MetersPath.cs b/TestBenchFramework/Entities/MetersPath.cs index 70a13bfe9..20fc5c025 100644 --- a/TestBenchFramework/Entities/MetersPath.cs +++ b/TestBenchFramework/Entities/MetersPath.cs @@ -35,6 +35,28 @@ namespace TBF.Entities public virtual string Sensor18 { get; set; } public virtual string Sensor19 { get; set; } public virtual string Sensor20 { get; set; } +#if IPERLST + public virtual string Sensor21 { get; set; } + public virtual string Sensor22 { get; set; } + public virtual string Sensor23 { get; set; } + public virtual string Sensor24 { get; set; } + public virtual string Sensor25 { get; set; } + public virtual string Sensor26 { get; set; } + public virtual string Sensor27 { get; set; } + public virtual string Sensor28 { get; set; } + public virtual string Sensor29 { get; set; } + public virtual string Sensor30 { get; set; } + public virtual string Sensor31 { get; set; } + public virtual string Sensor32 { get; set; } + public virtual string Sensor33 { get; set; } + public virtual string Sensor34 { get; set; } + public virtual string Sensor35 { get; set; } + public virtual string Sensor36 { get; set; } + public virtual string Sensor37 { get; set; } + public virtual string Sensor38 { get; set; } + public virtual string Sensor39 { get; set; } + public virtual string Sensor40 { get; set; } +#endif /// ------------- Additional stuff not mapped into the database ------------- @@ -75,6 +97,28 @@ namespace TBF.Entities if (Program.WMsCount >= 18) Sensor18 = (path.RegisterReaders[17] != null) ? path.RegisterReaders[17].Cfg.Name : null; if (Program.WMsCount >= 19) Sensor19 = (path.RegisterReaders[18] != null) ? path.RegisterReaders[18].Cfg.Name : null; if (Program.WMsCount >= 20) Sensor20 = (path.RegisterReaders[19] != null) ? path.RegisterReaders[19].Cfg.Name : null; +#if IPERLST + if (Program.WMsCount >= 21) Sensor21 = (path.RegisterReaders[20] != null) ? path.RegisterReaders[20].Cfg.Name : null; + if (Program.WMsCount >= 22) Sensor22 = (path.RegisterReaders[21] != null) ? path.RegisterReaders[21].Cfg.Name : null; + if (Program.WMsCount >= 23) Sensor23 = (path.RegisterReaders[22] != null) ? path.RegisterReaders[22].Cfg.Name : null; + if (Program.WMsCount >= 24) Sensor24 = (path.RegisterReaders[23] != null) ? path.RegisterReaders[23].Cfg.Name : null; + if (Program.WMsCount >= 25) Sensor25 = (path.RegisterReaders[24] != null) ? path.RegisterReaders[24].Cfg.Name : null; + if (Program.WMsCount >= 26) Sensor26 = (path.RegisterReaders[25] != null) ? path.RegisterReaders[25].Cfg.Name : null; + if (Program.WMsCount >= 27) Sensor27 = (path.RegisterReaders[26] != null) ? path.RegisterReaders[26].Cfg.Name : null; + if (Program.WMsCount >= 28) Sensor28 = (path.RegisterReaders[27] != null) ? path.RegisterReaders[27].Cfg.Name : null; + if (Program.WMsCount >= 29) Sensor29 = (path.RegisterReaders[28] != null) ? path.RegisterReaders[28].Cfg.Name : null; + if (Program.WMsCount >= 30) Sensor30 = (path.RegisterReaders[29] != null) ? path.RegisterReaders[29].Cfg.Name : null; + if (Program.WMsCount >= 31) Sensor31 = (path.RegisterReaders[30] != null) ? path.RegisterReaders[30].Cfg.Name : null; + if (Program.WMsCount >= 32) Sensor32 = (path.RegisterReaders[31] != null) ? path.RegisterReaders[31].Cfg.Name : null; + if (Program.WMsCount >= 33) Sensor33 = (path.RegisterReaders[32] != null) ? path.RegisterReaders[32].Cfg.Name : null; + if (Program.WMsCount >= 34) Sensor34 = (path.RegisterReaders[33] != null) ? path.RegisterReaders[33].Cfg.Name : null; + if (Program.WMsCount >= 35) Sensor35 = (path.RegisterReaders[34] != null) ? path.RegisterReaders[34].Cfg.Name : null; + if (Program.WMsCount >= 36) Sensor36 = (path.RegisterReaders[35] != null) ? path.RegisterReaders[35].Cfg.Name : null; + if (Program.WMsCount >= 37) Sensor37 = (path.RegisterReaders[36] != null) ? path.RegisterReaders[36].Cfg.Name : null; + if (Program.WMsCount >= 38) Sensor38 = (path.RegisterReaders[37] != null) ? path.RegisterReaders[37].Cfg.Name : null; + if (Program.WMsCount >= 39) Sensor39 = (path.RegisterReaders[38] != null) ? path.RegisterReaders[38].Cfg.Name : null; + if (Program.WMsCount >= 40) Sensor40 = (path.RegisterReaders[39] != null) ? path.RegisterReaders[39].Cfg.Name : null; +#endif #pragma warning restore } @@ -103,6 +147,28 @@ namespace TBF.Entities result.Sensor18 = Sensor18; result.Sensor19 = Sensor19; result.Sensor20 = Sensor20; +#if IPERLST + result.Sensor21 = Sensor21; + result.Sensor22 = Sensor22; + result.Sensor23 = Sensor23; + result.Sensor24 = Sensor24; + result.Sensor25 = Sensor25; + result.Sensor26 = Sensor26; + result.Sensor27 = Sensor27; + result.Sensor28 = Sensor28; + result.Sensor29 = Sensor29; + result.Sensor30 = Sensor30; + result.Sensor31 = Sensor31; + result.Sensor32 = Sensor32; + result.Sensor33 = Sensor33; + result.Sensor34 = Sensor34; + result.Sensor35 = Sensor35; + result.Sensor36 = Sensor36; + result.Sensor37 = Sensor37; + result.Sensor38 = Sensor38; + result.Sensor39 = Sensor39; + result.Sensor40 = Sensor40; +#endif return result; } @@ -129,6 +195,28 @@ namespace TBF.Entities else if (i == 17) return Sensor18; else if (i == 18) return Sensor19; else if (i == 19) return Sensor20; +#if IPERLST + else if (i == 20) return Sensor21; + else if (i == 21) return Sensor22; + else if (i == 22) return Sensor23; + else if (i == 23) return Sensor24; + else if (i == 24) return Sensor25; + else if (i == 25) return Sensor26; + else if (i == 26) return Sensor27; + else if (i == 27) return Sensor28; + else if (i == 28) return Sensor29; + else if (i == 29) return Sensor30; + else if (i == 30) return Sensor31; + else if (i == 31) return Sensor32; + else if (i == 32) return Sensor33; + else if (i == 33) return Sensor34; + else if (i == 34) return Sensor35; + else if (i == 35) return Sensor36; + else if (i == 36) return Sensor37; + else if (i == 37) return Sensor38; + else if (i == 38) return Sensor39; + else if (i == 39) return Sensor40; +#endif else return null; } @@ -155,6 +243,28 @@ namespace TBF.Entities else if (i == 17) Sensor18 = cmpntName; else if (i == 18) Sensor19 = cmpntName; else if (i == 19) Sensor20 = cmpntName; +#if IPERLST + else if (i == 20) Sensor21 = cmpntName; + else if (i == 21) Sensor22 = cmpntName; + else if (i == 22) Sensor23 = cmpntName; + else if (i == 23) Sensor24 = cmpntName; + else if (i == 24) Sensor25 = cmpntName; + else if (i == 25) Sensor26 = cmpntName; + else if (i == 26) Sensor27 = cmpntName; + else if (i == 27) Sensor28 = cmpntName; + else if (i == 28) Sensor29 = cmpntName; + else if (i == 29) Sensor30 = cmpntName; + else if (i == 30) Sensor31 = cmpntName; + else if (i == 31) Sensor32 = cmpntName; + else if (i == 32) Sensor33 = cmpntName; + else if (i == 33) Sensor34 = cmpntName; + else if (i == 34) Sensor35 = cmpntName; + else if (i == 35) Sensor36 = cmpntName; + else if (i == 36) Sensor37 = cmpntName; + else if (i == 37) Sensor38 = cmpntName; + else if (i == 38) Sensor39 = cmpntName; + else if (i == 39) Sensor40 = cmpntName; +#endif } } } diff --git a/TestBenchFramework/Mappings/MetersPathMap.cs b/TestBenchFramework/Mappings/MetersPathMap.cs index 89b99c036..076a4f832 100644 --- a/TestBenchFramework/Mappings/MetersPathMap.cs +++ b/TestBenchFramework/Mappings/MetersPathMap.cs @@ -36,6 +36,28 @@ namespace TBF.Mappings if (Program.WMsCount >= 18) Map(x => x.Sensor18); if (Program.WMsCount >= 19) Map(x => x.Sensor19); if (Program.WMsCount >= 20) Map(x => x.Sensor20); +#if IPERLST + if (Program.WMsCount >= 21) Map(x => x.Sensor21); + if (Program.WMsCount >= 22) Map(x => x.Sensor22); + if (Program.WMsCount >= 23) Map(x => x.Sensor23); + if (Program.WMsCount >= 24) Map(x => x.Sensor24); + if (Program.WMsCount >= 25) Map(x => x.Sensor25); + if (Program.WMsCount >= 26) Map(x => x.Sensor26); + if (Program.WMsCount >= 27) Map(x => x.Sensor27); + if (Program.WMsCount >= 28) Map(x => x.Sensor28); + if (Program.WMsCount >= 29) Map(x => x.Sensor29); + if (Program.WMsCount >= 30) Map(x => x.Sensor30); + if (Program.WMsCount >= 31) Map(x => x.Sensor31); + if (Program.WMsCount >= 32) Map(x => x.Sensor32); + if (Program.WMsCount >= 33) Map(x => x.Sensor33); + if (Program.WMsCount >= 34) Map(x => x.Sensor34); + if (Program.WMsCount >= 35) Map(x => x.Sensor35); + if (Program.WMsCount >= 36) Map(x => x.Sensor36); + if (Program.WMsCount >= 37) Map(x => x.Sensor37); + if (Program.WMsCount >= 38) Map(x => x.Sensor38); + if (Program.WMsCount >= 39) Map(x => x.Sensor39); + if (Program.WMsCount >= 40) Map(x => x.Sensor40); +#endif #pragma warning restore } }