Change product-names

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

include/interfaces.h

@@ -24,7 +24,8 @@ struct T_emp
 
    // dynamic:
    uint8_t state;      // step counter of EMP (electronic coin checker) FSM (finite state machine):
-       // 0=start command
+   /*
+   // 0=start command
        // 1=powered, do emp ini, send reset
        // 2=delay
        // 3=wait for response, requesting status after response
@@ -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
 {
 
@@ -1834,6 +1852,9 @@ public:
     virtual uint8_t prn_getPrintResult() const {
        return 0;
     }
+    // return:  0: just printing, wait
+    //          1: OK - last print was succesful
+    //          2: error - not printed
 
 
 
@@ -2249,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
-    //  currentNotes an array with up to 16 (further) notes collected
+    // return value: numbers of bills or 99 in case of error
+    //  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 {}
 
@@ -2270,10 +2300,100 @@ 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;
+
+    virtual void hwapi_coinCollectionJustStarted(void) const=0;
+    virtual void hwapi_coinCollectionAborted(void) const=0;
+
+    virtual void hwapi_gotNewCoin(void) const=0;
+    virtual void hwapi_payStopByMax(void) const=0;
+    virtual void hwapi_payStopByPushbutton(void) const=0;
+
+    virtual void hwapi_payStopByEscrow(void) const=0;
+    virtual void hwapi_payStopByError(void) const=0;
+    virtual void hwapi_payStopByTimeout(void) const=0;
+    virtual void hwapi_payCancelled(void) const=0;
+    virtual void hwapi_coinProcessJustStopped(void) const=0;
+
+    virtual void hwapi_doorServiceDoorOpened(void) const=0;
+    virtual void hwapi_doorVaultDoorOpened(void) const=0;
+    virtual void hwapi_doorCoinBoxRemoved(void) const=0;
+    virtual void hwapi_doorCoinBoxInserted(void) const=0;
+    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
     void hwapi_templatePrintFinished_OK() const;
     void hwapi_templatePrintFinished_Err() const;
 
@@ -2296,6 +2416,7 @@ signals:
     void hwapi_doorCoinBoxInserted() const;
     void hwapi_doorCBinAndAllDoorsClosed() const;
     void hwapi_doorAllDoorsClosed() const;
+    */
 };
 
 

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>
@@ -46,6 +47,7 @@ ATBDeviceControllerPlugin::ATBDeviceControllerPlugin(QObject *parent)
     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
@@ -59,13 +61,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() {}
@@ -77,13 +82,17 @@ PLUGIN_STATE ATBDeviceControllerPlugin::initDCPlugin(QObject *eventReceiver, con
     // read variables from setting
     this->serialPortName = settings.value("ATBDeviceControllerPlugin/serialPort", "ttymxc2").toString();
     QByteArray printerEncoding = settings.value("ATBDeviceControllerPlugin/printerEncoding", "ISO 8859-2").toString().toLatin1();
+    QString printerLocaleString = settings.value("ATBDeviceControllerPlugin/printerLocale", "de_DE").toString().toLatin1();
+    this->printerLocale = QLocale(printerLocaleString);
+
 
     if (this->isMaster) {
         // open serial port
         hw->dc_openSerial(5, "115200", this->serialPortName, 1);
-        hw->dc_autoRequest(true);
     }
 
+    hw->dc_autoRequest(true);
+
     hw->dc_setNewCustomerNumber(PTUSystem::readCustomerNumber());
     hw->dc_setNewMachineNumber(PTUSystem::readMachineNumber());
     hw->dc_setNewZone(PTUSystem::readZoneNumber());
@@ -94,6 +103,11 @@ 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);
@@ -126,6 +140,11 @@ void ATBDeviceControllerPlugin::startPhysicalLayer()
         return;
     }
 
+    qCritical() << "ATBDeviceControllerPlugin::startPhysicalLayer() " << endl
+                << "     -> use master lib " << endl
+                << "     -> start physical layer";
+
+
     // open serial port
     hw->dc_openSerial(5, "115200", this->serialPortName, 1);
 
@@ -134,6 +153,10 @@ 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)
@@ -170,20 +193,20 @@ 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);
 
@@ -200,11 +223,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()
@@ -218,7 +241,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()
@@ -406,9 +455,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.
@@ -419,7 +465,13 @@ void ATBDeviceControllerPlugin::onVaultDoorOpened()
     // BackgroundTask("ACCOUNT") is finished, if account message is sent to ISMAS!
     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()
