Merge branch 'improveDeviceControllerDiag' into pu/integration

src/ATBAPP/ATBDeviceControllerPlugin.cpp

@@ -24,8 +24,7 @@
 
 
 ATBDeviceControllerPlugin::ATBDeviceControllerPlugin(QObject *parent)
-    : currentProgramMode(PROGRAM_MODE::INIT)
-    , isMaster(false)
+    : isMaster(false)
     , pluginState(PLUGIN_STATE::NOT_INITIALIZED)
     , eventReceiver(nullptr)
 {
@@ -291,14 +290,12 @@ void ATBDeviceControllerPlugin::onChangedProgramModeToSELL()
     hw->dc_autoRequest(true);
     hw->rtc_setDateTime();
     hw->mdb_switchWake(0);   // wakeup MDB components
-    this->currentProgramMode = PROGRAM_MODE::SELL;
 }
 
 void ATBDeviceControllerPlugin::onChangedProgramModeToSERVICE()
 {    
     hw->dc_autoRequest(true);
     hw->mdb_switchWake(0);   // wakeup MDB components
-    this->currentProgramMode = PROGRAM_MODE::SERVICE;
 }
 
 void ATBDeviceControllerPlugin::onChangedProgramModeToIDLE()
@@ -306,19 +303,12 @@ void ATBDeviceControllerPlugin::onChangedProgramModeToIDLE()
     hw->dc_autoRequest(true);
     this->diag->diagRequest();
     hw->mdb_switchWake(1);
-    this->currentProgramMode = PROGRAM_MODE::IDLE;
 
 }
 
 void ATBDeviceControllerPlugin::onChangedProgramModeToOOO()
 {
-    // trigger diagRequest on SERVICE -> IDLE
-    if (this->currentProgramMode == PROGRAM_MODE::SERVICE) {
-        hw->dc_autoRequest(true);
-        this->diag->diagRequest();
-        hw->mdb_switchWake(1);
-    }
-    this->currentProgramMode = PROGRAM_MODE::OOO;
+
 }
 
 
@@ -1909,17 +1899,8 @@ int ATBDeviceControllerPlugin::init_sc_dbus()
 
 void ATBDeviceControllerPlugin::onWokeUp(uchar source)
 {
-    /* PTU5 wakeup sources:
-     *    0x01 - on wakeup from DeviceController
-     *    0x02 - on wakeup from WakeupButton
-     *    0x03 - on wakeup from ResetKey
-     *    0x04 - on wakeup from rtc
-     *    0xFE - signal emitted by timer (on mains powered machines)
-     *    0xFF - unknown wakeup source
-     */
-
-    if (source == 0x01 || source == 0x03 || source == 0xFE) {
-        // woke up from device controller, rtc or timer
+    if (source == 0x01 || source == 0xFE) {
+        // woke up from device controller
         hw->dc_autoRequest(true);
         this->diag->diagRequest();
     }

src/ATBAPP/ATBDeviceControllerPlugin.h

@@ -25,16 +25,6 @@ using namespace nsDeviceControllerInterface;
 
 class QSettings;
 
-enum class PROGRAM_MODE {
-    INIT,
-    IDLE,
-    SELL,
-    SERVICE,
-    OOO,
-    NOT_DEFINED
-};
-
-
 
 class ATBDeviceControllerPlugin :
         public DeviceControllerInterface
@@ -110,8 +100,6 @@ private:
 
    QString serialPortName;
 
-   PROGRAM_MODE currentProgramMode;
-
    bool useDebug;
 
    bool isMaster;

src/ATBAPP/DeviceControllerDiag.cpp

@@ -62,6 +62,7 @@ void DeviceControllerDiag::diagRequest()
         qCritical() << "DeviceControllerDiag::diagRequest() is already running";
         return;
     }
+    this->machineEventSet.clear();
     this->isRequestRunning = true;
     this->diagRequestTimeoutTimer->start();
 
@@ -132,9 +133,7 @@ void DeviceControllerDiag::private_startDiag()
              * - diag is called again in ModeOOO wokeup()
              */
         }
