Skip to content

Inspector group retry to same #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
peterbarancek merged 3 commits into from
May 28, 2026
Merged

Inspector group retry to same #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
674e8a8
Create draft PR for #48
github-actions[bot] May 25, 2026
c51ae40
remove TriggerEnable from restore method
peterbarancek May 25, 2026
b70a976
Refactor inspector methods to streamline restore functionality and up…
peterbarancek May 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...CognexVision/src/XAE/XAE/TcoCognexVision/POUs/TcoDataman/v_5_x_x/TcoDataman_v_5_x_x.TcPOU
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,8 +402,8 @@ _readTask.Restore();

Tc2_System.MEMSET(destAddr:= ADR(THIS^._results.Data) , fillByte:= 0 , n:= SIZEOF(THIS^._results.Data));

THIS^.inoIoData.AcquisitionControl.TriggerEnable := FALSE;
THIS^.inoIoData.AcquisitionControl.Trigger := FALSE;
//THIS^.inoIoData.AcquisitionControl.TriggerEnable := FALSE;
//THIS^.inoIoData.AcquisitionControl.Trigger := FALSE;

Comment on lines 403 to 407
THIS^._results.Code := 0;
THIS^._results.Extended := 0;
Expand Down
34 changes: 20 additions & 14 deletions src/TcoInspectors/src/XAE/XAE/TcoInspectors/POUs/TcoInspectionGroup/TcoInspectionGroup.TcPOU
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ VAR
_tierAct : TcoCore.TcoTier(THIS^);
_normalizedAllowedRetries : UINT;


END_VAR

