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

Cosmetical changes and minor improvements

Browse Source
This commit is contained in:
Milan Hanajik 2018-01-24 13:49:39 +01:00
parent 4144a8970b
commit 095d4aab2b
16 changed files with 175 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
TestBenchFramework/BenchControl/Configs/ConfigCtrlUtils.cs
View File

@ -44,6 +44,34 @@ namespace TBF.BenchControl.Configs
if (cfgVar != itmp) { cfgVar = itmp; return flagsWhenUpdated; } else return 0;
}
/// <summary>
/// Updates destination variable when its value differes from the source value.
/// Returns appropriate flags
/// </summary>
/// <param name="cfgVar">Reference to destination variable</param>
/// <param name="toBeParsedString">Source integer value is obtained by parsing this string</param>
/// <param name="flagsWhenUpdated">Flags returned when an update occurs</param>
/// <returns>Flags or 0</returns>
protected CfgUpdateFlags UpdateDifferent(ref float cfgVar, string toBeParsedString, CfgUpdateFlags flagsWhenUpdated)
{
float ftmp = Utils.ParseSFloat(toBeParsedString);
if (cfgVar != ftmp) { cfgVar = ftmp; return flagsWhenUpdated; } else return 0;
}
/// <summary>
/// Updates destination variable when its value differes from the source value.
/// Returns appropriate flags
/// </summary>
/// <param name="cfgVar">Reference to destination variable</param>
/// <param name="toBeParsedString">Source integer value is obtained by parsing this string</param>
/// <param name="flagsWhenUpdated">Flags returned when an update occurs</param>
/// <returns>Flags or 0</returns>
protected CfgUpdateFlags UpdateDifferent(ref double cfgVar, string toBeParsedString, CfgUpdateFlags flagsWhenUpdated)
{
double dtmp = Utils.ParseSDouble(toBeParsedString);
if (cfgVar != dtmp) { cfgVar = dtmp; return flagsWhenUpdated; } else return 0;
}
/// <summary>
/// Updates destination variable when its value differes from the source value.
/// Returns appropriate flags

2
TestBenchFramework/BenchControl/Elde/Common.cs
View File

