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

Fix standing start Store Data

Browse Source 
Refactor to use `ICommonRegReader` in `StandingStartSeq` and update parameter handling in `SmartCommunicationSeq`.
This commit is contained in:
Michal Buzik 2025-12-06 12:48:42 +01:00
parent 2842425673
commit a5936c8f19
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TBF/Rig/TestMethods/SmartMeterFlyingStartMassCollection/SmartCommunicationSeq.cs
View File

@ -373,7 +373,7 @@ namespace TBF.Rig.TestMethods.SmartMeterFlyingStartMassCollection
/// Show the modeless dialog with error indication
///
string componentName = (method as IComponent)?.Name ?? string.Empty;
Program.MainWnd.Invoke(new SmartCommFormDlgt(OpenSmartCommForm), new object[] { this, componentName, test, testParams });
Program.MainWnd.Invoke(new SmartCommFormDlgt(OpenSmartCommForm), new object[] { this, method, test, testParams });
//------------------------------------------------
Bridge.OnActivity(this, Strings.iPerl_Communication_in_progress);

17
TBF/Rig/TestMethods/StandingStart/StandingStartSeq.cs
View File

@ -513,8 +513,8 @@ namespace TBF.Rig.TestMethods.StandingStart
{
GenericDevices.IRegReader rr = sensPath.RegisterReaders[i];
if (rr is ISmartReader)
(rr as ISmartReader).BeginWMState = dataEntryCmpnt.WMStartState(i);
if (rr is ICommonRegReader)
(rr as ICommonRegReader).BeginWMState = dataEntryCmpnt.WMStartState(i);
if (rr is Rig.RegisterReaders.StandingStartStop.RegisterReader)
(rr as Rig.RegisterReaders.StandingStartStop.RegisterReader).BeginWMState = dataEntryCmpnt.WMStartState(i);
@ -766,9 +766,9 @@ namespace TBF.Rig.TestMethods.StandingStart
for (int i = 0; i < Data.WMsCount; i++)
{
GenericDevices.IRegReader rr = sensPath.RegisterReaders[i];
if (rr is ISmartReader)
(rr as ISmartReader).EndWMState = dataEntryCmpnt.WMEndState(i);
if (rr is ICommonRegReader)
(rr as ICommonRegReader).EndWMState = dataEntryCmpnt.WMEndState(i);
if (rr is Rig.RegisterReaders.StandingStartStop.RegisterReader)
(rr as Rig.RegisterReaders.StandingStartStop.RegisterReader).EndWMState = dataEntryCmpnt.WMEndState(i);
@ -1017,6 +1017,13 @@ namespace TBF.Rig.TestMethods.StandingStart
&& (tstRslt.ErrorFlags == 0);
meterRslt.TestDone = true;
tstRslt.TestDone = true;
if (regReader is ICommonRegReader regReaderCommon)
// if (meterRslt.WaterMeter != null
// && tstRslt is ICommonRegReader tstRsltCommon
// && !string.IsNullOrEmpty(tstRsltCommon.SerialNr))
{
meterRslt.WaterMeter.SerialNr = regReaderCommon.SerialNr;
}
}
}
}