Extend getString().

nChangedProgramModeToIDLE(), onChangedProgramModeToOOO(), startPhysicalLayer(),
stopPhysicalLayer(), reboot(), reset().
Add signals printTicketFinished,...,Error.

DCPlugin.pro

@@ -9,7 +9,7 @@ QT += serialport
 INCLUDEPATH += $${PWD}/plugins
 INCLUDEPATH += $${PWD}/include
 
-QMAKE_CXXFLAGS += -Wno-deprecated-copy
+QMAKE_CXXFLAGS += -Wno-deprecated-copy -O
 
 # default
 ARCH = PTU5
@@ -49,6 +49,8 @@ INTERFACE_DEFINITION = $${PWD}/src/ATBAPP/DeviceControllerInterface.h
 
 DEFINES += DEVICECONTROLLERPLUGIN_LIBRARY
 
+DEFINES += USE_DC_VMC_UNIFICATION
+
 # The following define makes your compiler emit warnings if you use
 # any Qt feature that has been marked deprecated (the exact warnings
 # depend on your compiler). Please consult the documentation of the
@@ -77,7 +79,7 @@ HEADERS += \
     src/ATBAPP/ATBMachineEvent.h \
     src/ATBAPP/ATBDeviceControllerPlugin.h \
     src/ATBAPP/Utils.h \
-    src/ATBAPP/support/CashUtils.h \
+    src/ATBAPP/UnifiedDCVMCInterface.h \
     src/ATBAPP/support/DBusControllerInterface.h \
     src/ATBAPP/support/JSON.h \
     src/ATBAPP/support/PTUSystem.h
@@ -88,7 +90,6 @@ 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/ATBAPPplugin.h

@@ -5,18 +5,63 @@
  * a simple class with only one method for plugin info
  */
 #include <QObject>
-#include <QString>
+#include <QStringList>
 
