Merge branch 'master-3' into feature/processLogging
# Conflicts: # TBF/Rig/Sequences/ProcessData.cs # TBF/Rig/TestMethods/PMaxTest/PMaxTestSeq.cs
This commit is contained in:
@@ -11,6 +11,7 @@ using TBF.Rig;
|
||||
using TBF.Boxes;
|
||||
using TBF.Resources;
|
||||
using TBF.UiBridge;
|
||||
//using AppDiagnostic;
|
||||
|
||||
namespace TBF.Rig.TestMethods.PMaxTest
|
||||
{
|
||||
@@ -189,6 +190,16 @@ namespace TBF.Rig.TestMethods.PMaxTest
|
||||
LogProcessDataHeader(processDataLogger, "Starting the test");
|
||||
|
||||
|
||||
|
||||
/*//---new1
|
||||
LogProcessDataTestInfo(processDataLogger, test.Procedure.Name, test.Name);
|
||||
|
||||
if (heatMetersPath == null) LogProcessDataHeader(processDataLogger, "Start mass");
|
||||
else LogProcessDataHeaderHeatMeters(processDataLogger, "Start mass");
|
||||
//---endNew1*/
|
||||
|
||||
//DiagApi.addLog();
|
||||
|
||||
State.Create(string.Format("{0}({1}) : Starting the test", test.Method, test.Name))
|
||||
.AddOperation(checkUiOp)
|
||||
.AddOperations(readTempPressOps)
|
||||
|
||||
Reference in New Issue
Block a user