PayUp: CashCollect(amount)

Ticket helper methods e.g. string format helpers.
Currently only on method for getting a date string in short format
according to selected language.

DCPlugin.pro

@@ -30,7 +30,14 @@ contains( CONFIG, PTU5 ) {
     QMAKE_CXXFLAGS += -std=c++11
     linux-clang {  QMAKE_CXXFLAGS += -Qunused-arguments   }
     CONFIG += link_pkgconfig
+    PTU5BASEPATH = /opt/devel/ptu5
     ARCH = PTU5
+
+    INCLUDEPATH += $$PTU5BASEPATH/qt/libs/deviceController/include/
+    LIBS += -L$$PTU5BASEPATH/qt/libs/deviceController/library
+
+    LIBS += -lCAslave
+    LIBS += -lCAmaster
 }
 
 contains( CONFIG, PTU5_YOCTO ) {
@@ -38,8 +45,8 @@ contains( CONFIG, PTU5_YOCTO ) {
     PTU5BASEPATH = /opt/devel/ptu5
     ARCH = PTU5
 
-    # add qmqtt lib
+    LIBS += -lCAslave
-    #LIBS += -lQt5Qmqtt
+    LIBS += -lCAmaster
 }
 
 TARGET   = ATBDeviceControllerPlugin
@@ -69,7 +76,6 @@ DEFINES += QT_DEPRECATED_WARNINGS
 
 # ATBAPP interface
 HEADERS += \
-    include/interfaces.h \
     src/ATBAPP/ATBAPPplugin.h \
     src/ATBAPP/DeviceControllerDiag.h \
     src/ATBAPP/DeviceControllerInterface.h \
@@ -81,7 +87,9 @@ HEADERS += \
     src/ATBAPP/support/DBusControllerInterface.h \
     src/ATBAPP/support/JSON.h \
     src/ATBAPP/support/PTUSystem.h \
-    src/ATBAPP/support/PersistentData.h
+    src/ATBAPP/support/PersistentData.h \
+    src/ATBAPP/support/Ticket.h \
+    src/ATBAPP/support/TicketUtils.h
 
 SOURCES += \
     src/ATBAPP/ATBHealthEvent.cpp \
@@ -93,7 +101,9 @@ SOURCES += \
     src/ATBAPP/support/DBusControllerInterface.cpp \
     src/ATBAPP/support/JSON.cpp \
     src/ATBAPP/support/PTUSystem.cpp \
-    src/ATBAPP/support/PersistentData.cpp
+    src/ATBAPP/support/PersistentData.cpp \
+    src/ATBAPP/support/Ticket.cpp \
+    src/ATBAPP/support/TicketUtils.cpp
 
 DISTFILES += \
     generate-version.sh

include/interfaces.h

@@ -24,6 +24,7 @@ struct T_emp
 
    // dynamic:
    uint8_t state;      // step counter of EMP (electronic coin checker) FSM (finite state machine):
+   /*
    // 0=start command
        // 1=powered, do emp ini, send reset
        // 2=delay
@@ -39,7 +40,7 @@ struct T_emp
        // 90: stop all, 1s delay
        // 99: off, all stopped
 
-
+*/
    uint8_t pollingRunning;
    uint8_t paymentRunning;
 
@@ -238,6 +239,7 @@ struct T_dynamicCondition
         uint8_t lastVDoorState;
         uint8_t lastCBstate;
         char        paymentInProgress;
+        // Version Szeged:  aug2023
         //	0: stopped by timeout
         //  1: running  2: wait4lastCoin
         //				3: payment stopped manually, coins in Escrow
@@ -246,6 +248,21 @@ struct T_dynamicCondition
         //			    6: coins encashed   7:coins returned
         //				8: CoinChecker or MDB on Error
 
+        // since Schoenau with bill and changer, nov2023
+        //0 = no payment
+        //will be set to 1 by cash_startCollection()
+        //neu 1: wait for devices getting ready for payment
+        //2 = payment,
+        //3 = wait for last coin/bill
+        //4 = Bezahlvorgang manuell beendet
+        //5 = payment stopped autom, amount collected, coins in Escrow
+        //6 = Bezahlvorgang beendet weil ZK voll
+        //4,5,6: payment done, keep on polling, wait for cash or return command
+        //7 = encash collected money from coin escrow into cash box
+        //8 = return "amountToReturn", can be complete inserted amount or only overpayment
+        //9 = wait for changer result
+        //10= print refund receipt with "amountToReturn"
+
 
         char        res1;
         uint16_t    U_Batt;
@@ -397,6 +414,7 @@ struct T_bna
 
 };
 