-class ATBAPPplugin
-{
+struct ATBAPPplugin {
+    enum class PLUGIN_STATE : quint8 {
+        NOT_INITIALIZED = 0,
+        INITIALIZED = 1
+    };
+    enum class RESULT_STATE : quint8 {
+        SUCCESS = 1,                // operation was successfull
+        ERROR_BACKEND,              // error from backend (e.g. backend replies with error)
+        ERROR_NETWORK,
+        ERROR_TIMEOUT,              // the operation timed out
+        ERROR_PROCESS,              // internal plugin error, should not occur (this is a bug in implementation)
+        ERROR_BUSY,
+        ERROR_STATE,
+        ERROR_RETRY,                // retry operation
+        INFO                        // informational (e.g. display a message, log something etc.)
+    };
+    enum class CASH_STATE   : quint8 {
+        CACHE_EMPTY,                // Cache still empty, default state
+        CACHE_INPUT,                // Coins are in Cache
+        OVERPAYED,
+        /* t.b.d. */
+    };
+    enum class TICKET_VARIANT : quint8 {
+        PARKING_TICKET,
+        RECEIPT,
+        ERROR_RECEIPT,
+        START_RECEIPT,   // e.g. Szeged Start
+        STOP_RECEIPT,    // e.g. Szeged Stop
+    };
+    enum class STEP : quint8 {
+        UP = 1,
+        DOWN = 2
+    };
+    enum class TERMINAL_STATE : quint8 {
+        NOT_AVAILABLE = 1,
+        AVAILABLE,
+        PREPARED_FOR_VENDING,
+        BUSY,
+        NEEDS_MAINTENANCE
+    };
 
-public:
-    virtual const QString & getPluginInfo() = 0;
+    virtual const QString &getPluginInfo() = 0;
+    virtual QStringList getPluginInfoList() {
+        return QStringList(QString());
+    }
 };
 
+using PLUGIN_STATE = ATBAPPplugin::PLUGIN_STATE;
+using RESULT_STATE = ATBAPPplugin::RESULT_STATE;
+using CASH_STATE = ATBAPPplugin::CASH_STATE;
+using TICKET_VARIANT = ATBAPPplugin::TICKET_VARIANT;
+using STEP = ATBAPPplugin::STEP;
+using TERMINAL_STATE = ATBAPPplugin::TERMINAL_STATE;
+
 Q_DECLARE_INTERFACE(ATBAPPplugin,
                     "eu.atb.ptu.plugin.ATBAPPplugin/0.9")
 
-
-
 #endif // ATBAPPPLUGIN_H

src/ATBAPP/ATBDeviceControllerPlugin.cpp

@@ -5,7 +5,6 @@
 #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>
@@ -23,8 +22,7 @@
 
 
 ATBDeviceControllerPlugin::ATBDeviceControllerPlugin(QObject *parent)
-    : isMaster(false)
-    , pluginState(PLUGIN_STATE::NOT_INITIALIZED)
+    : pluginState(PLUGIN_STATE::NOT_INITIALIZED)
     , eventReceiver(nullptr)
 {
     this->setParent(parent);
@@ -41,12 +39,11 @@ 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_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_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_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
@@ -67,27 +64,46 @@ ATBDeviceControllerPlugin::ATBDeviceControllerPlugin(QObject *parent)
 
     this->currentSelectedTicketType = 0;
     this->currentCashState = CASH_STATE::CACHE_EMPTY;
-
-    this->cashStartAmountInt = 0;
 }
 
 ATBDeviceControllerPlugin::~ATBDeviceControllerPlugin() {}
 
+PLUGIN_STATE ATBDeviceControllerPlugin::initVMCPlugin(QObject *eventReceiver,
+                                                      QObject *atbSystem,
+                                                      QObject *hmiConfig,
+                                                      const QSettings &settings) {
+    Q_UNUSED(eventReceiver);
+    Q_UNUSED(atbSystem);
+    Q_UNUSED(hmiConfig);
+    Q_UNUSED(settings);
+
+    return PLUGIN_STATE::NOT_INITIALIZED;
+}
+
+PLUGIN_STATE ATBDeviceControllerPlugin::initPlugin(QObject *eventReceiver,
+                                                   QObject *atbSystem,
+                                                   QObject *hmiConfig,
+                                                   QSettings const &settings) {
+    Q_UNUSED(atbSystem);
+    Q_UNUSED(hmiConfig);
+
+    return initDCPlugin(eventReceiver, settings);
+}
+
+PLUGIN_STATE ATBDeviceControllerPlugin::initPlugin(QObject *eventReceiver, QSettings const &settings) {
+    return initDCPlugin(eventReceiver, settings);
+}
+
 PLUGIN_STATE ATBDeviceControllerPlugin::initDCPlugin(QObject *eventReceiver, const QSettings & settings)
 {
     this->eventReceiver = eventReceiver;
 
     // 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);
+    this->serialPortName = settings.value("DEVICE_CONTROLLER/serialPort", "ttymxc2").toString();
+    QByteArray printerEncoding = settings.value("DEVICE_CONTROLLER/printerEnconding", "ISO 8859-2").toString().toLatin1();
 
-
-    if (this->isMaster) {
-        // open serial port
-        hw->dc_openSerial(5, "115200", this->serialPortName, 1);
-    }
+    // open serial port
+    hw->dc_openSerial(5, "115200", this->serialPortName, 1);
 
     hw->dc_autoRequest(true);
 
@@ -105,16 +121,6 @@ PLUGIN_STATE ATBDeviceControllerPlugin::initDCPlugin(QObject *eventReceiver, con
     // 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;
@@ -125,8 +131,6 @@ 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";
@@ -141,8 +145,6 @@ void ATBDeviceControllerPlugin::startPhysicalLayer()
 
 void ATBDeviceControllerPlugin::stopPhysicalLayer()
 {
-    if (!this->isMaster) return;
-
     if (this->pluginState == PLUGIN_STATE::NOT_INITIALIZED)
     {
         qCritical() << "ATBDeviceControllerPlugin::startPhysicalLayer(): plugin is not initialized";
@@ -177,22 +179,19 @@ 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->mdb_switchWake(0);   // wakeup MDB components
+    //hw->dc_autoRequest(true);
 }
 
 void ATBDeviceControllerPlugin::onChangedProgramModeToIDLE()
 {
-    hw->dc_autoRequest(true);
+    //hw->dc_autoRequest(false);  // <-- TODO: ???
+
     this->diag->diagRequest();
-    hw->mdb_switchWake(1);
 
 }
 
@@ -207,11 +206,11 @@ void ATBDeviceControllerPlugin::requestStartCashInput(const QString & amount)
 {
     qCritical() << "Start Cash vending with amount = " << amount;
 
-    this->cashStartAmountInt = static_cast<uint32_t>(amount.toUInt());
+    uint32_t amountInt = static_cast<uint32_t>(amount.toUInt());
 
-    if (this->cashStartAmountInt == 0) this->cashStartAmountInt = UINT_MAX;
+    if (amountInt == 0) amountInt = UINT_MAX;
 
-    hw->cash_startPayment(this->cashStartAmountInt);
+    hw->cash_startPayment(amountInt);
 }
 
 void ATBDeviceControllerPlugin::requestStopCashInput()
@@ -225,33 +224,7 @@ void ATBDeviceControllerPlugin::requestStopCashInput()
 void ATBDeviceControllerPlugin::cashCollect()
 {
     hw->vend_success();
-
-    // 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;
-    }
+    this->currentCashState = CASH_STATE::CACHE_EMPTY;
 }
 
 void ATBDeviceControllerPlugin::cashAbort()
@@ -260,19 +233,6 @@ 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:
@@ -376,9 +336,9 @@ void ATBDeviceControllerPlugin::private_getAccountData()
     accountData.insert("accountStartTime", startDateTime);
     //-------------------------------------------------------------------------
 
-    // COINS in Vault: --------------------------------------------------------
 
-    int numberOfCoinVariants = sizeof(retVR.coinsInVault)/sizeof(retVR.coinsInVault[0]);
+
+    int numberOfCoinVariants = sizeof(retVR.coinsInVault);
 
     // DEBUG
     qCritical() << "      NumberOfCoinVariants = " << numberOfCoinVariants;
@@ -388,36 +348,14 @@ void ATBDeviceControllerPlugin::private_getAccountData()
 
     accountData.insert("NumberOfCoinVariants", numberOfCoinVariants);
     for (int i = 0; i < numberOfCoinVariants; ++i) {
-        accountData.insert("COIN_" + QString::number(i+1) + "_Quantity",  retVR.coinsInVault[i]);
-        accountData.insert("COIN_" + QString::number(i+1) + "_Value",     retVR.coinDenomination[i]);
+        accountData.insert("COIN_" + QString::number(i) + "_Quantity",  retVR.coinsInVault[i]);
+        accountData.insert("COIN_" + QString::number(i) + "_Value",     retVR.coinDenomination[i]);
 
         // DEBUG
-        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"];
+        qCritical() << "COIN_" + QString::number(i) + "_Quantity = " << accountData["COIN_" + QString::number(i) + "_Quantity"];
+        qCritical() << "COIN_" + QString::number(i) + "_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);
 }
 
@@ -439,6 +377,9 @@ 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.
@@ -449,7 +390,7 @@ void ATBDeviceControllerPlugin::onVaultDoorOpened()
     // BackgroundTask("ACCOUNT") is finished, if account message is sent to ISMAS!
     this->dbus->startBackgroundTask("DOOR_OPEN");
 
-    emit this->requestModeACCOUNT();
+    // do not: emit this->requestModeSERVICE();
 }
 
 void ATBDeviceControllerPlugin::onCoinBoxRemoved()
@@ -536,26 +477,21 @@ 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));  // Szeged
-    memcpy((char*)dynTicketData->dynDat6,       ba_amount.data(), std::min(ba_amount.size(),8));  // Schoenau
+    memcpy((char*)dynTicketData->vendingPrice,  ba_amount.data(), std::min(ba_amount.size(),8));
 
     QByteArray ba_parkingEndTime = codec->fromUnicode(parkingEndDateTime.toString("hh:mm"));
     memcpy((char*)dynTicketData->parkingEnd,  ba_parkingEndTime.data(), std::min(ba_parkingEndTime.size(),8));
 
