Send W255 on restart CArun

... this prevents sending Operate "O000" in case of an opend door and
enables sending Operate "O000" after closing all doors because
'lastResult' has not changed.

src/ATBAPP/ATBDeviceControllerPlugin.cpp

@@ -82,6 +82,8 @@ PLUGIN_STATE ATBDeviceControllerPlugin::initDCPlugin(QObject *eventReceiver, con
     this->diag = new DeviceControllerDiag(this->persistentData, this);
     connect(this->diag, &DeviceControllerDiag::newVoltage, this, &ATBDeviceControllerPlugin::onNewVoltage);
 
+    int diagTimeout = settings.value("ATBDeviceControllerPlugin/diagTimeout", "45").toInt();
+    this->diag->setTimeout(diagTimeout);
 
     // currentSelectedTicketType - number of used "Kombiticket" (deprecated) use TICKET_VARIANT in future
     this->currentSelectedTicketType = 0;
@@ -540,6 +542,8 @@ void ATBDeviceControllerPlugin::onCBinAndAllDoorsClosed()
 {
     qCritical() << "ATBDeviceControllerPlugin::onCBinAndAllDoorsClosed()";
 
+    this->diag->diagReInit();
+
     QTimer::singleShot(2000, this, SIGNAL(requestModeIDLE()));
 
     this->dbus->finishedBackgroundTask("DOOR_OPEN");

src/ATBAPP/DeviceControllerDiag.cpp

@@ -5,6 +5,8 @@
 #include <QUuid>
 #include <QDebug>
 
+#include <QProcess>
+
 #include "support/JSON.h"
 
 
@@ -18,9 +20,10 @@ DeviceControllerDiag::DeviceControllerDiag(PersistentData *pData, QObject *paren
     , lastState(DeviceController::State::INITIAL_STATE)
     , _isErrorState(false)
     , pData(pData)
+    , E255counter(0)
 {
     diagRequestTimeoutTimer = new QTimer(this);
-    diagRequestTimeoutTimer->setInterval(1000*20);  // 20s
+    diagRequestTimeoutTimer->setInterval(1000*45);
     diagRequestTimeoutTimer->setSingleShot(true);
     connect(diagRequestTimeoutTimer, &QTimer::timeout, this, &DeviceControllerDiag::onDiagRequestTimeoutTimerTimeout);
 }
@@ -36,6 +39,17 @@ void DeviceControllerDiag::init(hwinf *hw, QObject* eventReceiver)
 }
 
 
+void DeviceControllerDiag::diagReInit()
+{
+    this->machineEventSet.clear();
+    this->_isErrorState = false;
+}
+
+void DeviceControllerDiag::setTimeout(int timeout)
+{
+    this->diagRequestTimeoutTimer->setInterval(1000 * timeout);
+}
+
 void DeviceControllerDiag::diagRequest()
 {
     qCritical() << "DeviceControllerDiag::diagRequest()";
@@ -93,6 +107,20 @@ void DeviceControllerDiag::private_startDiag()
         this->private_sendDiagEvent(DeviceController::State::E255);
         this->isRequestRunning  = false;
         this->flagInterruptDiag = false;
+        if (this->E255counter > 5) {
+            this->restartCArun();
+        }
+        else {
+            this->E255counter++;
+
+            // try it again, until success:
+            QTimer::singleShot(400, this, &DeviceControllerDiag::diagRequest);
+            /**
+             * But please note:
+             * - diag does currently not stop suspend (start a background task)
+             * - diag is called again in ModeOOO wokeup()
+             */
+        }
         return;
     }
 
@@ -127,6 +155,8 @@ void DeviceControllerDiag::sys_superviseSystem()
         this->private_sendDiagEvent(DeviceController::State::E255);
         this->flagInterruptDiag = false;
         this->isRequestRunning  = false;
+        if (this->E255counter > 5) { this->restartCArun(); }
+                              else { this->E255counter++; }
         return;
     }
 
@@ -137,6 +167,8 @@ void DeviceControllerDiag::sys_superviseSystem()
         this->private_sendDiagEvent(DeviceController::State::E254);
         this->diagRequestTimeoutTimer->stop();
         this->isRequestRunning  = false;
+        if (this->E255counter > 5) { this->restartCArun(); }
+                              else { this->E255counter++; }
         return;
     }
 
