Use global interfaces.h

Reading dc-fw-version is somehow complicated ...
Id does not work reliable on startup, so we do read it also on every
diagRequest().
Version string is then stored in persistent data.
This data can be used e.g. by other tools to show the
device-controller-firmware-version.

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 += -lQt5Qmqtt
+    LIBS += -lCAslave
+    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 \
@@ -77,9 +83,11 @@ HEADERS += \
     src/ATBAPP/ATBMachineEvent.h \
     src/ATBAPP/ATBDeviceControllerPlugin.h \
     src/ATBAPP/Utils.h \
+    src/ATBAPP/support/CashUtils.h \
     src/ATBAPP/support/DBusControllerInterface.h \
     src/ATBAPP/support/JSON.h \
-    src/ATBAPP/support/PTUSystem.h
+    src/ATBAPP/support/PTUSystem.h \
+    src/ATBAPP/support/PersistentData.h
 
 SOURCES += \
     src/ATBAPP/ATBHealthEvent.cpp \
@@ -87,9 +95,11 @@ SOURCES += \
     src/ATBAPP/ATBDeviceControllerPlugin.cpp \
     src/ATBAPP/DeviceControllerDiag.cpp \
     src/ATBAPP/Utils.cpp \
+    src/ATBAPP/support/CashUtils.cpp \
     src/ATBAPP/support/DBusControllerInterface.cpp \
     src/ATBAPP/support/JSON.cpp \
-    src/ATBAPP/support/PTUSystem.cpp
+    src/ATBAPP/support/PTUSystem.cpp \
+    src/ATBAPP/support/PersistentData.cpp
 
 DISTFILES += \
     generate-version.sh

src/ATBAPP/ATBDeviceControllerPlugin.cpp

@@ -5,6 +5,7 @@
 #include "src/ATBAPP/support/JSON.h"
 #include "src/ATBAPP/support/DBusControllerInterface.h"
 #include "src/ATBAPP/support/PTUSystem.h"
+#include "src/ATBAPP/support/CashUtils.h"
 
 #include <QTimer>
 #include <QThread>
@@ -22,7 +23,8 @@
 
 
 ATBDeviceControllerPlugin::ATBDeviceControllerPlugin(QObject *parent)
