GerhardHoffmann/DCPlugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add interface for coinProcessor() and billAcceptor()

Browse Source
This commit is contained in:
Siegfried Siegert 2023-11-23 17:58:36 +01:00
parent 2221463fe5
commit 48d65b679f
Signed by: SiegfriedSiegert
GPG Key ID: 68371E015E8F0B03
5 changed files with 61 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ATBAPP/ATBDeviceControllerPlugin.cpp
View File

@ -213,6 +213,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:

4
src/ATBAPP/ATBDeviceControllerPlugin.h
View File

@ -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);

21
src/ATBAPP/DeviceControllerDiag.cpp
View File

@ -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)
{

7
src/ATBAPP/DeviceControllerDiag.h
View File

@ -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();

17
src/ATBAPP/DeviceControllerInterface.h
View File

@ -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