-    QByteArray ba_parkingEndDate = codec->fromUnicode(parkingEndDateString);
+    QByteArray ba_parkingEndDate = codec->fromUnicode(parkingEndDateTime.toString("yy.MM.dd"));
     memcpy((char*)dynTicketData->currentTime,  ba_parkingEndDate.data(), std::min(ba_parkingEndDate.size(),8));
     // ! and yes... 'ParkingEndDate' is 'currentTime'
 
-    QByteArray ba_currentDate = codec->fromUnicode(currentDateString);
+    QByteArray ba_currentDate = codec->fromUnicode(currentDateTime.toString("yy.MM.dd"));
     memcpy((char*)dynTicketData->currentDate,  ba_currentDate.data(), std::min(ba_currentDate.size(),8));
 
     // STAN for Szeged Start/Stop: must be 9 digits
@@ -607,13 +543,11 @@ 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)) {
@@ -709,9 +643,6 @@ 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!
      * -----------------------------------------------------------------------------------------
@@ -722,18 +653,16 @@ 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));  // Szeged
-    memcpy((char*)dynTicketData->dynDat6,       ba_amount.data(), std::min(ba_amount.size(),8));  // Schoenau
-
+    memcpy((char*)dynTicketData->vendingPrice,  ba_amount.data(), std::min(ba_amount.size(),8));
 
     QByteArray ba_parkingEndTime = codec->fromUnicode(parkingEndDateTime.toString("hh:mm"));
     memcpy((char*)dynTicketData->parkingEnd,  ba_parkingEndTime.data(), std::min(ba_parkingEndTime.size(),8));
 
