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

BenchControl.Uni.Diverter/FlowMeter/RegReader added, etc. (many changes and refactorization).

Browse Source
This commit is contained in:
Milan Hanajik
2021-02-24 14:15:10 +01:00
parent 5325d7f6ee
commit 4cf4192ebb
163 changed files with 6766 additions and 1041 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/Sequences/MainSeq.cs
+6 -6
View File
@@ -326,9 +326,9 @@ namespace TBF.BenchControl.Sequences
/// Procedure selected at this point, a new batch was started
///
int newBatchNr = Program.LocalSettings.BatchNr;
if (StateMachine.ControlBoard is ControlBoard.Legacy.ControlBoardDev)
if (StateMachine.ControlBoard is ControlBoard.Legacy.CBoard)
{
(StateMachine.ControlBoard as ControlBoard.Legacy.ControlBoardDev).ManualUIAllowed = !StateMachine.Procedure.ManualCtrlDisabled;
(StateMachine.ControlBoard as ControlBoard.Legacy.CBoard).ManualUIAllowed = !StateMachine.Procedure.ManualCtrlDisabled;
}
Bridge.Bench2UI(ButtonsEtc.StopBtnEn); /// A new cycle started : Enable STOP button
log.FatalFormat("New measurement session started: batch = {0}, procedure = {1}", newBatchNr, StateMachine.Procedure.Name);
@@ -656,9 +656,9 @@ namespace TBF.BenchControl.Sequences
}
if (selection == Selection.Break)
{
if (StateMachine.ControlBoard is ControlBoard.Legacy.ControlBoardDev)
if (StateMachine.ControlBoard is ControlBoard.Legacy.CBoard)
{
(StateMachine.ControlBoard as ControlBoard.Legacy.ControlBoardDev).ManualUIAllowed = true;
(StateMachine.ControlBoard as ControlBoard.Legacy.CBoard).ManualUIAllowed = true;
}
Bridge.Bench2UI(ButtonsEtc.ShowBenchEmpty);
Bridge.OnProcedureCompleted(this, new ProcedureCompletedEventArgs(StateMachine.Procedure));
@@ -1288,9 +1288,9 @@ namespace TBF.BenchControl.Sequences
ProcessData.BatchRslts.Batch.ProcedureName,
Program.LocalSettings.BatchNr);
if (StateMachine.ControlBoard is ControlBoard.Legacy.ControlBoardDev)
if (StateMachine.ControlBoard is ControlBoard.Legacy.CBoard)
{
(StateMachine.ControlBoard as ControlBoard.Legacy.ControlBoardDev).ManualUIAllowed = true;
(StateMachine.ControlBoard as ControlBoard.Legacy.CBoard).ManualUIAllowed = true;
}
Event evacRetv = DoEvacuation(purgeEnd);