+class DownloadThread;
 class hwinf
 {
 
@@ -2252,14 +2270,23 @@ public:
     virtual void bna_requestCurrentNotes() const {}
     // send command to DC in order to get transaction data
 
-    virtual uint8_t bna_getCurrentNotes(uint16_t latestBill, uint16_t *currentNotes) const {
+    virtual uint8_t bna_getCurrentNotes(uint16_t latestBill, uint16_t *currentNotes) const
+    {
         Q_UNUSED(latestBill);
         Q_UNUSED(currentNotes);
         return 0;
     }
     // returns number of collected bank notes since start-command (current transaction)
-    //  latestBill: last accepted bank note, value in cent
+    // return value: numbers of bills or 99 in case of error
-    //  currentNotes an array with up to 16 (further) notes collected
+    //  latestBill: not used
+    // in case of error: currentNotes[0,1,2,3] = 1..4 error number(s)
+    // in normal case:
+    //  currentNotes[0]: last bill in cent (e.g. 1000 = 10€)
+    //  currentNotes[1]: bin 1 = bill is still in escrow   else bill is stacked
+    //       note: by now (dec2023) escrow is not used, bills always go to stacker (box)
+    //  currentNotes[2]: total sum of bills in cent, low word (16bit)
+    //  currentNotes[3]: total sum of bills in cent, high word (16bit)
+
 
     virtual void bna_requestStackerLevel() const {}
 
@@ -2273,9 +2300,73 @@ public:
     //                                          countOfBills[1] for 10€   and so on
 
 
+    // download device controller
+    virtual bool dcDownloadRequest(QString const &fileToDownload) const {
+        Q_UNUSED(fileToDownload);
+        return false;
+    }
+    virtual bool dcDownloadRequested() const { return false; }
+    virtual bool dcDownloadResetRequest() const { return false; }
+    virtual bool dcDownloadRequestAck() const { return false; }
+    virtual bool dcDownloadRunning() const { return false; }
+    virtual bool dcDownloadFinished() { return false; }
+
+    virtual bool dcDownloadReportStart() const { return false; }
+    virtual bool dcDownloadReportRunning() const { return true; }
+    virtual bool dcDownloadReportFinished() { return true; }
+
+    virtual bool dcDownloadThreadStart() { return false; }
+    virtual bool dcDownloadThreadRunning() const { return true; }
+    virtual void dcDownloadThreadFinalize(DownloadThread *) {}
+    virtual bool dcDownloadThreadFinished() const { return true; }
+    virtual bool dcDownloadReportThreadStart() { return false; }
+    virtual bool dcDownloadReportThreadRunning() const { return true; }
+    virtual void dcDownloadReportThreadFinalize() {}
+    virtual void dcDownloadReportThreadQuit() {}
+    virtual bool dcDownloadReportThreadFinished() const { return true; }
+
+
+    virtual QString dcDownloadFileName() const { return ""; }
+    virtual bool dcDownloadSetRequested(bool requested) {
+       Q_UNUSED(requested); return false;
+    }
+    virtual bool dcDownloadSetRunning(bool running) {
+       Q_UNUSED(running); return false;
+    }
+    virtual bool dcDownloadSetFinished(bool finished) {
+       Q_UNUSED(finished); return false;
+    }
+    virtual void dcDownloadSetTotalBlockNumber(uint16_t totalBlockNumber) {
+       Q_UNUSED(totalBlockNumber);
+    }
+    virtual void dcDownloadSetCurrentBlockNumber(uint16_t currentBlockNumber) {
+       Q_UNUSED(currentBlockNumber);
+    }
+    virtual bool dcDownloadGetRequested() const { return false; }
+    virtual bool dcDownloadGetRunning() const { return false; }
+    virtual bool dcDownloadGetFinished() const { return false; }
+    virtual uint16_t dcDownloadGetTotalBlockNumber() const { return 0; }
+    virtual uint16_t dcDownloadGetCurrentBlockNumber() const { return 0; }
+
+    virtual QObject const *getAPI() { return nullptr; }
 
 
 signals:
+    /*
+        NOTE: the difference between a virtual Qt signal and a normal Qt signal:
+        A Qt virtual signal is a connection that is established using a pointer
+        or reference and is not connected to an object or data. It is therefore
+        not bound to a particular object, but to a specific class (object type).
+        Qt virtual signals are useful because they allow you to create
+        connections without worrying about whether an object or a specific data
+        element has been destroyed.
+        https://www.youtube.com/watch?v=HTH3VFfqsXw
+
+     */
+    virtual void hwapi_reportDCDownloadStatus(QString const&) const {}
+    virtual void hwapi_reportDCDownloadSuccess(QString const&) const {}
+    virtual void hwapi_reportDCDownloadFailure(QString const&) const {}
+
     virtual void hwapi_templatePrintFinished_OK(void) const=0;
     virtual void hwapi_templatePrintFinished_Err(void) const=0;
 
@@ -2299,6 +2390,7 @@ signals:
     virtual void hwapi_doorCBinAndAllDoorsClosed(void) const=0;
     virtual void hwapi_doorAllDoorsClosed(void) const=0;
 
+    virtual void hwapi_coinAttached() const = 0;
 
     // NOTE: declaring a "pure virtual" "signal" should be an error and thus not valid.
     /* GH Version, bringt Fehler

src/ATBAPP/ATBDeviceControllerPlugin.cpp

@@ -6,6 +6,7 @@
 #include "src/ATBAPP/support/DBusControllerInterface.h"
 #include "src/ATBAPP/support/PTUSystem.h"
 #include "src/ATBAPP/support/CashUtils.h"
+#include "src/ATBAPP/support/TicketUtils.h"
 
 #include <QTimer>
 #include <QThread>
@@ -30,46 +31,6 @@ ATBDeviceControllerPlugin::ATBDeviceControllerPlugin(QObject *parent)
     this->setParent(parent);
 
     this->pluginInfo = QString::fromUtf8(pluginInfoString.c_str());
-
-    if (!this->private_loadCashAgentLib("")) {
-        return;
-    }
-
-    this->init_sc_dbus();
-
-
-    //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);
-
-    connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_gotNewCoin()),          this, SLOT(onCashGotCoin()),             Qt::QueuedConnection);
-    connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_payStopByMax()),        this, SLOT(onCashPayStopByMax()),        Qt::QueuedConnection);
-    connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_payStopByPushbutton()), this, SLOT(onCashPayStopByPushbutton()), Qt::QueuedConnection);
-    connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_payStopByEscrow()),     this, SLOT(onCashPayStopByEscrow()),     Qt::QueuedConnection);
-    connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_payStopByError()),      this, SLOT(onCashPayStopByError()),      Qt::QueuedConnection);
-    connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_payStopByTimeout()),    this, SLOT(onCashPayStopByTimeout()),    Qt::QueuedConnection);
-
-    connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_doorServiceDoorOpened()),     this, SLOT(onServiceDoorOpened()), Qt::QueuedConnection);  // switch to ModeSERVICE
-    connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_doorVaultDoorOpened()),       this, SLOT(onVaultDoorOpened()),   Qt::QueuedConnection);    // Screen?? with message
-    connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_doorCoinBoxRemoved()),        this, SLOT(onCoinBoxRemoved()),    Qt::QueuedConnection);     // Create/Send Account
-    connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_doorCoinBoxInserted()),       this, SLOT(onCoinBoxInserted()),   Qt::QueuedConnection);
-    connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_doorCBinAndAllDoorsClosed()), this, SLOT(onCBinAndAllDoorsClosed()), Qt::QueuedConnection);
-    connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_doorAllDoorsClosed()),        this, SLOT(onAllDoorsClosed()),    Qt::QueuedConnection);     // check for errors, switch to mode IDLE
-
-    // move hw object to separate thread:
-    auto hwThread = new QThread;
-    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);
-
-    this->currentSelectedTicketType = 0;
-    this->currentCashState = CASH_STATE::CACHE_EMPTY;
-
-    this->cashStartAmountInt = 0;
 }
 
 ATBDeviceControllerPlugin::~ATBDeviceControllerPlugin() {}
@@ -85,6 +46,56 @@ PLUGIN_STATE ATBDeviceControllerPlugin::initDCPlugin(QObject *eventReceiver, con
     this->printerLocale = QLocale(printerLocaleString);
 
 
+    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);
+
+    connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_gotNewCoin()),          this, SLOT(onCashGotCoin()),             Qt::QueuedConnection);
+    connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_payStopByMax()),        this, SLOT(onCashPayStopByMax()),        Qt::QueuedConnection);
+    connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_payStopByPushbutton()), this, SLOT(onCashPayStopByPushbutton()), Qt::QueuedConnection);
+    connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_payStopByEscrow()),     this, SLOT(onCashPayStopByEscrow()),     Qt::QueuedConnection);
+    connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_payStopByError()),      this, SLOT(onCashPayStopByError()),      Qt::QueuedConnection);
+    connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_payStopByTimeout()),    this, SLOT(onCashPayStopByTimeout()),    Qt::QueuedConnection);
+    connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_coinAttached()),        this, SIGNAL(coinAttached()),            Qt::QueuedConnection);     // check for errors, switch to mode IDLE
+
+    connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_doorServiceDoorOpened()),     this, SLOT(onServiceDoorOpened()), Qt::QueuedConnection);  // switch to ModeSERVICE
+    connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_doorVaultDoorOpened()),       this, SLOT(onVaultDoorOpened()),   Qt::QueuedConnection);    // Screen?? with message
+    connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_doorCoinBoxRemoved()),        this, SLOT(onCoinBoxRemoved()),    Qt::QueuedConnection);     // Create/Send Account
+    connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_doorCoinBoxInserted()),       this, SLOT(onCoinBoxInserted()),   Qt::QueuedConnection);
+    connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_doorCBinAndAllDoorsClosed()), this, SLOT(onCBinAndAllDoorsClosed()), Qt::QueuedConnection);
+    connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_doorAllDoorsClosed()),        this, SLOT(onAllDoorsClosed()),    Qt::QueuedConnection);     // check for errors, switch to mode IDLE
+
+    // move hw object to separate thread:
+    auto hwThread = new QThread;
+    dynamic_cast<QObject*>(hw)->moveToThread(hwThread);
+    hwThread->start();
+
+    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;
+    this->currentTicket = new Ticket(TICKET_VARIANT::PARKING_TICKET, this);
+
+    this->currentCashState = CASH_STATE::CACHE_EMPTY;
+
+    this->cashStartAmountInt = 0;
+
+
+
     if (this->isMaster) {
         // open serial port
         hw->dc_openSerial(5, "115200", this->serialPortName, 1);
@@ -129,6 +140,37 @@ PLUGIN_STATE ATBDeviceControllerPlugin::initDCPlugin(QObject *eventReceiver, con
 }
 
 
+void ATBDeviceControllerPlugin::sendDeviceParameter(const QJsonObject &jsonObject)
+{
+
+    qCritical() << "ATBDeviceControllerPlugin::sendDeviceParameter:";
+
+
+    // extract location info and store location info in persistent data:
+    QJsonValue jsonSubVal;
+    jsonSubVal = jsonObject["Location"];
+
+    QString locationString = jsonSubVal.toString("");
+
+    if (locationString == "") {
+
+        qCritical() << "    -->  locationString NULL";
+        return;
+    }
+
+
+    uint16_t customerNr = PTUSystem::readCustomerNumber();
+    uint16_t machineNr  = PTUSystem::readMachineNumber();
+    uint16_t borough    = PTUSystem::readZoneNumber();
+    uint16_t zone       = PTUSystem::readGroupNumber();
+    uint16_t alias      = 0;
+    QByteArray locationBa = locationString.toLocal8Bit();
+
+    this->hw->sendMachineID(customerNr, machineNr, borough, zone, alias, locationBa.data());
+}
+
+
+
 void ATBDeviceControllerPlugin::startPhysicalLayer()
 {
     if (!this->isMaster) return;
@@ -269,6 +311,73 @@ void ATBDeviceControllerPlugin::cashCollect()
     }
 }
 
+
+void ATBDeviceControllerPlugin::cashCollect(const QString & amount)
+{
+    if (this->coinProcessor() != nsDeviceControllerInterface::COIN_PROCESSOR::CHANGER) {
+        this->cashCollect();
+        return;
+    }
+
+    // check if we must change coins:
+
+    // inserted amount
+    uint32_t amountInsertedInt = this->hw->getInsertedAmount();
+
+    bool ok;
+    uint32_t amountToPayInt = amount.toInt(&ok);
+
+    // check if we must change coins:
+    if (amountInsertedInt > amountToPayInt) {
+
+        uint32_t amountToChangeInt = amountInsertedInt - amountToPayInt;
+
+        qCritical() << "cashCollect(" << amount << ")";
+        qCritical() << "             amount to change: " << QString::number(amountToChangeInt);
+
+
+        // trigger changer:
+        emit this->cashPaymentChanging(nsDeviceControllerInterface::RESULT_STATE::SUCCESS,
+                                       QString::number(amountToChangeInt),
+                                       "",    // ErrorCode
+                                       "");   // ErrorDescription
+
+        // change
+        hw->changer_returnCoins(amountToChangeInt);
+
+        QTimer::singleShot(1000, this, &ATBDeviceControllerPlugin::onCashChangerState);
+
+    }
+    else {
+        // nothing to change:
+
+        qCritical() << "cashCollect(" << amount << ")";
+        qCritical() << "             nothing to change. ";
+
+
+        hw->vend_success();
+
+        QString amountString = QString::number(amountInsertedInt);
+
+        // inserted coins
+        uint32_t amountCoinsInt = CashUtils::getAmountOfInsertedCoins(this->hw);
+        QString amountCoinsString = QString::number(amountCoinsInt);
+
+        // inserted notes
+        uint32_t amountNotesInt = CashUtils::getAmountOfInsertedNotes(this->hw);
+        QString amountNotesString = QString::number(amountNotesInt);
+
+        emit this->cashPaymentFinished(nsDeviceControllerInterface::RESULT_STATE::SUCCESS,
+                                  amountString,
+                                  amountCoinsString,        // coins
+                                  amountNotesString,        // notes
+                                  0,                        // proposed change
+                                  "",
+                                  "");
+        this->currentCashState = CASH_STATE::CACHE_EMPTY;
+    }
+}
+
 void ATBDeviceControllerPlugin::cashAbort()
 {
     hw->vend_failed();
@@ -501,6 +610,8 @@ void ATBDeviceControllerPlugin::onCBinAndAllDoorsClosed()
 {
     qCritical() << "ATBDeviceControllerPlugin::onCBinAndAllDoorsClosed()";
 
+    this->diag->diagReInit();
+
     QTimer::singleShot(2000, this, SIGNAL(requestModeIDLE()));
 
     this->dbus->finishedBackgroundTask("DOOR_OPEN");
@@ -514,10 +625,14 @@ void ATBDeviceControllerPlugin::onAllDoorsClosed()
 {
     qCritical() << "ATBDeviceControllerPlugin::onAllDoorsClosed()";
 
+    if (this->diag->isErrorState()) {
+        emit this->requestModeOOO();
+    }
+    else {
         emit this->requestModeIDLE();
-    this->dbus->finishedBackgroundTask("DOOR_OPEN");
+    }
 
-    // TODO: check for errors and create a machine event
+    this->dbus->finishedBackgroundTask("DOOR_OPEN");    
 }
 
 void ATBDeviceControllerPlugin::onNewVoltage(uint32_t voltage)
@@ -553,86 +668,40 @@ void ATBDeviceControllerPlugin::onNewVoltage(uint32_t voltage)
 
 
 
-
+/**
+ * @brief ATBDeviceControllerPlugin::requestPrintTicket
+ * @param ticketVariant
+ * @param printingData
+ *
+ * Setup (initNew()) Ticket-Object
+ *
+ */
 void ATBDeviceControllerPlugin::requestPrintTicket(nsDeviceControllerInterface::TICKET_VARIANT ticketVariant, const QHash<QString, QVariant> & printingData)
 {
-    struct T_dynDat *dynTicketData = new T_dynDat;
+    QList<quint8> templateList;
-    memset(dynTicketData, 0, sizeof(*dynTicketData));
 
-    QDateTime parkingEndDateTime = QDateTime::fromString(printingData["parkingEnd"].toString(),  Qt::ISODate);
+    // TODO: read template list from .ini
-    QDateTime currentDateTime    = QDateTime::fromString(printingData["currentDateTime"].toString(), Qt::ISODate);
 
-    QString parkingEndDateString = this->printerLocale.toString(parkingEndDateTime.date(), QLocale::ShortFormat);
-    QString currentDateString    = this->printerLocale.toString(currentDateTime.date(),    QLocale::ShortFormat);
-
-
-    // set dynamic printer data:
-    QByteArray ba_licenseplate = codec->fromUnicode(printingData["licenseplate"].toString());
-    memcpy((char*)dynTicketData->licensePlate, ba_licenseplate.data(), std::min(ba_licenseplate.size(),8));
-
-    QByteArray ba_amount = codec->fromUnicode(printingData["amount"].toString());
-    memcpy((char*)dynTicketData->vendingPrice,  ba_amount.data(), std::min(ba_amount.size(),8));  // Szeged
-    memcpy((char*)dynTicketData->dynDat6,       ba_amount.data(), std::min(ba_amount.size(),8));  // Schoenau
-
-    QByteArray ba_parkingEndTime = codec->fromUnicode(parkingEndDateTime.toString("hh:mm"));
-    memcpy((char*)dynTicketData->parkingEnd,  ba_parkingEndTime.data(), std::min(ba_parkingEndTime.size(),8));
-
-    QByteArray ba_parkingEndDate = codec->fromUnicode(parkingEndDateString);
-    memcpy((char*)dynTicketData->currentTime,  ba_parkingEndDate.data(), std::min(ba_parkingEndDate.size(),8));
-    // ! and yes... 'ParkingEndDate' is 'currentTime'
-
-    QByteArray ba_currentDate = codec->fromUnicode(currentDateString);
-    memcpy((char*)dynTicketData->currentDate,  ba_currentDate.data(), std::min(ba_currentDate.size(),8));
-
-    // STAN for Szeged Start/Stop: must be 9 digits
-    // --------------------------------------------------------------------------------------
-    QString stan = codec->fromUnicode(printingData["STAN"].toString());
-    qCritical() << "   requestPrintTicket() STAN = " << stan;
-    QString stan1;
-    QString stan2;
-    if (stan.length() == 9) {
-        stan1 = "     " + stan.mid(0,3);
-        stan2 = stan.mid(3,3) + " " + stan.mid(6,3);
-    }
-    else {
-        qCritical() << "ASSERT: ATBDeviceControllerPlugin::requestPrintTicket() invalid STAN: " << stan;
-        stan1 = "     000";
-        stan2 = "000 000";
-    }
-    QByteArray ba_stan1 = codec->fromUnicode(stan1);
-    QByteArray ba_stan2 = codec->fromUnicode(stan2);
-    // --------------------------------------------------------------------------------------
-
-    this->templateList.clear();
-
-    switch (ticketVariant) {
-    case nsDeviceControllerInterface::TICKET_VARIANT::START_RECEIPT:
-        qCritical() << "      -> TICKET_VARIANT::START_RECEIPT";
-        memcpy((char*)dynTicketData->dynDat6, ba_stan1.data(), std::min(ba_stan1.size(),8));
-        memcpy((char*)dynTicketData->dynDat7, ba_stan2.data(), std::min(ba_stan2.size(),8));
-        this->templateList << 21 << 22 << 23;
-        break;
-    case nsDeviceControllerInterface::TICKET_VARIANT::STOP_RECEIPT:
-        qCritical() << "      -> TICKET_VARIANT::STOP_RECEIPT";
-        memcpy((char*)dynTicketData->dynDat6, ba_stan1.data(), std::min(ba_stan1.size(),8));
-        memcpy((char*)dynTicketData->dynDat7, ba_stan2.data(), std::min(ba_stan2.size(),8));
-        this->templateList << 24 << 25 << 26;
-        break;
-    case nsDeviceControllerInterface::TICKET_VARIANT::RECEIPT:
-        break;
-    case nsDeviceControllerInterface::TICKET_VARIANT::ERROR_RECEIPT:
-        break;
-    case nsDeviceControllerInterface::TICKET_VARIANT::PARKING_TICKET:
-        break;
-    }
 
     // DEBUG
+    qCritical() << "------------------------------------------------------------------------";
     qCritical() << "ATBDeviceControllerPlugin::requestPrintTicket()";
-    for (int i =0; i < this->templateList.size(); ++i) {
+    qCritical() << "     TICKET_VARIANT: " << ticketVariant;
-        qCritical() << "     template: " << this->templateList.at(i);
+    qCritical() << "          dyn1_list: " << printingData["dyn1_list"].toStringList();
-    }
+    qCritical() << "          dyn2_list: " << printingData["dyn2_list"].toStringList();
+    qCritical() << "------------------------------------------------------------------------";
 
 
+    if (!this->currentTicket->initNew(ticketVariant, templateList, printingData)) {
+        this->errorCode = this->currentTicket->getErrorCode();
+        this->errorDescription = this->currentTicket->getErrorCode();
+
+        qCritical() << "ERROR: ticket->initNew: " << ticketVariant;
+
+        this->onPrintFinishedERR();
+        return;
+    }
+
     /*
     if (!this->hw->dc_isPortOpen()) {
         qCritical() << "    ... serial port is not open!";
@@ -641,26 +710,7 @@ void ATBDeviceControllerPlugin::requestPrintTicket(nsDeviceControllerInterface::
     }
     */
 
-    // TODO: wird hier nur 'licensePlate' gedruckt?
+    this->prepareDynTemplateData();
-    if (!this->hw->prn_sendDynamicPrnValues(dynTicketData->licensePlate)) {
-        this->errorCode = "hwapi::prn_sendDynamicPrnValues";
-        this->errorDescription = "hwapi method 'hwapi::prn_sendDynamicPrnValues' result is false";
-
-        qCritical() << "ERROR:";
-        qCritical() << "ATBDeviceControllerPlugin::requestPrintTicket( "        << endl
-                    << "     licenseplate = " << printingData["licenseplate"]   << endl
-                    << "           amount = " << printingData["amount"]         << endl
-                    << "       parkingEnd = " << printingData["parkingEnd"]     << endl
-                    << "      currentTime = " << printingData["currentTime"]    << endl
-                    << "      currentDate = " << printingData["currentDate"]    << endl
-                    << "             stan = " << printingData["STAN"]           << endl;
-
-        this->onPrintFinishedERR();
-        return;
-    }
-
-    QTimer::singleShot(1000, this, SLOT(onPrinterDataPreparedForTemplates()));
-
 }
 
 void ATBDeviceControllerPlugin::requestPrintReceipt(const QHash<QString, QVariant> & printingData)
@@ -672,10 +722,22 @@ void ATBDeviceControllerPlugin::requestPrintReceipt(const QHash<QString, QVarian
 
 void ATBDeviceControllerPlugin::requestPrintReceipt(const QString & printingString)
 {
-    QByteArray ba = printingString.toUtf8();
+    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);
+    hw->prn_sendText(&ba_receipt);
+
+    // DEBUG
+    //qCritical() << "---------------------------------------------------------------";
+    //qCritical() << "ATBDeviceControllerPlugin::requestPrintReceipt()";
+    //qCritical() << "    receipt data:";
+    //qCritical() << QString(ba_receipt);
+    //qCritical() << "---------------------------------------------------------------";
+
+
+    this->printResultCheckCounter = 0;
     QTimer::singleShot(4000, this, SLOT(onPrinterWaitForPrintingReceipt()));
 
     //QTimer::singleShot(2000, this, [this](){ hw->prn_cut(3);  } );
@@ -724,20 +786,36 @@ 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
                 << "     licenseplate = " << printingData["licenseplate"]    << endl
                 << "           amount = " << printingData["amount"]          << endl
                 << "       parkingEnd = " << printingData["parkingEnd"]      << endl
-                << "  currentDateTime = " << printingData["currentDateTime"] << endl;
+                << "  currentDateTime = " << printingData["currentDateTime"] << endl
+                << "     ticketNumber = " << printingData["ticketNumber"]    << endl;
 
     QDateTime parkingEndDateTime = QDateTime::fromString(printingData["parkingEnd"].toString(),      Qt::ISODate);
     QDateTime currentDateTime    = QDateTime::fromString(printingData["currentDateTime"].toString(), Qt::ISODate);
 
-    QString parkingEndDateString = this->printerLocale.toString(parkingEndDateTime.date(), QLocale::ShortFormat);
+    QString parkingEndDateString = TicketUtils::getLocaleDateString(this->printerLocale, parkingEndDateTime.date());
-    QString currentDateString    = this->printerLocale.toString(currentDateTime.date(),    QLocale::ShortFormat);
+    QString currentDateString    = TicketUtils::getLocaleDateString(this->printerLocale, currentDateTime.date());
+
+    /*******************************************************************************************
+     *  TEST date formate strings:
+    QLocale ltLocale("lt_LT");
+    QLocale deLocale("de_DE");
+
+    QString ltShortDate = ltLocale.toString(currentDateTime.date(), QLocale::ShortFormat);
+    QString deShortDate = deLocale.toString(currentDateTime.date(), QLocale::ShortFormat);
+
+    qCritical() << "*********************************************************************";
+    qCritical() << "   ltShortDate = " << ltShortDate;
+    qCritical() << "   deShortDate = " << deShortDate;
+    qCritical() << "*********************************************************************";
+     */
 
     /* -----------------------------------------------------------------------------------------
      * note: the following highly depends on printer template files!
@@ -763,6 +841,10 @@ void ATBDeviceControllerPlugin::requestPrintTicket(const QHash<QString, QVariant
     QByteArray ba_currentDate = codec->fromUnicode(currentDateString);
     memcpy((char*)dynTicketData->currentDate,  ba_currentDate.data(), std::min(ba_currentDate.size(),8));
 
+    // Ticket-Number
+    QByteArray ba_ticketNumber = codec->fromUnicode(printingData["ticketNumber"].toString());
+    memcpy((char*)dynTicketData->dynDat7,      ba_ticketNumber.data(), std::min(ba_ticketNumber.size(),8));
+
 
     // DEBUG
     /*
@@ -796,7 +878,8 @@ void ATBDeviceControllerPlugin::requestPrintTicket(const QHash<QString, QVariant
                     << "           amount = " << printingData["amount"]         << endl
                     << "       parkingEnd = " << printingData["parkingEnd"]     << endl
                     << "      currentTime = " << printingData["currentTime"]    << endl
-                    << "      currentDate = " << printingData["currentDate"]    << endl;
+                    << "      currentDate = " << printingData["currentDate"]    << endl
+                    << "     ticketNumber = " << printingData["ticketNumber"]   << endl;
 
 
         this->onPrintFinishedERR();
@@ -809,24 +892,57 @@ void ATBDeviceControllerPlugin::requestPrintTicket(const QHash<QString, QVariant
     //          2 - Card / ShortTimeParking
     //          3 - Cash / DayTicket
     //          4 - Card / DayTicket
+    //      00744 - NeuhauserVT/NAZ:
+    //          1 - Erwachsene
+    //          2 - Jugendliche
+    //      00741 - NeuhauserVT/Linsinger Maschinenbau
+    //          t.b.d.
     QString paymentType = printingData["paymentType"].toString(); // must be "CASH" | "CARD"
     QString productName = printingData["product"].toString();     // must be "ShortTimeParking" | "DayTicket"
 
-    if ( (paymentType == "CASH") && (productName == "ShortTimeParking") ) {
+    if ( (paymentType == "CASH") &&  ( (productName == "SHORT_TERM_PARKING")        ||
+                                       (productName == "SHORT_TERM_PARKING_CAR")    ||
+                                       (productName == "SHORT_TERM_PARKING_VAN")    ||
+                                       (productName == "SHORT_TERM_PARKING_CAMPER")
+                                     ))
+    {
+        this->currentSelectedTicketType = 1; // "Kombiticket #1"
+    }
+    else
+    if ( (paymentType == "CARD") && ( (productName == "SHORT_TERM_PARKING")        ||
+                                      (productName == "SHORT_TERM_PARKING_CAR")    ||
+                                      (productName == "SHORT_TERM_PARKING_VAN")    ||
+                                      (productName == "SHORT_TERM_PARKING_CAMPER")
+                                    ))
+    {
+        this->currentSelectedTicketType = 2; // "Kombiticket #2"
+    }
+    else
+    if ( (paymentType == "CASH") && ( (productName == "DAY_TICKET")         ||
+                                      (productName == "DAY_TICKET_CAR")     ||
+                                      (productName == "DAY_TICKET_VAN")     ||
+                                      (productName == "DAY_TICKET_CAMPER")
+                                    ))
+    {
+        this->currentSelectedTicketType = 3; // "Kombiticket #3"
+    }
+    else
+    if ( (paymentType == "CARD") && ( (productName == "DAY_TICKET")         ||
+                                      (productName == "DAY_TICKET_CAR")     ||
+                                      (productName == "DAY_TICKET_VAN")     ||
+                                      (productName == "DAY_TICKET_CAMPER")
+                                    ))
+    {
+        this->currentSelectedTicketType = 4; // "Kombiticket #4"
+    }
+    else
+    if ( productName == "DAY_TICKET_ADULT") {
         this->currentSelectedTicketType = 1;
     }
     else
-    if ( (paymentType == "CARD") && (productName == "ShortTimeParking") ) {
+    if ( productName == "DAY_TICKET_TEEN") {
         this->currentSelectedTicketType = 2;
     }
-    else
-    if ( (paymentType == "CASH") && (productName == "DayTicket") ) {
-        this->currentSelectedTicketType = 3;
-    }
-    else
-    if ( (paymentType == "CARD") && (productName == "DayTicket") ) {
-        this->currentSelectedTicketType = 4;
-    }
     else {
         qCritical() << "ERROR: requestPrintTicket(): invalid payment data:";
         qCritical() << "       paymentType = " << paymentType   << endl
@@ -841,7 +957,7 @@ void ATBDeviceControllerPlugin::requestPrintTicket(const QHash<QString, QVariant
 
 void ATBDeviceControllerPlugin::onPrinterDataPreparedForTemplates()
 {
-    if (this->templateList.isEmpty()) return;
+    if (this->currentTicket->templateList()->isEmpty()) return;
 
     this->onPrinterPrintNextTemplate();
 }
@@ -852,6 +968,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:
@@ -875,8 +992,17 @@ void ATBDeviceControllerPlugin::onPrinterWaitForPrintingTicket()
         this->onPrintFinishedERR();
         break;
     default:
+        // 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;
     }
 
@@ -886,30 +1012,38 @@ void ATBDeviceControllerPlugin::onPrinterWaitForPrintingTicket()
 void ATBDeviceControllerPlugin::onPrinterPrintNextTemplate()
 {
     // template list must not be empty
-    if (this->templateList.isEmpty()) {
+    if (this->currentTicket->templateList()->isEmpty()) {
         this->onPrintFinishedERR();
         return;
     }
 
-    qCritical() << "     ... print template " << this->templateList.first();
+    qCritical() << "     ... print template " << this->currentTicket->templateList()->first();
 
-    if (!this->hw->prn_printTemplate(this->templateList.first())) {
+    if (!this->hw->prn_printTemplate(this->currentTicket->templateList()->first())) {
         this->errorCode = "hwapi::prn_printTemplate";
-        this->errorDescription = QString("hwapi method 'hwapi::onPrinterPrintNextTemplate(%1)' result is false").arg(this->templateList.first());
+        this->errorDescription = QString("hwapi method 'hwapi::onPrinterPrintNextTemplate(%1)' result is false").arg(this->currentTicket->templateList()->first());
         this->onPrintFinishedERR();
         return;
     }
-    this->templateList.removeFirst();
+    this->currentTicket->templateList()->removeFirst();
+    this->currentTicket->setCurrentTemplateProcessed();
 
-    if (templateList.isEmpty()) {
+    if (this->currentTicket->templateList()->isEmpty()) {
         // all templates are printed
+        this->printResultCheckCounter = 0;
         QTimer::singleShot(2000, this, SLOT(onPrinterWaitForPrintingTicket()));
     }
+    else {
+
+        if (this->currentTicket->hasTemplateDynData()) {
+            // set new dyn data:
+            QTimer::singleShot(2000, this, SLOT(onPrinterPrepareDynTemplateData()));
+        }
         else {
             // print next template
             QTimer::singleShot(2000, this, SLOT(onPrinterPrintNextTemplate()));
         }
-
+    }
 }
 
 /************************************************************************************************
@@ -942,6 +1076,203 @@ void ATBDeviceControllerPlugin::onPrintFinishedERR()
 
 
 
+void ATBDeviceControllerPlugin::onPrinterPrepareDynTemplateData()
+{
+    this->prepareDynTemplateData();
+}
+void ATBDeviceControllerPlugin::prepareDynTemplateData()
+{
+    struct T_dynDat dynamicTicketData;
+    struct T_dynDat *dynTicketData = &dynamicTicketData;
+    memset(dynTicketData, 0, sizeof(*dynTicketData));
+
+    // setup dynTicketData dependent on currentTicket
+
+    // DEBUG:
+    qCritical() << "---------------------------------------------------";
+    qCritical() << "ATBDeviceControllerPlugin::prepareDynTemplateData():";
+    qCritical() << "    -> currentProcessedTemplateNumber: " << this->currentTicket->getCurrentProcessedTemplateNumber();
+    qCritical() << "    -> this->currentTicket->variant(): " << this->currentTicket->variant();
+    qCritical() << "---------------------------------------------------";
+
+    switch (this->currentTicket->variant()) {
+    case nsDeviceControllerInterface::TICKET_VARIANT::START_RECEIPT:
+        private_setupDynTemplateData_START_RECEIPT(dynTicketData, this->currentTicket);
+        break;
+    case nsDeviceControllerInterface::TICKET_VARIANT::STOP_RECEIPT:
+        private_setupDynTemplatData_STOP_RECEIPT(dynTicketData, this->currentTicket);
+        break;
+    case nsDeviceControllerInterface::TICKET_VARIANT::FINE_PAYMENT:
+        private_setupDynTemplatData_FINE_PAYMENT(dynTicketData, this->currentTicket);
+        break;
+    case nsDeviceControllerInterface::TICKET_VARIANT::RECEIPT:
+        break;
+    case nsDeviceControllerInterface::TICKET_VARIANT::ERROR_RECEIPT:
+        break;
+    case nsDeviceControllerInterface::TICKET_VARIANT::PARKING_TICKET:
+        break;
+    case nsDeviceControllerInterface::TICKET_VARIANT::FREE_TICKET:
+        private_setupDynTemplatData_FREE_TICKET(dynTicketData, this->currentTicket);
+        break;
+    case nsDeviceControllerInterface::TICKET_VARIANT::FOOD_STAMP:
+        private_setupDynTemplatData_FOOD_STAMP(dynTicketData, this->currentTicket);
+        break;
+    }
+
+    // C-Programmierung: wird hier nur 'licensePlate' gedruckt?
+    if (!this->hw->prn_sendDynamicPrnValues(dynTicketData->licensePlate)) {
+        this->errorCode = "hwapi::prn_sendDynamicPrnValues";
+        this->errorDescription = "hwapi method 'hwapi::prn_sendDynamicPrnValues' result is false";
+
+        qCritical() << "ERROR: hw->prn_sendDynamicPrnValues";
+
+        this->onPrintFinishedERR();
+        return;
+    }
+
+    QTimer::singleShot(1000, this, SLOT(onPrinterDataPreparedForTemplates()));
+}
+
+
+void ATBDeviceControllerPlugin::private_setupDynTemplateData_START_RECEIPT(struct T_dynDat *dynTicketData, Ticket *ticket)
+{
+    QDateTime parkingEndDateTime = QDateTime::fromString(ticket->getPrintingData()["parkingEnd"].toString(),  Qt::ISODate);
+    QDateTime currentDateTime    = QDateTime::fromString(ticket->getPrintingData()["currentDateTime"].toString(), Qt::ISODate);
+
+    QString parkingEndDateString = TicketUtils::getLocaleDateString(this->printerLocale, parkingEndDateTime.date());
+    QString currentDateString    = TicketUtils::getLocaleDateString(this->printerLocale, currentDateTime.date());
+
+    // set dynamic printer data:
+    QByteArray ba_licenseplate = codec->fromUnicode(ticket->getPrintingData()["licenseplate"].toString());
+    memcpy((char*)dynTicketData->licensePlate, ba_licenseplate.data(), std::min(ba_licenseplate.size(),8));
+
+    QByteArray ba_amount = codec->fromUnicode(ticket->getPrintingData()["amount"].toString());
+    memcpy((char*)dynTicketData->vendingPrice,  ba_amount.data(), std::min(ba_amount.size(),8));  // Szeged
+    memcpy((char*)dynTicketData->dynDat6,       ba_amount.data(), std::min(ba_amount.size(),8));  // Schoenau
+
+    QByteArray ba_parkingEndTime = codec->fromUnicode(parkingEndDateTime.toString("hh:mm"));
+    memcpy((char*)dynTicketData->parkingEnd,  ba_parkingEndTime.data(), std::min(ba_parkingEndTime.size(),8));
+
+    QByteArray ba_parkingEndDate = codec->fromUnicode(parkingEndDateString);
+    memcpy((char*)dynTicketData->currentTime,  ba_parkingEndDate.data(), std::min(ba_parkingEndDate.size(),8));
+    // ! and yes... 'ParkingEndDate' is 'currentTime'
+
+    QByteArray ba_currentDate = codec->fromUnicode(currentDateString);
+    memcpy((char*)dynTicketData->currentDate,  ba_currentDate.data(), std::min(ba_currentDate.size(),8));
+    // STAN for Szeged Start/Stop: must be 9 digits
+    // --------------------------------------------------------------------------------------
+    QString stan = codec->fromUnicode(ticket->getPrintingData()["STAN"].toString());
+    qCritical() << "   requestPrintTicket() STAN = " << stan;
+    QString stan1;
+    QString stan2;
+    if (stan.length() == 9) {
+        stan1 = "     " + stan.mid(0,3);
+        stan2 = stan.mid(3,3) + " " + stan.mid(6,3);
+    }
+    else {
+        qCritical() << "ASSERT: ATBDeviceControllerPlugin::requestPrintTicket() invalid STAN: " << stan;
+        stan1 = "     000";
+        stan2 = "000 000";
+    }
+    QByteArray ba_stan1 = codec->fromUnicode(stan1);
+    QByteArray ba_stan2 = codec->fromUnicode(stan2);
+
+
+    // --------------------------------------------------------------------------------------
+
+    memcpy((char*)dynTicketData->dynDat6, ba_stan1.data(), std::min(ba_stan1.size(),8));
+    memcpy((char*)dynTicketData->dynDat7, ba_stan2.data(), std::min(ba_stan2.size(),8));
+}
+
+void ATBDeviceControllerPlugin::private_setupDynTemplatData_STOP_RECEIPT(struct T_dynDat *dynTicketData,  Ticket *ticket)
+{
+    // same as START_RECEIPT
+    this->private_setupDynTemplateData_START_RECEIPT(dynTicketData, ticket);
+}
+
+void ATBDeviceControllerPlugin::private_setupDynTemplatData_FOOD_STAMP(struct T_dynDat *dynTicketData, Ticket *ticket)
+{
+    quint8 currentProcessedTemplateNumber = ticket->getCurrentProcessedTemplateNumber();
+
+    // TODO: check DynXList size / or ensure that DynXList has value
+
+    // "Mitarbeiter-Nummer": dynPr1 -> licenceplate
+    QString currentEMP_Nr = ticket->getDyn1List().at(currentProcessedTemplateNumber);
+    QByteArray ba_licenseplate = codec->fromUnicode(currentEMP_Nr);
+    memcpy((char*)dynTicketData->licensePlate, ba_licenseplate.data(), std::min(ba_licenseplate.size(),8));
+
+    // "Lauf.Nr": dynPr2 -> vendingPrice
+    QString currentStampNumber = ticket->getDyn2List().at(currentProcessedTemplateNumber);
+    QByteArray ba_amount = codec->fromUnicode(currentStampNumber);
+    memcpy((char*)dynTicketData->vendingPrice, ba_amount.data(), std::min(ba_amount.size(),8));
+
+    // DEBUG
+    qCritical() << "-------------------------------------------------------";
+    qCritical() << "private_setupDynTemplatData_FOOD_STAMP()";
+    qCritical() << "       currentProcessedTemplateNumber: " << currentProcessedTemplateNumber;
+    qCritical() << "                        currentEMP_Nr: " << currentEMP_Nr;
+    qCritical() << "                   currentStampNumber: " << currentStampNumber;
+    qCritical() << "-------------------------------------------------------";
+}
+
+void ATBDeviceControllerPlugin::private_setupDynTemplatData_FINE_PAYMENT(struct T_dynDat *dynTicketData,   Ticket *ticket)
+{
+    QDateTime currentDateTime    = QDateTime::fromString(ticket->getPrintingData()["currentDateTime"].toString(), Qt::ISODate);
+
+    QString currentDateString    = this->printerLocale.toString(currentDateTime.date(),    QLocale::ShortFormat);
+
+
+    // set dynamic printer data:
+    QByteArray ba_licenseplate = codec->fromUnicode(ticket->getPrintingData()["licenseplate"].toString());
+    memcpy((char*)dynTicketData->licensePlate, ba_licenseplate.data(), std::min(ba_licenseplate.size(),8));
+
+    QByteArray ba_amount = codec->fromUnicode(ticket->getPrintingData()["amount"].toString());
+    memcpy((char*)dynTicketData->vendingPrice,  ba_amount.data(), std::min(ba_amount.size(),8));  // Szeged
+    memcpy((char*)dynTicketData->dynDat6,       ba_amount.data(), std::min(ba_amount.size(),8));  // Schoenau
+
+    QByteArray ba_currentDate = codec->fromUnicode(currentDateString);
+    memcpy((char*)dynTicketData->currentDate,   ba_currentDate.data(), std::min(ba_currentDate.size(),8));
+
+    QByteArray ba_ticketId = codec->fromUnicode(ticket->getPrintingData()["ticketId"].toString());
+    memcpy((char*)dynTicketData->dynDat7,       ba_ticketId.data(), std::min(ba_ticketId.size(),8));
+}
+
+
+
+void ATBDeviceControllerPlugin::private_setupDynTemplatData_FREE_TICKET(struct T_dynDat *dynTicketData,   Ticket *ticket)
+{
+    QDateTime currentDateTime    = QDateTime::fromString(ticket->getPrintingData()["currentDateTime"].toString(), Qt::ISODate);
+
+    QString currentDateString    = this->printerLocale.toString(currentDateTime.date(),    QLocale::ShortFormat);
+
+
+    // set dynamic printer data:
+    QByteArray ba_licenseplate = codec->fromUnicode(ticket->getPrintingData()["licenseplate"].toString());
+    memcpy((char*)dynTicketData->licensePlate, ba_licenseplate.data(), std::min(ba_licenseplate.size(),8));
+
+    QByteArray ba_amount = codec->fromUnicode(ticket->getPrintingData()["amount"].toString());
+    memcpy((char*)dynTicketData->vendingPrice,  ba_amount.data(), std::min(ba_amount.size(),8));  // Szeged
+    memcpy((char*)dynTicketData->dynDat6,       ba_amount.data(), std::min(ba_amount.size(),8));  // Schoenau
+
+    QByteArray ba_currentDate = codec->fromUnicode(currentDateString);
+    memcpy((char*)dynTicketData->currentDate,   ba_currentDate.data(), std::min(ba_currentDate.size(),8));
+
+
+    // FREE_TICKET needs parking endtime:
+
+    QDateTime parkingEndDateTime = QDateTime::fromString(ticket->getPrintingData()["parkingEnd"].toString(),  Qt::ISODate);
+
+    QByteArray ba_parkingEndTime = codec->fromUnicode(parkingEndDateTime.toString("hh:mm"));
+    memcpy((char*)dynTicketData->parkingEnd,  ba_parkingEndTime.data(), std::min(ba_parkingEndTime.size(),8));
+
+    QString parkingEndDateString = TicketUtils::getLocaleDateString(this->printerLocale, parkingEndDateTime.date());
+
+    QByteArray ba_parkingEndDate = codec->fromUnicode(parkingEndDateString);
+    memcpy((char*)dynTicketData->currentTime,  ba_parkingEndDate.data(), std::min(ba_parkingEndDate.size(),8));
+    // ! and yes... 'ParkingEndDate' is 'currentTime'
+}
+
+
 /************************************************************************************************
  * cash payment
  */
@@ -1180,6 +1511,10 @@ void ATBDeviceControllerPlugin::onCashChangerState()
                                   "");
         changerStateRequestCounter = 0;
         lastChangerResult = 0;
+
+        // finalize vending:
+        hw->vend_success();
+
         return;
     }
     else
@@ -1234,6 +1569,10 @@ void ATBDeviceControllerPlugin::onCashChangerState()
                                   errorDescription);
         changerStateRequestCounter = 0;
         lastChangerResult = 0;