VAR CONSTANT
Expand Down Expand Up @@ -95,12 +94,15 @@ END_VAR
</Get>
</Property>
<Method Name="Dialog" Id="{74a2f6ff-2257-0b1f-0c44-f3b62d0819e8}" FolderPath="OnFail\">
<Declaration><![CDATA[METHOD Dialog : BOOL
<Declaration><![CDATA[{attribute 'hide'}
{attribute 'obsolete' := 'You should access `Evaluate` method via `OnFail()` method.'}
METHOD Dialog : BOOL
VAR_INPUT
inRetryStep : INT;
END_VAR]]></Declaration>
<Implementation>
<ST><![CDATA[IF(THIS^.Done) THEN
<ST><![CDATA[
IF(THIS^.Done) THEN
_tcoInspectorDialogue.OverInspected := THIS^.OverInspected;
IF(THIS^._currentRunResult.Result = eOverallResult.Failed) THEN
THIS^._tcoInspectorDialogue.Invoke();
Expand Down Expand Up @@ -130,22 +132,17 @@ END_IF;
</Implementation>
</Method>
<Method Name="DialogWithExternalClose" Id="{672e39a2-df24-00dc-01ed-378f101e1a1c}" FolderPath="OnFail\">
<Declaration><![CDATA[METHOD DialogWithExternalClose : BOOL
<Declaration><![CDATA[{attribute 'hide'}
{attribute 'obsolete' := 'You should access `Evaluate` method via `OnFail()` method.'}
METHOD DialogWithExternalClose : BOOL
VAR_INPUT
inRetryStep : INT;
inRetrySignal:BOOL;
inTerminateSignal : BOOL;
END_VAR
]]></Declaration>
<Implementation>
<ST><![CDATA[//IF THIS^._tcoInspectorDialogue.State=eTaskState.Ready THEN
// THIS^._tcoInspectorDialogue.DialogRetry := FALSE;
// THIS^._tcoInspectorDialogue.DialogTerminate := FALSE;
// THIS^._tcoInspectorDialogue.DialogOverride := FALSE;
//END_IF



<ST><![CDATA[

_tcoInspectorDialogue.HandleExternalSignals(inRetrySignal:=inRetrySignal,inTerminateSignal:=inTerminateSignal);

Expand Down Expand Up @@ -315,6 +312,10 @@ END_VAR
<Implementation>
<ST><![CDATA[OnEnterInspection();

IF(_coordinator.IsFreshState) THEN
Inspector.Restore();
END_IF;
Comment on lines +315 to +317

IF(_normalizedAllowedRetries <> 0
AND _normalizedAllowedRetries <> MAX_NORMALIZED_RETRIES) THEN
Inspector.CommonData.NumberOfAllowedRetries := _normalizedAllowedRetries;
Expand All @@ -328,13 +329,14 @@ IF(Inspector.OverInspected) THEN
END_IF;

IF (Inspector.Done) THEN
Inspector.UpdateComprehensiveResult(_currentRunResult);
Inspector.UpdateComprehensiveResult(_currentRunResult);
ELSE
_done := FALSE;
_done_PV := FALSE;
END_IF



IF(_inspectionIndex < LAST_INSPECTION_INDEX)THEN
_inspections[_inspectionIndex] := Inspector.Identity;
_inspectionIndex := _inspectionIndex + 1;
Expand Down Expand Up @@ -376,7 +378,10 @@ VAR_INPUT
END_VAR
]]></Declaration>
<Implementation>
<ST><![CDATA[//THIS^._tcoInspectorDialogue.SetInspector(THIS^);
<ST><![CDATA[IF(_coordinator = 0) THEN
Messenger.Programming('Missing `coordinator`. You will need to call inspector `WithCoordinator` method.');
END_IF

OnFail := THIS^;

]]></ST>
Expand Down Expand Up @@ -587,6 +592,7 @@ END_VAR
]]></Declaration>
<Implementation>
<ST><![CDATA[_WithCoordinator(inCoordinator);

WithCoordinator := THIS^;]]></ST>
</Implementation>
</Method>
Expand Down
6 changes: 6 additions & 0 deletions src/TcoInspectors/src/XAE/XAE/TcoInspectors/POUs/TcoInspector/IInspector.TcIO
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,12 @@ END_VAR
<Declaration><![CDATA[]]></Declaration>
</Get>
</Property>
<Method Name="Restore" Id="{2c3d293d-5022-030e-042d-8f0d2e83ccad}">
<Declaration><![CDATA[METHOD Restore : TcoCore.ITcoRestorable
VAR_INPUT
END_VAR
]]></Declaration>
</Method>
<Property Name="Result" Id="{059b95a9-368b-016b-1e77-bc829a9a2a15}">
<Declaration><![CDATA[PROPERTY Result : eInspectorResult]]></Declaration>
<Get Name="Get" Id="{11bcb09e-df05-0600-3fcc-c1e8eab49bfc}">
Expand Down
9 changes: 7 additions & 2 deletions src/TcoInspectors/src/XAE/XAE/TcoInspectors/POUs/TcoInspector/TcoInspector.TcPOU
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ END_VAR
<ST><![CDATA[_coordinator := inCoordinator;

IF(_coordinator.IsFreshState) THEN
_inspectorTask.Restore();
_tcoInspectorDialogue.Restore();
Restore();
END_IF

_WithCoordinator := THIS^;]]></ST>
Expand Down Expand Up @@ -136,6 +135,8 @@ END_VAR
</summary>
</docu>
~*)
{attribute 'hide'}
{attribute 'obsolete' := 'You should access `Evaluate` method via `OnFail()` method.'}
METHOD PUBLIC Dialog : BOOL
VAR_INPUT
inRetryStep : INT;
Expand All @@ -155,6 +156,8 @@ END_VAR]]></Declaration>
</summary>
</docu>
~*)
{attribute 'hide'}
{attribute 'obsolete' := 'You should access `Evaluate` method via `OnFail()` method.'}
METHOD PUBLIC DialogWithExternalClose : BOOL
VAR_INPUT
inRetryStep : INT;
Expand Down Expand Up @@ -459,6 +462,8 @@ END_VAR
]]></Declaration>
<Implementation>
<ST><![CDATA[_tcoInspectorDialogue.Restore();
_inspectorTask.Restore();

]]></ST>
</Implementation>
</Method>
Expand Down
36 changes: 25 additions & 11 deletions src/TcoInspectors/src/XAE/XAE/TcoInspectorsTests/POUs/Examples/ExampleContext.TcPOU
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ IF (seq.Step(inStepID := 120,
.Inspect(Components.DmcReader)
.UpdateComprehensiveResult(Data.OverallResult)
.OnFail()
.RetryThenTerminate(110);
.RetryThenTerminate(120);
//--------------------------------------------------------
END_IF;

Expand All @@ -172,7 +172,7 @@ IF (seq.Step(inStepID := 201,
inStepDescription := 'INSPECT BOLT PRESENCE - ASK WHAT TO DO WITH INSTRUCTION')) THEN
//--------------------------------------------------------
IF seq.IsFreshState THEN
SetupData();
//SetupData();
END_IF

Data.BoltPresenceInspector
Expand All @@ -181,7 +181,7 @@ IF (seq.Step(inStepID := 201,
.UpdateComprehensiveResult(Data.OverallResult)
.Instruct('Something is wrong')
.OnFail()
.Dialog(seq.CurrentStep.ID + 1);
.Dialog(seq.CurrentStep.ID );
//--------------------------------------------------------
END_IF;

Expand Down Expand Up @@ -282,9 +282,9 @@ IF (seq.Step(inStepID := 250,
inEnabled := TRUE,
inStepDescription := 'INSPECT BOLT PRESENCE - ASK WHAT TO DO WITH EXTERNAL CLOSE')) THEN
//--------------------------------------------------------
IF seq.IsFreshState THEN
SetupData();
END_IF
// IF seq.IsFreshState THEN
// SetupData();
// END_IF

Data.BoltPresenceInspector
.WithCoordinator(seq)
Expand All @@ -299,9 +299,9 @@ IF (seq.Step(inStepID := 300,
inEnabled := TRUE,
inStepDescription := 'INSPECT DIMENSIONS - WITH NORMALIZE RETRIES (lower `number of allowed retries` for this call of inspection group)')) THEN
//--------------------------------------------------------
IF seq.IsFreshState THEN
SetupData();
END_IF
// IF seq.IsFreshState THEN
// SetupData();
// END_IF

GroupInspection
.WithCoordinator(seq)
Expand All @@ -314,21 +314,35 @@ IF (seq.Step(inStepID := 300,
.Inspect(Data.Dimensions.DimZ_Inspector.Inspect(Components.DimZ_Sensor))
.UpdateComprehensiveResult(Data.OverallResult)
.OnFail()
.Dialog(300);
.Retry(300);
//--------------------------------------------------------
END_IF;

IF (seq.Step(inStepID := 309,
IF (seq.Step(inStepID := 308,
inEnabled := TRUE,
inStepDescription := 'INSPECT MULTI DIMENSIONS - EXTERNAL CLOSE')) THEN
//--------------------------------------------------------
IF seq.IsFreshState THEN
SetupData();
END_IF
seq.CompleteStep();
//--------------------------------------------------------
END_IF
IF (seq.Step(inStepID := 309,
inEnabled := TRUE,
inStepDescription := 'INSPECT MULTI DIMENSIONS - EXTERNAL CLOSE')) THEN
//--------------------------------------------------------
// IF seq.IsFreshState THEN
// SetupData();
// END_IF


GroupInspection
.WithCoordinator(seq)
.Act();




GroupInspection.Inspect(Data.Dimensions.DimX_Inspector.Inspect(Components.DimX_Sensor));
GroupInspection.Inspect(Data.Dimensions.DimY_Inspector.WithCoordinator(seq).Inspect(Components.DimY_Sensor));
Expand Down
Loading