Repository navigation
P0 consolidate: firmware-truth PTP lifecycle, firm SV START and native clipboard tests #268
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| // SPDX-License-Identifier: GPL-3.0-or-later | ||
| // Native GUI clipboard contract: exercise the SAME production adapter as Studio. | ||
| #include "StudioClipboard.hpp" | ||
|
|
||
| #include <QClipboard> | ||
| #include <QGuiApplication> | ||
| #include <QString> | ||
|
|
||
| int main(int argc, char** argv) { | ||
| QGuiApplication app(argc, argv); | ||
| StudioClipboard clipboard; | ||
| auto* osClipboard = QGuiApplication::clipboard(); | ||
| if (osClipboard == nullptr) return 2; | ||
|
|
||
| if (clipboard.copyText(QString{})) return 3; // no fabricated success | ||
| constexpr auto kHeader = "ARStack Studio field diagnostics"; | ||
| const QString evidence = QString::fromUtf8( | ||
| "ARStack Studio field diagnostics\n" | ||
| "Installed firmware: df73fea0b68e7f47\n" | ||
| "PTP START error: PTPROLE rejected: stop PTP before changing operating role\n" | ||
| "SVSYNC event: ETHERNET_LINK_LOSS\n"); | ||
| if (!evidence.startsWith(QString::fromLatin1(kHeader))) return 4; | ||
| if (!clipboard.copyText(evidence)) return 5; | ||
| if (osClipboard->text(QClipboard::Clipboard) != evidence) return 6; | ||
|
|
||
| const QString second = QString::fromUtf8( | ||
| "PTP diagnostic: SOURCE running\n" | ||
| "MAC phase ±2 us\n" | ||
| "SVSYNC ACQUIRED\n"); | ||
| if (!clipboard.copyText(second)) return 7; | ||
| if (osClipboard->text(QClipboard::Clipboard) != second) return 8; | ||
| if (osClipboard->text(QClipboard::Clipboard) == evidence) return 9; | ||
| return 0; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -814,6 +814,7 @@ bool DeviceController::startWithScenario(const QVariantMap& scenario) { | |
| scenarioProfileGeneration_ = profileGeneration_; | ||
| if (!sendCommandBatch(commands, false, true)) { resetScenarioStart(); return false; } | ||
| scenarioTimer_.start(); | ||
| emit scenarioStateChanged(); | ||
| signalFrequencyHz_ = hz; | ||
| return true; | ||
| } | ||
|
|
@@ -1436,9 +1437,22 @@ bool DeviceController::startPtpConfigured(const QString& requestedRole, | |
| void DeviceController::advancePtpStartup(const QString& line) { | ||
| if (!ptpStarting() || ptpStartStage_ == PtpStartStage::stop_unconfirmed) return; | ||
| if (ptpStartStage_ == PtpStartStage::awaiting_preflight) { | ||
| // PTP SHOW provides measured PTP2 role before status. Only adopt an | ||
| // already-active transmitter if THIS preflight saw the expected role; | ||
| // historical UI role cannot authorize mutation or claim an exact role. | ||
| const auto roleProof = kPtpMeasuredStateExpression.match(line); | ||
| if (roleProof.hasMatch()) | ||
| ptpRuntimeRoleSeen_ = roleProof.captured(1).toUpper() == pendingPtpRole_; | ||
| const auto actual = kPtpStatusExpression.match(line); | ||
| if (!actual.hasMatch()) return; | ||
| if (actual.captured(1).compare(QStringLiteral("RUNNING"), Qt::CaseInsensitive) == 0) { | ||
| if (ptpRuntimeRoleSeen_) { | ||
| const QString existingRole = pendingPtpRole_; | ||
| resetPtpStartup(); | ||
| ptpStatus_ = QStringLiteral("PTP %1 already active on board; external sync unqualified").arg(existingRole); | ||
| emit ptpStateChanged(); | ||
| return; // No redundant role/config/start, no surprise STOP. | ||
|
Comment on lines
+1449
to
+1454
There was a problem hiding this comment.
When reconnecting to an already-running board whose role matches the requested role but whose domain, transportSpecific, VLAN, or cadence differs, this branch resets the startup transaction and reports the runtime as adopted without ever comparing AGENTS.md reference: AGENTS.md:L11-L18 Useful? React with 👍 / 👎. |
||
| } | ||
| ptpLastStartFailure_ = QStringLiteral( | ||
| "Board PTP is already RUNNING. Click Stop PTP, wait for verified STOPPED, then retry Start."); | ||
| ptpStatus_ = ptpLastStartFailure_; | ||
|
|
@@ -1496,6 +1510,19 @@ void DeviceController::advancePtpStartup(const QString& line) { | |
| line.contains(QStringLiteral("PTP start rejected"), Qt::CaseInsensitive) || | ||
| line.contains(QStringLiteral("PTP unavailable"), Qt::CaseInsensitive); | ||
| if (rejected) { | ||
| if (line.contains(QStringLiteral("PTPROLE rejected: stop PTP before changing operating role"), | ||
| Qt::CaseInsensitive)) { | ||
| // A physical role rejection is positive evidence the timing runtime | ||
| // is active. Do not reset it to OFF, and never auto-stop a source | ||
| // that the current Studio transaction has not proven it owns. | ||
| ptpLastStartFailure_ = QStringLiteral("Board PTP is still RUNNING: ") + line; | ||
| resetPtpStartup(); | ||
| ptpRunning_ = true; | ||
| ptpStatus_ = QStringLiteral("PTP active on board; verify STOP before changing role"); | ||
| emit ptpStateChanged(); | ||
| setError(ptpLastStartFailure_); | ||
| return; | ||
| } | ||
| const bool rollback = ptpStartStage_ == PtpStartStage::awaiting_start || | ||
| ptpStartStage_ == PtpStartStage::awaiting_runtime; | ||
| const QString step = ptpStartPhase(); | ||
|
|
@@ -1693,7 +1720,10 @@ void DeviceController::resetScenarioStart() noexcept { | |
| scenarioSignalGeneration_ = 0; | ||
| scenarioBoot_.clear(); | ||
| scenarioProfileGeneration_.clear(); | ||
| if (wasPending) { | ||
| emit scenarioStateChanged(); | ||
| emit scenarioApplicationFinished(); | ||
| } | ||
| } | ||
|
|
||
| void DeviceController::failScenarioStart(const QString& message) { | ||
|
|
@@ -1864,8 +1894,11 @@ void DeviceController::processLine(const QString& rawLine) { | |
| failScenarioStart(QStringLiteral("Unexpected SV START ACK identity/hash.")); | ||
| return; | ||
| } | ||
| // Publish verified RUNNING before clearing the pending START phase. | ||
| // Otherwise QML can briefly see neither RUNNING nor STARTING and | ||
| // bounce the button back to START during a successful ACK handoff. | ||
| setRunning(true); | ||
| resetScenarioStart(); | ||
| return; | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When
pendingApplyis already false after a previous successful run, a subsequent CFG commit/readback/START rejection or timeout now only clearsscenarioApplying; because the broad error handler was removed and this connection only handles successful RUNNING evidence,pendingApplyremains false. After such a failure the status strip incorrectly says the setpoints are applied even when the transaction failed before commit, so the authoritative transaction failure path needs to mark the draft pending without reacting to unrelated device errors.Useful? React with 👍 / 👎.