+
+        // finalize vending:
+        hw->vend_success();
+
         return;
     }
 
@@ -1371,7 +1710,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

@@ -7,12 +7,13 @@
 #include "src/ATBAPP/DeviceControllerInterface.h"
 #include "src/ATBAPP/ATBAPPplugin.h"
 #include "src/ATBAPP/DeviceControllerDiag.h"
+#include "src/ATBAPP/support/Ticket.h"
 
 #include "version.h"
 
 #include "support/PersistentData.h"
 
-#include "interfaces.h"
+#include <DeviceController/interfaces.h>
 
 #include <unistd.h>
 
@@ -20,11 +21,11 @@
 class DBusControllerInterface;
 class QTextCodec;
 
-
 using namespace nsDeviceControllerInterface;
 
 class QSettings;
 
+
 class ATBDeviceControllerPlugin :
         public DeviceControllerInterface
 {
@@ -43,10 +44,13 @@ public:
     // interface:
     PLUGIN_STATE initDCPlugin(QObject *eventReceiver, const QSettings & settings);
 
+    void sendDeviceParameter(const QJsonObject & jsonObject);
+
     // TASKS: Cash handling -------------------------------------------------------
     void requestStartCashInput(const QString & amount);
     void requestStopCashInput();
     void cashCollect();
+    void cashCollect(const QString & amount);
     void cashAbort();
 
     // read coin/cash processing variants -----------------------------------------
@@ -94,8 +98,6 @@ private:
    QString errorDescription;
    QString pluginInfo;
 
-   QList<int> templateList;
-
    QString serialPortName;
 
    bool useDebug;
@@ -128,11 +130,25 @@ private:
    // counts failed hw->log_chkIfVaultRecordAvailable()
    int accountCheckCounter;
 
+   // counts faild hw->prn-getPrintResult()
+   int printResultCheckCounter;
+
    // dbus
    int init_sc_dbus();
 
+   // printer privates ----------------------------------------------------------------------------
+   Ticket * currentTicket;
    QLocale printerLocale;
 
+   void prepareDynTemplateData();
+
+   void private_setupDynTemplateData_START_RECEIPT(struct T_dynDat *dynTicketData, Ticket *ticket);
+   void private_setupDynTemplatData_STOP_RECEIPT(struct T_dynDat *dynTicketData,   Ticket *ticket);
+   void private_setupDynTemplatData_FOOD_STAMP(struct T_dynDat *dynTicketData,     Ticket *ticket);
+   void private_setupDynTemplatData_FINE_PAYMENT(struct T_dynDat *dynTicketData,   Ticket *ticket);
+   void private_setupDynTemplatData_FREE_TICKET(struct T_dynDat *dynTicketData,   Ticket *ticket);
+   // ---------------------------------------------------------------------------------------------
+
 private slots:
    // printer
 
@@ -142,6 +158,8 @@ private slots:
    void onPrinterWaitForPrintingTicket();
    void onPrinterWaitForPrintingReceipt();
 
+   void onPrinterPrepareDynTemplateData();
+
    void onPrintFinishedOK();
    void onPrintFinishedERR();
 

src/ATBAPP/DeviceControllerDiag.cpp

@@ -5,6 +5,11 @@
 #include <QUuid>
 #include <QDebug>
 
+#include <QProcess>
+
+#include "support/JSON.h"
+
+
 DeviceControllerDiag::DeviceControllerDiag(PersistentData *pData, QObject *parent)
     : QObject(parent)
     , coinProcessorType(nsDeviceControllerInterface::COIN_PROCESSOR::ESCROW)
@@ -12,10 +17,13 @@ DeviceControllerDiag::DeviceControllerDiag(PersistentData *pData, QObject *paren
     , eventReceiver(nullptr)
     , isRequestRunning(false)
     , flagInterruptDiag(false)
+    , 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);
 }
