From ccc1c6033f4bb70ff369473731d8dc6f939c24a8 Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Wed, 11 Jun 2025 14:13:09 +0200 Subject: [PATCH] Diag: Send operate O000 as last event (after set/reset events) --- src/ATBAPP/DeviceControllerDiag.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/ATBAPP/DeviceControllerDiag.cpp b/src/ATBAPP/DeviceControllerDiag.cpp index e098b02..834dd63 100644 --- a/src/ATBAPP/DeviceControllerDiag.cpp +++ b/src/ATBAPP/DeviceControllerDiag.cpp @@ -418,13 +418,6 @@ void DeviceControllerDiag::sub_componentAssessment() this->private_setDiagEvent(DeviceController::State::W004); } - if (flag_sendOperate) { - // O000 must not be part of event set - DCMachineEvent O000DCMachineEvent = DCMachineEvent(DeviceController::State::O000, - QUuid::createUuid().toString(QUuid::WithoutBraces).mid(0, 8)); - this->private_sendDiagEvent(O000DCMachineEvent, DeviceController::Action::SET); - } - // compare machineEventSets // New events: present in current but not previous @@ -459,6 +452,15 @@ void DeviceControllerDiag::sub_componentAssessment() } qCritical() << "diagReq result: " << DeviceControllerStateStringList; + // send Operate if there is no error + if (flag_sendOperate) { + // O000 must not be part of event set + DCMachineEvent O000DCMachineEvent = DCMachineEvent(DeviceController::State::O000, + QUuid::createUuid().toString(QUuid::WithoutBraces).mid(0, 8)); + this->private_sendDiagEvent(O000DCMachineEvent, DeviceController::Action::SET); + } + + // finish diag this->diagRequestTimeoutTimer->stop();