-    : pluginState(PLUGIN_STATE::NOT_INITIALIZED)
+    : isMaster(false)
+    , pluginState(PLUGIN_STATE::NOT_INITIALIZED)
     , eventReceiver(nullptr)
 {
     this->setParent(parent);
@@ -39,11 +41,12 @@ ATBDeviceControllerPlugin::ATBDeviceControllerPlugin(QObject *parent)
     //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_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_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
@@ -57,13 +60,16 @@ ATBDeviceControllerPlugin::ATBDeviceControllerPlugin(QObject *parent)
     dynamic_cast<QObject*>(hw)->moveToThread(hwThread);
     hwThread->start();
 
+    QString persistentDataFile = "/mnt/system_data/dc_persistentData.dat";
+    this->persistentData = new PersistentData(persistentDataFile);
 
-    this->diag = new DeviceControllerDiag(this);
+    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() {}
@@ -73,11 +79,16 @@ PLUGIN_STATE ATBDeviceControllerPlugin::initDCPlugin(QObject *eventReceiver, con
     this->eventReceiver = eventReceiver;
 
     // read variables from setting
-    this->serialPortName = settings.value("DEVICE_CONTROLLER/serialPort", "ttymxc2").toString();
-    QByteArray printerEncoding = settings.value("DEVICE_CONTROLLER/printerEnconding", "ISO 8859-2").toString().toLatin1();
+    this->serialPortName = settings.value("ATBDeviceControllerPlugin/serialPort", "ttymxc2").toString();
+    QByteArray printerEncoding = settings.value("ATBDeviceControllerPlugin/printerEncoding", "ISO 8859-2").toString().toLatin1();
+    QString printerLocaleString = settings.value("ATBDeviceControllerPlugin/printerLocale", "de_DE").toString().toLatin1();
+    this->printerLocale = QLocale(printerLocaleString);
 
-    // open serial port
-    hw->dc_openSerial(5, "115200", this->serialPortName, 1);
+
+    if (this->isMaster) {
+        // open serial port
+        hw->dc_openSerial(5, "115200", this->serialPortName, 1);
+    }
 
     hw->dc_autoRequest(true);
 
@@ -91,10 +102,25 @@ PLUGIN_STATE ATBDeviceControllerPlugin::initDCPlugin(QObject *eventReceiver, con
     // this is necessary to init the CashAgentLib (!)
     hw->vend_failed();
 
+    // read sw-version and store it in persistentData, if changed
+    QString dc_fw_version = hw->dc_getSWversion().remove(QChar('\0'));
+    qCritical() << "ATBDeviceControllerPlugin: DC firmware version: " << dc_fw_version;
+    this->persistentData->setDCFirmwareVersion(dc_fw_version);
+    this->persistentData->serializeToFile();
 
     // text encoding for printer
     this->codec = QTextCodec::codecForName(printerEncoding);
 
+    if (this->codec == nullptr) {
+        printerEncoding = "ISO 8859-1";
+        qCritical() << "ATBDeviceControllerPlugin: ERROR: printer encoding \"" << printerEncoding << "\" is not supported!";
+        qCritical() << "     ... use default encoding: " << printerEncoding;
+        this->codec = QTextCodec::codecForName(printerEncoding);
+    }
+    else {
+        qCritical() << "ATBDeviceControllerPlugin: Set printer encoding to " << printerEncoding;
+    }
+
     this->diag->init(this->hw, this->eventReceiver);
 
     this->pluginState = PLUGIN_STATE::INITIALIZED;
@@ -105,12 +131,19 @@ PLUGIN_STATE ATBDeviceControllerPlugin::initDCPlugin(QObject *eventReceiver, con
 
 void ATBDeviceControllerPlugin::startPhysicalLayer()
 {
+    if (!this->isMaster) return;
+
     if (this->pluginState == PLUGIN_STATE::NOT_INITIALIZED)
     {
         qCritical() << "ATBDeviceControllerPlugin::startPhysicalLayer(): plugin is not initialized";
         return;
     }
 
+    qCritical() << "ATBDeviceControllerPlugin::startPhysicalLayer() " << endl
+                << "     -> use master lib " << endl
+                << "     -> start physical layer";
+
+
     // open serial port
     hw->dc_openSerial(5, "115200", this->serialPortName, 1);
 
@@ -119,6 +152,12 @@ void ATBDeviceControllerPlugin::startPhysicalLayer()
 
 void ATBDeviceControllerPlugin::stopPhysicalLayer()
 {
+    // store persistent data
+    this->persistentData->serializeToFile();
+
+    // skip, if we use slave lib
+    if (!this->isMaster) return;
+
     if (this->pluginState == PLUGIN_STATE::NOT_INITIALIZED)
     {
         qCritical() << "ATBDeviceControllerPlugin::startPhysicalLayer(): plugin is not initialized";
@@ -153,19 +192,22 @@ void ATBDeviceControllerPlugin::reset()
 
 void ATBDeviceControllerPlugin::onChangedProgramModeToSELL()
 {
+    hw->dc_autoRequest(true);
     hw->rtc_setDateTime();
+    hw->mdb_switchWake(0);   // wakeup MDB components
 }
 
 void ATBDeviceControllerPlugin::onChangedProgramModeToSERVICE()
 {
-    //hw->dc_autoRequest(true);
+    hw->dc_autoRequest(true);
+    hw->mdb_switchWake(0);   // wakeup MDB components
 }
 
 void ATBDeviceControllerPlugin::onChangedProgramModeToIDLE()
 {
-    //hw->dc_autoRequest(false);  // <-- TODO: ???
-
+    hw->dc_autoRequest(true);
     this->diag->diagRequest();
+    hw->mdb_switchWake(1);
 
 }
 
@@ -180,11 +222,11 @@ void ATBDeviceControllerPlugin::requestStartCashInput(const QString & amount)
 {
     qCritical() << "Start Cash vending with amount = " << amount;
 
-    uint32_t amountInt = static_cast<uint32_t>(amount.toUInt());
+    this->cashStartAmountInt = static_cast<uint32_t>(amount.toUInt());
 
-    if (amountInt == 0) amountInt = UINT_MAX;
+    if (this->cashStartAmountInt == 0) this->cashStartAmountInt = UINT_MAX;
 
-    hw->cash_startPayment(amountInt);
+    hw->cash_startPayment(this->cashStartAmountInt);
 }
 
 void ATBDeviceControllerPlugin::requestStopCashInput()
@@ -198,7 +240,33 @@ void ATBDeviceControllerPlugin::requestStopCashInput()
 void ATBDeviceControllerPlugin::cashCollect()
 {
     hw->vend_success();
-    this->currentCashState = CASH_STATE::CACHE_EMPTY;
+
+    // inserted amount
+    uint32_t amountInt = this->hw->getInsertedAmount();
+    QString amountString = QString::number(amountInt);
+
+    // 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);
+
+
+    if (this->coinProcessor() == nsDeviceControllerInterface::COIN_PROCESSOR::CHANGER) {
+        QTimer::singleShot(1000, this, &ATBDeviceControllerPlugin::onCashChangerState);
+    }
+    else {
+        emit this->cashPaymentFinished(nsDeviceControllerInterface::RESULT_STATE::SUCCESS,
+                                  amountString,
+                                  amountCoinsString,        // coins
+                                  amountNotesString,        // notes
+                                  0,                        // proposed change
+                                  "",
+                                  "");
+        this->currentCashState = CASH_STATE::CACHE_EMPTY;
+    }
 }
 
 void ATBDeviceControllerPlugin::cashAbort()
@@ -207,6 +275,19 @@ void ATBDeviceControllerPlugin::cashAbort()
     this->currentCashState = CASH_STATE::CACHE_EMPTY;
 }
 
+// Coin/Cash processing variants ----------------------------------------------
+
+nsDeviceControllerInterface::COIN_PROCESSOR ATBDeviceControllerPlugin::coinProcessor()
+{
+    return this->diag->coinProcessorType;
+}
+
+nsDeviceControllerInterface::BILL_ACCEPTOR  ATBDeviceControllerPlugin::billAcceptor()
+{
+    return this->diag->billAcceptor;
+}
+
+
 // TASKS: Account -------------------------------------------------------------
 
 // for an external account request, e.g. by an ui-button:
@@ -310,9 +391,9 @@ void ATBDeviceControllerPlugin::private_getAccountData()
     accountData.insert("accountStartTime", startDateTime);
     //-------------------------------------------------------------------------
 
+    // COINS in Vault: --------------------------------------------------------
 
-
-    int numberOfCoinVariants = sizeof(retVR.coinsInVault);
+    int numberOfCoinVariants = sizeof(retVR.coinsInVault)/sizeof(retVR.coinsInVault[0]);
 
     // DEBUG
     qCritical() << "      NumberOfCoinVariants = " << numberOfCoinVariants;
@@ -322,14 +403,36 @@ void ATBDeviceControllerPlugin::private_getAccountData()
 
     accountData.insert("NumberOfCoinVariants", numberOfCoinVariants);
     for (int i = 0; i < numberOfCoinVariants; ++i) {
-        accountData.insert("COIN_" + QString::number(i) + "_Quantity",  retVR.coinsInVault[i]);
-        accountData.insert("COIN_" + QString::number(i) + "_Value",     retVR.coinDenomination[i]);
+        accountData.insert("COIN_" + QString::number(i+1) + "_Quantity",  retVR.coinsInVault[i]);
+        accountData.insert("COIN_" + QString::number(i+1) + "_Value",     retVR.coinDenomination[i]);
 
         // DEBUG
-        qCritical() << "COIN_" + QString::number(i) + "_Quantity = " << accountData["COIN_" + QString::number(i) + "_Quantity"];
-        qCritical() << "COIN_" + QString::number(i) + "_Value    = " << accountData["COIN_" + QString::number(i) + "_Value"];
+        qCritical() << "COIN_" + QString::number(i+1) + "_Quantity = " << accountData["COIN_" + QString::number(i) + "_Quantity"];
+        qCritical() << "COIN_" + QString::number(i+1) + "_Value    = " << accountData["COIN_" + QString::number(i) + "_Value"];
     }
 
+    // NOTES in stacker: --------------------------------------------------------
+
+    int numberOfBillVariants = sizeof(retVR.billsInStacker)/sizeof(retVR.billsInStacker[0]);
+
+    // DEBUG
+    qCritical() << "      numberOfBillVariants = " << numberOfBillVariants;
+
+    // limit numberOfBillVariants:
+    if (numberOfBillVariants > 16) { numberOfBillVariants = 16; }
+
+    accountData.insert("NumberOfBillVariants", numberOfBillVariants);
+    for (int i = 0; i < numberOfBillVariants; ++i) {
+        accountData.insert("NOTE_" + QString::number(i+1) + "_Quantity",  retVR.billsInStacker[i]);
+        accountData.insert("NOTE_" + QString::number(i+1) + "_Value",     retVR.billDenom[i]);
+
+        // DEBUG
+        qCritical() << "NOTE_" + QString::number(i+1) + "_Quantity = " << accountData["NOTE_" + QString::number(i+1) + "_Quantity"];
+        qCritical() << "NOTE_" + QString::number(i+1) + "_Value    = " << accountData["NOTE_" + QString::number(i+1) + "_Value"];
+    }
+
+
+
     emit requestAccountResponse(accountData);
 }
 
@@ -351,9 +454,6 @@ void ATBDeviceControllerPlugin::onServiceDoorOpened()
 
 void ATBDeviceControllerPlugin::onVaultDoorOpened()
 {
-    // TODO:
-    // - show special screen / message on screen
-    // - create an HealthEvent (-> ISMAS-Event)
     qCritical() << "ATBDeviceControllerPlugin::onVaultDoorOpened()";
 
     // ... to detect alarm etc.
@@ -362,36 +462,62 @@ void ATBDeviceControllerPlugin::onVaultDoorOpened()
     // this is started here because we want to keep ptu awake in order to get
     // coin box removed / inserted etc.
     // BackgroundTask("ACCOUNT") is finished, if account message is sent to ISMAS!
-    this->dbus->startBackgroundTask("ACCOUNT");
+    this->dbus->startBackgroundTask("DOOR_OPEN");
 
-    // do not: emit this->requestModeSERVICE();
+    emit this->requestModeACCOUNT();
+
+    // send service message, delayed:
+    QTimer::singleShot(1000, this, [this](){
+        emit this->showServiceText(nsDeviceControllerInterface::SERVICE_TEXT::VAULT_DOOR_OPENED, "Please remove coinbox");
+        hw->prn_cut(3);
+    } );
 }
 
 void ATBDeviceControllerPlugin::onCoinBoxRemoved()
 {
     qCritical() << "ATBDeviceControllerPlugin::onCoinBoxRemoved()";
 
+    // BackgroundTask("ACCOUNT") is finished, if account message is sent to ISMAS!
+    this->dbus->startBackgroundTask("ACCOUNT");
+
+    emit this->showServiceText(nsDeviceControllerInterface::SERVICE_TEXT::COIN_BOX_REMOVED, "Please insert coinbox");
+
     QTimer::singleShot(4000, this, SLOT(private_startAccount()));
 }
 
 void ATBDeviceControllerPlugin::onCoinBoxInserted()
 {
     qCritical() << "ATBDeviceControllerPlugin::onCoinBoxInserted()";
+
+    emit this->showServiceText(nsDeviceControllerInterface::SERVICE_TEXT::COIN_BOX_INSERTED, "Please close vault door");
+    // emit this->showServiceText(0x1234);
 }
 
+/**
+ * This is called, when all CoinBox is inserted and all doors
+ * are closed.
+ */
 void ATBDeviceControllerPlugin::onCBinAndAllDoorsClosed()
 {
     qCritical() << "ATBDeviceControllerPlugin::onCBinAndAllDoorsClosed()";
 
     QTimer::singleShot(2000, this, SIGNAL(requestModeIDLE()));
+
+    this->dbus->finishedBackgroundTask("DOOR_OPEN");
 }
 
-
+/**
+ *  This is called, when all no coinbox is inserted and all doors are
+ *  closed.
+ */
 void ATBDeviceControllerPlugin::onAllDoorsClosed()
 {
     qCritical() << "ATBDeviceControllerPlugin::onAllDoorsClosed()";
 
     emit this->requestModeIDLE();
+    this->dbus->finishedBackgroundTask("DOOR_OPEN");
+
+    // TODO: check for errors and create a machine event
 }
 
 void ATBDeviceControllerPlugin::onNewVoltage(uint32_t voltage)
@@ -436,21 +562,26 @@ void ATBDeviceControllerPlugin::requestPrintTicket(nsDeviceControllerInterface::
     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 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));
+    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(parkingEndDateTime.toString("yy.MM.dd"));
+    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(currentDateTime.toString("yy.MM.dd"));
+    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
@@ -502,11 +633,13 @@ void ATBDeviceControllerPlugin::requestPrintTicket(nsDeviceControllerInterface::
     }
 
 
+    /*
     if (!this->hw->dc_isPortOpen()) {
         qCritical() << "    ... serial port is not open!";
         this->onPrintFinishedERR();
         return;
     }
+    */
 
     // TODO: wird hier nur 'licensePlate' gedruckt?
     if (!this->hw->prn_sendDynamicPrnValues(dynTicketData->licensePlate)) {
@@ -603,6 +736,9 @@ void ATBDeviceControllerPlugin::requestPrintTicket(const QHash<QString, QVariant
     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 currentDateString    = this->printerLocale.toString(currentDateTime.date(),    QLocale::ShortFormat);
+
     /* -----------------------------------------------------------------------------------------
      * note: the following highly depends on printer template files!
      * -----------------------------------------------------------------------------------------
@@ -613,16 +749,18 @@ void ATBDeviceControllerPlugin::requestPrintTicket(const QHash<QString, QVariant
     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));
+    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(parkingEndDateTime.toString("yy.MM.dd"));
+    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(currentDateTime.toString("yy.MM.dd"));
+    QByteArray ba_currentDate = codec->fromUnicode(currentDateString);
     memcpy((char*)dynTicketData->currentDate,  ba_currentDate.data(), std::min(ba_currentDate.size(),8));
 
 
@@ -639,12 +777,13 @@ void ATBDeviceControllerPlugin::requestPrintTicket(const QHash<QString, QVariant
     // DEBUG
     qCritical() << "ATBDeviceControllerPlugin::requestPrintTicket()";
 
+    /*
     if (!this->hw->dc_isPortOpen()) {
         qCritical() << "    ... serial port is not open!";
         this->onPrintFinishedERR();
         return;
     }
-
+    */
 
     // TODO: wird hier nur 'licensePlate' gedruckt?
     if (!this->hw->prn_sendDynamicPrnValues(dynTicketData->licensePlate)) {
@@ -825,6 +964,15 @@ void ATBDeviceControllerPlugin::onCashGotCoin()
                               "");
 }
 
+void ATBDeviceControllerPlugin::onCashPayStopByPushbutton()
+{
+    // DEBUG
+    qCritical() << "ATBDeviceControllerPlugin::onCashPayStopByPushbutton()";
+
+    // we need new cash value in application...
+    QTimer::singleShot(500, this, SLOT(onCashPayStopedSuccess()));
+
+}
 
 void ATBDeviceControllerPlugin::onCashPayStopByMax()
 {
@@ -848,6 +996,9 @@ void ATBDeviceControllerPlugin::onCashPayStopByEscrow()
     emit this->cashInputFinished(nsDeviceControllerInterface::RESULT_STATE::ERROR_BACKEND,
                               amountString,
                               "",
+                              "",
+                              "",
+                              "",
                               "");
 }
 
@@ -863,6 +1014,9 @@ void ATBDeviceControllerPlugin::onCashPayStopByError()
     emit this->cashInputFinished(nsDeviceControllerInterface::RESULT_STATE::ERROR_BACKEND,
                               amountString,
                               "",
+                              "",
+                              "",
+                              "",
                               "");
 }
 
@@ -878,27 +1032,217 @@ void ATBDeviceControllerPlugin::onCashPayStopByTimeout()
     emit this->cashInputFinished(nsDeviceControllerInterface::RESULT_STATE::ERROR_BACKEND,
                               amountString,
                               "",
+                              "",
+                              "",
+                              "",
                               "");
 }
 
 void ATBDeviceControllerPlugin::onCashPayStopedSuccess()
 {
     // DEBUG
-    qCritical() << "ATBDeviceControllerPlugin::onCashPayStoped()";
+    qCritical() << "ATBDeviceControllerPlugin::onCashPayStopedSuccess()";
 
+    // inserted amount
     uint32_t amountInt = this->hw->getInsertedAmount();
-
     QString amountString = QString::number(amountInt);
 
-    qCritical() << "      insertedAmount (int) = " << amountInt;
-    qCritical() << "            insertedAmount = " << amountString;
+    // 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);
+
+    // amount due to change
+    uint32_t amountDueToChangeInt;
+    if (amountInt > this->cashStartAmountInt) {
+        amountDueToChangeInt = amountInt - this->cashStartAmountInt;
+    }
+    else {
+        amountDueToChangeInt = 0;
+    }
+    QString amountDueToChangeString = QString::number(amountDueToChangeInt);
+
+
+    // DEBUG
+    qCritical() << "---------------------------------------------------------";
+    qCritical() << "ATBDeviceControllerPlugin::onCashPayStopedSuccess()";
+    qCritical() << "";
+    qCritical() << "                         amountInt: " << amountInt;
+    qCritical() << "                      amountString: " << amountString;
+    qCritical() << "";
+    qCritical() << "                    amountNotesInt: " << amountNotesInt;
+    qCritical() << "                 amountNotesString: " << amountNotesString;
+    qCritical() << "";
+    qCritical() << "                    amountCoinsInt: " << amountCoinsInt;
+    qCritical() << "                 amountCoinsString: " << amountCoinsString;
+    qCritical() << "";
+    qCritical() << "          this->cashStartAmountInt: " << this->cashStartAmountInt;
+    qCritical() << "              amountDueToChangeInt: " << amountDueToChangeInt;
+    qCritical() << "           amountDueToChangeString: " << amountDueToChangeString;
+    qCritical() << "---------------------------------------------------------";
+
 
     emit this->cashInputFinished(nsDeviceControllerInterface::RESULT_STATE::SUCCESS,
                               amountString,
+                              amountCoinsString,        // coins
+                              amountNotesString,        // notes
+                              amountDueToChangeString,  // proposed change
                               "",
                               "");
 }
 
+void ATBDeviceControllerPlugin::onCashChangerState()
+{
+    uint32_t amountThatCouldNotBeChangedInt;
+
+    static int changerStateRequestCounter = 0;
+    static uint8_t lastChangerResult = 0;
+
+
+    // inserted amount
+    uint32_t amountInt = this->hw->getInsertedAmount();
+    QString amountString = QString::number(amountInt);
+
+    // 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);
+
+    // amount due to change
+    uint32_t amountCoinsChangedInt;
+    if (amountInt > this->cashStartAmountInt) {
+        amountCoinsChangedInt = amountInt - this->cashStartAmountInt;
+    }
+    else {
+        amountCoinsChangedInt = 0; 
+    }
+    QString amountCoinsChangedString = QString::number(amountCoinsChangedInt);
+
+    // if we do not need to give change:
+    if (amountCoinsChangedInt == 0) {
+        emit this->cashPaymentFinished(nsDeviceControllerInterface::RESULT_STATE::SUCCESS,
+                                  amountString,
+                                  amountCoinsString,        // coins
+                                  amountNotesString,        // notes
+                                  amountCoinsChangedString, // change
+                                  "",
+                                  "");
+        changerStateRequestCounter = 0;
+        lastChangerResult = 0;
+        return;
+    }
+
+
+    // get changer state ------------------------------------------------
+    // Note: 'returnedAmount'-parameter is missleading here!
+    // 'returnedAmount' is the amount which could not be changed!
+
+    lastChangerResult = hw->changer_getChangeResult(&amountThatCouldNotBeChangedInt);
+
+    // DEBUG
+    qCritical() << "---------------------------------------------------------";
+    qCritical() << "ATBDeviceControllerPlugin::onCashChangerState()";
+    qCritical() << "        changerStateRequestCounter: " << changerStateRequestCounter;
+    qCritical() << "                 lastChangerResult: " << lastChangerResult;
+    qCritical() << "    amountThatCouldNotBeChangedInt: " << amountThatCouldNotBeChangedInt;
+    qCritical() << "";
+    qCritical() << "                         amountInt: " << amountInt;
+    qCritical() << "                      amountString: " << amountString;
+    qCritical() << "";
+    qCritical() << "                    amountCoinsInt: " << amountCoinsInt;
+    qCritical() << "                 amountCoinsString: " << amountCoinsString;
+    qCritical() << "";
+    qCritical() << "                    amountNotesInt: " << amountNotesInt;
+    qCritical() << "                 amountNotesString: " << amountNotesString;
+    qCritical() << "";
+    qCritical() << "          this->cashStartAmountInt: " << this->cashStartAmountInt;
+    qCritical() << "             amountCoinsChangedInt: " << amountCoinsChangedInt;
+    qCritical() << "          amountCoinsChangedString: " << amountCoinsChangedString;
+    qCritical() << "---------------------------------------------------------";
+
+    if (lastChangerResult == 1) { // change is returned
+
+
+        QString amountCoinsChangedString = QString::number(amountCoinsChangedInt);
+
+        emit this->cashPaymentFinished(nsDeviceControllerInterface::RESULT_STATE::SUCCESS,
+                                  amountString,
+                                  amountCoinsString,        // coins
+                                  amountNotesString,        // notes
+                                  amountCoinsChangedString, // change
+                                  "",
+                                  "");
+        changerStateRequestCounter = 0;
+        lastChangerResult = 0;
+        return;
+    }
+    else
+    if (lastChangerResult == 0) { // not yet started
+        qCritical() << "ATBDeviceControllerPlugin::onCashChangerState(): ERROR: change not yet started: amount due to return: " << amountCoinsChangedString;
+    }
+    else
+    if (lastChangerResult == 2) { // only partial return
+        qCritical() << "ATBDeviceControllerPlugin::onCashChangerState(): ERROR: only partial return: amount due to return: " << amountCoinsChangedString;
+    }
+    else
+    if (lastChangerResult == 3) { // no return possible
+        qCritical() << "ATBDeviceControllerPlugin::onCashChangerState(): ERROR: no return possible: amount due to return: " << amountCoinsChangedString;
+    }
+    else {
+        qCritical() << "ATBDeviceControllerPlugin::onCashChangerState(): ERROR: invalid changerState (" << lastChangerResult << ")";
+    }
+
+
+    // handle timeout ------------------------------------------------
+    if (changerStateRequestCounter > 15) {
+        QString errorCode;
+        QString errorDescription;
+        switch (lastChangerResult) {
+        case 0:  // not yet started
+            errorCode = "DC::CHANGER::START";
+            errorDescription = "Changer does not start";
+            break;
+        case 1:  // amount returned
+            // This error should not occur!
+            errorCode = "DC::CHANGER::INVALID";
+            errorDescription = "Changer returned amount";
+            break;
+        case 2:  // only partial return
+            errorCode = "DC::CHANGER::CHANGE";
+            errorDescription = "Changer does only partial return";
+            break;
+        case 3:  // no return possible
+            errorCode = "DC::CHANGER::CHANGE_NOT_POSSIBLE";
+            errorDescription = "Changing not possible";
+            break;
+        default:
+
+            break;
+        }
+        emit this->cashPaymentFinished(nsDeviceControllerInterface::RESULT_STATE::ERROR_BACKEND,
+                                  amountString,
+                                  amountCoinsString,
+                                  amountNotesString,
+                                  0,
+                                  errorCode,
+                                  errorDescription);
+        changerStateRequestCounter = 0;
+        lastChangerResult = 0;
+        return;
+    }
+
+    // restart changer check:
+    changerStateRequestCounter++;
+    QTimer::singleShot(1000, this, &ATBDeviceControllerPlugin::onCashChangerState);
+}
+
+
 
 
 /**
@@ -913,7 +1257,8 @@ bool ATBDeviceControllerPlugin::private_loadCashAgentLib(QString pluginName)
 
         // search list for plugin (.so) file:
         QStringList pluginNameList;
-        pluginNameList << "/usr/lib/libCAmaster.so"
+        pluginNameList << "/usr/lib/libCAslave.so"
+                       << "/usr/lib/libCAmaster.so"
                        << "/usr/lib/libCashAgentLib.so";
         // using C++11 range based loop:
         for (const auto& filename : pluginNameList) {
@@ -939,6 +1284,14 @@ bool ATBDeviceControllerPlugin::private_loadCashAgentLib(QString pluginName)
         return false;
     }
 
+    if (pluginName.contains("slave", Qt::CaseInsensitive)) {
+        this->isMaster = false;
+    }
+    else
+    if (pluginName.contains("master", Qt::CaseInsensitive)) {
+        this->isMaster = true;
+    }
+
     QPluginLoader* pluginLoader = new QPluginLoader();
     pluginLoader->setFileName(pluginName);
 
@@ -970,6 +1323,10 @@ bool ATBDeviceControllerPlugin::private_loadCashAgentLib(QString pluginName)
 
     qCritical() << "ATBDeviceControllerPlugin: loaded CashAgentLib";
 
+    if (this->isMaster) {
+        QTimer::singleShot(500, this, &ATBDeviceControllerPlugin::startPhysicalLayer);
+    }
+
     return true;
 }
 

src/ATBAPP/ATBDeviceControllerPlugin.h

@@ -2,6 +2,7 @@
 #define ATBDEVICECONTROLLERPLUGIN_H
 
 #include <QObject>
+#include <QLocale>
 
 #include "src/ATBAPP/DeviceControllerInterface.h"
 #include "src/ATBAPP/ATBAPPplugin.h"
@@ -9,9 +10,9 @@
 
 #include "version.h"
 
+#include "support/PersistentData.h"
 
-
-#include "interfaces.h"
+#include <DeviceController/interfaces.h>
 
 #include <unistd.h>
 
@@ -48,6 +49,10 @@ public:
     void cashCollect();
     void cashAbort();
 
+    // read coin/cash processing variants -----------------------------------------
+    nsDeviceControllerInterface::COIN_PROCESSOR coinProcessor();
+    nsDeviceControllerInterface::BILL_ACCEPTOR  billAcceptor();
+
     // TASKS: printing ------------------------------------------------------------
     void requestPrintTicket(const QHash<QString, QVariant> & printingData);
     void requestPrintTicket(nsDeviceControllerInterface::TICKET_VARIANT ticketVariant, const QHash<QString, QVariant> & printingData);
@@ -95,6 +100,8 @@ private:
 
    bool useDebug;
 
+   bool isMaster;
+
    PLUGIN_STATE pluginState;
 
    QObject* eventReceiver;
@@ -105,6 +112,10 @@ private:
 
    DeviceControllerDiag* diag;
 
+   PersistentData *persistentData;
+
+   uint32_t cashStartAmountInt;
+
 
    QTextCodec *codec;
 
@@ -120,6 +131,8 @@ private:
    // dbus
    int init_sc_dbus();
 
+   QLocale printerLocale;
+
 private slots:
    // printer
 
@@ -136,9 +149,11 @@ private slots:
    void onCashGotCoin();
    void onCashPayStopedSuccess();
    void onCashPayStopByMax();
+   void onCashPayStopByPushbutton();
    void onCashPayStopByEscrow();
    void onCashPayStopByError();
    void onCashPayStopByTimeout();
+   void onCashChangerState();
 
    // doors and hardware contacts
    void onServiceDoorOpened();

src/ATBAPP/DeviceControllerDiag.cpp

@@ -5,11 +5,14 @@
 #include <QUuid>
 #include <QDebug>
 
-DeviceControllerDiag::DeviceControllerDiag(QObject *parent)
+DeviceControllerDiag::DeviceControllerDiag(PersistentData *pData, QObject *parent)
     : QObject(parent)
+    , coinProcessorType(nsDeviceControllerInterface::COIN_PROCESSOR::ESCROW)
+    , billAcceptor(nsDeviceControllerInterface::BILL_ACCEPTOR::NO)
     , eventReceiver(nullptr)
     , isRequestRunning(false)
     , flagInterruptDiag(false)
+    , pData(pData)
 {
     diagRequestTimeoutTimer = new QTimer(this);
     diagRequestTimeoutTimer->setInterval(1000*20);  // 20s
@@ -40,6 +43,16 @@ void DeviceControllerDiag::diagRequest()
     this->diagRequestTimeoutTimer->start();
 
     this->private_startDiag();
+
+    // read dc-fw-version:
+    /* note: dc_getSWVersion() returns always 32 characters (QString)...
+     * if no version string could be read it will contain 32 null-characters:
+     * "\u0000\u0000..."
+     */
+    QString dc_fw_version = hw->dc_getSWversion().remove(QChar('\0'));
+    qCritical() << "ATBDeviceControllerPlugin: DC firmware version: " << dc_fw_version;
+    this->pData->setDCFirmwareVersion(dc_fw_version);
+    this->pData->serializeToFile();
 }
 
 
@@ -55,6 +68,8 @@ void DeviceControllerDiag::private_startDiag()
     if (this->flagInterruptDiag) {
         qCritical() << "DeviceControllerDiag::private_startDiag() interrupted!";
         this->private_sendDiagEvent(DeviceController::State::E255);
+        this->isRequestRunning  = false;
+        this->flagInterruptDiag = false;
         return;
     }
 
@@ -87,6 +102,8 @@ void DeviceControllerDiag::sys_superviseSystem()
     if (this->flagInterruptDiag) {
         qCritical() << "DeviceControllerDiag::sys_superviseSystem() interrupted!";
         this->private_sendDiagEvent(DeviceController::State::E255);
+        this->flagInterruptDiag = false;
+        this->isRequestRunning  = false;
         return;
     }
 
@@ -95,6 +112,8 @@ void DeviceControllerDiag::sys_superviseSystem()
         // es gibt keinerlei gültige Daten vom DC
         qCritical() << "DeviceControllerDiag::sys_superviseSystem() no valid data!";
         this->private_sendDiagEvent(DeviceController::State::E254);
+        this->diagRequestTimeoutTimer->stop();
+        this->isRequestRunning  = false;
         return;
     }
 
@@ -210,6 +229,16 @@ void DeviceControllerDiag::sub_componentAssessment()
     }
     // -----------------------------------------------------------------------------------------------
 