@ -22,7 +22,7 @@ namespace TBF.BenchControl.Elde
#if FUZHOU300 || PT200IL || TORINO50 || BADGER_MALA_TRAT || TURA_IPERL || TURA_SPECIAL || BADGER_VELKA_TRAT || PUCHONG_PT200 || SLM_50 || GENESIS || MALTA_WSD25 || SLM_END || WARSAW_END || BERLIN || SLM_150 || PETERSBURG_50 || PETERSBURG_200 || KEMPNO_50 || BAHRAIN_50 || RUM_MOB || KRAKOW_50
public enum StatusP : ulong
{
RefFlowMeterMask = 0x7,
RefFlowMeterMask = 0x7, /// bits 0,1,2
TestCompleted = 0x10, /// bit 4
TestInProgress = 0x20, /// bit 5
//DiverterError = 0x20,

86
TestBenchFramework/BenchControl/Elde/StartMeasurementOp.cs
View File

@ -35,6 +35,7 @@ namespace TBF.BenchControl.Elde
enum OpState
{
StartingTest,
ResendCommand,
TestStarted,
ValveMoveToFlow,
OpCompleted,
@ -107,22 +108,27 @@ namespace TBF.BenchControl.Elde
log.Debug(this.ToString());
}
/// <summary>Start this operation</summary>
public void Start()
void SendStartCommand()
{
controlBoard.SyncRoute();
controlBoard.SyncRoute();
#if TURA_IPERL || TURA_SPECIAL || BADGER_VELKA_TRAT || SLM_50
int flowMeterIdxAndDiv = flowMeterNr + 16 * diverterNr;
#else
int flowMeterIdxAndDiv = flowMeterNr;
#endif
log.InfoFormat("Start() : SendCommand(Cmd.Start, {0}, route, {1}, {1}, {2}, {3}, {4}, 0, Stop.None)",
flowMeterIdxAndDiv, totalRefPulses, testMethod, filterConstant, (int)pidCoef);
log.InfoFormat("Start() : SendCommand(Cmd.Start, {0}, route, {1}, {1}, {2}, {3}, {4}, 0, Stop.None)",
flowMeterIdxAndDiv, totalRefPulses, testMethod, filterConstant, (int)pidCoef);
controlBoard.SendCommand(Command.Start, flowMeterIdxAndDiv, controlBoard.Route,
totalRefPulses, massRefPulses, testMethod,
controlBoard.SendCommand(Command.Start, flowMeterIdxAndDiv, controlBoard.Route,
totalRefPulses, massRefPulses, testMethod,
filterConstant, (int)pidCoef, 0, StopDevs.None);
}
/// <summary>Start this operation</summary>
public void Start()
{
SendStartCommand();
opState = OpState.StartingTest;
}
@ -141,40 +147,50 @@ namespace TBF.BenchControl.Elde
(((ulong)statusP >> 16) & 0xFFFF).ToString("X4"),
((ulong)statusP & 0xFFFF).ToString("X4"));
if (0 != (statusP & StatusP.TestInProgress))
{
log.Info("Test started");
opState = OpState.TestStarted;
}
if ((statusP & StatusP.TestInProgress) != 0)
{
log.Info("Test started");
opState = OpState.TestStarted;
}
else
{
//opState = OpState.ResendCommand;
}
return Event.None;
}
else if (opState == OpState.TestStarted)
{
///
/// Done once, issues an appropriate ValveMove(...) command
///
if (reqFlowLo >= reqFlowHi || reqFlowLo > nominalFlow || reqFlowHi <= 0)
{
return Event.OpArgumentError;
}
else if (opState == OpState.ResendCommand)
{
SendStartCommand();
opState = OpState.StartingTest;
return Event.None;
}
else if (opState == OpState.TestStarted)
{
///
/// Done once, issues an appropriate ValveMove(...) command
///
if (reqFlowLo >= reqFlowHi || reqFlowLo > nominalFlow || reqFlowHi <= 0)
{
return Event.OpArgumentError;
}
log.InfoFormat("Run(): rv#={0} flowMtr#={1} TARGET: flowLo={2} flowHi={3}",
regulValveNr, flowMeterNr, reqFlowLo, reqFlowHi);
log.InfoFormat("Run(): rv#={0} flowMtr#={1} TARGET: flowLo={2} flowHi={3}",
regulValveNr, flowMeterNr, reqFlowLo, reqFlowHi);
float freqLo = 2000.0f * reqFlowLo / nominalFlow;
float freqHi = 2000.0f * reqFlowHi / nominalFlow;
controlBoard.ValveMove(regulValveNr, RegulValveMode.TargetFrequency,
new float[2] { freqLo, freqHi },
regulValve.StableTime);
float freqLo = 2000.0f * reqFlowLo / nominalFlow;
float freqHi = 2000.0f * reqFlowHi / nominalFlow;
controlBoard.ValveMove(regulValveNr, RegulValveMode.TargetFrequency,
new float[2] { freqLo, freqHi },
regulValve.StableTime);
opState = OpState.OpCompleted;
return Event.None;
}
else if (opState == OpState.OpCompleted)
{
return Event.MeasurementStarted;
}
opState = OpState.OpCompleted;
return Event.None;
}
else if (opState == OpState.OpCompleted)
{
return Event.MeasurementStarted;
}
return Event.None;
}

63
TestBenchFramework/BenchControl/Elde/StopPreviousOp.cs
View File