@@ -31,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()";
@@ -62,6 +81,24 @@ void DeviceControllerDiag::onDiagRequestTimeoutTimerTimeout()
     this->flagInterruptDiag = true;
 }
 
+
+bool DeviceControllerDiag::isErrorState()
+{
+    return this->_isErrorState;
+}
+
+bool DeviceControllerDiag::isOperatingState()
+{
+    return !this->_isErrorState;
+}
+
+QSet<DeviceController::State> DeviceControllerDiag::getCurrentMachineState()
+{
+    return this->machineEventSet;
+}
+
+
+
 void DeviceControllerDiag::private_startDiag()
 {
     // check for DiagRequestTimeoutTimerTimeout:
@@ -70,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;
     }
 
@@ -91,8 +142,8 @@ void DeviceControllerDiag::private_startDiag()
 void DeviceControllerDiag::sys_superviseSystem()
 {    // this function proofs if vending is possible depending of doors state
 
-    struct T_dynamicCondition dynMaCond;
+    struct T_dynamicCondition dynMaCond = {};
-    struct T_moduleCondition  modCond;
+    struct T_moduleCondition  modCond = {};
 
 
     qCritical() << "      sys_superviseSystem()";
@@ -104,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;
     }
 
@@ -114,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;
     }
 
@@ -126,7 +181,7 @@ void DeviceControllerDiag::sys_superviseSystem()
     {
         // noch keine Testergebnisse
         if (dynMaCond.startupTestIsRunning) {
-            // TODO?
+            qCritical() << "            startupTestIsRunning --> call again";
         }
 
 
@@ -136,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();
@@ -159,13 +202,13 @@ void DeviceControllerDiag::sub_componentAssessment()
 {
     bool flag_sendOperate = true;
 
-    struct T_moduleCondition modCond;
+    struct T_moduleCondition modCond = {};
     hw->sys_getDeviceConditions(&modCond);
 
-    struct T_dynamicCondition dynMaCond;
+    struct T_dynamicCondition dynMaCond = {};
     hw->sys_getDynMachineConditions(&dynMaCond);
 
-    struct T_devices devPara;
+    struct T_devices devPara = {};
     hw->sys_restoreDeviceParameter(&devPara);
 
     // store some interesting results:
@@ -181,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) {
@@ -224,12 +282,16 @@ 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);
         }
     }
     // -----------------------------------------------------------------------------------------------
 
     switch (devPara.kindOfCoinChecker) {
+        case 0:
+            this->coinProcessorType = nsDeviceControllerInterface::COIN_PROCESSOR::NONE;
+            break;
         case 1:
         case 2:
             this->coinProcessorType = nsDeviceControllerInterface::COIN_PROCESSOR::ESCROW;
@@ -243,7 +305,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;
@@ -315,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
@@ -362,7 +425,6 @@ void DeviceControllerDiag::private_sendDiagEvent(DeviceController::State result)
 {
     qCritical() << "DeviceControllerDiag::private_sendDiagEvent() result: " << result;
 
-
     if (this->eventReceiver == nullptr) {
         qCritical() << "DeviceControllerDiag: no eventReceiver";
         return;
@@ -385,61 +447,81 @@ void DeviceControllerDiag::private_sendDiagEvent(DeviceController::State result)
     QString parameter;
     switch (result) {
 
+    case DeviceController::State::INITIAL_STATE:
+        break;
     case DeviceController::State::A000:   // alarm / intrusion
         eventClass = EVENT_CLASS::ALARM;
         parameter  = "alarm / intrusion";
+        this->_isErrorState = true;
         break;
     case DeviceController::State::E002:    // real time clock error
         eventClass = EVENT_CLASS::ERROR;
         parameter  = "real time clock error";
+        this->_isErrorState = true;
         break;
     case DeviceController::State::E003:   // voltage error
         eventClass = EVENT_CLASS::ERROR;
         parameter  = "voltage error";
+        this->_isErrorState = true;
         break;
     case DeviceController::State::E004:   // temperature error
         eventClass = EVENT_CLASS::ERROR;
         parameter  = "temperature error";
+        this->_isErrorState = true;
         break;
     case DeviceController::State::E007:    // coin safe full
         eventClass = EVENT_CLASS::ERROR;
         parameter  = "coin safe full";
+        this->_isErrorState = true;
         break;
     case DeviceController::State::E008:    // bill acceptor full
         eventClass = EVENT_CLASS::ERROR;
         parameter  = "bill acceptor full";
+        this->_isErrorState = true;
         break;
     case DeviceController::State::E009:    // no cash box
         eventClass = EVENT_CLASS::ERROR;
         parameter  = "no cash box";
+        this->_isErrorState = true;
         break;
     case DeviceController::State::E010:    // coin escrow
         eventClass = EVENT_CLASS::ERROR;
         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.";
+        this->_isErrorState = true;
         break;
     case DeviceController::State::E018:    // no paper
         eventClass = EVENT_CLASS::ERROR;
         parameter  = "no paper";
+        this->_isErrorState = true;
         break;
     case DeviceController::State::E020:    // printer error
         eventClass = EVENT_CLASS::ERROR;
         parameter  = "printer error";
+        this->_isErrorState = true;
         break;
     case DeviceController::State::E025:    // coin blocker
         eventClass = EVENT_CLASS::ERROR;
         parameter  = "coin blocker";
+        this->_isErrorState = true;
         break;
     case DeviceController::State::E026:    // error coin validator
         eventClass = EVENT_CLASS::ERROR;
         parameter  = "error coin validator";
+        this->_isErrorState = true;
         break;
     case DeviceController::State::E034:    // mdb error
         eventClass = EVENT_CLASS::ERROR;
         parameter  = "mdb error";
+        this->_isErrorState = true;
         break;
 
     case DeviceController::State::E071:   // cash box change is ongoing
@@ -468,16 +550,21 @@ 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;
+        eventClass = EVENT_CLASS::ERROR;
-        parameter  = "";
+        parameter  = "no valid data from DeviceController";
-        qCritical() << "                ... ignore " << QMetaEnum::fromType<DeviceController::State>().valueToKey(result);
-        return;
         break;
     case DeviceController::State::O000:   // everything is fine
         this->machineEventSet.clear();
+        this->_isErrorState = false;
         eventClass = EVENT_CLASS::OPERATE;
         parameter  = "";
+        if (this->lastState == DeviceController::State::O000) {
+            qCritical() << "   ... everything fine, no state change -> skip sending";
+            return;
+        }
+        else {
             qCritical() << "   ... everything fine";
+        }
         break;
 
     case DeviceController::State::W001:   // paper low
@@ -496,23 +583,46 @@ 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;
+
+    /**
+     * 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",
                 eventClass,
                 eventName,
-                1,
+                1,         // eventState
                 parameter,
                 ""         // second level info
                 );
 
-    //emit diagResponse(machineEvent);
-
     QCoreApplication::postEvent(eventReceiver, machineEvent);
 
 }
 
 
+
+/**
+ * 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

@@ -5,9 +5,10 @@
 #include <QSet>
 #include <QTimer>
 
-#include "ATBMachineEvent.h"
+#include <DeviceController/interfaces.h>
-#include "interfaces.h"
+
 #include "DeviceControllerInterface.h"
+#include "ATBMachineEvent.h"
 
 #include "support/PersistentData.h"
 
@@ -28,6 +29,7 @@ namespace DeviceController {
         E008,
         E009,
         E010,
+        W010,   // Coin Escrow
         E011,
 
         E018,
@@ -51,7 +53,11 @@ namespace DeviceController {
         W001,
         W002,
         W003,
-        W004
+        W004,
+
+        W255,
+
+        INITIAL_STATE
     };
     Q_ENUM_NS(State)
 }
@@ -69,9 +75,32 @@ public:
     nsDeviceControllerInterface::COIN_PROCESSOR coinProcessorType;
     nsDeviceControllerInterface::BILL_ACCEPTOR  billAcceptor;
 
+    /**
+     * return true, if machineEventSet contains an error
+     */
+    bool isErrorState();
+    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);
 
@@ -90,10 +119,14 @@ private:
 
     int lastVoltage;
 
+    DeviceController::State lastState;
     QSet<DeviceController::State> machineEventSet;
+    bool _isErrorState;
 
     PersistentData* pData;
 
+    int E255counter;
+
 private slots:
     void onDiagRequestTimeoutTimerTimeout();
 
@@ -102,7 +135,6 @@ private slots:
 
     void sys_superviseSystem();
 
-
 };
 
 #endif // DEVICECONTROLLERDIAG_H

src/ATBAPP/DeviceControllerInterface.h

@@ -5,6 +5,7 @@
 
 #include <QSettings>
 #include <QString>
+#include <QJsonObject>
 
 #include "ATBAPPplugin.h"
 
@@ -39,6 +40,12 @@ public:
     virtual nsDeviceControllerInterface::PLUGIN_STATE initDCPlugin(QObject *eventReceiver,
                                                                    const QSettings & settings) = 0;
 
+    /**
+     * e.g. send location
+     */
+    virtual void sendDeviceParameter(const QJsonObject & jsonObject) = 0;
+
+
     // TASKS: Cash handling -------------------------------------------------------
     /**
      * enables coin input
@@ -53,9 +60,10 @@ public:
     virtual void requestStopCashInput() = 0;
 
     /**
-     * called e.g. on Button "NEXT" in pay-up (direct coin input)
+     * called e.g. after printing
      */
     virtual void cashCollect() = 0;
+    virtual void cashCollect(const QString & amount) = 0;
     virtual void cashAbort() = 0;
 
     // TASKS: Account -------------------------------------------------------------
@@ -104,6 +112,9 @@ signals:
                                      const QString & errorCode,
                                      const QString & errorDescription);
 
+
+    void coinAttached();
+
     /**
      * emitted on e.g. a coin input
      */
@@ -128,6 +139,14 @@ signals:
                                      const QString & errorCode,
                                      const QString & errorDescription);
 