+    switch (devPara.kindOfCoinChecker) {
+        case 1:
+        case 2:
+            this->coinProcessorType = nsDeviceControllerInterface::COIN_PROCESSOR::ESCROW;
+            break;
+        case 3:
+            this->coinProcessorType = nsDeviceControllerInterface::COIN_PROCESSOR::CHANGER;
+            break;
+    }
+
     if (devPara.kindOfCoinChecker==1 || devPara.kindOfCoinChecker==2)  // 0: without  1=EMP820   2=EMP900    3=currenza c²	(MW)
     {
         if (modCond.coinEscrow>=200) {
@@ -242,6 +271,15 @@ void DeviceControllerDiag::sub_componentAssessment()
         }
     }
 
+    switch (devPara.BillAcceptor) {
+        case 0:
+            this->billAcceptor = nsDeviceControllerInterface::BILL_ACCEPTOR::NO;
+            break;
+        default:
+            this->billAcceptor = nsDeviceControllerInterface::BILL_ACCEPTOR::YES;
+            break;
+    }
+
     /*
     if ( modCond.billReader>=200 && devPara.BillAcceptor>0)
     {

src/ATBAPP/DeviceControllerDiag.h

@@ -5,8 +5,13 @@
 #include <QSet>
 #include <QTimer>
 
+#include <DeviceController/interfaces.h>
+
+#include "DeviceControllerInterface.h"
 #include "ATBMachineEvent.h"
-#include "interfaces.h"
+
+#include "support/PersistentData.h"
+
 
 namespace DeviceController {
     Q_NAMESPACE
@@ -58,10 +63,13 @@ class DeviceControllerDiag : public QObject
     Q_OBJECT
 
 public:
-    DeviceControllerDiag(QObject *parent = nullptr);
+    DeviceControllerDiag(PersistentData *pData, QObject *parent = nullptr);
 
     void init(hwinf* hw, QObject* eventReceiver);
 
+    nsDeviceControllerInterface::COIN_PROCESSOR coinProcessorType;
+    nsDeviceControllerInterface::BILL_ACCEPTOR  billAcceptor;
+
 public slots:
     void diagRequest();
 
@@ -85,6 +93,8 @@ private:
 
     QSet<DeviceController::State> machineEventSet;
 
+    PersistentData* pData;
+
 private slots:
     void onDiagRequestTimeoutTimerTimeout();
 

src/ATBAPP/DeviceControllerInterface.h

@@ -13,6 +13,11 @@ namespace nsDeviceControllerInterface {
     enum class RESULT_STATE : quint8;
     enum class CASH_STATE   : quint8;
     enum class TICKET_VARIANT : quint8;
+    enum class COIN_PROCESSOR : quint8;
+    enum class BILL_ACCEPTOR  : quint8;
+
+
+    enum class SERVICE_TEXT  : quint16;
 }
 
 
@@ -64,6 +69,10 @@ public:
     virtual void requestPrintReceipt(const QHash<QString, QVariant> & printingData) = 0;
     virtual void requestPrintReceipt(const QString & printingString) = 0;
 
+    // read coin/cash processing variants
+    virtual nsDeviceControllerInterface::COIN_PROCESSOR coinProcessor() = 0;
+    virtual nsDeviceControllerInterface::BILL_ACCEPTOR  billAcceptor() = 0;
+
     // mandantory ATBAPP plugin methods:
     virtual nsDeviceControllerInterface::PLUGIN_STATE getState() = 0;
     virtual const QString & getLastError() = 0;
@@ -113,16 +122,38 @@ signals:
      */
     void cashInputFinished(nsDeviceControllerInterface::RESULT_STATE resultState,
                                      const QString & newCashValue,
-                                     /*  additional variables? */
+                                     const QString & coinValue,
+                                     const QString & noteValue,
+                                     const QString & changeValue,
                                      const QString & errorCode,
                                      const QString & errorDescription);
 