-    QByteArray ba_parkingEndDate = codec->fromUnicode(parkingEndDateString);
+    QByteArray ba_parkingEndDate = codec->fromUnicode(parkingEndDateTime.toString("yy.MM.dd"));
     memcpy((char*)dynTicketData->currentTime,  ba_parkingEndDate.data(), std::min(ba_parkingEndDate.size(),8));
     // ! and yes... 'ParkingEndDate' is 'currentTime'
 
-    QByteArray ba_currentDate = codec->fromUnicode(currentDateString);
+    QByteArray ba_currentDate = codec->fromUnicode(currentDateTime.toString("yy.MM.dd"));
     memcpy((char*)dynTicketData->currentDate,  ba_currentDate.data(), std::min(ba_currentDate.size(),8));
 
 
@@ -750,13 +679,12 @@ 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)) {
@@ -937,15 +865,6 @@ 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()
 {
@@ -969,9 +888,6 @@ void ATBDeviceControllerPlugin::onCashPayStopByEscrow()
     emit this->cashInputFinished(nsDeviceControllerInterface::RESULT_STATE::ERROR_BACKEND,
                               amountString,
                               "",
-                              "",
-                              "",
-                              "",
                               "");
 }
 
@@ -987,9 +903,6 @@ void ATBDeviceControllerPlugin::onCashPayStopByError()
     emit this->cashInputFinished(nsDeviceControllerInterface::RESULT_STATE::ERROR_BACKEND,
                               amountString,
                               "",
-                              "",
-                              "",
-                              "",
                               "");
 }
 
@@ -1005,203 +918,27 @@ void ATBDeviceControllerPlugin::onCashPayStopByTimeout()
     emit this->cashInputFinished(nsDeviceControllerInterface::RESULT_STATE::ERROR_BACKEND,
                               amountString,
                               "",
-                              "",
-                              "",
-                              "",
                               "");
 }
 
 void ATBDeviceControllerPlugin::onCashPayStopedSuccess()
 {
     // DEBUG
-    qCritical() << "ATBDeviceControllerPlugin::onCashPayStopedSuccess()";
+    qCritical() << "ATBDeviceControllerPlugin::onCashPayStoped()";
 
-    // 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 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() << "---------------------------------------------------------";
-
+    qCritical() << "      insertedAmount (int) = " << amountInt;
+    qCritical() << "            insertedAmount = " << amountString;
 
     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);