@@ -149,7 +181,7 @@ void DeviceControllerDiag::sys_superviseSystem()
     {
         // noch keine Testergebnisse
         if (dynMaCond.startupTestIsRunning) {
-            // TODO?
+            qCritical() << "            startupTestIsRunning --> call again";
         }
 
 
@@ -159,18 +191,6 @@ void DeviceControllerDiag::sys_superviseSystem()
         return;
     }
 
-    // all doors: 99: undefined  0:closed  1:open
-    if (dynMaCond.lowerDoor || dynMaCond.upperDoor) {
-        // Service or battery door is open, goto INTRUSION MODE
-        qCritical() << "DeviceControllerDiag::sys_superviseSystem() Service or battery door is open, goto INTRUSION MODE";
-        this->private_sendDiagEvent(DeviceController::State::E253);
-    }
-    if (dynMaCond.middleDoor) {
-        // vault door is open, goto INTRUSION MODE
-        qCritical() << "DeviceControllerDiag::sys_superviseSystem() vault door is open, goto INTRUSION MODE";
-        this->private_sendDiagEvent(DeviceController::State::E252);
-    }
-
     qCritical() << "      --> call  sub_componentAssessment()";
 
     sub_componentAssessment();
@@ -204,6 +224,21 @@ void DeviceControllerDiag::sub_componentAssessment()
         this->private_sendDiagEvent(DeviceController::State::A000);
     }
 
+    // check for open doors
+    // all doors: 99: undefined  0:closed  1:open
+    if (dynMaCond.lowerDoor || dynMaCond.upperDoor) {
+        // Service or battery door is open
+        flag_sendOperate = false;
+        qCritical() << "DeviceControllerDiag::sys_superviseSystem() Service or battery door is open, goto INTRUSION MODE";
+        this->private_sendDiagEvent(DeviceController::State::E253);
+    }
+    if (dynMaCond.middleDoor) {
+        // vault door is open
+        flag_sendOperate = false;
+        qCritical() << "DeviceControllerDiag::sys_superviseSystem() vault door is open, goto INTRUSION MODE";
+        this->private_sendDiagEvent(DeviceController::State::E252);
+    }
+
     // check for invalid states:
 
     if (modCond.rtc>=200) {
@@ -343,7 +378,7 @@ void DeviceControllerDiag::sub_componentAssessment()
     }
     if (modCond.temper>=200) {
         flag_sendOperate = false;
-        this->private_sendDiagEvent(DeviceController::State::E004);
+        this->private_sendDiagEvent(DeviceController::State::W004);
     }
 
     // check for warnings
@@ -548,6 +583,10 @@ void DeviceControllerDiag::private_sendDiagEvent(DeviceController::State result)
         eventClass = EVENT_CLASS::WARNING;
         parameter  = "temperatur warning";
         break;
+    case DeviceController::State::W255:   // restart carun
+        eventClass = EVENT_CLASS::WARNING;
+        parameter  = "restart carun";
+        break;
     }
 
     this->lastState = result;
@@ -577,3 +616,13 @@ void DeviceControllerDiag::private_sendDiagEvent(DeviceController::State result)
 }
 
 
+
+/**
+ * reset / restart / reinit deviceController
+ */
+void DeviceControllerDiag::restartCArun()
+{
+    this->E255counter = 0;
+    this->private_sendDiagEvent(DeviceController::State::W255);
+    QProcess::startDetached("/bin/systemctl", {"restart", "carun"});
+}

src/ATBAPP/DeviceControllerDiag.h

@@ -55,6 +55,8 @@ namespace DeviceController {
         W003,
         W004,
 
+        W255,
+
         INITIAL_STATE
     };
     Q_ENUM_NS(State)
@@ -80,9 +82,25 @@ public:
     bool isOperatingState();
     QSet<DeviceController::State> getCurrentMachineState();
 
+    void setTimeout(int timeout);
+
 public slots:
+    /**
+     * start diag request
+     */
     void diagRequest();
 
+    /**
+     * reset / re-init diag request.
+     * Called e.g. when doors are closed.
+     */
+    void diagReInit();
+
+    /**
+     * reset / restart / reinit deviceController
+     */
+    void restartCArun();
+
 signals:
     void diagResponse(ATBMachineEvent* machineEvent);
 
@@ -107,6 +125,8 @@ private:
 
     PersistentData* pData;
 
+    int E255counter;
+
 private slots:
     void onDiagRequestTimeoutTimerTimeout();
 
@@ -115,7 +135,6 @@ private slots:
 
     void sys_superviseSystem();
 
-
 };
 
 #endif // DEVICECONTROLLERDIAG_H