+    /**
+     * emitted if cashPayment has been finished, e.g. in result to task cashCollect():
+     *  -> ticket should be printed sucessfully
+     *  -> coins in excrow or changer are given back to user
+     * Provides data for logging, especially changed value
+     */
+    void cashPaymentFinished(nsDeviceControllerInterface::RESULT_STATE resultState,
+                                     const QString & newCashValue,  // total inserted amount 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
+                                     const QString & errorCode,
+                                     const QString & errorDescription);
+
+
 
     /**
      * emitted e.g. if service door is opened
      */
     void requestModeSERVICE();
 
+    /**
+     * emitted e.g. if vault door is opened
+     */
+    void requestModeACCOUNT();
+
     /**
      * emitted e.g. if doors are closed
      */
@@ -139,7 +170,10 @@ signals:
     void requestAccountResponse(const QHash<QString, QVariant> & accountData);
 
 
-
+    /**
+     * show text messages in service mode
+     */
+    void showServiceText(nsDeviceControllerInterface::SERVICE_TEXT serviceText, const QString & text);
 
 
     /**
@@ -159,7 +193,7 @@ signals:
 
 
 Q_DECLARE_INTERFACE(DeviceControllerInterface,
-                    "eu.atb.ptu.plugin.DeviceControllerInterface/1.0")
+                    "eu.atb.ptu.plugin.DeviceControllerInterface/1.1.1")
 
 
 namespace nsDeviceControllerInterface {
@@ -194,6 +228,23 @@ namespace nsDeviceControllerInterface {
         STOP_RECEIPT,    // e.g. Szeged Stop
     };
 
+    enum class COIN_PROCESSOR : quint8 {
+        CHANGER,
+        ESCROW
+    };
+
+    enum class BILL_ACCEPTOR  : quint8 {
+        YES,
+        NO
+    };
+
+    enum class SERVICE_TEXT  : quint16 {
+        SERVICE_DOOR_OPENED,
+        VAULT_DOOR_OPENED,
+        COIN_BOX_REMOVED,
+        COIN_BOX_INSERTED
+        /* t.b.d. */
+    };
 }
 
 #endif // DEVICECONTROLLERINTERFACE_H