-
-
-    // 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);
-}
-
-
 
 
 /**
@@ -1216,8 +953,7 @@ bool ATBDeviceControllerPlugin::private_loadCashAgentLib(QString pluginName)
 
         // search list for plugin (.so) file:
         QStringList pluginNameList;
-        pluginNameList << "/usr/lib/libCAslave.so"
-                       << "/usr/lib/libCAmaster.so"
+        pluginNameList << "/usr/lib/libCAmaster.so"
                        << "/usr/lib/libCashAgentLib.so";
         // using C++11 range based loop:
         for (const auto& filename : pluginNameList) {
@@ -1243,14 +979,6 @@ 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);
 
@@ -1343,12 +1071,12 @@ PLUGIN_STATE ATBDeviceControllerPlugin::getState()
     return this->pluginState;
 }
 
-QString & ATBDeviceControllerPlugin::getLastError()
+QString const &ATBDeviceControllerPlugin::getLastError()
 {
     return this->errorCode;
 }
 
-const QString & ATBDeviceControllerPlugin::getLastErrorDescription()
+QString const &ATBDeviceControllerPlugin::getLastErrorDescription()
 {
     return this->errorDescription;
 }
@@ -1358,10 +1086,15 @@ const QString & ATBDeviceControllerPlugin::getPluginInfo()
     return this->pluginInfo;
 }
 
+QStringList ATBDeviceControllerPlugin::getPluginInfoList() {
+   pluginInfoList.clear();
+   return pluginInfoList;
+}
 
-const QString ATBDeviceControllerPlugin::getString(nsDeviceControllerInterface::RESULT_STATE resultState)
+
+QString const &ATBDeviceControllerPlugin::getString(nsDeviceControllerInterface::RESULT_STATE resultState)
 {
-    QString str;
+    static QString str;
 
     switch (resultState) {
     case nsDeviceControllerInterface::RESULT_STATE::SUCCESS:
@@ -1382,6 +1115,15 @@ const QString ATBDeviceControllerPlugin::getString(nsDeviceControllerInterface::
     case nsDeviceControllerInterface::RESULT_STATE::INFO:
         str = QString("RESULT_STATE::INFO");
         break;
+    case nsDeviceControllerInterface::RESULT_STATE::ERROR_NETWORK:
+        str = QString("RESULT_STATE::ERROR_NETWORK");
+        break;
+    case nsDeviceControllerInterface::RESULT_STATE::ERROR_BUSY:
+        str = QString("RESULT_STATE::ERROR_BUSY");
+        break;
+    case nsDeviceControllerInterface::RESULT_STATE::ERROR_STATE:
+        str = QString("RESULT_STATE::ERROR_STATE");
+        break;
     }
     return str;
 

src/ATBAPP/ATBDeviceControllerPlugin.h

@@ -2,7 +2,6 @@
 #define ATBDEVICECONTROLLERPLUGIN_H
 
 #include <QObject>
-#include <QLocale>
 
 #include "src/ATBAPP/DeviceControllerInterface.h"
 #include "src/ATBAPP/ATBAPPplugin.h"
@@ -14,19 +13,16 @@
 
 #include "interfaces.h"
 
-#include <unistd.h>
-
 
 class DBusControllerInterface;
 class QTextCodec;
 
 
-using namespace nsDeviceControllerInterface;
+// using namespace nsDeviceControllerInterface;
 
 class QSettings;
 
-class ATBDeviceControllerPlugin :
-        public DeviceControllerInterface
+class ATBDeviceControllerPlugin : public DeviceControllerInterface
 {
     Q_OBJECT
     Q_INTERFACES(ATBAPPplugin)
@@ -37,11 +33,14 @@ class ATBDeviceControllerPlugin :
 
 public:
     explicit ATBDeviceControllerPlugin(QObject *parent = nullptr);
-    ~ATBDeviceControllerPlugin();
+    virtual ~ATBDeviceControllerPlugin();
 
     // ----------------------------------------------------------------------------
     // interface:
-    PLUGIN_STATE initDCPlugin(QObject *eventReceiver, const QSettings & settings);
+    virtual PLUGIN_STATE initPlugin(QObject *eventReceiver, QObject *atbSystem, QObject *hmiConfig, QSettings const &settings) override;
+    virtual PLUGIN_STATE initPlugin(QObject *eventReceiver, QSettings const &settings) override;
+    virtual PLUGIN_STATE initVMCPlugin(QObject *eventReceiver, QObject *atbSystem, QObject *hmiConfig, const QSettings & settings) override;
+    virtual PLUGIN_STATE initDCPlugin(QObject *eventReceiver, const QSettings & settings) override;
 
     // TASKS: Cash handling -------------------------------------------------------
     void requestStartCashInput(const QString & amount);
@@ -49,10 +48,6 @@ 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);
@@ -63,36 +58,99 @@ public:
     void requestAccount();
 
     // mandantory ATBAPP plugin methods: ------------------------------------------
-    nsDeviceControllerInterface::PLUGIN_STATE getState();
-    QString & getLastError();
-    const QString & getLastErrorDescription();
+    nsDeviceControllerInterface::PLUGIN_STATE getState() override;
+    QString const &getLastError() override;
+    QString const &getLastErrorDescription() override;
 
-    const QString & getPluginInfo();
+    virtual QStringList getPluginInfoList() override;
+    virtual const QString &getPluginInfo() override;
 
     // helpers e.g. for debug / log
-    const QString getString(nsDeviceControllerInterface::RESULT_STATE resultState);;
+    virtual QString const &getString(RESULT_STATE resultState) override;
 
 public slots:
-    void onChangedProgramModeToSELL();
-    void onChangedProgramModeToSERVICE();
-    void onChangedProgramModeToIDLE();
-    void onChangedProgramModeToOOO();
+    virtual void onChangedProgramModeToSELL() override;
+    virtual void onChangedProgramModeToSERVICE() override;
+    virtual void onChangedProgramModeToIDLE() override;
+    virtual void onChangedProgramModeToOOO() override;
 
-    void startPhysicalLayer();
-    void stopPhysicalLayer();
-    void reboot();
-    void reset();
+    virtual void startPhysicalLayer() override;
+    virtual void stopPhysicalLayer() override;
+    virtual void reboot() override;
+    virtual void reset() override;
 
 
 
 signals:
-    // public Signals are defined in interface
+    void printTicketFinished(RESULT_STATE resultState,
+                             const QString & errorCode,
+                             const QString & errorDescription);
+    void printReceiptFinished(RESULT_STATE resultState,
+                              const QString & errorCode,
+                              const QString & errorDescription);
+
+    /**
+     * emitted on e.g. a coin input
+     */
+    void cashInputEvent(RESULT_STATE resultState,
+                                CASH_STATE cashState,
+                                const QString & newCashValue,
+                                /* additional variables? */
+                                const QString & errorCode,
+                                const QString & errorDescription);
+
+    /**
+     * emitted if cashInput has been stopped, e.g. in result to task requestStopCashInput():
+     *  -> shutter is blocked
+     *  -> no cash input is possible
+     *  -> coins are in cache
+     */
+    void cashInputFinished(RESULT_STATE resultState,
+                                     const QString & newCashValue,
+                                     /*  additional variables? */
+                                     const QString & errorCode,
+                                     const QString & errorDescription);
+
+
+    /**
+     * emitted e.g. if service door is opened
+     */
+    void requestModeSERVICE();
+
+    /**
+     * emitted e.g. if doors are closed
+     */
+    void requestModeIDLE();
+
+    /**
+     * emitted e.g. on severe errors
+     */
+    void requestModeOOO();
+
+    /**
+     * emitted e.g. if service door is opened
+     */
+    void requestAccountResponse(const QHash<QString, QVariant> & accountData);
+
+    /**
+     * emitted on error
+     * depending on errorCode:
+     * -> interrupt selling process
+     * -> machine can go to state OOO
+     * -> send error event to ISMAS
+     * -> ...
+     */
+    void Error(
+            /*  additional variables? */
+            const QString & errorCode,
+            const QString & errorDescription);
 
 
 private:
    QString errorCode;
    QString errorDescription;
    QString pluginInfo;
