diff --git a/src/TcoCognexVision/src/XAE/XAE/TcoCognexVision/POUs/TcoDataman/v_5_x_x/TcoDataman_v_5_x_x.TcPOU b/src/TcoCognexVision/src/XAE/XAE/TcoCognexVision/POUs/TcoDataman/v_5_x_x/TcoDataman_v_5_x_x.TcPOU index fdc787fe..2c71efb8 100644 --- a/src/TcoCognexVision/src/XAE/XAE/TcoCognexVision/POUs/TcoDataman/v_5_x_x/TcoDataman_v_5_x_x.TcPOU +++ b/src/TcoCognexVision/src/XAE/XAE/TcoCognexVision/POUs/TcoDataman/v_5_x_x/TcoDataman_v_5_x_x.TcPOU @@ -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; THIS^._results.Code := 0; THIS^._results.Extended := 0; diff --git a/src/TcoInspectors/src/XAE/XAE/TcoInspectors/POUs/TcoInspectionGroup/TcoInspectionGroup.TcPOU b/src/TcoInspectors/src/XAE/XAE/TcoInspectors/POUs/TcoInspectionGroup/TcoInspectionGroup.TcPOU index 2cda5e68..f3505873 100644 --- a/src/TcoInspectors/src/XAE/XAE/TcoInspectors/POUs/TcoInspectionGroup/TcoInspectionGroup.TcPOU +++ b/src/TcoInspectors/src/XAE/XAE/TcoInspectors/POUs/TcoInspectionGroup/TcoInspectionGroup.TcPOU @@ -15,7 +15,6 @@ VAR _tierAct : TcoCore.TcoTier(THIS^); _normalizedAllowedRetries : UINT; - END_VAR VAR CONSTANT @@ -95,12 +94,15 @@ END_VAR - - - - 0 AND _normalizedAllowedRetries <> MAX_NORMALIZED_RETRIES) THEN Inspector.CommonData.NumberOfAllowedRetries := _normalizedAllowedRetries; @@ -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; @@ -376,7 +378,10 @@ VAR_INPUT END_VAR ]]> - @@ -587,6 +592,7 @@ END_VAR ]]> diff --git a/src/TcoInspectors/src/XAE/XAE/TcoInspectors/POUs/TcoInspector/IInspector.TcIO b/src/TcoInspectors/src/XAE/XAE/TcoInspectors/POUs/TcoInspector/IInspector.TcIO index 13f42cec..67453ba7 100644 --- a/src/TcoInspectors/src/XAE/XAE/TcoInspectors/POUs/TcoInspector/IInspector.TcIO +++ b/src/TcoInspectors/src/XAE/XAE/TcoInspectors/POUs/TcoInspector/IInspector.TcIO @@ -82,6 +82,12 @@ END_VAR + + + diff --git a/src/TcoInspectors/src/XAE/XAE/TcoInspectors/POUs/TcoInspector/TcoInspector.TcPOU b/src/TcoInspectors/src/XAE/XAE/TcoInspectors/POUs/TcoInspector/TcoInspector.TcPOU index f229df81..285d85c7 100644 --- a/src/TcoInspectors/src/XAE/XAE/TcoInspectors/POUs/TcoInspector/TcoInspector.TcPOU +++ b/src/TcoInspectors/src/XAE/XAE/TcoInspectors/POUs/TcoInspector/TcoInspector.TcPOU @@ -41,8 +41,7 @@ END_VAR @@ -136,6 +135,8 @@ END_VAR ~*) +{attribute 'hide'} +{attribute 'obsolete' := 'You should access `Evaluate` method via `OnFail()` method.'} METHOD PUBLIC Dialog : BOOL VAR_INPUT inRetryStep : INT; @@ -155,6 +156,8 @@ END_VAR]]> ~*) +{attribute 'hide'} +{attribute 'obsolete' := 'You should access `Evaluate` method via `OnFail()` method.'} METHOD PUBLIC DialogWithExternalClose : BOOL VAR_INPUT inRetryStep : INT; @@ -459,6 +462,8 @@ END_VAR ]]> diff --git a/src/TcoInspectors/src/XAE/XAE/TcoInspectorsTests/POUs/Examples/ExampleContext.TcPOU b/src/TcoInspectors/src/XAE/XAE/TcoInspectorsTests/POUs/Examples/ExampleContext.TcPOU index 94520d91..80d54604 100644 --- a/src/TcoInspectors/src/XAE/XAE/TcoInspectorsTests/POUs/Examples/ExampleContext.TcPOU +++ b/src/TcoInspectors/src/XAE/XAE/TcoInspectorsTests/POUs/Examples/ExampleContext.TcPOU @@ -145,7 +145,7 @@ IF (seq.Step(inStepID := 120, .Inspect(Components.DmcReader) .UpdateComprehensiveResult(Data.OverallResult) .OnFail() - .RetryThenTerminate(110); + .RetryThenTerminate(120); //-------------------------------------------------------- END_IF; @@ -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 @@ -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; @@ -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) @@ -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) @@ -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));