src/ATBAPP/support/CashUtils.cpp

@@ -0,0 +1,74 @@
+#include "CashUtils.h"
+
+#include <QDebug>
+
+#define MAX_COINS 64
+#define MAX_NOTES 16
+
+/*****************************************************************************
+* Get current inserted coins
+*
+* getAllInsertedCoins(uint16_t *types, uint16_t *values)
+*       all inserted coins of this past transaction are stored, max 64
+*/
+uint32_t CashUtils::getAmountOfInsertedCoins(hwinf* hw)
+{
+    uint32_t result = 0;
+
+    uint16_t types[MAX_COINS];
+    uint16_t values[MAX_COINS];
+    hw->getAllInsertedCoins(types, values);
+
+    for (int i = 0; i < MAX_COINS; i++) {
+        result += values[i];
+    }
+
+    return result;
+}
+
+
+/*****************************************************************************
+ * Get current inserted notes
+ *
+ * virtual uint8_t bna_getCurrentNotes(uint16_t latestBill, uint16_t *currentNotes) const =0;
+ * returns number of collected bank notes since start-command (current transaction)
+ *    latestBill: last accepted bank note, value in cent
+ *    currentNotes an array with up to 16 (further) notes collected
+ *
+ */
+uint32_t CashUtils::getAmountOfInsertedNotes(hwinf* hw)
+{
+    uint32_t result = 0;
+    uint8_t numberOfInsertedNotes;
+
+    uint16_t beforeArray = 0;
+    uint16_t currentNotes[4];
+    uint16_t afterArray = 0;
+    numberOfInsertedNotes = hw->bna_getCurrentNotes(0, currentNotes);
+
+    if ( (beforeArray != 0) || (afterArray != 0) ) {
+        qCritical() << "CashUtils::getAmountOfInsertedNotes() ERROR: Array";
+    }
+
+    if (numberOfInsertedNotes == 99) {
+        // Error
+        qCritical() << "CashUtils::getAmountOfInsertedNotes() ERROR: ";
+        for (int i = 0; i < 4; i++) {
+        qCritical() << "   currentNotes[" << i << "] = " << currentNotes[i];
+        }
+    }
+    else {
+        // no error
+        result = currentNotes[3];
+        result = ( result << 16 ) | currentNotes[2];
+    }
+
+    // DEBUG
+    qCritical() << "--------------------------------------------------";
+    qCritical() << "CashUtils::getAmountOfInsertedNotes()";
+    qCritical() << "          numberOfInsertedNotes = " << numberOfInsertedNotes;
+    qCritical() << "                         result = " << result;
+    qCritical() << "--------------------------------------------------";
+
+    return result;
+}

