MDBwake: switch on/off during ModeSELL/ModeSERVICE

Additionally to vedingPrice (Szeged).
TODO: make configurable?

src/ATBAPP/ATBDeviceControllerPlugin.cpp

@@ -22,7 +22,8 @@
 
 
 ATBDeviceControllerPlugin::ATBDeviceControllerPlugin(QObject *parent)
-    : pluginState(PLUGIN_STATE::NOT_INITIALIZED)
+    : isMaster(false)
+    , pluginState(PLUGIN_STATE::NOT_INITIALIZED)
     , eventReceiver(nullptr)
 {
     this->setParent(parent);
@@ -39,11 +40,12 @@ ATBDeviceControllerPlugin::ATBDeviceControllerPlugin(QObject *parent)
     //connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_templatePrintFinished_OK()),  this, SLOT(onPrintFinishedOK()),  Qt::QueuedConnection);
     //connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_templatePrintFinished_Err()), this, SLOT(onPrintFinishedERR()), Qt::QueuedConnection);
 
-    connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_gotNewCoin()),       this, SLOT(onCashGotCoin()),                Qt::QueuedConnection);
+    connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_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_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_payStopByPushbutton()), this, SLOT(onCashPayStopByPushbutton()), Qt::QueuedConnection);
-    connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_payStopByError()),   this, SLOT(onCashPayStopByError()),         Qt::QueuedConnection);
+    connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_payStopByEscrow()),     this, SLOT(onCashPayStopByEscrow()),     Qt::QueuedConnection);
-    connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_payStopByTimeout()), this, SLOT(onCashPayStopByTimeout()),       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
@@ -73,13 +75,14 @@ PLUGIN_STATE ATBDeviceControllerPlugin::initDCPlugin(QObject *eventReceiver, con
     this->eventReceiver = eventReceiver;
 
     // read variables from setting
-    this->serialPortName = settings.value("DEVICE_CONTROLLER/serialPort", "ttymxc2").toString();
+    this->serialPortName = settings.value("ATBDeviceControllerPlugin/serialPort", "ttymxc2").toString();
-    QByteArray printerEncoding = settings.value("DEVICE_CONTROLLER/printerEnconding", "ISO 8859-2").toString().toLatin1();
+    QByteArray printerEncoding = settings.value("ATBDeviceControllerPlugin/printerEncoding", "ISO 8859-2").toString().toLatin1();
 
-    // open serial port
+    if (this->isMaster) {
-    hw->dc_openSerial(5, "115200", this->serialPortName, 1);
+        // 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());
@@ -95,6 +98,16 @@ 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;
@@ -105,6 +118,8 @@ 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";
@@ -119,6 +134,8 @@ void ATBDeviceControllerPlugin::startPhysicalLayer()
 
 void ATBDeviceControllerPlugin::stopPhysicalLayer()
 {
+    if (!this->isMaster) return;
+
     if (this->pluginState == PLUGIN_STATE::NOT_INITIALIZED)
     {
         qCritical() << "ATBDeviceControllerPlugin::startPhysicalLayer(): plugin is not initialized";
@@ -154,11 +171,13 @@ void ATBDeviceControllerPlugin::reset()
 void ATBDeviceControllerPlugin::onChangedProgramModeToSELL()
 {
     hw->rtc_setDateTime();
+    hw->mdb_switchWake(0);   // wakeup MDB components
 }
 
 void ATBDeviceControllerPlugin::onChangedProgramModeToSERVICE()
 {
     //hw->dc_autoRequest(true);
+    hw->mdb_switchWake(0);   // wakeup MDB components
 }
 
 void ATBDeviceControllerPlugin::onChangedProgramModeToIDLE()
@@ -166,6 +185,7 @@ void ATBDeviceControllerPlugin::onChangedProgramModeToIDLE()
     //hw->dc_autoRequest(false);  // <-- TODO: ???
 
     this->diag->diagRequest();
+    hw->mdb_switchWake(1);
 
 }
 
@@ -207,6 +227,19 @@ void ATBDeviceControllerPlugin::cashAbort()
     this->currentCashState = CASH_STATE::CACHE_EMPTY;
 }
 
+// Coin/Cash processing variants ----------------------------------------------
+
+nsDeviceControllerInterface::COIN_PROCESSOR ATBDeviceControllerPlugin::coinProcessor()
+{
+    return this->diag->coinProcessorType;
+}
+
+nsDeviceControllerInterface::BILL_ACCEPTOR  ATBDeviceControllerPlugin::billAcceptor()
+{
+    return this->diag->billAcceptor;
+}
+
+
 // TASKS: Account -------------------------------------------------------------
 
 // for an external account request, e.g. by an ui-button:
@@ -310,9 +343,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;
@@ -322,14 +355,36 @@ void ATBDeviceControllerPlugin::private_getAccountData()
 
     accountData.insert("NumberOfCoinVariants", numberOfCoinVariants);
     for (int i = 0; i < numberOfCoinVariants; ++i) {
-        accountData.insert("COIN_" + QString::number(i) + "_Quantity",  retVR.coinsInVault[i]);
+        accountData.insert("COIN_" + QString::number(i+1) + "_Quantity",  retVR.coinsInVault[i]);
-        accountData.insert("COIN_" + QString::number(i) + "_Value",     retVR.coinDenomination[i]);
+        accountData.insert("COIN_" + QString::number(i+1) + "_Value",     retVR.coinDenomination[i]);
 
         // DEBUG
-        qCritical() << "COIN_" + QString::number(i) + "_Quantity = " << accountData["COIN_" + QString::number(i) + "_Quantity"];
+        qCritical() << "COIN_" + QString::number(i+1) + "_Quantity = " << accountData["COIN_" + QString::number(i) + "_Quantity"];
-        qCritical() << "COIN_" + QString::number(i) + "_Value    = " << accountData["COIN_" + QString::number(i) + "_Value"];
+        qCritical() << "COIN_" + QString::number(i+1) + "_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);
 }
 
@@ -362,7 +417,7 @@ void ATBDeviceControllerPlugin::onVaultDoorOpened()
     // this is started here because we want to keep ptu awake in order to get
     // coin box removed / inserted etc.
     // BackgroundTask("ACCOUNT") is finished, if account message is sent to ISMAS!
-    this->dbus->startBackgroundTask("ACCOUNT");
+    this->dbus->startBackgroundTask("DOOR_OPEN");
 
     // do not: emit this->requestModeSERVICE();
 }
@@ -371,6 +426,9 @@ void ATBDeviceControllerPlugin::onCoinBoxRemoved()
 {
     qCritical() << "ATBDeviceControllerPlugin::onCoinBoxRemoved()";
 
+    // BackgroundTask("ACCOUNT") is finished, if account message is sent to ISMAS!
+    this->dbus->startBackgroundTask("ACCOUNT");
+
     QTimer::singleShot(4000, this, SLOT(private_startAccount()));
 }
 
@@ -379,19 +437,31 @@ void ATBDeviceControllerPlugin::onCoinBoxInserted()
     qCritical() << "ATBDeviceControllerPlugin::onCoinBoxInserted()";
 }
 