@ -21,8 +21,8 @@ namespace TBF.BenchControl.Elde
{
Idle = 0,
CheckIfStopped,
Stopped,
SendCommandAgain,
ResendCommand,
Stopped,
}
OpState opState;
@ -40,10 +40,9 @@ namespace TBF.BenchControl.Elde
}
/// <summary>Start this operation</summary>
public void Start()
void SendStopCommand()
{
controlBoard.SyncRoute();
controlBoard.SyncRoute();
controlBoard.SendCommand(Command.Stop,
0, /// ref. flowmeter number
controlBoard.Route, /// route
@ -53,7 +52,13 @@ namespace TBF.BenchControl.Elde
20,
0,
StopDevs.Diverter | StopDevs.GatePulse | StopDevs.Reference | StopDevs.RegValveRegulation);
}
/// <summary>Start this operation</summary>
public void Start()
{
SendStopCommand();
opState = OpState.CheckIfStopped;
}
@ -66,49 +71,27 @@ namespace TBF.BenchControl.Elde
{
if (opState == OpState.CheckIfStopped)
{
if (0 == (controlBoard.StatusP & StatusP.TestCompleted))
if ((controlBoard.StatusP & (StatusP.TestCompleted | StatusP.TestInProgress)) == 0)
{
opState = OpState.Stopped;
return Event.PreviousStopped;
}
else
{
//opState = OpState.SendCommandAgain;
controlBoard.SyncRoute();
controlBoard.SendCommand(Command.Stop,
0, /// ref. flowmeter number
controlBoard.Route, /// route
0, 0, /// ref. pulses
TestMethods.Diverter,
0.0f,
20,
0,
StopDevs.Diverter | StopDevs.GatePulse | StopDevs.Reference | StopDevs.RegValveRegulation);
return Event.None;
}
else
{
//opState = OpState.ResendCommand;
return Event.None;
}
}
else if (opState == OpState.Stopped)
else if (opState == OpState.ResendCommand)
{
SendStopCommand();
opState = OpState.CheckIfStopped;
return Event.None;
}
else if (opState == OpState.Stopped)
{
return Event.PreviousStopped;
}
else if (opState == OpState.SendCommandAgain)
{
controlBoard.SyncRoute();
controlBoard.SendCommand(Command.Stop,
0, /// ref. flowmeter number
controlBoard.Route, /// route
0, 0, /// ref. pulses
TestMethods.Diverter,
0.0f,
20,
0,
StopDevs.Diverter | StopDevs.GatePulse | StopDevs.Reference | StopDevs.RegValveRegulation);
opState = OpState.CheckIfStopped;
return Event.None;
}
return Event.None;
}

4
TestBenchFramework/BenchControl/MettlerToledo/Multi/BalanceCfg.cs
View File

@ -1,5 +1,5 @@
///
/// Copyright (c) 2015-2016 Sensus Metering Systems
/// Copyright (c) 2015-2018 Sensus Slovensko a.s.
///
using System;
using System.IO;
@ -10,7 +10,7 @@ using TBF.BenchControl.Generic;
namespace TBF.BenchControl.MettlerToledo.Multi
{
public class BalanceCfg : ComponentCfgBase, GenericDevices.IScaleCfg, GenericDevices.ICalibInfoCfg
public class BalanceCfg : ComponentCfgBase, GenericDevices.IScaleCfg
{
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(BalanceCfg) })[0];
protected override XmlSerializer GetSerializer() { return Serializer; }

4
TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceCfg.cs
View File

@ -1,5 +1,5 @@
///
/// Copyright (c) 2013-2017 Sensus Metering Systems
/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
///
using System;
using System.IO;
@ -10,7 +10,7 @@ using TBF.BenchControl.Generic;
namespace TBF.BenchControl.MettlerToledo.Standard
{
public class BalanceCfg : ComponentCfgBase, GenericDevices.IScaleCfg, GenericDevices.ICalibInfoCfg, GenericDevices.ITankDrainingCfg
public class BalanceCfg : ComponentCfgBase, GenericDevices.IScaleCfg, GenericDevices.ITankDrainingCfg
{
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(BalanceCfg) })[0];
protected override XmlSerializer GetSerializer() { return Serializer; }

2
TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestParams.cs
View File

