Action.IsFromUI, MeasureFlow works OK, SetFlow in progress, ver. 3.1.1624

This commit is contained in:
Milan Hanajik
2021-03-10 16:51:52 +01:00
parent 6f701adb9e
commit a21766b944
39 changed files with 393 additions and 307 deletions
+6 -6
View File
@@ -15,7 +15,7 @@ namespace TBF.Rig.Uni.Diverter
public class Diverter : ComponentBase, IDevice, GenericDevices.IDiverter, GenericDevices.ISequenceCondition, GenericDevices.IHasCalendarEvents, SchematicDrawing.IDrawingItCmpnt
{
private static readonly ILog log = LogManager.GetLogger(typeof(Diverter));
public override string ToString() { return string.Format("Diverter({0})", Cfg.ToString(1)); }
public override string ToString() { return string.Format("Diverter({0})", Cfg.ToString(-1)); }
/// <summary>
@@ -93,8 +93,8 @@ namespace TBF.Rig.Uni.Diverter
// Name, cBoard.RegValveCalib.GetLength(0), diverterCfg.AdcNr);
//}
diverterToTankOp = new SwitchDiverterOp(cBoard, true, DiverterNr);
diverterToSinkOp = new SwitchDiverterOp(cBoard, false, DiverterNr);
diverterToTankOp = new SwitchDiverterOp(cBoard, DiverterNr, true);
diverterToSinkOp = new SwitchDiverterOp(cBoard, DiverterNr, false);
log.Warn(this.ToString());
}
@@ -196,15 +196,15 @@ namespace TBF.Rig.Uni.Diverter
}
else if (args.Command == CfgChangeCmd.DivToTank)
{
cBoard.DiverterToTank(diverterCfg.DivNr1);
cBoard.SwitchDiverter(true, diverterCfg.DivNr1, true);
}
else if (args.Command == CfgChangeCmd.DivToSink)
{
cBoard.DiverterToSink(diverterCfg.DivNr1);
cBoard.SwitchDiverter(true, diverterCfg.DivNr1, false);
}
else if (args.Command == CfgChangeCmd.ReadDivTransition)
{
cBoard.ReadDiverterTransition(diverterCfg.DivNr1);
cBoard.ReadDiverterTransition(true, diverterCfg.DivNr1);
}
}
};