+/**
+ * This is called, when all CoinBox is inserted and all doors
+ * are closed.
+ */
 void ATBDeviceControllerPlugin::onCBinAndAllDoorsClosed()
 {
     qCritical() << "ATBDeviceControllerPlugin::onCBinAndAllDoorsClosed()";
 
     QTimer::singleShot(2000, this, SIGNAL(requestModeIDLE()));
+
+    this->dbus->finishedBackgroundTask("DOOR_OPEN");
 }
 
-
+/**
+ *  This is called, when all no coinbox is inserted and all doors are
+ *  closed.
+ */
 void ATBDeviceControllerPlugin::onAllDoorsClosed()
 {
     qCritical() << "ATBDeviceControllerPlugin::onAllDoorsClosed()";
 
     emit this->requestModeIDLE();
+    this->dbus->finishedBackgroundTask("DOOR_OPEN");
+
+    // TODO: check for errors and create a machine event
 }
 
 void ATBDeviceControllerPlugin::onNewVoltage(uint32_t voltage)
@@ -441,7 +511,8 @@ void ATBDeviceControllerPlugin::requestPrintTicket(nsDeviceControllerInterface::
     memcpy((char*)dynTicketData->licensePlate, ba_licenseplate.data(), std::min(ba_licenseplate.size(),8));
 
     QByteArray ba_amount = codec->fromUnicode(printingData["amount"].toString());
-    memcpy((char*)dynTicketData->vendingPrice,  ba_amount.data(), std::min(ba_amount.size(),8));
+    memcpy((char*)dynTicketData->vendingPrice,  ba_amount.data(), std::min(ba_amount.size(),8));  // Szeged
+    memcpy((char*)dynTicketData->dynDat6,       ba_amount.data(), std::min(ba_amount.size(),8));  // Schoenau
 
     QByteArray ba_parkingEndTime = codec->fromUnicode(parkingEndDateTime.toString("hh:mm"));
     memcpy((char*)dynTicketData->parkingEnd,  ba_parkingEndTime.data(), std::min(ba_parkingEndTime.size(),8));
@@ -612,7 +683,9 @@ void ATBDeviceControllerPlugin::requestPrintTicket(const QHash<QString, QVariant
     memcpy((char*)dynTicketData->licensePlate, ba_licenseplate.data(), std::min(ba_licenseplate.size(),8));
 
     QByteArray ba_amount = codec->fromUnicode(printingData["amount"].toString());
-    memcpy((char*)dynTicketData->vendingPrice,  ba_amount.data(), std::min(ba_amount.size(),8));
+    memcpy((char*)dynTicketData->vendingPrice,  ba_amount.data(), std::min(ba_amount.size(),8));  // Szeged
+    memcpy((char*)dynTicketData->dynDat6,       ba_amount.data(), std::min(ba_amount.size(),8));  // Schoenau
+
 
     QByteArray ba_parkingEndTime = codec->fromUnicode(parkingEndDateTime.toString("hh:mm"));
     memcpy((char*)dynTicketData->parkingEnd,  ba_parkingEndTime.data(), std::min(ba_parkingEndTime.size(),8));
@@ -824,6 +897,15 @@ void ATBDeviceControllerPlugin::onCashGotCoin()
                               "");
 }
 