@ -28,7 +28,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged.Compound
string[] paramNames = new string[]
{
Strings.Volume_to_tank,
string.Format("{0} [l]", Strings.Volume_to_tank),
Strings.SupressWMTrills,
};
public override string ParamName(int i) { return paramNames[i]; }

30
TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs
View File

@ -808,11 +808,11 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
tstRslt.FlowMin = (float)RefFlowStat.Min;
tstRslt.FlowMax = (float)RefFlowStat.Max;
tstRslt.DiverterStart = Math.Abs(switchTimeStartHi.Val - switchTimeStartLo.Val);
tstRslt.DiverterStart = switchTimeStart; /// Math.Abs(switchTimeStartHi.Val - switchTimeStartLo.Val);
tstRslt.DivStart10 = switchTimeStartLo.Val;
tstRslt.DivStart50 = switchTimeStart;
tstRslt.DivStart90 = switchTimeStartHi.Val;
tstRslt.DiverterEnd = Math.Abs(switchTimeEndLo.Val - switchTimeEndHi.Val);
tstRslt.DiverterEnd = switchTimeEnd; /// Math.Abs(switchTimeEndLo.Val - switchTimeEndHi.Val);
tstRslt.DivEnd90 = switchTimeEndHi.Val;
tstRslt.DivEnd50 = switchTimeEnd;
tstRslt.DivEnd10 = switchTimeEndLo.Val;
@ -1020,32 +1020,6 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
}
meterRslt.Error = Formulas.ErrorFromVolumes(meterRslt.VolumeMeter, meterRslt.VolumeRef);
#if TEST_MODE
if (!BatchRslts.IsProduction() &&
((test.Name.ToLower().Contains("q2") && Math.Abs(meterRslt.Error) > 2.0 && Math.Abs(meterRslt.Error) <= 4.0) ||
(test.Name.ToLower().Contains("q1") && Math.Abs(meterRslt.Error) > 5.0 && Math.Abs(meterRslt.Error) <= 10.0)))
{
meterRslt.KorrErrQ = meterRslt.Error;
meterRslt.Error /= 2.0;
meterRslt.VolumeMeter = (1.0 + meterRslt.Error / 100.0) * meterRslt.VolumeRef;
meterRslt.PulsesMeter = meterRslt.VolumeMeter * regReader.PulsesPerLtr;
if (meterRslt.VolumeEnd > meterRslt.VolumeStart)
{
meterRslt.VolumeEnd = meterRslt.VolumeStart + meterRslt.VolumeMeter;
}
else if (meterRslt.VolumeEnd < meterRslt.VolumeStart)
{
meterRslt.VolumeEnd = meterRslt.VolumeStart - meterRslt.VolumeMeter;
}
}
else
{
meterRslt.KorrErrQ = 0;
}
#endif
meterRslt.Passed = (meterRslt.Error >= test.GetErrLimLo(tstRslt.FlowMean) + test.Uncertainty)
&& (meterRslt.Error <= test.GetErrLimHi(tstRslt.FlowMean) - test.Uncertainty)
&& (tstRslt.ErrorFlags == 0 || tstRslt.ErrorFlagsMode() != Config.Entities.ErrorFlagsMode.On);

2
TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestParams.cs
View File

