Update interfaces.h

DCPlugin.pro

@@ -9,7 +9,7 @@ QT += serialport
 INCLUDEPATH += $${PWD}/plugins
 INCLUDEPATH += $${PWD}/include
 
-QMAKE_CXXFLAGS += -Wno-deprecated-copy -O
+QMAKE_CXXFLAGS += -Wno-deprecated-copy
 
 # default
 ARCH = PTU5
@@ -49,8 +49,6 @@ 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
@@ -79,7 +77,6 @@ HEADERS += \
     src/ATBAPP/ATBMachineEvent.h \
     src/ATBAPP/ATBDeviceControllerPlugin.h \
     src/ATBAPP/Utils.h \
-    src/ATBAPP/UnifiedDCVMCInterface.h \
     src/ATBAPP/support/DBusControllerInterface.h \
     src/ATBAPP/support/JSON.h \
     src/ATBAPP/support/PTUSystem.h

src/ATBAPP/ATBAPPplugin.h

@@ -5,63 +5,18 @@
  * a simple class with only one method for plugin info
  */
 #include <QObject>
-#include <QStringList>
+#include <QString>
 
-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
-    };
+class ATBAPPplugin
+{
 
-    virtual const QString &getPluginInfo() = 0;
-    virtual QStringList getPluginInfoList() {
-        return QStringList(QString());
-    }
+public:
+    virtual const QString & getPluginInfo() = 0;
 };
 
-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

@@ -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);
@@ -68,32 +69,6 @@ ATBDeviceControllerPlugin::ATBDeviceControllerPlugin(QObject *parent)
 
 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;
@@ -102,10 +77,11 @@ PLUGIN_STATE ATBDeviceControllerPlugin::initDCPlugin(QObject *eventReceiver, con
     this->serialPortName = settings.value("DEVICE_CONTROLLER/serialPort", "ttymxc2").toString();
     QByteArray printerEncoding = settings.value("DEVICE_CONTROLLER/printerEnconding", "ISO 8859-2").toString().toLatin1();
 
-    // open serial port
-    hw->dc_openSerial(5, "115200", this->serialPortName, 1);
-
-    hw->dc_autoRequest(true);
+    if (this->isMaster) {
+        // open serial port
+        hw->dc_openSerial(5, "115200", this->serialPortName, 1);
+        hw->dc_autoRequest(true);
+    }
 
     hw->dc_setNewCustomerNumber(PTUSystem::readCustomerNumber());
     hw->dc_setNewMachineNumber(PTUSystem::readMachineNumber());
@@ -131,6 +107,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";
@@ -145,6 +123,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";
@@ -953,7 +933,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) {
@@ -979,6 +960,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);
 
@@ -1071,12 +1060,12 @@ PLUGIN_STATE ATBDeviceControllerPlugin::getState()
     return this->pluginState;
 }
 
-QString const &ATBDeviceControllerPlugin::getLastError()
+QString & ATBDeviceControllerPlugin::getLastError()
 {
     return this->errorCode;
 }
 
-QString const &ATBDeviceControllerPlugin::getLastErrorDescription()
+const QString & ATBDeviceControllerPlugin::getLastErrorDescription()
 {
     return this->errorDescription;
 }
@@ -1086,15 +1075,10 @@ const QString & ATBDeviceControllerPlugin::getPluginInfo()
     return this->pluginInfo;
 }
 
-QStringList ATBDeviceControllerPlugin::getPluginInfoList() {
-   pluginInfoList.clear();
-   return pluginInfoList;
-}
 
