update printQR method

if wrong account is provided by DC.

src/ATBAPP/ATBDeviceControllerPlugin.cpp

@@ -28,6 +28,7 @@ ATBDeviceControllerPlugin::ATBDeviceControllerPlugin(QObject *parent)
     , isMaster(false)
     , pluginState(PLUGIN_STATE::NOT_INITIALIZED)
     , eventReceiver(nullptr)
+    , latestAccountNumber(0)
 {
     this->setParent(parent);
 
@@ -42,12 +43,19 @@ PLUGIN_STATE ATBDeviceControllerPlugin::initDCPlugin(QObject *eventReceiver, con
 
     // read variables from setting
     this->serialPortName = settings.value("ATBDeviceControllerPlugin/serialPort", "ttymxc2").toString();
-    QByteArray printerEncoding = settings.value("ATBDeviceControllerPlugin/printerEncoding", "ISO 8859-2").toString().toLatin1();
+//    QByteArray printerEncoding = settings.value("ATBDeviceControllerPlugin/printerEncoding", "ISO 8859-2").toString().toLatin1();
+    QByteArray printerEncoding = settings.value("ATBDeviceControllerPlugin/printerEncoding", "Windows-1250").toString().toLatin1();
     QString printerLocaleString = settings.value("ATBDeviceControllerPlugin/printerLocale", "de_DE").toString().toLatin1();
     this->printerLocale = QLocale(printerLocaleString);
 
     this->initTicketTemplateList(&settings);
 
+    // configurable default printer settings for 'prn_sendText()' used e.g. for bank receipts
+    this->printerDefaultFont.font   = settings.value("ATBDeviceControllerPlugin/printerDefaultFont",    "8").toUInt();
+    this->printerDefaultFont.size   = settings.value("ATBDeviceControllerPlugin/printerDefaultSize",   "12").toUInt();
+    this->printerDefaultFont.width  = settings.value("ATBDeviceControllerPlugin/printerDefaultWidth",   "0").toUInt();
+    this->printerDefaultFont.height = settings.value("ATBDeviceControllerPlugin/printerDefaultHeight",  "0").toUInt();
+
     this->init_sc_dbus();
 
     QString persistentDataFile = "/mnt/system_data/dc_persistentData.dat";
@@ -125,7 +133,7 @@ PLUGIN_STATE ATBDeviceControllerPlugin::initDCPlugin(QObject *eventReceiver, con
     this->codec = QTextCodec::codecForName(printerEncoding);
 
     if (this->codec == nullptr) {
-        printerEncoding = "ISO 8859-1";
+        printerEncoding = "Windows-1250";
         qCritical() << "ATBDeviceControllerPlugin: ERROR: printer encoding \"" << printerEncoding << "\" is not supported!";
         qCritical() << "     ... use default encoding: " << printerEncoding;
         this->codec = QTextCodec::codecForName(printerEncoding);
@@ -321,6 +329,12 @@ void ATBDeviceControllerPlugin::onChangedProgramModeToOOO()
     this->currentProgramMode = PROGRAM_MODE::OOO;
 }
 
+void ATBDeviceControllerPlugin::requestDiag()
+{
+    hw->dc_autoRequest(true);
+    this->diag->diagRequest();
+}
+
 
 // TASKS: Cash handling -------------------------------------------------------
 void ATBDeviceControllerPlugin::requestStartCashInput(const QString & amount)
@@ -487,13 +501,13 @@ void ATBDeviceControllerPlugin::private_startAccount()
 
     qsort( backupedAccNumbers, nrOfVals, sizeof (uint16_t), Utils::compare );
 
-    uint16_t latestAccountNumber = backupedAccNumbers[nrOfVals-1];
+    this->latestAccountNumber = backupedAccNumbers[nrOfVals-1];
 
 
     // DEBUG
-    qCritical() << "       latestAccountNumber = " << latestAccountNumber;
+    qCritical() << "       latestAccountNumber = " << this->latestAccountNumber;
 
-    hw->log_selectVaultRecord(latestAccountNumber);
+    hw->log_selectVaultRecord(this->latestAccountNumber);
 
     this->accountCheckCounter = 0;
     QTimer::singleShot(500, this, SLOT(private_checkAccountData()));
@@ -516,11 +530,25 @@ void ATBDeviceControllerPlugin::private_checkAccountData()
             // cannot get accountData within ~10*500ms
             qCritical() << "checkAccountData() failed";
 
-            // simulate:
-            this->private_getAccountData();
+            JSON::setPrettySerialize(false);
+            JSON::JsonObject json = JSON::objectBuilder()
+                      ->set("Error", QString("check account data failed"))
+                      ->set("AccountNumber", this->latestAccountNumber)
+                ->create();
+            QString parameterJsonString = JSON::serialize(json);
 
 
-            // TODO: create and send an HealthEvent...
+            QString eventId = QUuid::createUuid().toString(QUuid::WithoutBraces).mid(0, 8);
+            ATBMachineEvent *machineEvent = new ATBMachineEvent(
+                        eventId,                           // id
+                        "DC",                              // device name: PTU/PRINTER/DC/...
+                        EVENT_CLASS::STATE,                // reason of event: Error/Warning/Alarm
+                        "M01000",                          // eventName
+                        1,                                 // state
+                        parameterJsonString,               // parameter
+                        "ACCOUNT"                          // second level info
+                        );
+            QCoreApplication::postEvent(this, machineEvent);
         }
     }
 }
