Diag: check doors in sub_componentAssessment ...

... 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

@@ -30,13 +30,31 @@ ATBDeviceControllerPlugin::ATBDeviceControllerPlugin(QObject *parent)
     this->setParent(parent);
 
     this->pluginInfo = QString::fromUtf8(pluginInfoString.c_str());
+}
+
+ATBDeviceControllerPlugin::~ATBDeviceControllerPlugin() {}
+
+PLUGIN_STATE ATBDeviceControllerPlugin::initDCPlugin(QObject *eventReceiver, const QSettings & settings)
+{
+    this->eventReceiver = eventReceiver;
+
+    // read variables from setting
+    this->serialPortName = settings.value("ATBDeviceControllerPlugin/serialPort", "ttymxc2").toString();
+    QByteArray printerEncoding = settings.value("ATBDeviceControllerPlugin/printerEncoding", "ISO 8859-2").toString().toLatin1();
+    QString printerLocaleString = settings.value("ATBDeviceControllerPlugin/printerLocale", "de_DE").toString().toLatin1();
+    this->printerLocale = QLocale(printerLocaleString);
 
-    if (!this->private_loadCashAgentLib("")) {
-        return;
-    }
 
     this->init_sc_dbus();
 
+    QString persistentDataFile = "/mnt/system_data/dc_persistentData.dat";
+    this->persistentData = new PersistentData(persistentDataFile);
+
+
+    // setup libCA:
+    if (!this->private_loadCashAgentLib("")) {
+        return PLUGIN_STATE::NOT_INITIALIZED;
+    }
 
     //connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_templatePrintFinished_OK()),  this, SLOT(onPrintFinishedOK()),  Qt::QueuedConnection);
     //connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_templatePrintFinished_Err()), this, SLOT(onPrintFinishedERR()), Qt::QueuedConnection);
@@ -61,12 +79,11 @@ ATBDeviceControllerPlugin::ATBDeviceControllerPlugin(QObject *parent)
     dynamic_cast<QObject*>(hw)->moveToThread(hwThread);
     hwThread->start();
 
-    QString persistentDataFile = "/mnt/system_data/dc_persistentData.dat";
-    this->persistentData = new PersistentData(persistentDataFile);
-
     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;
@@ -75,19 +92,7 @@ ATBDeviceControllerPlugin::ATBDeviceControllerPlugin(QObject *parent)
     this->currentCashState = CASH_STATE::CACHE_EMPTY;
 
     this->cashStartAmountInt = 0;
-}
 
