diff --git a/src/ATBAPP/DeviceControllerDiag.cpp b/src/ATBAPP/DeviceControllerDiag.cpp index ffff726..70658fb 100644 --- a/src/ATBAPP/DeviceControllerDiag.cpp +++ b/src/ATBAPP/DeviceControllerDiag.cpp @@ -144,7 +144,7 @@ void DeviceControllerDiag::private_startDiag() if (result) { qCritical() << "DeviceControllerDiag::private_startDiag() DCdata is valid"; this->machineEventSet.remove(DCMachineEvent(DeviceController::State::E255)); - this->machineEventSet.remove(DCMachineEvent(DeviceController::State::W255)); + this->machineEventSet.remove(DCMachineEvent(DeviceController::State::M0255)); QTimer::singleShot(200, this, &DeviceControllerDiag::sys_superviseSystem); } else { @@ -680,8 +680,8 @@ void DeviceControllerDiag::private_sendDiagEvent(DCMachineEvent result, DeviceCo eventClass = EVENT_CLASS::WARNING; parameter = "temperatur warning"; break; - case DeviceController::State::W255: // restart carun - eventClass = EVENT_CLASS::WARNING; + case DeviceController::State::M0255: // restart carun + eventClass = EVENT_CLASS::STATE; parameter = "restart carun"; break; } @@ -722,10 +722,10 @@ void DeviceControllerDiag::restartCArun() this->E255counter = 0; - DCMachineEvent W255Event = DCMachineEvent(DeviceController::State::W255); - if (!this->previousMachineEventSet.contains(W255Event)) { - machineEventSet.insert(W255Event); - private_sendDiagEvent(W255Event, DeviceController::Action::SET); + DCMachineEvent M0255Event = DCMachineEvent(DeviceController::State::M0255); + if (!this->previousMachineEventSet.contains(M0255Event)) { + machineEventSet.insert(M0255Event); + private_sendDiagEvent(M0255Event, DeviceController::Action::SET); } QProcess::startDetached("/bin/systemctl", {"restart", "carun"}); diff --git a/src/ATBAPP/DeviceControllerDiag.h b/src/ATBAPP/DeviceControllerDiag.h index 0b4ddf7..a228960 100644 --- a/src/ATBAPP/DeviceControllerDiag.h +++ b/src/ATBAPP/DeviceControllerDiag.h @@ -49,6 +49,7 @@ namespace DeviceController { M0252, // cashbox door open M0253, // service or battery door is open M0254, // no valid data from DC + M0255, // restart carun E255, @@ -57,8 +58,6 @@ namespace DeviceController { W003, W004, - W255, - INITIAL_STATE }; Q_ENUM_NS(State)