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

- Fixed a bug in valves inversion

Browse Source 
- Changes in ProcessTabPageCtrl
This commit is contained in:
Milan Hanajik 2014-09-06 13:29:04 +02:00
parent a6f5b287c9
commit 36f2842b01
4 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs
View File

@ -176,6 +176,9 @@ namespace TBF.BenchControl.Elde
ulong valvesToInvert,
float[] tankCapacities)
{
this.valvesToInvert = valvesToInvert;
this.route = valvesToInvert;
if (controlBoardCfg.DebugLevel == Entities.DebugMode.Simulate)
{
controlCom = new ControlComSim();

1
TestBenchFramework/BenchControl/Elde/Valve/Valve.cs
View File

@ -29,6 +29,7 @@ namespace TBF.BenchControl.Elde.Valve
public string Name { get { return valveCfg.Name; } }
public ValveCategory Category { get { return valveCfg.Category; } }
public int Delay { get { return valveCfg.OpenCloseTime; } }
public bool Inverted { get { return valveCfg.Inverted; } }
public IValve CoupledTo { get { return coupledTo; } }
public bool InvertCouple { get { return valveCfg.InvertCouple; } }
public int LagOpening { get { return valveCfg.LagOpening; } }

4
TestBenchFramework/BenchControl/StateMachine.cs
View File

@ -217,7 +217,9 @@ namespace TBF.BenchControl
else if (balance.BalanceNr == 1) Balance2 = balance;
else if (balance.BalanceNr == 2) Balance3 = balance;
}
if (cmpnt is Elde.Valve.Valve) valvesToInvert |= (cmpnt as Elde.Valve.Valve).Mask;
Elde.Valve.Valve eldeValve = (cmpnt as Elde.Valve.Valve);
if ((eldeValve != null) && eldeValve.Inverted) valvesToInvert |= eldeValve.Mask;
}
/// Create an array with tank capacities

38
TestBenchFramework/Screens/ProcessTabPageCtrl.cs
View File

@ -18,28 +18,38 @@ namespace TBF.Screens
Bridge.ProcedureSelectedHandler += delegate(object sndr, ProcedureSelectedEventArgs args)
{
if (InvokeRequired) { Invoke(new EventHandler<ProcedureSelectedEventArgs>(OnProcedureSelected), sndr, args); }
else OnProcedureSelected(sndr, args);
if (InvokeRequired)
Invoke(new EventHandler<ProcedureSelectedEventArgs>(OnProcedureSelected), sndr, args);
else
OnProcedureSelected(sndr, args);
};
Bridge.TestSelectedHandler += delegate(object sender, TestSelectedEventArgs args)
{
if (InvokeRequired) { Invoke(new EventHandler<TestSelectedEventArgs>(OnTestSelected), sender, args); }
else OnTestSelected(sender, args);
if (InvokeRequired)
Invoke(new EventHandler<TestSelectedEventArgs>(OnTestSelected), sender, args);
else
OnTestSelected(sender, args);
};
Bridge.TestProgressHandler += delegate(object sender, TestProgressEventArgs args)
{
if (InvokeRequired) { Invoke(new EventHandler<TestProgressEventArgs>(OnTestProgress), sender, args); }
else OnTestProgress(sender, args);
if (InvokeRequired)
Invoke(new EventHandler<TestProgressEventArgs>(OnTestProgress), sender, args);
else
OnTestProgress(sender, args);
};
Bridge.TestCompletedHandler += delegate(object sender, TestCompletedEventArgs args)
{
if (InvokeRequired) { Invoke(new EventHandler<TestCompletedEventArgs>(OnTestCompleted), sender, args); }
else OnTestCompleted(sender, args);
if (InvokeRequired)
Invoke(new EventHandler<TestCompletedEventArgs>(OnTestCompleted), sender, args);
else
OnTestCompleted(sender, args);
};
Bridge.ProcedureCompletedHandler += delegate(object sender, ProcedureCompletedEventArgs args)
{
if (InvokeRequired) { Invoke(new EventHandler<ProcedureCompletedEventArgs>(OnProcedureCompleted), sender, args); }
else OnProcedureCompleted(sender, args);
if (InvokeRequired)
Invoke(new EventHandler<ProcedureCompletedEventArgs>(OnProcedureCompleted), sender, args);
else
OnProcedureCompleted(sender, args);
};
}
@ -141,7 +151,10 @@ namespace TBF.Screens
void OnTestSelected(object sender, TestSelectedEventArgs args)
{
/// Target values
/// Readings and target values
ResetReadings();
/// Target values
targetFlowLowLabel.Text = args.Test.Qfrom.ToString("F3");
targetFlowHighLabel.Text = args.Test.Qto.ToString("F3");
targetVolumeLabel.Text = args.Test.Volume.ToString("F1");
@ -160,9 +173,6 @@ namespace TBF.Screens
sensor1Label.Text = (args.MetersPath.RegisterReaders[0] == null) ? "" : args.MetersPath.RegisterReaders[0].Cfg.Name;
sensor2Label.Text = (args.MetersPath.RegisterReaders[1] == null) ? "" : args.MetersPath.RegisterReaders[1].Cfg.Name;
sensor3Label.Text = (args.MetersPath.RegisterReaders[2] == null) ? "" : args.MetersPath.RegisterReaders[2].Cfg.Name;
/// Readings and target values
ResetReadings();
}
void OnTestProgress(object sender, TestProgressEventArgs args)