+    /**
+     * emitted if cashPayment has been finished, e.g. in result to task cashCollect():
+     * if coins in changer must be given back to user.
+     */
+    void cashPaymentChanging(nsDeviceControllerInterface::RESULT_STATE resultState,
+                                     const QString & changeValue,        // amount changed by changer/escrow
+                                     const QString & errorCode,
+                                     const QString & errorDescription);
     /**
      * emitted if cashPayment has been finished, e.g. in result to task cashCollect():
      *  -> ticket should be printed sucessfully
@@ -135,7 +154,7 @@ signals:
      * Provides data for logging, especially changed value
      */
     void cashPaymentFinished(nsDeviceControllerInterface::RESULT_STATE resultState,
-                                     const QString & newCashValue,  // total inserted amount amount
+                                     const QString & newCashValue,  // total inserted amount
                                      const QString & coinValue,     // inserted amount, paid with coins
                                      const QString & noteValue,     // inserted amount, paid with notes
                                      const QString & changeValue,   // amount changed by changer/escrow
@@ -193,7 +212,7 @@ signals:
 
 
 Q_DECLARE_INTERFACE(DeviceControllerInterface,
-                    "eu.atb.ptu.plugin.DeviceControllerInterface/1.1.1")
+                    "eu.atb.ptu.plugin.DeviceControllerInterface/1.2.0")
 
 
 namespace nsDeviceControllerInterface {
@@ -226,11 +245,15 @@ namespace nsDeviceControllerInterface {
         ERROR_RECEIPT,
         START_RECEIPT,   // e.g. Szeged Start
         STOP_RECEIPT,    // e.g. Szeged Stop
+        FINE_PAYMENT,    // e.g. Klaipeda
+        FOOD_STAMP,
+        FREE_TICKET
     };
 
     enum class COIN_PROCESSOR : quint8 {
         CHANGER,
-        ESCROW
+        ESCROW,
+        NONE
     };
 
     enum class BILL_ACCEPTOR  : quint8 {

src/ATBAPP/support/CashUtils.h

@@ -2,7 +2,7 @@
 #define CASHUTILS_H
 
 #include <QObject>
-#include "interfaces.h"
+#include <DeviceController/interfaces.h>
 
 namespace CashUtils {
 

src/ATBAPP/support/PersistentData.cpp

@@ -30,8 +30,11 @@ PersistentData::PersistentData(const QString &datafileName, QObject *parent)
 
 void PersistentData::serializeToFile()
 {
+    if (this->isChangedFlag) {
+        qCritical() << "PersistentData::isChanged -> save";
         this->save();
     }
+}
 
 void PersistentData::save()
 {
@@ -44,6 +47,8 @@ void PersistentData::save()
         out << this->hash;
         fileOut.flush();
         fileOut.close();
+
+        this->isChangedFlag = false;
     }
 }
 

src/ATBAPP/support/Ticket.cpp

@@ -0,0 +1,181 @@
+#include "Ticket.h"
+
+#include <QDebug>
+
+Ticket::Ticket(TICKET_VARIANT ticketVariant, QObject *parent )
+    : QObject(parent)
+    , ticketVariant(ticketVariant)
+    , _hasTemplateDynData(false)
+{
+
+}
+
+TICKET_VARIANT Ticket::variant()
+{
+    return this->ticketVariant;
+}
+
+QList<quint8> * Ticket::templateList()
+{
+    return &(this->_templateList);
+}
+
+bool Ticket::hasTemplateDynData()
+{
+    return this->_hasTemplateDynData;
+}
+
+quint8 Ticket::getCurrentProcessedTemplateNumber()
+{
+    return this->currentProcessedTemplateNumber;
+}
+
+void Ticket::setCurrentTemplateProcessed()
+{
+    this->currentProcessedTemplateNumber++;
+}
+
+
+bool Ticket::initNew(TICKET_VARIANT ticketVariant, const QList<quint8> & templateList, const QHash<QString, QVariant> & printingData)
+{
+    this->clear();
+
+    this->ticketVariant = ticketVariant;
+    this->printingData = printingData;
+    this->_templateList = templateList;
+    this->currentProcessedTemplateNumber = 0;
+
+    // DEBUG
+    qCritical() << "Ticket::initNew():";
+    qCritical() << "      -> " << ticketVariant;
+
+    int multiplicatorInt = 1;  // default
+
+    switch (this->ticketVariant) {
+    case TICKET_VARIANT::PARKING_TICKET:
+        break;
+    case TICKET_VARIANT::RECEIPT:
+        break;
+    case TICKET_VARIANT::ERROR_RECEIPT:
+        break;
+    case TICKET_VARIANT::START_RECEIPT:
+        this->_templateList << 21 << 22 << 23;
+        break;
+    case TICKET_VARIANT::STOP_RECEIPT:
+        this->_templateList << 24 << 25 << 26;
+        break;
+    case TICKET_VARIANT::FINE_PAYMENT:
+        this->_templateList << 24 << 25 << 26;
+        break;
+    case TICKET_VARIANT::FREE_TICKET:
+        this->_templateList << 24 << 25 << 26;
+        break;
+    case TICKET_VARIANT::FOOD_STAMP:
+         if (printingData.contains("dyn1_list")) {
+            this->_hasTemplateDynData = true;
+
+            this->dyn1List = printingData["dyn1_list"].toStringList();
+            this->dyn2List = printingData["dyn2_list"].toStringList();
+         }
+
+         if (printingData.contains("multiplicator")) {
+             multiplicatorInt = printingData["multiplicator"].toInt();
+             for (int i = 1; i < multiplicatorInt; i++) {
+                 this->_templateList << 1;
+             }
+             // last template:
+             this->_templateList << 2;
+         }
+
+         // DEBUG FOOD_STAMP:
+         qCritical() << "     --> printingData[\"multiplicator\"]" << multiplicatorInt;
+
+        break;
+    }
+
+
+    // DEBUG
+    QString templateListString;
+    for (int i =0; i < this->_templateList.size(); ++i) {
+        templateListString.append(QString(" %1").arg(this->_templateList.at(i)));
+    }
+    qCritical() << "     -> templates: " << templateListString;
+
+
+    return true;
+}
+
+void Ticket::clear()
+{
+    this->ticketVariant = TICKET_VARIANT::PARKING_TICKET;
+    this->printingData.clear();
+    this->_templateList.clear();
+    this->errorCode.clear();
+    this->errorDescription.clear();
+
+    this->_hasTemplateDynData = false;
+    this->dyn1List.clear();
+    this->dyn1List.clear();
+}
+
+QString Ticket::getErrorCode()         {  return this->errorCode;        }
+QString Ticket::getErrorDescription()  {  return this->errorDescription; }
+
+
+
+
+/**
+ */
+QStringList Ticket::getDyn1List()
+{
+    return this->dyn1List;
+}
+
+QStringList Ticket::getDyn2List()
+{
+    return this->dyn2List;
+}
+
+QHash<QString, QVariant> & Ticket::getPrintingData()
+{
+    return this->printingData;
+}
+
+
+
+
+/************************************************************************************************
+ * operator
+ *
+ */
+QDebug operator<<(QDebug debug, TICKET_VARIANT ticketVariant)
+{
+    switch (ticketVariant) {
+        case TICKET_VARIANT::PARKING_TICKET:
+            debug << "TICKET_VARIANT::PARKING_TICKET";
+            break;
+        case TICKET_VARIANT::RECEIPT:
+            debug << "TICKET_VARIANT::RECEIPT";
+            break;
+        case TICKET_VARIANT::ERROR_RECEIPT:
+            debug << "TICKET_VARIANT::ERROR_RECEIPT";
+            break;
+        case TICKET_VARIANT::START_RECEIPT:
+            debug << "TICKET_VARIANT::START_RECEIPT";
+            break;
+        case TICKET_VARIANT::STOP_RECEIPT:
+            debug << "TICKET_VARIANT::STOP_RECEIPT";
+            break;
+        case TICKET_VARIANT::FINE_PAYMENT:
+            debug << "TICKET_VARIANT::FINE_PAYMENT";
+            break;
+        case TICKET_VARIANT::FOOD_STAMP:
+            debug << "TICKET_VARIANT::FOOD_STAMP";
+            break;
+        case TICKET_VARIANT::FREE_TICKET:
+            debug << "TICKET_VARIANT::FREE_TICKET";
+            break;
+    }
+
+    return debug;
+}

src/ATBAPP/support/Ticket.h

@@ -0,0 +1,88 @@
+#ifndef TICKET_H
+#define TICKET_H
+
+#include <QObject>
+#include <QHash>
+
+#include "../DeviceControllerInterface.h"
+
+using namespace nsDeviceControllerInterface;
+
+QDebug operator<<(QDebug debug, TICKET_VARIANT ticketVariant);
+
+
+
+class Ticket : public QObject
+{
+    Q_OBJECT
+
+public:
+    Ticket(TICKET_VARIANT ticketVariant, QObject *parent = nullptr);
+
+    bool initNew(TICKET_VARIANT ticketVariant, const QList<quint8> & templateList, const QHash<QString, QVariant> & printingData);
+    void clear();
+
+    TICKET_VARIANT variant();
+
+    QList<quint8> * templateList();
+
+    /**
+     * @brief getPrintingData - generic getter for printingData
+     * Used mainly for simple tickets (single tickets e.g. ParkingTicket)
+     * @return
+     */
+    QHash<QString, QVariant> & getPrintingData();
+
+    /**
+     * @brief hasTemplateDynData
+     * @return true, if ticket has dynamic data for each template.
+     *
+     * This depends on TICKET_VARIANT and printingData
+     */
+    bool hasTemplateDynData();
+
+    /**
+     * @brief getDyn1List
+     * contains dynamic template data
+     * The size of the lists must be exactly the same as the number of templates.
+     */
+    QStringList getDyn1List();
+    QStringList getDyn2List();
+
+    quint8 getCurrentProcessedTemplateNumber();
+
+    /**
+     * Mark current template as processed
+     */
+    void setCurrentTemplateProcessed();
+
+
+    // error handling
+    QString getErrorCode();
+    QString getErrorDescription();
+
+
+
+
+private:
+    TICKET_VARIANT ticketVariant;
+
+    // printingData from application
+    QHash<QString, QVariant> printingData;
+
+    // templateList, from .ini or created by ticketVariant...
+    QList<quint8> _templateList;
+
+    bool _hasTemplateDynData;
+
+    quint8 currentProcessedTemplateNumber;
+
+    QStringList dyn1List;
+    QStringList dyn2List;
+
+    // error handling
+    QString errorCode;
+    QString errorDescription;
+};
+
+#endif // TICKET_H

src/ATBAPP/support/TicketUtils.cpp

@@ -0,0 +1,26 @@
+#include "TicketUtils.h"
+
+#include <QLocale>
+#include <QDate>
+
+TicketUtils::TicketUtils(QObject *parent) : QObject(parent)
+{
+
+}
+
+
+QString TicketUtils::getLocaleDateString(const QLocale & qLocale, const QDate & qDate)
+{
+    QString dateString;
+
+    if (qLocale.language() == QLocale::Lithuanian) {
+        // QLocale::ShortFormat produces date string: "yyyy-mm-dd" ...
+        // this is to long for the printer.
+        dateString = qDate.toString("yy-MM-dd");
+    }
+    else {
+        dateString = qLocale.toString(qDate, QLocale::ShortFormat);
+    }
+
+    return dateString;
+}

src/ATBAPP/support/TicketUtils.h

@@ -0,0 +1,34 @@
+#ifndef TICKETUTILS_H
+#define TICKETUTILS_H
+
+#include <QObject>
+
+class TicketUtils : public QObject
+{
+    Q_OBJECT
+public:
+    explicit TicketUtils(QObject *parent = nullptr);
+
+    /**
+     * @brief getLocaleDateString
+     * @param qLocale
+     * @param qDate
+     * @return a localized date string short format
+     *
+     * Note QLocale::ShortFormat does not result to the
+     * string we need for ticket printing therefore this
+     * helper method was created.
+     *
+     * e.g. using Lithuanian (lt_LT) we get a date in short format:
+     *      "2024-08-08" unfortunately this is to long, we need
+     * the year with only two digits.
+     * e.g. in German (de_DE) it is enought: "08.08.24"
+     *
+     */
+    static QString getLocaleDateString(const QLocale &qLocale, const QDate &qDate);
+
+signals:
+
+};
+
+#endif // TICKETUTILS_H