-        this->diagRequestTimeoutTimer->stop();
-        this->isRequestRunning  = false;
-        this->flagInterruptDiag = false;
+        this->private_finishDiag();
         return;
     }
 
@@ -144,7 +143,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::M0255));
+        this->machineEventSet.remove(DCMachineEvent(DeviceController::State::W255));
         QTimer::singleShot(200, this, &DeviceControllerDiag::sys_superviseSystem);
     }
     else {
@@ -184,9 +183,7 @@ void DeviceControllerDiag::sys_superviseSystem()
         if (this->E255counter > 5) { this->restartCArun(); }
                               else { this->E255counter++; }
         QTimer::singleShot(400, this, &DeviceControllerDiag::diagRequest);
-        this->diagRequestTimeoutTimer->stop();
-        this->isRequestRunning  = false;
-        this->flagInterruptDiag = false;
+        this->private_finishDiag();
         return;
     }
 
@@ -197,15 +194,13 @@ void DeviceControllerDiag::sys_superviseSystem()
         hw->dc_autoRequest(true);
 
         DCMachineEvent E255Event = DCMachineEvent(DeviceController::State::M0254);
-        previousMachineEventSet.insert(E255Event);
+        machineEventSet.insert(E255Event);
         private_sendDiagEvent(E255Event, DeviceController::Action::SET);
 
         if (this->E255counter > 5) { this->restartCArun(); }
                               else { this->E255counter++; }
         QTimer::singleShot(400, this, &DeviceControllerDiag::diagRequest);
-        this->diagRequestTimeoutTimer->stop();
-        this->isRequestRunning  = false;
-        this->flagInterruptDiag = false;
+        this->private_finishDiag();
         return;
     }
 
@@ -237,8 +232,6 @@ void DeviceControllerDiag::sys_superviseSystem()
 
 void DeviceControllerDiag::sub_componentAssessment()
 {
-    this->machineEventSet.clear();
-
     bool flag_sendOperate = true;
 
     struct T_moduleCondition modCond = {};
@@ -680,8 +673,8 @@ void DeviceControllerDiag::private_sendDiagEvent(DCMachineEvent result, DeviceCo
         eventClass = EVENT_CLASS::WARNING;
         parameter  = "temperatur warning";
         break;
-    case DeviceController::State::M0255:   // restart carun
-        eventClass = EVENT_CLASS::STATE;
+    case DeviceController::State::W255:   // restart carun
+        eventClass = EVENT_CLASS::WARNING;
         parameter  = "restart carun";
         break;
     }
@@ -722,11 +715,9 @@ void DeviceControllerDiag::restartCArun()
     this->E255counter = 0;
 
 
-    DCMachineEvent M0255Event = DCMachineEvent(DeviceController::State::M0255);
-    if (!this->previousMachineEventSet.contains(M0255Event)) {
-        machineEventSet.insert(M0255Event);
-        private_sendDiagEvent(M0255Event, DeviceController::Action::SET);
-    }
+    DCMachineEvent W255Event = DCMachineEvent(DeviceController::State::W255);
+    machineEventSet.insert(W255Event);
+    private_sendDiagEvent(W255Event, DeviceController::Action::SET);
 
     QProcess::startDetached("/bin/systemctl", {"restart", "carun"});
 }

src/ATBAPP/DeviceControllerDiag.h

@@ -49,7 +49,6 @@ namespace DeviceController {
         M0252, // cashbox door open
         M0253, // service or battery door is open
         M0254, // no valid data from DC
-        M0255, // restart carun
 
         E255,
 
@@ -58,6 +57,8 @@ namespace DeviceController {
         W003,
         W004,
 
+        W255,
+
         INITIAL_STATE
     };
     Q_ENUM_NS(State)