+   QStringList pluginInfoList;
 
    QList<int> templateList;
 
@@ -100,8 +158,6 @@ private:
 
    bool useDebug;
 
-   bool isMaster;
-
    PLUGIN_STATE pluginState;
 
    QObject* eventReceiver;
@@ -112,8 +168,6 @@ private:
 
    DeviceControllerDiag* diag;
 
-   uint32_t cashStartAmountInt;
-
 
    QTextCodec *codec;
 
@@ -129,8 +183,6 @@ private:
    // dbus
    int init_sc_dbus();
 
-   QLocale printerLocale;
-
 private slots:
    // printer
 
@@ -147,11 +199,9 @@ 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

@@ -7,8 +7,6 @@
 
 DeviceControllerDiag::DeviceControllerDiag(QObject *parent)
     : QObject(parent)
-    , coinProcessorType(nsDeviceControllerInterface::COIN_PROCESSOR::ESCROW)
-    , billAcceptor(nsDeviceControllerInterface::BILL_ACCEPTOR::NO)
     , eventReceiver(nullptr)
     , isRequestRunning(false)
     , flagInterruptDiag(false)
@@ -57,8 +55,6 @@ 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;
     }
 
@@ -91,8 +87,6 @@ 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;
     }
 
@@ -101,8 +95,6 @@ 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;
     }
 