@@ -429,12 +481,17 @@ void 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);
 }
 
 /**
@@ -506,6 +563,10 @@ 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));
@@ -517,11 +578,11 @@ void ATBDeviceControllerPlugin::requestPrintTicket(nsDeviceControllerInterface::
     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
@@ -573,11 +634,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)) {
@@ -612,6 +675,7 @@ void ATBDeviceControllerPlugin::requestPrintReceipt(const QString & printingStri
 {
     QByteArray ba = printingString.toUtf8();
     hw->prn_switchPower(true);
+    hw->prn_setFonts(8,12,0,0);
     hw->prn_sendText(&ba);
     QTimer::singleShot(4000, this, SLOT(onPrinterWaitForPrintingReceipt()));
 
@@ -673,6 +737,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!
      * -----------------------------------------------------------------------------------------
@@ -690,11 +757,11 @@ void ATBDeviceControllerPlugin::requestPrintTicket(const QHash<QString, QVariant
     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));
 
 
@@ -711,12 +778,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)) {
@@ -745,19 +813,19 @@ void ATBDeviceControllerPlugin::requestPrintTicket(const QHash<QString, QVariant
     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") ) {
         this->currentSelectedTicketType = 1;
     }
     else
-    if ( (paymentType == "CARD") && (productName == "ShortTimeParking") ) {
+    if ( (paymentType == "CARD") && (productName == "SHORT_TERM_PARKING") ) {
         this->currentSelectedTicketType = 2;
     }
     else
-    if ( (paymentType == "CASH") && (productName == "DayTicket") ) {
+    if ( (paymentType == "CASH") && (productName == "DAY_TICKET") ) {
         this->currentSelectedTicketType = 3;
     }
     else
-    if ( (paymentType == "CARD") && (productName == "DayTicket") ) {
+    if ( (paymentType == "CARD") && (productName == "DAY_TICKET") ) {
         this->currentSelectedTicketType = 4;
     }
     else {
@@ -929,6 +997,9 @@ void ATBDeviceControllerPlugin::onCashPayStopByEscrow()
     emit this->cashInputFinished(nsDeviceControllerInterface::RESULT_STATE::ERROR_BACKEND,
                               amountString,
                               "",
+                              "",
+                              "",
+                              "",
                               "");
 }
 
@@ -944,6 +1015,9 @@ void ATBDeviceControllerPlugin::onCashPayStopByError()
     emit this->cashInputFinished(nsDeviceControllerInterface::RESULT_STATE::ERROR_BACKEND,
                               amountString,
                               "",
+                              "",
+                              "",
+                              "",
                               "");
 }
 
@@ -959,6 +1033,9 @@ void ATBDeviceControllerPlugin::onCashPayStopByTimeout()
     emit this->cashInputFinished(nsDeviceControllerInterface::RESULT_STATE::ERROR_BACKEND,
                               amountString,
                               "",
+                              "",
+                              "",
+                              "",
                               "");
 }
 
@@ -967,19 +1044,206 @@ void ATBDeviceControllerPlugin::onCashPayStopedSuccess()
     // DEBUG
     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);
+}
+
+
 
 
 /**
@@ -1060,6 +1324,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>
 
@@ -111,6 +112,10 @@ private:
 
    DeviceControllerDiag* diag;
 
+   PersistentData *persistentData;
+
+   uint32_t cashStartAmountInt;
+
 
    QTextCodec *codec;
 
@@ -126,6 +131,8 @@ private:
    // dbus
    int init_sc_dbus();
 
+   QLocale printerLocale;
+
 private slots:
    // printer
 
@@ -146,6 +153,7 @@ private slots:
    void onCashPayStopByEscrow();
    void onCashPayStopByError();
    void onCashPayStopByTimeout();
+   void onCashChangerState();
 
    // doors and hardware contacts
    void onServiceDoorOpened();

src/ATBAPP/DeviceControllerDiag.cpp

@@ -5,13 +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
@@ -42,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();
 }
 
 
@@ -57,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;
     }
 
@@ -89,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;
     }
 
@@ -97,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;
     }
 

src/ATBAPP/DeviceControllerDiag.h

@@ -5,9 +5,12 @@
 #include <QSet>
 #include <QTimer>
 
-#include "ATBMachineEvent.h"
-#include "interfaces.h"
+#include <DeviceController/interfaces.h>
+
 #include "DeviceControllerInterface.h"
+#include "ATBMachineEvent.h"
+
+#include "support/PersistentData.h"
 
 
 namespace DeviceController {
@@ -60,7 +63,7 @@ class DeviceControllerDiag : public QObject
     Q_OBJECT
 
 public:
-    DeviceControllerDiag(QObject *parent = nullptr);
+    DeviceControllerDiag(PersistentData *pData, QObject *parent = nullptr);
 
     void init(hwinf* hw, QObject* eventReceiver);
 
@@ -90,7 +93,7 @@ private:
 
     QSet<DeviceController::State> machineEventSet;
 
-
+    PersistentData* pData;
 
 private slots:
     void onDiagRequestTimeoutTimerTimeout();

src/ATBAPP/DeviceControllerInterface.h

@@ -15,6 +15,9 @@ namespace nsDeviceControllerInterface {
     enum class TICKET_VARIANT : quint8;
     enum class COIN_PROCESSOR : quint8;
     enum class BILL_ACCEPTOR  : quint8;
+
+
+    enum class SERVICE_TEXT  : quint16;
 }
 
 
@@ -101,6 +104,9 @@ signals:
                                      const QString & errorCode,
                                      const QString & errorDescription);
 
+
+    void coinAttached();
+
     /**
      * emitted on e.g. a coin input
      */
@@ -119,16 +125,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
      */
@@ -145,7 +173,10 @@ signals:
     void requestAccountResponse(const QHash<QString, QVariant> & accountData);
 
 
-
+    /**
+     * show text messages in service mode
+     */
+    void showServiceText(nsDeviceControllerInterface::SERVICE_TEXT serviceText, const QString & text);
 
 
     /**
@@ -165,7 +196,7 @@ signals:
 
 
 Q_DECLARE_INTERFACE(DeviceControllerInterface,
-                    "eu.atb.ptu.plugin.DeviceControllerInterface/1.0.1")
+                    "eu.atb.ptu.plugin.DeviceControllerInterface/1.1.2")
 
 
 namespace nsDeviceControllerInterface {
@@ -209,6 +240,14 @@ namespace nsDeviceControllerInterface {
         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