@@ -537,6 +565,14 @@ void ATBDeviceControllerPlugin::private_getAccountData()
 
     QHash<QString, QVariant> accountData;
 
+    if (this->latestAccountNumber != retVR.AccountingNumber) {
+        // this is the wrong account! -> read again
+        hw->log_selectVaultRecord(this->latestAccountNumber);
+
+        QTimer::singleShot(500, this, SLOT(private_checkAccountData()));
+        return;
+    }
+
     accountData.insert("AccountingNumber", QString::number(retVR.AccountingNumber));
 
 
@@ -798,13 +834,25 @@ void ATBDeviceControllerPlugin::requestPrintReceipt(const QHash<QString, QVarian
 
 void ATBDeviceControllerPlugin::requestPrintReceipt(const QString & printingString)
 {
+    this->codec = QTextCodec::codecForName("Windows-1250");
+
+    qCritical() << "Printer codec forced:"
+                << this->codec->name();
+
     QByteArray ba_receipt = this->codec->fromUnicode(printingString);
 
     //QByteArray ba = printingString.toUtf8();
     hw->prn_switchPower(true);
-    hw->prn_setFonts(8,12,0,0);
-    hw->prn_sendText(&ba_receipt);
+    hw->prn_sendPrnSetup(100, 25, 'c', 0);
+    hw->prn_setFonts(printerDefaultFont.font,
+                     //printerDefaultFont.size,
+                     11,
+                     printerDefaultFont.width,
+                     printerDefaultFont.height);
 
+    qCritical() << "Receipt bytes (hex):";
+    qCritical().noquote() << ba_receipt.toHex(' ');
+    hw->prn_sendText(&ba_receipt);
     // DEBUG
     //qCritical() << "---------------------------------------------------------------";
     //qCritical() << "ATBDeviceControllerPlugin::requestPrintReceipt()";
@@ -814,11 +862,38 @@ void ATBDeviceControllerPlugin::requestPrintReceipt(const QString & printingStri
 
 
     this->printResultCheckCounter = 0;
-    QTimer::singleShot(2000, this, SLOT(onPrinterWaitForPrintingReceipt()));
+    //QTimer::singleShot(2000, this, SLOT(onPrinterWaitForPrintingReceipt()));
 
     //QTimer::singleShot(2000, this, [this](){ hw->prn_cut(3);  } );
 }
 
+void ATBDeviceControllerPlugin::requestPrintQR(const QString & printingString)
+{
+    QByteArray ba_qr = this->codec->fromUnicode(printingString);
+
+    //QByteArray ba = printingString.toUtf8();
+    hw->prn_switchPower(true);
+    hw->prn_sendQRdata(&ba_qr);
+    hw->prn_printQRcode();
+    // DEBUG
+    qCritical() << "---------------------------------------------------------------";
+    qCritical() << "ATBDeviceControllerPlugin::requestPrintQR()";
+    qCritical() << "    QR data:";
+    qCritical() << QString(ba_qr);
+    qCritical() << "---------------------------------------------------------------";
+
+
+    this->printResultCheckCounter = 0;
+    //QTimer::singleShot(2000, this, SLOT(onPrinterWaitForPrintingReceipt()));
+
+    //QTimer::singleShot(2000, this, [this](){ hw->prn_cut(3);  } );
+}
+
+void ATBDeviceControllerPlugin::requestPrintCut(const qint16 & printTimer)
+{
+       QTimer::singleShot(printTimer, this, SLOT(onPrinterWaitForPrintingReceipt()));
+}
+
 void ATBDeviceControllerPlugin::onPrinterWaitForPrintingReceipt()
 {
     quint8 printerResult = this->hw->prn_getPrintResult();
@@ -1909,8 +1984,17 @@ int ATBDeviceControllerPlugin::init_sc_dbus()
 
 void ATBDeviceControllerPlugin::onWokeUp(uchar source)
 {
-    if (source == 0x01 || source == 0xFE) {
-        // woke up from device controller
+    /* 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
         hw->dc_autoRequest(true);
         this->diag->diagRequest();
     }

src/ATBAPP/ATBDeviceControllerPlugin.h

@@ -34,7 +34,14 @@ enum class PROGRAM_MODE {
     NOT_DEFINED
 };
 
-
+class PrinterDefaultsFont
+{
+public:
+    quint8 font;
+    quint8 size;
+    quint8 width;
+    quint8 height;
+};
 
 class ATBDeviceControllerPlugin :
         public DeviceControllerInterface
@@ -72,6 +79,8 @@ public:
     void requestPrintTicket(nsDeviceControllerInterface::TICKET_VARIANT ticketVariant, const QHash<QString, QVariant> & printingData);
     void requestPrintReceipt(const QHash<QString, QVariant> & printingData);
     void requestPrintReceipt(const QString & printingString);
+    void requestPrintQR(const QString & printingString);
+    void requestPrintCut(const qint16 & printTimer);
 
     // TASKS: Account -------------------------------------------------------------
     void requestAccount();
@@ -97,7 +106,7 @@ public slots:
     void reboot();
     void reset();
 
-
+    void requestDiag();
 
 signals:
     // public Signals are defined in interface
@@ -133,6 +142,8 @@ private:
 
    QTextCodec *codec;
 
+   PrinterDefaultsFont printerDefaultFont;
+
    bool private_loadCashAgentLib(QString pluginName);
 
    quint8 currentSelectedTicketType;
@@ -142,6 +153,8 @@ private:
    // counts failed hw->log_chkIfVaultRecordAvailable()
    int accountCheckCounter;
 
+   uint16_t latestAccountNumber;
+
    // counts faild hw->prn-getPrintResult()
    int printResultCheckCounter;
 

src/ATBAPP/DeviceControllerDiag.cpp

@@ -113,8 +113,8 @@ void DeviceControllerDiag::private_startDiag()
         qCritical() << "DeviceControllerDiag::private_startDiag() interrupted!";
         DCMachineEvent E255Event = DCMachineEvent(DeviceController::State::E255);
         if (!this->previousMachineEventSet.contains(E255Event)) {
-            machineEventSet.insert(E255Event);
-            private_sendDiagEvent(E255Event, DeviceController::Action::SET);
+            this->private_setDiagEvent(DeviceController::State::E255);
+            this->private_sendDiagEvent(E255Event, DeviceController::Action::SET);
         }
         if (this->E255counter > 5) {
             this->restartCArun();
@@ -132,9 +132,9 @@ void DeviceControllerDiag::private_startDiag()
              * - diag is called again in ModeOOO wokeup()
              */
         }
-        this->diagRequestTimeoutTimer->stop();
-        this->isRequestRunning  = false;
-        this->flagInterruptDiag = false;
+
+        this->private_finishDiag(false);
+
         return;
     }
 
@@ -178,15 +178,16 @@ void DeviceControllerDiag::sys_superviseSystem()
         // send
         DCMachineEvent E255Event = DCMachineEvent(DeviceController::State::E255);
         if (!this->previousMachineEventSet.contains(E255Event)) {
-            machineEventSet.insert(E255Event);
-            private_sendDiagEvent(E255Event, DeviceController::Action::SET);
+            this->private_setDiagEvent(DeviceController::State::E255);
+            this->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(false);
+
         return;
     }
 
@@ -196,16 +197,14 @@ void DeviceControllerDiag::sys_superviseSystem()
         qCritical() << "DeviceControllerDiag::sys_superviseSystem() no valid data!";
         hw->dc_autoRequest(true);
 
-        DCMachineEvent E255Event = DCMachineEvent(DeviceController::State::M0254);
-        previousMachineEventSet.insert(E255Event);
-        private_sendDiagEvent(E255Event, DeviceController::Action::SET);
+        DCMachineEvent M0254Event = DCMachineEvent(DeviceController::State::M0254);
+        this->private_setDiagEvent(DeviceController::State::M0254);
+        this->private_sendDiagEvent(M0254Event, 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(false);
         return;
     }
 
@@ -477,7 +476,7 @@ void DeviceControllerDiag::sub_componentAssessment()
 
 
     // finish diag
-    this->private_finishDiag();
+    this->private_finishDiag(true);
 }
 
 /**
@@ -486,14 +485,20 @@ void DeviceControllerDiag::sub_componentAssessment()
  * Single point to finish a diag process:
  *  -
  */
-void DeviceControllerDiag::private_finishDiag()
+void DeviceControllerDiag::private_finishDiag(bool dataValid)
 {
     this->diagRequestTimeoutTimer->stop();
     this->isRequestRunning  = false;
     this->flagInterruptDiag = false;
 
-    this->previousMachineEventSet.unite(machineEventSet);      // add new elements from machineEventSet
-    this->previousMachineEventSet.intersect(machineEventSet);  // remove elements not in machineEventSet
+    // add new elements from machineEventSet
+    this->previousMachineEventSet.unite(machineEventSet);
+
+    if (dataValid) {
+        // remove elements not in machineEventSet
+        // ... only if data is valid
+        this->previousMachineEventSet.intersect(machineEventSet);
+    }
 
     if (this->isDiagBackgroundTask) {
         this->isDiagBackgroundTask = false;

src/ATBAPP/DeviceControllerDiag.h

@@ -170,7 +170,7 @@ private slots:
     void private_setDiagEvent(DeviceController::State result);
     void private_sendDiagEvent(DCMachineEvent result, DeviceController::Action action);
 
-    void private_finishDiag();
+    void private_finishDiag(bool dataValid = false);
 
     void sys_superviseSystem();
 

src/ATBAPP/DeviceControllerInterface.h

@@ -77,6 +77,8 @@ public:
     virtual void requestPrintTicket(nsDeviceControllerInterface::TICKET_VARIANT ticketVariant, const QHash<QString, QVariant> & printingData) = 0;
     virtual void requestPrintReceipt(const QHash<QString, QVariant> & printingData) = 0;
     virtual void requestPrintReceipt(const QString & printingString) = 0;
+    virtual void requestPrintQR(const QString & printingSTring) = 0;
+    virtual void requestPrintCut(const qint16 & printTimer) = 0;
 
     // read coin/cash processing variants
     virtual nsDeviceControllerInterface::COIN_PROCESSOR coinProcessor() = 0;
@@ -104,6 +106,9 @@ public slots:
     virtual void reboot() = 0;
     virtual void reset() = 0;
 
+    virtual void requestDiag() = 0;
+
+
 
 signals:
     void printTicketFinished(nsDeviceControllerInterface::RESULT_STATE resultState,
@@ -213,7 +218,7 @@ signals:
 
 
 Q_DECLARE_INTERFACE(DeviceControllerInterface,
-                    "eu.atb.ptu.plugin.DeviceControllerInterface/1.2.1")
+                    "eu.atb.ptu.plugin.DeviceControllerInterface/1.2.2")
 
 
 namespace nsDeviceControllerInterface {