From 2a5a318c1a2ad20091d5796ec44c1bed153a95d8 Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Mon, 24 Jul 2023 15:15:38 +0200 Subject: [PATCH] Send "Operate" machine-event if machine state is no error --- src/ATBAPP/ATBMachineEvent.cpp | 3 +++ src/ATBAPP/ATBMachineEvent.h | 1 + src/ATBAPP/DeviceControllerDiag.cpp | 8 ++++++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/ATBAPP/ATBMachineEvent.cpp b/src/ATBAPP/ATBMachineEvent.cpp index 50fdead..4f34895 100644 --- a/src/ATBAPP/ATBMachineEvent.cpp +++ b/src/ATBAPP/ATBMachineEvent.cpp @@ -56,6 +56,9 @@ QString ATBMachineEvent::getEventClassString(EVENT_CLASS eventClass) case EVENT_CLASS::STATE: return "STATE"; break; + case EVENT_CLASS::OPERATE: + return "OPERATE"; + break; case EVENT_CLASS::NOT_DEFINED: return "NOT_DEFINED"; break; diff --git a/src/ATBAPP/ATBMachineEvent.h b/src/ATBAPP/ATBMachineEvent.h index ae3bd9c..d041ae1 100644 --- a/src/ATBAPP/ATBMachineEvent.h +++ b/src/ATBAPP/ATBMachineEvent.h @@ -41,6 +41,7 @@ enum class EVENT_CLASS : quint8 { ALARM, DEBUG, STATE, + OPERATE, NOT_DEFINED }; diff --git a/src/ATBAPP/DeviceControllerDiag.cpp b/src/ATBAPP/DeviceControllerDiag.cpp index 1ab7bf8..e3d00f0 100644 --- a/src/ATBAPP/DeviceControllerDiag.cpp +++ b/src/ATBAPP/DeviceControllerDiag.cpp @@ -261,6 +261,7 @@ uint8_t DeviceControllerDiag::sys_getSystemErrors() /** * @brief DeviceControllerDiag::private_finishedDiag * @param result - result value from 'sub_componentAssessment()', + * - 0x00 everything is fine * - 0xFF on timer interrupt * - 0xFE no valid data from DeviceController * - 0xFD Service or battery door is open @@ -272,8 +273,6 @@ void DeviceControllerDiag::private_finishedDiag(uint8_t result) this->isRequestRunning = false; this->flagInterruptDiag = false; - if (result == 0) return; - qCritical() << "DeviceControllerDiag::private_finishedDiag() result: " << result; @@ -371,6 +370,11 @@ void DeviceControllerDiag::private_finishedDiag(uint8_t result) eventClass = EVENT_CLASS::STATE; parameter = "no valid data from DeviceController"; break; + case 0x00: // everything is fine + eventName = "O000"; + eventClass = EVENT_CLASS::OPERATE; + parameter = ""; + break; }