src/ATBAPP/support/CashUtils.h

@@ -0,0 +1,14 @@
+#ifndef CASHUTILS_H
+#define CASHUTILS_H
+
+#include <QObject>
+#include <DeviceController/interfaces.h>
+
+namespace CashUtils {
+
+uint32_t getAmountOfInsertedCoins(hwinf* hw);
+uint32_t getAmountOfInsertedNotes(hwinf* hw);
+
+}
+
+#endif // CASHUTILS_H

src/ATBAPP/support/PersistentData.cpp

@@ -0,0 +1,140 @@
+#include "PersistentData.h"
+
+#include <QFile>
+#include <QFileInfo>
+#include <QDir>
+#include <QDateTime>
+#include <QDataStream>
+#include <QDebug>
+
+PersistentData::PersistentData(const QString &datafileName, QObject *parent)
+    : QObject(parent)
+    , isChangedFlag(false)
+{
+    // load persistant data, if available
+    this->filename = datafileName;
+
+    QFileInfo dataFileInfo(this->filename);
+    QString dataFilePath = dataFileInfo.path();
+
+    QDir dir;
+    if ( ! dir.exists(dataFilePath)) {
+        qCritical() << "Persistent data file does not exist!";
+        qCritical() << "          --> create new: " << this->filename;
+        dir.mkpath(dataFilePath);
+    }
+
+    this->read();
+}
+
+
+void PersistentData::serializeToFile()
+{
+    this->save();
+}
+
+void PersistentData::save()
+{
+    QFile fileOut(this->filename);
+    if (fileOut.open(QIODevice::WriteOnly))
+    {
+        QDataStream out(&fileOut);
+        out.setVersion(QDataStream::Qt_4_6);
+
+        out << this->hash;
+        fileOut.flush();
+        fileOut.close();
+    }
+}
+
+void PersistentData::read()
+{
+    QFile fileIn(this->filename);
+    if (fileIn.open(QIODevice::ReadOnly))
+    {
+        QDataStream in(&fileIn);
+        in.setVersion(QDataStream::Qt_4_6);
+
+        in >> hash;
+
+        fileIn.close();
+    }
+}
+
+
+
+QVariant PersistentData::getParameter(const QString & key) const {
+#if defined (ARCH_DesktopLinux)
+    // note: QVariant.toString() returns empty string for custom types
+    qDebug() << "VendingData::getParameter() key = " << key << " value = " << hash.value(key).toString();
+#endif
+    return hash.value(key);
+}
+
+QVariant PersistentData::getParameter(const QString & key)
+{
+    #if defined (ARCH_DesktopLinux)
+    // note: QVariant.toString() returns empty string for custom types
+    qDebug() << "VendingData::getParameter() key = " << key << " value = " << hash.value(key).toString();
+    #endif
+
+    return hash.value(key);
+}
+
+void PersistentData::setParameter(const QString & key, QVariant value)
+{
+    this->isChangedFlag = true;
+
+    #if defined (ARCH_DesktopLinux)
+    // note: QVariant.toString() returns empty string for custom types
+    qDebug() << "VendingData::setParameter() key = " << key << " value = " << value.toString();
+    #endif
+
+    this->hash.insert(key, value);
+}
+
+void PersistentData::clearParameter(const QString & key)
+{
+    this->isChangedFlag = true;
+    this->hash.remove(key);
+}
+
+bool PersistentData::hasParameter(const QString & key) const
+{
+    return hash.contains(key);
+}
+
+
+uint PersistentData::getUintParameter(const QString & key) const
+{
+    qDebug() << "PersistentData::getUintParameter() key = " << key << " value = " << hash.value(key).toString();
+
+    uint returnValue = 0;
+    bool ok;
+
+    returnValue = hash.value(key).toString().toUInt(&ok);
+    if (!ok) returnValue = 0;
+
+    return returnValue;
+}
+
+QList<QString> PersistentData::uniqueKeys() const {
+    return hash.uniqueKeys();
+}
+
+
+void PersistentData::setDCFirmwareVersion(const QString & fw_version)
+{
+    // there must be a version string!
+    if (fw_version.size() < 1) return;
+
+    if (this->hash["dc_fw_version"].toString() != fw_version) {
+        this->isChangedFlag = true;
+        this->hash.insert("dc_fw_version", fw_version);
+    }
+}
+
+QString PersistentData::getDCFirmwareVersion()
+{
+    return this->hash["dc_fw_version"].toString();
+}

src/ATBAPP/support/PersistentData.h

@@ -0,0 +1,49 @@
+#ifndef PERSISTENTDATA_H
+#define PERSISTENTDATA_H
+
+#include <QObject>
+#include <QHash>
+#include <QVariant>
+#include <QList>
+#include <QString>
+
+class PersistentData : public QObject
+{
+    Q_OBJECT
+public:
+    explicit PersistentData(const QString &datafileName, QObject *parent = nullptr);
+
+    void setDCFirmwareVersion(const QString & fw_version);
+    QString getDCFirmwareVersion();
+
+
+    QVariant getParameter(const QString & key);
+    QVariant getParameter(const QString & key) const;
+    void setParameter(const QString & key, QVariant value);
+    void clearParameter(const QString & key);
+    bool hasParameter(const QString & key) const;
+
+    uint getUintParameter(const QString & key) const;
+    QList<QString> uniqueKeys() const;
+
+
+public slots:
+    void serializeToFile();
+
+signals:
+
+
+private:
+    QHash<QString, QVariant> hash;
+
+    QString dc_fw_version;
+
+    QString filename;
+
+    void save();
+    void read();
+
+    bool isChangedFlag;
+};
+
+#endif // PERSISTENTDATA_H