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

FixedStartMassCollection modified, ControlBoard.Elde repmoved, ver. 3.1.1624

Browse Source
This commit is contained in:
Milan Hanajik
2021-04-16 14:06:47 +02:00
parent 95d5d16c83
commit 847956f708
46 changed files with 113 additions and 3688 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/Rig/Uni/RegValve/ChangeRegValvePositionOp.cs
+10 -10
View File
@@ -17,7 +17,7 @@ namespace TBF.Rig.Uni.RegValve
}
/// Set by the constructor
readonly TBF.Rig.ControlBoard.Legacy.CBoard controlBoard;
readonly TBF.Rig.ControlBoard.Uni.UniCB controlBoard;
readonly RegValve regulValve;
readonly int regulValveNr;
readonly double timePulseSec;
@@ -34,7 +34,7 @@ namespace TBF.Rig.Uni.RegValve
/// <remarks>Only Elde.Valve flow are used, other flow on the lists are ignored</remarks>
public ChangeRegValvePositionOp(TBF.Rig.ControlBoard.IControlBoard cb, RegValve rv, double timePulseSec)
{
controlBoard = cb as TBF.Rig.ControlBoard.Legacy.CBoard;
controlBoard = cb as TBF.Rig.ControlBoard.Uni.UniCB;
if (controlBoard == null) throw new ArgumentNullException("ctrlBoard");
regulValve = rv as RegValve;
@@ -49,13 +49,13 @@ namespace TBF.Rig.Uni.RegValve
/// <summary>Start this operation</summary>
public void Start()
{
double positionPct = controlBoard.RValvePosition(regulValveNr);
log.WarnFormat("RV#={0}, actPos={1}%", regulValveNr, positionPct.ToString("F1"));
//double positionPct = controlBoard.RValvePosition(regulValveNr);
//log.WarnFormat("RV#={0}, actPos={1}%", regulValveNr, positionPct.ToString("F1"));
controlBoard.ValveMove(regulValveNr,
TBF.Rig.ControlBoard.Legacy.RegulValveMode.PulseWidth,
new double[2] { timePulseSec, timePulseSec },
regulValve.StableTime);
//controlBoard.ValveMove(regulValveNr,
// TBF.Rig.ControlBoard.Legacy.RegulValveMode.PulseWidth,
// new double[2] { timePulseSec, timePulseSec },
// regulValve.StableTime);
}
/// <summary>Run this operation</summary>
@@ -64,8 +64,8 @@ namespace TBF.Rig.Uni.RegValve
/// </returns>
public Event Run()
{
float positionPct = controlBoard.RValvePosition(regulValveNr);
log.WarnFormat("RV#={0}, actPos={1}%", regulValveNr, positionPct.ToString("F1"));
//float positionPct = controlBoard.RValvePosition(regulValveNr);
//log.WarnFormat("RV#={0}, actPos={1}%", regulValveNr, positionPct.ToString("F1"));
return Event.PositionReached;
}
TBF/Rig/Uni/RegValveAnalog/RegValveCfgCtrl.cs
+1 -1
View File
@@ -40,7 +40,7 @@ namespace TBF.Rig.Uni.RegValveAnalog
{
foreach (var cmpnt in parent.CmpntEntities)
{
if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is ControlBoard.Legacy.Factory)
if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is ControlBoard.Uni.Factory)
{
parentNameComboBox.Items.Add(cmpnt.Name);
}
TBF/Rig/Uni/RegValveTandem/ChangeRegValvePositionOp.cs
+11 -11
View File
@@ -4,7 +4,7 @@
using System;
using System.Collections.Generic;
using log4net;
using TBF.Rig.ControlBoard.Legacy;
using TBF.Rig.ControlBoard.Uni;
using TBF.Rig.GenericDevices;
namespace TBF.Rig.Uni.RegValveTandem
@@ -18,7 +18,7 @@ namespace TBF.Rig.Uni.RegValveTandem
}
/// Set by the constructor
readonly CBoard controlBoard;
readonly UniCB controlBoard;
readonly TBF.Rig.Uni.RegValve.RegValve regulValve;
readonly int regulValveNr;
readonly double timePulseSec;
@@ -33,7 +33,7 @@ namespace TBF.Rig.Uni.RegValveTandem
/// <param name="posHiPct">Upper limit of the position to be achieved</param>
/// <param name="timeout">Timeout in sec. for setting the flow</param>
/// <remarks>Only Elde.Valve flow are used, other flow on the lists are ignored</remarks>
public ChangeRegValvePositionOp(CBoard controlBoard, IRegValve _regulValve, float timePulseSec)
public ChangeRegValvePositionOp(UniCB controlBoard, IRegValve _regulValve, float timePulseSec)
{
if (controlBoard == null) throw new ArgumentNullException("ctrlBoard");
this.controlBoard = controlBoard;
@@ -50,13 +50,13 @@ namespace TBF.Rig.Uni.RegValveTandem
/// <summary>Start this operation</summary>
public void Start()
{
double positionPct = controlBoard.RValvePosition(regulValveNr);
log.WarnFormat("RV#={0}, actPos={1}%", regulValveNr, positionPct.ToString("F1"));
//double positionPct = controlBoard.RValvePosition(regulValveNr);
//log.WarnFormat("RV#={0}, actPos={1}%", regulValveNr, positionPct.ToString("F1"));
controlBoard.ValveMove(regulValveNr,
RegulValveMode.PulseWidth,
new double[2] { timePulseSec, timePulseSec },
regulValve.StableTime);
//controlBoard.ValveMove(regulValveNr,
// RegulValveMode.PulseWidth,
// new double[2] { timePulseSec, timePulseSec },
// regulValve.StableTime);
}
/// <summary>Run this operation</summary>
@@ -65,8 +65,8 @@ namespace TBF.Rig.Uni.RegValveTandem
/// </returns>
public Event Run()
{
float positionPct = controlBoard.RValvePosition(regulValveNr);
log.WarnFormat("RV#={0}, actPos={1}%", regulValveNr, positionPct.ToString("F1"));
//float positionPct = controlBoard.RValvePosition(regulValveNr);
//log.WarnFormat("RV#={0}, actPos={1}%", regulValveNr, positionPct.ToString("F1"));
return Event.PositionReached;
}