-
-QString const &ATBDeviceControllerPlugin::getString(nsDeviceControllerInterface::RESULT_STATE resultState)
+const QString ATBDeviceControllerPlugin::getString(nsDeviceControllerInterface::RESULT_STATE resultState)
 {
-    static QString str;
+    QString str;
 
     switch (resultState) {
     case nsDeviceControllerInterface::RESULT_STATE::SUCCESS:
@@ -1115,15 +1099,6 @@ QString const &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

@@ -13,16 +13,19 @@
 
 #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)
@@ -33,14 +36,11 @@ class ATBDeviceControllerPlugin : public DeviceControllerInterface
 
 public:
     explicit ATBDeviceControllerPlugin(QObject *parent = nullptr);
-    virtual ~ATBDeviceControllerPlugin();
+    ~ATBDeviceControllerPlugin();
 
     // ----------------------------------------------------------------------------
     // interface:
-    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;
+    PLUGIN_STATE initDCPlugin(QObject *eventReceiver, const QSettings & settings);
 
     // TASKS: Cash handling -------------------------------------------------------
     void requestStartCashInput(const QString & amount);
@@ -58,99 +58,36 @@ public:
     void requestAccount();
 
     // mandantory ATBAPP plugin methods: ------------------------------------------
-    nsDeviceControllerInterface::PLUGIN_STATE getState() override;
-    QString const &getLastError() override;
-    QString const &getLastErrorDescription() override;
+    nsDeviceControllerInterface::PLUGIN_STATE getState();
+    QString & getLastError();
+    const QString & getLastErrorDescription();
 
-    virtual QStringList getPluginInfoList() override;
-    virtual const QString &getPluginInfo() override;
+    const QString & getPluginInfo();
 
     // helpers e.g. for debug / log
-    virtual QString const &getString(RESULT_STATE resultState) override;
+    const QString getString(nsDeviceControllerInterface::RESULT_STATE resultState);;
 
 public slots:
-    virtual void onChangedProgramModeToSELL() override;
-    virtual void onChangedProgramModeToSERVICE() override;
-    virtual void onChangedProgramModeToIDLE() override;
-    virtual void onChangedProgramModeToOOO() override;
+    void onChangedProgramModeToSELL();
+    void onChangedProgramModeToSERVICE();
+    void onChangedProgramModeToIDLE();
+    void onChangedProgramModeToOOO();
 
-    virtual void startPhysicalLayer() override;
-    virtual void stopPhysicalLayer() override;
-    virtual void reboot() override;
-    virtual void reset() override;
+    void startPhysicalLayer();
+    void stopPhysicalLayer();
+    void reboot();
+    void reset();
 
 
 
 signals:
-    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);
+    // public Signals are defined in interface
 
 
 private:
    QString errorCode;
    QString errorDescription;
    QString pluginInfo;
-   QStringList pluginInfoList;
 
    QList<int> templateList;
 
@@ -158,6 +95,8 @@ private:
 
    bool useDebug;
 
+   bool isMaster;
+
    PLUGIN_STATE pluginState;
 
    QObject* eventReceiver;

src/ATBAPP/DeviceControllerInterface.h

@@ -7,23 +7,22 @@
 #include <QString>
 
 #include "ATBAPPplugin.h"
-#include "UnifiedDCVMCInterface.h"
 
 namespace nsDeviceControllerInterface {
-    using PLUGIN_STATE = ATBAPPplugin::PLUGIN_STATE;
-    using RESULT_STATE = ATBAPPplugin::RESULT_STATE;
-    using CASH_STATE = ATBAPPplugin::CASH_STATE;
-    using TICKET_VARIANT = ATBAPPplugin::TICKET_VARIANT;
+    enum class PLUGIN_STATE : quint8;
+    enum class RESULT_STATE : quint8;
+    enum class CASH_STATE   : quint8;
+    enum class TICKET_VARIANT : quint8;
 }
 
-class DeviceControllerInterface : public QObject, public UnifiedDCVMCInterface
+
+class DeviceControllerInterface : public QObject
+                                , public ATBAPPplugin
 {
     Q_OBJECT
     Q_INTERFACES(ATBAPPplugin)
-    Q_INTERFACES(UnifiedDCVMCInterface)
 
 public:
-
     virtual ~DeviceControllerInterface() {}
 
     /**
@@ -32,7 +31,8 @@ public:
      * @param settings
      * @return
      */
-    virtual PLUGIN_STATE initDCPlugin(QObject *eventReceiver, const QSettings & settings) = 0;
+    virtual nsDeviceControllerInterface::PLUGIN_STATE initDCPlugin(QObject *eventReceiver,
+                                                                   const QSettings & settings) = 0;
 
     // TASKS: Cash handling -------------------------------------------------------
     /**
@@ -60,11 +60,10 @@ public:
 
     // TASKS: printing ------------------------------------------------------------
     virtual void requestPrintTicket(const QHash<QString, QVariant> & printingData) = 0;
-    virtual void requestPrintTicket(TICKET_VARIANT ticketVariant, const QHash<QString, QVariant> & printingData) = 0;
+    virtual void requestPrintTicket(nsDeviceControllerInterface::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;
 
-
     // mandantory ATBAPP plugin methods:
     virtual nsDeviceControllerInterface::PLUGIN_STATE getState() = 0;
     virtual const QString & getLastError() = 0;
@@ -74,7 +73,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;
@@ -87,6 +86,7 @@ public slots:
     virtual void reboot() = 0;
     virtual void reset() = 0;
 
+
 signals:
     void printTicketFinished(nsDeviceControllerInterface::RESULT_STATE resultState,
                                      const QString & errorCode,
@@ -117,6 +117,7 @@ signals:
                                      const QString & errorCode,
                                      const QString & errorDescription);
 
+
     /**
      * emitted e.g. if service door is opened
      */
@@ -138,6 +139,9 @@ signals:
     void requestAccountResponse(const QHash<QString, QVariant> & accountData);
 
 
+
+
+
     /**
      * emitted on error
      * depending on errorCode:
@@ -153,7 +157,43 @@ signals:
 
 };
 
+
 Q_DECLARE_INTERFACE(DeviceControllerInterface,
                     "eu.atb.ptu.plugin.DeviceControllerInterface/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
+    };
+
+}
+
 #endif // DEVICECONTROLLERINTERFACE_H

src/ATBAPP/UnifiedDCInterface.cpp

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

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