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

Register readers cleanup, IRegReaderPulses added.

Browse Source
This commit is contained in:
Milan Hanajik
2020-11-06 14:33:32 +01:00
parent 6ec3b7b287
commit 1f581a72c1
83 changed files with 331 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/Sequences/MainSeqUtils.cs
+3 -3
View File
@@ -808,8 +808,8 @@ namespace TBF.BenchControl.Sequences
///
/// Wait until iPerl communications are completed
///
bool completed = !(modelessDlg is GenericDevices.IHasCompleted)
|| (modelessDlg as GenericDevices.IHasCompleted).Completed;
bool completed = !(modelessDlg is IHasCompleted)
|| (modelessDlg as IHasCompleted).Completed;
if (!completed)
{
State.Create("MainSeq : Wait until the entry form is closed")
@@ -824,7 +824,7 @@ namespace TBF.BenchControl.Sequences
return Event.UiCmdStop;
}
completed = (modelessDlg as GenericDevices.IHasCompleted).Completed;
completed = (modelessDlg as IHasCompleted).Completed;
}
while (!completed);
}
TBF/BenchControl/Sequences/ProcessData.cs
+2 -2
View File
@@ -40,7 +40,7 @@ namespace TBF.BenchControl.Sequences
/// RegisterReaders should never be null, RegisterReader.Length should be Config.Data.WMsCount
/// RegisterReader[i] where i = 0..Config.Data.WMsCount-1 may be null and should always be tested
///
RegisterReaders = new IRegisterReader[Config.Data.WMsCount];
RegisterReaders = new IRegReader[Config.Data.WMsCount];
IsQ2PreCorrectionCalculated = false;
CalculatedQ2PreCorrectionLR = 0;
CalculatedQ2PreCorrectionRL = 0;
@@ -171,7 +171,7 @@ namespace TBF.BenchControl.Sequences
/// Process values.
/// These variables contain immediate values or values overwritten in each test.
///
public static IRegisterReader[] RegisterReaders;
public static IRegReader[] RegisterReaders;
///
public static FloatBox AmbTemp = new FloatBox() { Name = "Ambient Temperature", Format = "F1" }; /// [Celsius]
public static FloatBox AmbPress = new FloatBox() { Name = "Ambient Pressure", Format = "F0", Factor = 1000 }; /// [bar], printed by ToString() in [mbar]
TBF/BenchControl/Sequences/SequenceBase.cs
+4 -4
View File
@@ -1542,7 +1542,7 @@ namespace TBF.BenchControl.Sequences
float errorPct = errorPctBase + 0.05f * i;
Results.Entities.MeterTestRslt meterRslt = ProcessData.BatchRslts.GetMeterTestRslt(fullTestName, i, CompoundMeterId.Single);
IRegisterReader regReader = sensPath.RegisterReaders[i];
IRegReader regReader = sensPath.RegisterReaders[i];
if (meterRslt != null && regReader != null)
{
@@ -1663,7 +1663,7 @@ namespace TBF.BenchControl.Sequences
for (int isAux = 0; isAux <= 1; isAux++) /// 0=main, 1=aux
{
GenericDevices.IRegisterReader regReader = sensPath.RegisterReaders[2 * i + isAux];
GenericDevices.IRegReader regReader = sensPath.RegisterReaders[2 * i + isAux];
Results.Entities.MeterTestRslt meterRslt = (isAux == 0) ? mainRslt : auxRslt;
if (meterRslt != null && regReader != null)
@@ -1784,8 +1784,8 @@ namespace TBF.BenchControl.Sequences
Results.Entities.MeterTestRslt energyRslt = ProcessData.BatchRslts.GetMeterTestRslt(fullTestName, i, CompoundMeterId.HeatMeterEnergy);
Results.Entities.MeterTestRslt volumeRslt = ProcessData.BatchRslts.GetMeterTestRslt(fullTestName, i, CompoundMeterId.HeatMeterVolume);
GenericDevices.IRegisterReader volumeRegReader = (sensPath.RegisterReaders.Length > 2 * i) ? sensPath.RegisterReaders[2 * i] : null;
GenericDevices.IRegisterReader energyRegReader = (sensPath.RegisterReaders.Length > 2 * i + 1) ? sensPath.RegisterReaders[2 * i + 1] : null;
GenericDevices.IRegReader volumeRegReader = (sensPath.RegisterReaders.Length > 2 * i) ? sensPath.RegisterReaders[2 * i] : null;
GenericDevices.IRegReader energyRegReader = (sensPath.RegisterReaders.Length > 2 * i + 1) ? sensPath.RegisterReaders[2 * i + 1] : null;
double volumeMeter = tstRslt.TargetVolume() * (1.0 + 0.01 * errorPct);
double energyMeter = energy * (1.0 + 0.01 * errorPct);