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

MainSeq uses string Test.TempControl to set temperature setpoint.

Browse Source
This commit is contained in:
Milan Hanajik 2022-05-23 09:57:26 +02:00
parent 72bf9135b5
commit 6d3ed2799b
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
TBF/Rig/Sequences/MainSeq.cs
View File

@ -957,11 +957,15 @@ namespace TBF.Rig.Sequences
StateMachine.LoadTestParams(testInst.Test);
ProcessData.RegisterReaders = (sensPath != null && sensPath.RegisterReaders != null) ? sensPath.RegisterReaders : null;
/// Set temperature control setpoint
ITempControl tControl = TbfComponents.FindComponent(testInst.Test.TempControl) as ITempControl;
if (tControl != null) tControl.SetTemperatureSetpoint((testInst.Test.TempLimLo + testInst.Test.TempLimHi) / 2.0);
///
/// Execute one test (single repetition of a repeated test)
/// Previously:
/// e = testMethod.Execute(test, outerLoopMode, (outerLoopMode ? outerLoopCounter: repetNr));
///
///
Event rsltTransBefore = Event.Done;
Event rsltTransBetween = Event.Done;
Event rsltTransAfter = Event.Done;
@ -1138,6 +1142,10 @@ namespace TBF.Rig.Sequences
StateMachine.LoadTestParams(test);
ProcessData.RegisterReaders = (sensPath != null && sensPath.RegisterReaders != null) ? sensPath.RegisterReaders : null;
/// Set temperature control setpoint
ITempControl tControl = TbfComponents.FindComponent(test.TempControl) as ITempControl;
if (tControl != null) tControl.SetTemperatureSetpoint((test.TempLimLo + test.TempLimHi) / 2.0);
Event rsltTransBefore = Event.Done;
Event rsltTransAfter = Event.Done;
{
@ -1337,7 +1345,7 @@ namespace TBF.Rig.Sequences
///
/// Clear a file with interim test results
///
ClearProcessData();
ClearProcessDataFile();
Program.LocalSettings.BatchNr++;
Program.LocalSettings.Save();

2
TBF/Rig/Sequences/ProcessData.cs
View File

@ -195,7 +195,7 @@ namespace TBF.Rig.Sequences
}
}
public static void ClearProcessData()
public static void ClearProcessDataFile()
{
File.Delete(PDataFileName);
}