From bbd0e5693c4a8eb023bf7ab8821206e89387bb5f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 3 Jun 2026 10:05:05 +0000 Subject: [PATCH 1/2] Create draft PR for #54 From ce5f4e82f5d9071fae0eba352df43c385454c2e4 Mon Sep 17 00:00:00 2001 From: peterbarancek <62284244+peterbarancek@users.noreply.github.com> Date: Wed, 3 Jun 2026 15:42:57 +0200 Subject: [PATCH 2/2] Fix comprehensive result accumulation to prevent overwriting failure descriptions --- .../TcoInspectionGroup.TcPOU | 10 +++++++--- .../POUs/TcoInspector/TcoInspector.TcPOU | 20 +++++++++++++------ 2 files changed, 21 insertions(+), 9 deletions(-) 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 f3505873..7dc7bc89 100644 --- a/src/TcoInspectors/src/XAE/XAE/TcoInspectors/POUs/TcoInspectionGroup/TcoInspectionGroup.TcPOU +++ b/src/TcoInspectors/src/XAE/XAE/TcoInspectors/POUs/TcoInspectionGroup/TcoInspectionGroup.TcPOU @@ -528,6 +528,10 @@ _refOverallResult REF= inoResult; IF(_tierUpdateOverall.IsNewTier()) THEN _originalOverallResult := inoResult; END_IF +IF _coordinator.IsFreshState THEN + _originalOverallResult := inoResult; +END_IF + CASE _currentRunResult.Result OF @@ -536,10 +540,10 @@ CASE _currentRunResult.Result OF eOverallResult.Passed: ; eOverallResult.Failed: - + _refOverallResult:=_originalOverallResult; _refOverallResult.Result := eOverallResult.Failed; - _refOverallResult.Failures := _currentRunResult.Failures; - _refOverallResult.ErrorCodes := _currentRunResult.ErrorCodes; + _refOverallResult.Failures := concat(concat(_refOverallResult.Failures,';'), _currentRunResult.Failures); + _refOverallResult.ErrorCodes := concat(concat(_refOverallResult.ErrorCodes,';'),_currentRunResult.ErrorCodes); END_CASE 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 285d85c7..4a975ca4 100644 --- a/src/TcoInspectors/src/XAE/XAE/TcoInspectors/POUs/TcoInspector/TcoInspector.TcPOU +++ b/src/TcoInspectors/src/XAE/XAE/TcoInspectors/POUs/TcoInspector/TcoInspector.TcPOU @@ -637,6 +637,9 @@ _refOverallResult REF= inoResult; IF (_tierUpdateOverall.IsNewTier()) THEN _originalOverallResult := inoResult; END_IF +IF _coordinator.IsFreshState THEN + _originalOverallResult := inoResult; +END_IF IF (NOT __ISVALIDREF(_inspectorTask.InspectionData)) THEN inoResult.Result := eOverallResult.NoAction; @@ -651,11 +654,13 @@ CASE _inspectorTask.InspectionData.Result OF eInspectorResult.Passed: ; eInspectorResult.Failed: - inoResult.Result := eOverallResult.Failed; - UpdateDescriptions(inoResult); + _refOverallResult:=_originalOverallResult; + _refOverallResult.Result := eOverallResult.Failed; + UpdateDescriptions(_originalOverallResult,inoResult); eInspectorResult.Inconclusive: - inoResult.Result := eOverallResult.Failed; - UpdateDescriptions(inoResult); + _refOverallResult:=_originalOverallResult; + _refOverallResult.Result := eOverallResult.Failed; + UpdateDescriptions(_originalOverallResult,inoResult); eInspectorResult.Excluded: ; eInspectorResult.Bypassed: @@ -672,6 +677,9 @@ END_CASE]]> ~*) METHOD PROTECTED UpdateDescriptions +VAR_INPUT + inOriginalResult:TcoComprehensiveResult;; +END_VAR VAR_IN_OUT inoResult : TcoComprehensiveResult; END_VAR @@ -679,13 +687,13 @@ END_VAR