@ -40,7 +40,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged.HeatMeters
string[] paramNames = new string[]
{
Strings.Volume_to_tank,
string.Format("{0} [l]", Strings.Volume_to_tank),
Strings.Err_limit_neg_pct_chdr,
Strings.Err_limit_pos_pct_chdr,
Strings.Evaluate_volume,

1
TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/Factory.cs
View File

@ -3,7 +3,6 @@
///
using System.Collections.Generic;
using TBF.BenchControl.Generic;
using TBF.BenchControl.Configs.NameOnly;
namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged.Single
{

2
TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestParams.cs
View File

@ -26,7 +26,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged.Single
string[] paramNames = new string[]
{
Strings.Volume_to_tank,
string.Format("{0} [l]", Strings.Volume_to_tank),
};
public override string ParamName(int i) { return paramNames[i]; }
public override int ParamsCount() { return paramNames.Length; }

6
TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
View File

@ -1,5 +1,5 @@
///
/// Copyright (c) 2013-2017 Sensus Metering Systems
/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
@ -792,11 +792,11 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
tstRslt.FlowMin = (float)RefFlowStat.Min;
tstRslt.FlowMax = (float)RefFlowStat.Max;
tstRslt.DiverterStart = Math.Abs(switchTimeStartHi.Val - switchTimeStartLo.Val);
tstRslt.DiverterStart = switchTimeStart; /// Math.Abs(switchTimeStartHi.Val - switchTimeStartLo.Val);
tstRslt.DivStart10 = switchTimeStartLo.Val;
tstRslt.DivStart50 = switchTimeStart;
tstRslt.DivStart90 = switchTimeStartHi.Val;
tstRslt.DiverterEnd = Math.Abs(switchTimeEndLo.Val - switchTimeEndHi.Val);
tstRslt.DiverterEnd = switchTimeEnd; /// Math.Abs(switchTimeEndLo.Val - switchTimeEndHi.Val);
tstRslt.DivEnd90 = switchTimeEndHi.Val;
tstRslt.DivEnd50 = switchTimeEnd;
tstRslt.DivEnd10 = switchTimeEndLo.Val;

36
TestBenchFramework/Resources/Strings.Designer.cs generated
View File

@ -1671,6 +1671,15 @@ namespace TBF.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Flow meter temperature range does not fit this test conditions.
/// </summary>
internal static string Flow_meter_temperature_range_does_not_fit_this_test_conditions {
get {
return ResourceManager.GetString("Flow_meter_temperature_range_does_not_fit_this_test_conditions", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Flow profile sensitivity class.
/// </summary>
@ -1707,6 +1716,15 @@ namespace TBF.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to from.
/// </summary>
internal static string from {
get {
return ResourceManager.GetString("from", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Full name.
/// </summary>
@ -2463,6 +2481,15 @@ namespace TBF.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Next test volume.
/// </summary>
internal static string Next_test_volume {
get {
return ResourceManager.GetString("Next_test_volume", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Next &gt;.
/// </summary>
@ -4761,6 +4788,15 @@ namespace TBF.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to to.
/// </summary>
internal static string to {
get {
return ResourceManager.GetString("to", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Toler. red. [%].
/// </summary>

6
TestBenchFramework/Resources/Strings.cs.resx
View File

@ -1305,4 +1305,10 @@
<data name="Volume_to_tank_exceeds_the_scale_capacity" xml:space="preserve">
<value>Objem na váhu je větší než kapacita váhy</value>
</data>
<data name="from" xml:space="preserve">
<value>od</value>
</data>
<data name="to" xml:space="preserve">
<value>do</value>
</data>
</root>

6
TestBenchFramework/Resources/Strings.de.resx
View File

@ -1446,4 +1446,10 @@
<data name="Protected_procedure" xml:space="preserve">
<value>Geschützte Prüfvorlage</value>
</data>
<data name="from" xml:space="preserve">
<value>von</value>
</data>
<data name="to" xml:space="preserve">
<value>bis</value>
</data>
</root>

12
TestBenchFramework/Resources/Strings.resx
View File

@ -1825,4 +1825,16 @@
<data name="Volume_to_tank_exceeds_the_scale_capacity" xml:space="preserve">
<value>Volume to tank exceeds the scale capacity</value>
</data>
<data name="from" xml:space="preserve">
<value>from</value>
</data>
<data name="to" xml:space="preserve">
<value>to</value>
</data>
<data name="Flow_meter_temperature_range_does_not_fit_this_test_conditions" xml:space="preserve">
<value>Flow meter temperature range does not fit this test conditions</value>
</data>
<data name="Next_test_volume" xml:space="preserve">
<value>Next test volume</value>
</data>
</root>