+void ATBDeviceControllerPlugin::onCashPayStopByPushbutton()
+{
+    // DEBUG
+    qCritical() << "ATBDeviceControllerPlugin::onCashPayStopByPushbutton()";
+
+    // we need new cash value in application...
+    QTimer::singleShot(500, this, SLOT(onCashPayStopedSuccess()));
+
+}
 
 void ATBDeviceControllerPlugin::onCashPayStopByMax()
 {
@@ -883,7 +965,7 @@ void ATBDeviceControllerPlugin::onCashPayStopByTimeout()
 void ATBDeviceControllerPlugin::onCashPayStopedSuccess()
 {
     // DEBUG
-    qCritical() << "ATBDeviceControllerPlugin::onCashPayStoped()";
+    qCritical() << "ATBDeviceControllerPlugin::onCashPayStopedSuccess()";
 
     uint32_t amountInt = this->hw->getInsertedAmount();
 
@@ -912,7 +994,8 @@ bool ATBDeviceControllerPlugin::private_loadCashAgentLib(QString pluginName)
 
         // search list for plugin (.so) file:
         QStringList pluginNameList;
-        pluginNameList << "/usr/lib/libCAmaster.so"
+        pluginNameList << "/usr/lib/libCAslave.so"
+                       << "/usr/lib/libCAmaster.so"
                        << "/usr/lib/libCashAgentLib.so";
         // using C++11 range based loop:
         for (const auto& filename : pluginNameList) {
@@ -938,6 +1021,14 @@ bool ATBDeviceControllerPlugin::private_loadCashAgentLib(QString pluginName)
         return false;
     }
 
+    if (pluginName.contains("slave", Qt::CaseInsensitive)) {
+        this->isMaster = false;
+    }
+    else
+    if (pluginName.contains("master", Qt::CaseInsensitive)) {
+        this->isMaster = true;
+    }
+
     QPluginLoader* pluginLoader = new QPluginLoader();
     pluginLoader->setFileName(pluginName);
 

src/ATBAPP/ATBDeviceControllerPlugin.h

@@ -48,6 +48,10 @@ public:
     void cashCollect();
     void cashAbort();
 
+    // read coin/cash processing variants -----------------------------------------
+    nsDeviceControllerInterface::COIN_PROCESSOR coinProcessor();
+    nsDeviceControllerInterface::BILL_ACCEPTOR  billAcceptor();
+
     // TASKS: printing ------------------------------------------------------------
     void requestPrintTicket(const QHash<QString, QVariant> & printingData);
     void requestPrintTicket(nsDeviceControllerInterface::TICKET_VARIANT ticketVariant, const QHash<QString, QVariant> & printingData);
@@ -95,6 +99,8 @@ private:
 
    bool useDebug;
 
+   bool isMaster;
+
    PLUGIN_STATE pluginState;
 
    QObject* eventReceiver;
@@ -136,6 +142,7 @@ private slots:
    void onCashGotCoin();
    void onCashPayStopedSuccess();
    void onCashPayStopByMax();
+   void onCashPayStopByPushbutton();
    void onCashPayStopByEscrow();
    void onCashPayStopByError();
    void onCashPayStopByTimeout();

src/ATBAPP/DeviceControllerDiag.cpp

@@ -7,6 +7,8 @@
 
 DeviceControllerDiag::DeviceControllerDiag(QObject *parent)
     : QObject(parent)
+    , coinProcessorType(nsDeviceControllerInterface::COIN_PROCESSOR::ESCROW)
+    , billAcceptor(nsDeviceControllerInterface::BILL_ACCEPTOR::NO)
     , eventReceiver(nullptr)
     , isRequestRunning(false)
     , flagInterruptDiag(false)
@@ -210,6 +212,16 @@ void DeviceControllerDiag::sub_componentAssessment()
     }
     // -----------------------------------------------------------------------------------------------
 
+    switch (devPara.kindOfCoinChecker) {
+        case 1:
+        case 2:
+            this->coinProcessorType = nsDeviceControllerInterface::COIN_PROCESSOR::ESCROW;
+            break;
+        case 3:
+            this->coinProcessorType = nsDeviceControllerInterface::COIN_PROCESSOR::CHANGER;
+            break;
+    }
+
     if (devPara.kindOfCoinChecker==1 || devPara.kindOfCoinChecker==2)  // 0: without  1=EMP820   2=EMP900    3=currenza c²	(MW)
     {
         if (modCond.coinEscrow>=200) {
@@ -242,6 +254,15 @@ void DeviceControllerDiag::sub_componentAssessment()
         }
     }
 
+    switch (devPara.BillAcceptor) {
+        case 0:
+            this->billAcceptor = nsDeviceControllerInterface::BILL_ACCEPTOR::NO;
+            break;
+        default:
+            this->billAcceptor = nsDeviceControllerInterface::BILL_ACCEPTOR::YES;
+            break;
+    }
+
     /*
     if ( modCond.billReader>=200 && devPara.BillAcceptor>0)
     {

src/ATBAPP/DeviceControllerDiag.h

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

src/ATBAPP/DeviceControllerInterface.h

@@ -13,6 +13,8 @@ namespace nsDeviceControllerInterface {
     enum class RESULT_STATE : quint8;
     enum class CASH_STATE   : quint8;
     enum class TICKET_VARIANT : quint8;
+    enum class COIN_PROCESSOR : quint8;
+    enum class BILL_ACCEPTOR  : quint8;
 }
 
 
@@ -64,6 +66,10 @@ public:
     virtual void requestPrintReceipt(const QHash<QString, QVariant> & printingData) = 0;
     virtual void requestPrintReceipt(const QString & printingString) = 0;
 
+    // read coin/cash processing variants
+    virtual nsDeviceControllerInterface::COIN_PROCESSOR coinProcessor() = 0;
+    virtual nsDeviceControllerInterface::BILL_ACCEPTOR  billAcceptor() = 0;
+
     // mandantory ATBAPP plugin methods:
     virtual nsDeviceControllerInterface::PLUGIN_STATE getState() = 0;
     virtual const QString & getLastError() = 0;
@@ -159,7 +165,7 @@ signals:
 
 
 Q_DECLARE_INTERFACE(DeviceControllerInterface,
-                    "eu.atb.ptu.plugin.DeviceControllerInterface/1.0")
+                    "eu.atb.ptu.plugin.DeviceControllerInterface/1.0.1")
 
 
 namespace nsDeviceControllerInterface {
@@ -194,6 +200,15 @@ namespace nsDeviceControllerInterface {
         STOP_RECEIPT,    // e.g. Szeged Stop
     };
 
+    enum class COIN_PROCESSOR : quint8 {
+        CHANGER,
+        ESCROW
+    };
+
+    enum class BILL_ACCEPTOR  : quint8 {
+        YES,
+        NO
+    };
 }
 
 #endif // DEVICECONTROLLERINTERFACE_H