ControlBoards, IControlBoard iface, Devices, test methods.

This commit is contained in:
Milan Hanajik
2020-05-21 15:55:02 +02:00
parent 6df9261697
commit 7b321abb30
222 changed files with 3995 additions and 1284 deletions
@@ -705,7 +705,7 @@ namespace TBF.UI.Bench.Components
string name = words[words.Length - 1]; /// The last word is the component name
cfg.Name = name.Replace("#", (zeroBasedIdx + 1).ToString());
if (cfg is BenchControl.Elde.Valve.ValveCfg)
if (cfg is BenchControl.BuiltIn.Valve.ValveCfg)
{
int bitNr = zeroBasedIdx;
if (words.Length >= 2 && words[0].StartsWith("D") && int.TryParse(words[0].Substring(1), out bitNr))
@@ -715,8 +715,8 @@ namespace TBF.UI.Bench.Components
if (name != "-")
{
(cfg as BenchControl.Elde.Valve.ValveCfg).BitPosition = bitNr;
(cfg as BenchControl.Elde.Valve.ValveCfg).Category =
(cfg as BenchControl.BuiltIn.Valve.ValveCfg).BitPosition = bitNr;
(cfg as BenchControl.BuiltIn.Valve.ValveCfg).Category =
name.Contains("L") ? ValveCategory.Bench :
name.Contains("I") ? ValveCategory.Output :
name.Contains("Z") ? ValveCategory.Feeding : ValveCategory.None;
@@ -753,7 +753,7 @@ namespace TBF.UI.Bench.Components
(cfg as BenchControl.Elde.RegisterReader.RegisterReaderCfg).Position = zeroBasedIdx + 1;
return true;
}
else if (cfg is BenchControl.Elde.FixedStartRegisterReader.RegisterReaderCfg)
else if (cfg is BenchControl.RegisterReaders.StandingStartStop.RegisterReaderCfg)
{
(cfg as IChildComponentCfg).ParentName = "CB";
return true;
+1 -1
View File
@@ -66,7 +66,7 @@ namespace TBF.UI.Bench.Paths
TbfComponents = BenchControl.TbfComponents.LoadComponentsFromDB(Config.FluentCommon.CreateSession(Users.Entities.DBKind.Config));
/// Find all master valves
Valves = BenchControl.GenericDevices.ValveBase.MasterValves(TbfComponents);
Valves = BenchControl.BuiltIn.ValveBase.GetMasterValves(TbfComponents);
/// Find all feeding regulation valves
FeedingRegulValves = new List<IRegulValve>();
+1 -1
View File
@@ -94,7 +94,7 @@ namespace TBF.UI.Bench.Transitions
/// Prepare a list of components and a list of all valves in the test bench
TbfComponents = BenchControl.TbfComponents.LoadComponentsFromDB(Session);
Valves = BenchControl.GenericDevices.ValveBase.MasterValves(TbfComponents);
Valves = BenchControl.BuiltIn.ValveBase.GetMasterValves(TbfComponents);
RegulValves = new List<IRegulValve>();
foreach (var cmpnt in TbfComponents)
{