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

Prolonged method evaluation fixed, ver. 3.1.1605

Browse Source
This commit is contained in:
Milan Hanajik
2021-03-23 11:08:33 +01:00
parent 78f9b10255
commit 9b1a427369
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("3.1.1604.0")] [assembly: AssemblyVersion("3.1.1605.0")]
[assembly: AssemblyFileVersion("3.1.1604.0")] [assembly: AssemblyFileVersion("3.1.1605.0")]
TBF/Rig/ControlBoard/Uni/UniCB.cs
+1
View File
@@ -146,6 +146,7 @@ namespace TBF.Rig.ControlBoard.Uni
/// Last test results /// Last test results
public double TestTime { get { return Data.Ttime; } } public double TestTime { get { return Data.Ttime; } }
public int RefPulses { get { return Data.EtPulses[0]; } } public int RefPulses { get { return Data.EtPulses[0]; } }
public int MassRefPulses { get { return Data.EtPulsesK; } }
public float ValveOpenCloseTime { set; get; } /// Start valve open or close time in sec public float ValveOpenCloseTime { set; get; } /// Start valve open or close time in sec
/// <summary> /// <summary>
TBF/Rig/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs
+3 -8
View File
@@ -22,8 +22,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollProlonged
/// <returns>true when capabilities of devices are OK</returns> /// <returns>true when capabilities of devices are OK</returns>
public static bool CheckDeviceCaps(Config.Entities.Test test, OutputPath devices, out string message) public static bool CheckDeviceCaps(Config.Entities.Test test, OutputPath devices, out string message)
{ {
if (!(StateMachine.ControlBoard is ControlBoard.Legacy.CBoard) && if (!(StateMachine.ControlBoard is ControlBoard.Uni.UniCB))
!(StateMachine.ControlBoard is ControlBoard.Uni.UniCB))
{ {
/// Control board does not support this method /// Control board does not support this method
message = string.Format("{0}: {1}", test.Name, Strings.Test_bench_does_not_suport_selected_test_method); message = string.Format("{0}: {1}", test.Name, Strings.Test_bench_does_not_suport_selected_test_method);
@@ -674,11 +673,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollProlonged
UpdateTempPressDensAmb(tstRslt); UpdateTempPressDensAmb(tstRslt);
double totalPulses = Convert.ToDouble(cBrd.RefPulses); double totalPulses = Convert.ToDouble(cBrd.RefPulses);
double massPulses = totalPulses; double massPulses = Convert.ToDouble(cBrd.MassRefPulses);
if (StateMachine.ControlBoard is ControlBoard.Legacy.CBoard)
{
massPulses = Convert.ToDouble((StateMachine.ControlBoard as ControlBoard.Legacy.CBoard).EtPulsesK);
}
/// Main results /// Main results
tstRslt.MethodClass = TbfComponents.FindComponent(test.Method).ClassName; tstRslt.MethodClass = TbfComponents.FindComponent(test.Method).ClassName;
@@ -951,7 +946,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollProlonged
meterRslt.VolumeMeter = meterRslt.PulsesMeter * regReader.LtrsPerPulse; /// [l] meterRslt.VolumeMeter = meterRslt.PulsesMeter * regReader.LtrsPerPulse; /// [l]
meterRslt.VolumeRef = meterRslt.PulsesMaster * tstRslt.ConstMaster; /// [l], tstRslt.ConstMaster is calculated from massPulses and VolumeCTV (from scale) meterRslt.VolumeRef = meterRslt.PulsesMaster * tstRslt.ConstMaster; /// [l], tstRslt.ConstMaster is calculated from massPulses and VolumeCTV (from scale)
log.DebugFormat("Datastream: RefPls4mtrRR={0} Tmtr={1} Ttime={2} Vmtr={3} Vref={4}", log.DebugFormat("Pulses: RefPls4mtrRR={0} Tmtr={1} Ttime={2} Vmtr={3} Vref={4}",
meterRslt.PulsesMaster, meterRslt.PulsesMaster,
meterRslt.TestTime, meterRslt.TestTime,
tstRslt.TestTime, tstRslt.TestTime,