-ATBDeviceControllerPlugin::~ATBDeviceControllerPlugin() {}
-
-PLUGIN_STATE ATBDeviceControllerPlugin::initDCPlugin(QObject *eventReceiver, const QSettings & settings)
-{
-    this->eventReceiver = eventReceiver;
-
-    // read variables from setting
-    this->serialPortName = settings.value("ATBDeviceControllerPlugin/serialPort", "ttymxc2").toString();
-    QByteArray printerEncoding = settings.value("ATBDeviceControllerPlugin/printerEncoding", "ISO 8859-2").toString().toLatin1();
-    QString printerLocaleString = settings.value("ATBDeviceControllerPlugin/printerLocale", "de_DE").toString().toLatin1();
-    this->printerLocale = QLocale(printerLocaleString);
 
 
     if (this->isMaster) {
@@ -227,20 +232,20 @@ void ATBDeviceControllerPlugin::reset()
 // Handle Mode-Changes --------------------------------------------------------
 
 void ATBDeviceControllerPlugin::onChangedProgramModeToSELL()
-{
+{    
     hw->dc_autoRequest(true);
     hw->rtc_setDateTime();
     hw->mdb_switchWake(0);   // wakeup MDB components
 }
 
 void ATBDeviceControllerPlugin::onChangedProgramModeToSERVICE()
-{
+{    
     hw->dc_autoRequest(true);
     hw->mdb_switchWake(0);   // wakeup MDB components
 }
 
 void ATBDeviceControllerPlugin::onChangedProgramModeToIDLE()
-{
+{    
     hw->dc_autoRequest(true);
     this->diag->diagRequest();
     hw->mdb_switchWake(1);
@@ -537,6 +542,8 @@ void ATBDeviceControllerPlugin::onCBinAndAllDoorsClosed()
 {
     qCritical() << "ATBDeviceControllerPlugin::onCBinAndAllDoorsClosed()";
 
+    this->diag->diagReInit();
+
     QTimer::singleShot(2000, this, SIGNAL(requestModeIDLE()));
 
     this->dbus->finishedBackgroundTask("DOOR_OPEN");
@@ -651,6 +658,7 @@ void ATBDeviceControllerPlugin::requestPrintReceipt(const QString & printingStri
     hw->prn_switchPower(true);
     hw->prn_setFonts(8,12,0,0);
     hw->prn_sendText(&ba);
+    this->printResultCheckCounter = 0;
     QTimer::singleShot(4000, this, SLOT(onPrinterWaitForPrintingReceipt()));
 
     //QTimer::singleShot(2000, this, [this](){ hw->prn_cut(3);  } );
@@ -699,7 +707,8 @@ void ATBDeviceControllerPlugin::onPrinterWaitForPrintingReceipt()
 
 void ATBDeviceControllerPlugin::requestPrintTicket(const QHash<QString, QVariant> & printingData)
 {
-    struct T_dynDat *dynTicketData = new T_dynDat;
+    struct T_dynDat dynamicTicketData;
+    struct T_dynDat *dynTicketData = &dynamicTicketData;
     memset(dynTicketData, 0, sizeof(*dynTicketData));
 
     qCritical() << "ATBDeviceControllerPlugin::requestPrintTicket( "         << endl
@@ -840,6 +849,7 @@ void ATBDeviceControllerPlugin::onPrinterDataPrepared()
 
     // note: calling prn_getPrintResult() immediately may result in wrong answer!
     // We have to wait "about some seconds" until calling this function!
+    this->printResultCheckCounter = 0;
     QTimer::singleShot(4000, this, SLOT(onPrinterWaitForPrintingTicket()));
 
     // old: use printer templates:
@@ -863,8 +873,17 @@ void ATBDeviceControllerPlugin::onPrinterWaitForPrintingTicket()
         this->onPrintFinishedERR();
         break;
     default:
-        qCritical() << "DC Error: wait for printing";
-        this->onPrintFinishedERR();
+        // result value is not defined (-> workaround for DC misbehaviour)
+        if (this->printResultCheckCounter < 10) {
+            this->printResultCheckCounter++;
+            qCritical() << "DC print result undefined: " << printerResult;
+            QTimer::singleShot(1000, this, SLOT(onPrinterWaitForPrintingTicket()));
+        }
+        else {
+            qCritical() << "DC Error: wait for printing";
+            this->onPrintFinishedERR();
+        }
+
         break;
     }
 
@@ -892,6 +911,7 @@ void ATBDeviceControllerPlugin::onPrinterPrintNextTemplate()
 
     if (this->currentTicket->templateList()->isEmpty()) {
         // all templates are printed
+        this->printResultCheckCounter = 0;
         QTimer::singleShot(2000, this, SLOT(onPrinterWaitForPrintingTicket()));
     }
     else {
@@ -943,7 +963,8 @@ void ATBDeviceControllerPlugin::onPrinterPrepareDynTemplateData()
 }
 void ATBDeviceControllerPlugin::prepareDynTemplateData()
 {
-    struct T_dynDat *dynTicketData = new T_dynDat;
+    struct T_dynDat dynamicTicketData;
+    struct T_dynDat *dynTicketData = &dynamicTicketData;
     memset(dynTicketData, 0, sizeof(*dynTicketData));
 
     // setup dynTicketData dependent on currentTicket
@@ -1501,7 +1522,7 @@ int ATBDeviceControllerPlugin::init_sc_dbus()
 
 void ATBDeviceControllerPlugin::onWokeUp(uchar source)
 {
-    if (source == 0x01) {
+    if (source == 0x01 || source == 0xFE) {
         // woke up from device controller
         this->diag->diagRequest();
     }

src/ATBAPP/ATBDeviceControllerPlugin.h

@@ -129,6 +129,9 @@ private:
    // counts failed hw->log_chkIfVaultRecordAvailable()
    int accountCheckCounter;
 
+   // counts faild hw->prn-getPrintResult()
+   int printResultCheckCounter;
+
    // dbus
    int init_sc_dbus();
 

src/ATBAPP/ATBMachineEvent.h

@@ -15,7 +15,7 @@ class ATBMachineEvent : public QEvent
 public:
     explicit ATBMachineEvent(const QString & id,
                 const QString & deviceName,              // PTU/PRINTER/DC/...
-                EVENT_CLASS eventClass,          // reason of event: Error/Warning/Alarm
+                EVENT_CLASS eventClass,                  // reason of event: Error/Warning/Alarm
                 const QString & name,                    // 'Event': "E001", "W003"
                 const int state,
                 const QString & parameter,

src/ATBAPP/DeviceControllerDiag.cpp

@@ -5,6 +5,9 @@
 #include <QUuid>
 #include <QDebug>
 
+#include "support/JSON.h"
+
+
 DeviceControllerDiag::DeviceControllerDiag(PersistentData *pData, QObject *parent)
     : QObject(parent)
     , coinProcessorType(nsDeviceControllerInterface::COIN_PROCESSOR::ESCROW)
@@ -17,7 +20,7 @@ DeviceControllerDiag::DeviceControllerDiag(PersistentData *pData, QObject *paren
     , pData(pData)
 {
     diagRequestTimeoutTimer = new QTimer(this);
-    diagRequestTimeoutTimer->setInterval(1000*20);  // 20s
+    diagRequestTimeoutTimer->setInterval(1000*45);
     diagRequestTimeoutTimer->setSingleShot(true);
     connect(diagRequestTimeoutTimer, &QTimer::timeout, this, &DeviceControllerDiag::onDiagRequestTimeoutTimerTimeout);
 }
@@ -33,6 +36,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()";
@@ -90,6 +104,14 @@ void DeviceControllerDiag::private_startDiag()
         this->private_sendDiagEvent(DeviceController::State::E255);
         this->isRequestRunning  = false;
         this->flagInterruptDiag = false;
+
+        // 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;
     }
 
@@ -156,18 +178,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();
@@ -201,6 +211,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) {
@@ -244,7 +269,8 @@ void DeviceControllerDiag::sub_componentAssessment()
         }
         if (modCond.coinEscrow>=200) {
             flag_sendOperate = false;
-            this->private_sendDiagEvent(DeviceController::State::E010);
+            // coinEscrow>200 is considered a warning:
+            this->private_sendDiagEvent(DeviceController::State::W010);
         }
     }
     // -----------------------------------------------------------------------------------------------
@@ -266,7 +292,8 @@ void DeviceControllerDiag::sub_componentAssessment()
     {
         if (modCond.coinEscrow>=200) {
             flag_sendOperate = false;
-            this->private_sendDiagEvent(DeviceController::State::E010);
+            // coinEscrow>200 is considered a warning:
+            this->private_sendDiagEvent(DeviceController::State::W010);
         }
         if (modCond.coinSafe==201)  { // full
             flag_sendOperate = false;
@@ -338,7 +365,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
@@ -449,6 +476,10 @@ void DeviceControllerDiag::private_sendDiagEvent(DeviceController::State result)
         parameter  = "coin escrow";
         this->_isErrorState = true;
         break;
+    case DeviceController::State::W010:    // coin escrow
+        eventClass = EVENT_CLASS::WARNING;
+        parameter  = "coin escrow";
+        break;
     case DeviceController::State::E011:    // mem error int.ee.
         eventClass = EVENT_CLASS::ERROR;
         parameter  = "mem error int.ee.";
@@ -506,10 +537,8 @@ void DeviceControllerDiag::private_sendDiagEvent(DeviceController::State result)
         parameter  = "no valid data from DeviceController";
         break;
     case DeviceController::State::E255:   // no valid data from DeviceController
-        eventClass = EVENT_CLASS::STATE;
-        parameter  = "";
-        qCritical() << "       ... ignore " << QMetaEnum::fromType<DeviceController::State>().valueToKey(result);
-        return;
+        eventClass = EVENT_CLASS::ERROR;
+        parameter  = "no valid data from DeviceController";
         break;
     case DeviceController::State::O000:   // everything is fine
         this->machineEventSet.clear();
@@ -545,6 +574,16 @@ void DeviceControllerDiag::private_sendDiagEvent(DeviceController::State result)
 
     this->lastState = result;
 
+    /**
+     * Variant: send 'parameter' as JSON:
+     *
+        JSON::setPrettySerialize(false);
+        JSON::JsonObject json = JSON::objectBuilder()
+                  ->set("description", parameter)
+            ->create();
+        QString parameterJsonString = JSON::serialize(json);
+    */
+
     ATBMachineEvent *machineEvent = new ATBMachineEvent(
                 eventId,
                 "DC",
@@ -555,8 +594,6 @@ void DeviceControllerDiag::private_sendDiagEvent(DeviceController::State result)
                 ""         // second level info
                 );
 
-    //emit diagResponse(machineEvent);
-
     QCoreApplication::postEvent(eventReceiver, machineEvent);
 
 }

src/ATBAPP/DeviceControllerDiag.h

@@ -29,6 +29,7 @@ namespace DeviceController {
         E008,
         E009,
         E010,
+        W010,   // Coin Escrow
         E011,
 
         E018,
@@ -79,9 +80,20 @@ 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();
+
 signals:
     void diagResponse(ATBMachineEvent* machineEvent);