@@ -218,16 +210,6 @@ 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) {
@@ -260,15 +242,6 @@ 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

@@ -7,8 +7,6 @@
 
 #include "ATBMachineEvent.h"
 #include "interfaces.h"
-#include "DeviceControllerInterface.h"
-
 
 namespace DeviceController {
     Q_NAMESPACE
@@ -64,9 +62,6 @@ public:
 
     void init(hwinf* hw, QObject* eventReceiver);
 
-    nsDeviceControllerInterface::COIN_PROCESSOR coinProcessorType;
-    nsDeviceControllerInterface::BILL_ACCEPTOR  billAcceptor;
-
 public slots:
     void diagRequest();
 
@@ -90,8 +85,6 @@ private:
 
     QSet<DeviceController::State> machineEventSet;
 
-
-
 private slots:
     void onDiagRequestTimeoutTimerTimeout();
 

src/ATBAPP/DeviceControllerInterface.h

@@ -7,24 +7,23 @@
 #include <QString>
 
 #include "ATBAPPplugin.h"
+#include "UnifiedDCVMCInterface.h"
 
 namespace nsDeviceControllerInterface {
-    enum class PLUGIN_STATE : quint8;
-    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;
+    using PLUGIN_STATE = ATBAPPplugin::PLUGIN_STATE;
+    using RESULT_STATE = ATBAPPplugin::RESULT_STATE;
+    using CASH_STATE = ATBAPPplugin::CASH_STATE;
+    using TICKET_VARIANT = ATBAPPplugin::TICKET_VARIANT;
 }
 
-
-class DeviceControllerInterface : public QObject
-                                , public ATBAPPplugin
+class DeviceControllerInterface : public QObject, public UnifiedDCVMCInterface
 {
     Q_OBJECT
     Q_INTERFACES(ATBAPPplugin)
+    Q_INTERFACES(UnifiedDCVMCInterface)
 
 public:
+
     virtual ~DeviceControllerInterface() {}
 
     /**
@@ -33,8 +32,7 @@ public:
      * @param settings
      * @return
      */
-    virtual nsDeviceControllerInterface::PLUGIN_STATE initDCPlugin(QObject *eventReceiver,
-                                                                   const QSettings & settings) = 0;
+    virtual PLUGIN_STATE initDCPlugin(QObject *eventReceiver, const QSettings & settings) = 0;
 
     // TASKS: Cash handling -------------------------------------------------------
     /**
@@ -62,13 +60,10 @@ public:
 
     // TASKS: printing ------------------------------------------------------------
     virtual void requestPrintTicket(const QHash<QString, QVariant> & printingData) = 0;
-    virtual void requestPrintTicket(nsDeviceControllerInterface::TICKET_VARIANT ticketVariant, const QHash<QString, QVariant> & printingData) = 0;
+    virtual void requestPrintTicket(TICKET_VARIANT ticketVariant, const QHash<QString, QVariant> & printingData) = 0;
     virtual void requestPrintReceipt(const QHash<QString, QVariant> & printingData) = 0;
     virtual void requestPrintReceipt(const QString & printingString) = 0;
 
-    // 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;
@@ -79,7 +74,7 @@ public:
     // -> ATBAPPplugin::getPluginInfo()
 
     // helpers e.g. for debug / log
-    virtual const QString getString(nsDeviceControllerInterface::RESULT_STATE resultState) = 0;
+    virtual const QString &getString(nsDeviceControllerInterface::RESULT_STATE resultState) = 0;
 
 public slots:
     virtual void onChangedProgramModeToSELL() = 0;
@@ -92,7 +87,6 @@ public slots:
     virtual void reboot() = 0;
     virtual void reset() = 0;
 
-
 signals:
     void printTicketFinished(nsDeviceControllerInterface::RESULT_STATE resultState,
                                      const QString & errorCode,
@@ -119,38 +113,15 @@ signals:
      */
     void cashInputFinished(nsDeviceControllerInterface::RESULT_STATE resultState,
                                      const QString & newCashValue,
-                                     const QString & coinValue,
-                                     const QString & noteValue,
-                                     const QString & changeValue,
+                                     /*  additional variables? */
                                      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
      */
@@ -167,13 +138,6 @@ signals:
     void requestAccountResponse(const QHash<QString, QVariant> & accountData);
 
 
-    /**
-     * show text messages in service mode
-     */
-    void showServiceText(const QString & text);
-    void showServiceText(quint16 textNumber);
-
-
     /**
      * emitted on error
      * depending on errorCode:
@@ -189,52 +153,7 @@ signals:
 
 };
 
-
 Q_DECLARE_INTERFACE(DeviceControllerInterface,
-                    "eu.atb.ptu.plugin.DeviceControllerInterface/1.1.0")
-
-
-namespace nsDeviceControllerInterface {
-
-    enum class PLUGIN_STATE : quint8 {
-        NOT_INITIALIZED = 0,
-        INITIALIZED = 1
-    };
-
-    enum class RESULT_STATE : quint8 {
-        SUCCESS = 1,                // operation was successfull
-        ERROR_BACKEND,              // error from backend (e.g. backend replies with error)
-        ERROR_TIMEOUT,              // the operation timed out
-        ERROR_PROCESS,              // internal plugin error, should not occur (this is a bug in implementation)
-        ERROR_RETRY,                // retry operation
-        INFO                        // informational (e.g. display a message, log something etc.)
-    };
-
-    enum class CASH_STATE   : quint8 {
-        CACHE_EMPTY,                // Cache still empty, default state
-        CACHE_INPUT,                // Coins are in Cache
-        OVERPAYED,
-        /* t.b.d. */
-    };
-
-
-    enum class TICKET_VARIANT : quint8 {
-        PARKING_TICKET,
-        RECEIPT,
-        ERROR_RECEIPT,
-        START_RECEIPT,   // e.g. Szeged Start
-        STOP_RECEIPT,    // e.g. Szeged Stop
-    };
-
-    enum class COIN_PROCESSOR : quint8 {
-        CHANGER,
-        ESCROW
-    };
-
-    enum class BILL_ACCEPTOR  : quint8 {
-        YES,
-        NO
-    };
-}
+                    "eu.atb.ptu.plugin.DeviceControllerInterface/1.0")
 
 #endif // DEVICECONTROLLERINTERFACE_H

src/ATBAPP/UnifiedDCInterface.cpp

@@ -0,0 +1,19 @@
+#include "DeviceControllerInterface.h"
+
+
+using UNIFIED_PLUGIN_STATE = UnifiedDCVMCInterface<DeviceControllerInterface>::UNIFIED_PLUGIN_STATE;
+
+
+template<>
+UNIFIED_PLUGIN_STATE UnifiedDCVMCInterface<DeviceControllerInterface>::initPlugin(QObject *eventReceiver, QSettings const &settings) {
+
+
+    switch(static_cast<DeviceControllerInterface*>(this)->initDCPlugin(eventReceiver, settings)) {
+    case nsDeviceControllerInterface::PLUGIN_STATE::INITIALIZED:
+        return UNIFIED_PLUGIN_STATE::INITIALIZED;
+    case nsDeviceControllerInterface::PLUGIN_STATE::NOT_INITIALIZED:
+        return UNIFIED_PLUGIN_STATE::NOT_INITIALIZED;
+    }
+
+    return UNIFIED_PLUGIN_STATE::NOT_INITIALIZED;
+}

src/ATBAPP/UnifiedDCVMCInterface.h

@@ -0,0 +1,62 @@
+#ifndef UNIFIED_DCVMC_INTERFACE_H_INCLUDED
+#define UNIFIED_DCVMC_INTERFACE_H_INCLUDED
+
+#include <QObject>
+#include <QSettings>
+
+#include <QtPlugin>
+
+#include <QSettings>
+#include <QString>
+
+#include "ATBAPPplugin.h"
+
+
+class UnifiedDCVMCInterface : public ATBAPPplugin {
+    Q_INTERFACES(ATBAPPplugin)
+
+public:
+    explicit UnifiedDCVMCInterface() = default;
+    virtual ~UnifiedDCVMCInterface() = default;
+
+    virtual QStringList getPluginInfoList() = 0;
+    virtual const QString &getPluginInfo() = 0;
+
+    // mandantory ATBAPP plugin methods:
+    virtual PLUGIN_STATE getState() = 0;
+    virtual QString const &getLastError() = 0;
+    virtual QString const &getLastErrorDescription() = 0;
+
+    virtual PLUGIN_STATE initPlugin(QObject *eventReceiver,
+                                    QObject *atbSystem,
+                                    QObject *hmiConfig,
+                                    QSettings const &settings) = 0;
+
+    virtual PLUGIN_STATE initPlugin(QObject *eventReceiver, QSettings const &settings) = 0;
+
+    virtual PLUGIN_STATE initDCPlugin(QObject *eventReceiver,
+                                      const QSettings & settings) = 0;
+
+    virtual PLUGIN_STATE initVMCPlugin(QObject *eventReceiver,
+                                       QObject *atbSystem, QObject *hmiConfig,
+                                       const QSettings & settings) = 0;
+
+
+    virtual QString const &getString(RESULT_STATE resultState) = 0;
+
+public slots:
+    virtual void onChangedProgramModeToSELL() = 0;
+    virtual void onChangedProgramModeToSERVICE() = 0;
+    virtual void onChangedProgramModeToIDLE() = 0;
+    virtual void onChangedProgramModeToOOO() = 0;
+
+    virtual void startPhysicalLayer() = 0;
+    virtual void stopPhysicalLayer() = 0;
+    virtual void reboot() = 0;
+    virtual void reset() = 0;
+};
+
+Q_DECLARE_INTERFACE(UnifiedDCVMCInterface,
+                    "eu.atb.ptu.plugin.UnifiedDCVMCInterface/1.0")
+
+#endif // UNIFIED_DCVMC_INTERFACE_H_INCLUDED

src/ATBAPP/support/CashUtils.cpp

@@ -1,74 +0,0 @@
-#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

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