Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 1 deletion apps/ied_simulator/qml/BrowserReportPane.qml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,11 @@ Rectangle {
// Preserve selection through repeat snapshots of the same report frame;
// reset only when the actual ReportID/sequence/entry identity changes.
readonly property string latestReportIdentity: !hasLastReport ? "" : [
latestReport.reportId || "", latestReport.sequence || "",
latestReport.rcbReference || "", latestReport.reportId || "", latestReport.sequence || "",
latestReport.subSequence || "", latestReport.entryId || ""
].join("|")
// A different indexed RCB can legitimately emit the same RptID/SqNum.
// Reset member selection when provenance changes, not only wire sequence.
onLatestReportIdentityChanged: selectedReportMemberIndex = -1
function selectedReportMemberEvidence() {
if (!hasLastReport || selectedReportMemberIndex < 0 ||
Expand Down
4 changes: 2 additions & 2 deletions apps/ied_simulator/src/MmsReportController.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1615,7 +1615,7 @@ bool MmsReportController::enableSelectedAuthored(
"Authored RCB restored to canonical static DataSet; configuration verified and enabled.")
: (requestGeneralInterrogation
? QStringLiteral(
"Authored RCB configuration verified; enabled; GI requested.")
"Authored RCB enabled; GI requested (inspect GI write outcome and received reports).")
: QStringLiteral(
"Authored RCB configuration verified and enabled.")));
emit self->inventoryChanged();
Expand Down Expand Up @@ -1718,7 +1718,7 @@ bool MmsReportController::enableSelected(const bool requestGeneralInterrogation)
self->reportDecodeFailureCount_ = ui.decodeFailureCount;
self->state_ = ui.cleanupRequired ? State::cleanup_required : State::active;
self->appendDiagnostic(requestGeneralInterrogation
? QStringLiteral("RCB enabled; GI requested explicitly.")
? QStringLiteral("RCB enabled; GI requested (inspect GI write outcome; report not yet proven).")
: QStringLiteral("RCB enabled without GI."));
emit self->reportsChanged();
emit self->stateChanged();
Expand Down
1 change: 1 addition & 0 deletions apps/ied_simulator/test_browser_convergence.py
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@
'selectedReportMemberEvidence()',
'root.selectedReportMemberIndex = dataRow.index',
'onLatestReportIdentityChanged: selectedReportMemberIndex = -1',
'latestReport.rcbReference || ""',
'BrowserEngineeringEvidence {',
'root.latestReport.valuesTruncated === true',
'root.latestReport.valueTextTruncated === true',
Expand Down
Loading