update printQR method

change printer codec to windows-1250
Implement interface 1.2.2 requestDiag()
2026-06-08 08:46:29 +02:00 · 2026-06-08 08:46:02 +02:00 · 2026-01-19 15:55:56 +01:00 · 2026-01-19 15:55:49 +01:00 · 2026-01-19 15:55:29 +01:00 · 2026-01-19 15:54:53 +01:00
3 changed files with 107 additions and 14 deletions
@@ -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();
@@ -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;

@@ -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 {
Author	SHA1	Message	Date
SiegfriedSiegert	34023bd82f	update printQR method	2026-06-08 08:46:29 +02:00
SiegfriedSiegert	f7e9c74dde	change printer codec to windows-1250	2026-06-08 08:46:02 +02:00
SiegfriedSiegert	7a9f523b59	Implement interface 1.2.2 requestDiag()	2026-01-19 15:55:56 +01:00
SiegfriedSiegert	9d81e1217e	DeviceControllerInterface 1.2.2 (requestDiag)	2026-01-19 15:55:49 +01:00
SiegfriedSiegert	feb53f8174	Account: send MachineEvent, if account can not be read from DC	2026-01-19 15:55:29 +01:00
SiegfriedSiegert	60f7a79dbe	Account: check account number and read again ... if wrong account is provided by DC.	2026-01-19 15:54:53 +01:00
SiegfriedSiegert	238ea71280	Print: set printer default font for printing text ... E.g. used for prn_sendText(). E.g. in Lithuania only printer font table 24 supports special Lithuanian charcters. Other projects my not have font table 24 installed in printers. They use e.g. printer font table 8.	2025-11-05 16:25:39 +01:00