Compare commits
73 Commits
Author | SHA1 | Date | |
---|---|---|---|
58c99753a9
|
|||
e703befb2f
|
|||
83bcdcb47e
|
|||
70e6ec293d
|
|||
3601f2d868
|
|||
0876fa229e
|
|||
1c13d92171
|
|||
10b0e494b2
|
|||
24a1390a11
|
|||
c8508a0c62
|
|||
fbfbe3d243
|
|||
cbc0dd0ad6
|
|||
1abd6bfa90
|
|||
a03dfe87a5
|
|||
03b192fb60
|
|||
e8b3bb1aa0
|
|||
8fe705f49b
|
|||
bf1bdc34bb
|
|||
73ae01573d
|
|||
bc595e1c7e
|
|||
18104b7271
|
|||
d720c7190f
|
|||
3fff6a0ebe
|
|||
bacee366b8
|
|||
acf3e143c1
|
|||
c84050091b
|
|||
9be2841187
|
|||
3e4db6cfcc
|
|||
5898be8807
|
|||
f20957c14a
|
|||
1bcdb5ba21
|
|||
a43af8ab86
|
|||
d7443974e2
|
|||
346c953175
|
|||
8cf6897a21
|
|||
69eb87e358
|
|||
8eab11479c
|
|||
ac93e9e631
|
|||
c1dd20ec4f
|
|||
2d60a7bd5c
|
|||
6d7d9ade70
|
|||
72dbc8b858
|
|||
32d70abf44
|
|||
c076090e03
|
|||
6c2717c56b
|
|||
816182c87b
|
|||
492d3a107a
|
|||
962cd01eac
|
|||
d66363da46
|
|||
7b25f86d6b
|
|||
5a999a0494
|
|||
ec18ac45e4
|
|||
560b6d3221
|
|||
b946dc5a92
|
|||
ea7542a248
|
|||
4541699ec3
|
|||
87d50a05dd
|
|||
379a5d4e3e
|
|||
6a08cf0b62
|
|||
849305bc8f
|
|||
a5c900b9fe
|
|||
70b488de66
|
|||
58f50b0ea6
|
|||
bc5beb4b96
|
|||
2a0aa2abe2
|
|||
f94f33862f
|
|||
b7cedf5444
|
|||
f81369944c
|
|||
6072970bf0
|
|||
8659627171
|
|||
d5786aa5ab
|
|||
ba7d801330
|
|||
19ce57e680
|
@@ -87,7 +87,9 @@ HEADERS += \
|
||||
src/ATBAPP/support/DBusControllerInterface.h \
|
||||
src/ATBAPP/support/JSON.h \
|
||||
src/ATBAPP/support/PTUSystem.h \
|
||||
src/ATBAPP/support/PersistentData.h
|
||||
src/ATBAPP/support/PersistentData.h \
|
||||
src/ATBAPP/support/Ticket.h \
|
||||
src/ATBAPP/support/TicketUtils.h
|
||||
|
||||
SOURCES += \
|
||||
src/ATBAPP/ATBHealthEvent.cpp \
|
||||
@@ -99,7 +101,9 @@ SOURCES += \
|
||||
src/ATBAPP/support/DBusControllerInterface.cpp \
|
||||
src/ATBAPP/support/JSON.cpp \
|
||||
src/ATBAPP/support/PTUSystem.cpp \
|
||||
src/ATBAPP/support/PersistentData.cpp
|
||||
src/ATBAPP/support/PersistentData.cpp \
|
||||
src/ATBAPP/support/Ticket.cpp \
|
||||
src/ATBAPP/support/TicketUtils.cpp
|
||||
|
||||
DISTFILES += \
|
||||
generate-version.sh
|
||||
|
File diff suppressed because it is too large
Load Diff
@@ -7,6 +7,7 @@
|
||||
#include "src/ATBAPP/DeviceControllerInterface.h"
|
||||
#include "src/ATBAPP/ATBAPPplugin.h"
|
||||
#include "src/ATBAPP/DeviceControllerDiag.h"
|
||||
#include "src/ATBAPP/support/Ticket.h"
|
||||
|
||||
#include "version.h"
|
||||
|
||||
@@ -20,11 +21,11 @@
|
||||
class DBusControllerInterface;
|
||||
class QTextCodec;
|
||||
|
||||
|
||||
using namespace nsDeviceControllerInterface;
|
||||
|
||||
class QSettings;
|
||||
|
||||
|
||||
class ATBDeviceControllerPlugin :
|
||||
public DeviceControllerInterface
|
||||
{
|
||||
@@ -43,10 +44,13 @@ public:
|
||||
// interface:
|
||||
PLUGIN_STATE initDCPlugin(QObject *eventReceiver, const QSettings & settings);
|
||||
|
||||
void sendDeviceParameter(const QJsonObject & jsonObject);
|
||||
|
||||
// TASKS: Cash handling -------------------------------------------------------
|
||||
void requestStartCashInput(const QString & amount);
|
||||
void requestStopCashInput();
|
||||
void cashCollect();
|
||||
void cashCollect(const QString & amount);
|
||||
void cashAbort();
|
||||
|
||||
// read coin/cash processing variants -----------------------------------------
|
||||
@@ -94,8 +98,6 @@ private:
|
||||
QString errorDescription;
|
||||
QString pluginInfo;
|
||||
|
||||
QList<int> templateList;
|
||||
|
||||
QString serialPortName;
|
||||
|
||||
bool useDebug;
|
||||
@@ -128,11 +130,30 @@ private:
|
||||
// counts failed hw->log_chkIfVaultRecordAvailable()
|
||||
int accountCheckCounter;
|
||||
|
||||
// counts faild hw->prn-getPrintResult()
|
||||
int printResultCheckCounter;
|
||||
|
||||
// dbus
|
||||
int init_sc_dbus();
|
||||
|
||||
// printer privates ----------------------------------------------------------------------------
|
||||
Ticket * currentTicket;
|
||||
QLocale printerLocale;
|
||||
|
||||
QHash<TICKET_VARIANT, QList<quint8>> ticketTemplateList;
|
||||
|
||||
void initTicketTemplateList(const QSettings * settings);
|
||||
void prepareDynTemplateData();
|
||||
|
||||
void private_setupDynTemplateData_DEFAULT(struct T_dynDat *dynTicketData, Ticket *ticket);
|
||||
void private_setupDynTemplateData_FIXED_PRICE(struct T_dynDat *dynTicketData, Ticket *ticket);
|
||||
void private_setupDynTemplateData_START_RECEIPT(struct T_dynDat *dynTicketData, Ticket *ticket);
|
||||
void private_setupDynTemplatData_STOP_RECEIPT(struct T_dynDat *dynTicketData, Ticket *ticket);
|
||||
void private_setupDynTemplatData_FOOD_STAMP(struct T_dynDat *dynTicketData, Ticket *ticket);
|
||||
void private_setupDynTemplatData_FINE_PAYMENT(struct T_dynDat *dynTicketData, Ticket *ticket);
|
||||
void private_setupDynTemplatData_FREE_TICKET(struct T_dynDat *dynTicketData, Ticket *ticket);
|
||||
// ---------------------------------------------------------------------------------------------
|
||||
|
||||
private slots:
|
||||
// printer
|
||||
|
||||
@@ -142,6 +163,8 @@ private slots:
|
||||
void onPrinterWaitForPrintingTicket();
|
||||
void onPrinterWaitForPrintingReceipt();
|
||||
|
||||
void onPrinterPrepareDynTemplateData();
|
||||
|
||||
void onPrintFinishedOK();
|
||||
void onPrintFinishedERR();
|
||||
|
||||
|
@@ -15,7 +15,7 @@ class ATBMachineEvent : public QEvent
|
||||
public:
|
||||
explicit ATBMachineEvent(const QString & id,
|
||||
const QString & deviceName, // PTU/PRINTER/DC/...
|
||||
EVENT_CLASS eventClass, // reason of event: Error/Warning/Alarm
|
||||
EVENT_CLASS eventClass, // reason of event: Error/Warning/Alarm
|
||||
const QString & name, // 'Event': "E001", "W003"
|
||||
const int state,
|
||||
const QString & parameter,
|
||||
|
@@ -5,6 +5,11 @@
|
||||
#include <QUuid>
|
||||
#include <QDebug>
|
||||
|
||||
#include <QProcess>
|
||||
|
||||
#include "support/JSON.h"
|
||||
|
||||
|
||||
DeviceControllerDiag::DeviceControllerDiag(PersistentData *pData, QObject *parent)
|
||||
: QObject(parent)
|
||||
, coinProcessorType(nsDeviceControllerInterface::COIN_PROCESSOR::ESCROW)
|
||||
@@ -12,10 +17,13 @@ DeviceControllerDiag::DeviceControllerDiag(PersistentData *pData, QObject *paren
|
||||
, eventReceiver(nullptr)
|
||||
, isRequestRunning(false)
|
||||
, flagInterruptDiag(false)
|
||||
, lastState(DeviceController::State::INITIAL_STATE)
|
||||
, _isErrorState(false)
|
||||
, pData(pData)
|
||||
, E255counter(0)
|
||||
{
|
||||
diagRequestTimeoutTimer = new QTimer(this);
|
||||
diagRequestTimeoutTimer->setInterval(1000*20); // 20s
|
||||
diagRequestTimeoutTimer->setInterval(1000*45);
|
||||
diagRequestTimeoutTimer->setSingleShot(true);
|
||||
connect(diagRequestTimeoutTimer, &QTimer::timeout, this, &DeviceControllerDiag::onDiagRequestTimeoutTimerTimeout);
|
||||
}
|
||||
@@ -31,6 +39,17 @@ void DeviceControllerDiag::init(hwinf *hw, QObject* eventReceiver)
|
||||
}
|
||||
|
||||
|
||||
void DeviceControllerDiag::diagReInit()
|
||||
{
|
||||
this->machineEventSet.clear();
|
||||
this->_isErrorState = false;
|
||||
}
|
||||
|
||||
void DeviceControllerDiag::setTimeout(int timeout)
|
||||
{
|
||||
this->diagRequestTimeoutTimer->setInterval(1000 * timeout);
|
||||
}
|
||||
|
||||
void DeviceControllerDiag::diagRequest()
|
||||
{
|
||||
qCritical() << "DeviceControllerDiag::diagRequest()";
|
||||
@@ -62,14 +81,46 @@ void DeviceControllerDiag::onDiagRequestTimeoutTimerTimeout()
|
||||
this->flagInterruptDiag = true;
|
||||
}
|
||||
|
||||
|
||||
bool DeviceControllerDiag::isErrorState()
|
||||
{
|
||||
return this->_isErrorState;
|
||||
}
|
||||
|
||||
bool DeviceControllerDiag::isOperatingState()
|
||||
{
|
||||
return !this->_isErrorState;
|
||||
}
|
||||
|
||||
QSet<DeviceController::State> DeviceControllerDiag::getCurrentMachineState()
|
||||
{
|
||||
return this->machineEventSet;
|
||||
}
|
||||
|
||||
|
||||
|
||||
void DeviceControllerDiag::private_startDiag()
|
||||
{
|
||||
// check for DiagRequestTimeoutTimerTimeout:
|
||||
if (this->flagInterruptDiag) {
|
||||
qCritical() << "DeviceControllerDiag::private_startDiag() interrupted!";
|
||||
this->private_sendDiagEvent(DeviceController::State::E255);
|
||||
this->private_setDiagEvent(DeviceController::State::E255);
|
||||
this->isRequestRunning = false;
|
||||
this->flagInterruptDiag = false;
|
||||
if (this->E255counter > 5) {
|
||||
this->restartCArun();
|
||||
}
|
||||
else {
|
||||
this->E255counter++;
|
||||
|
||||
// try it again, until success:
|
||||
QTimer::singleShot(400, this, &DeviceControllerDiag::diagRequest);
|
||||
/**
|
||||
* But please note:
|
||||
* - diag does currently not stop suspend (start a background task)
|
||||
* - diag is called again in ModeOOO wokeup()
|
||||
*/
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -84,6 +135,7 @@ void DeviceControllerDiag::private_startDiag()
|
||||
qCritical() << "DeviceControllerDiag::private_startDiag() DCdata is +++not+++ valid";
|
||||
|
||||
// try it again
|
||||
hw->dc_autoRequest(true);
|
||||
QTimer::singleShot(200, this, &DeviceControllerDiag::private_startDiag);
|
||||
}
|
||||
}
|
||||
@@ -91,8 +143,8 @@ void DeviceControllerDiag::private_startDiag()
|
||||
void DeviceControllerDiag::sys_superviseSystem()
|
||||
{ // this function proofs if vending is possible depending of doors state
|
||||
|
||||
struct T_dynamicCondition dynMaCond;
|
||||
struct T_moduleCondition modCond;
|
||||
struct T_dynamicCondition dynMaCond = {};
|
||||
struct T_moduleCondition modCond = {};
|
||||
|
||||
|
||||
qCritical() << " sys_superviseSystem()";
|
||||
@@ -101,9 +153,11 @@ void DeviceControllerDiag::sys_superviseSystem()
|
||||
// check for DiagRequestTimeoutTimerTimeout:
|
||||
if (this->flagInterruptDiag) {
|
||||
qCritical() << "DeviceControllerDiag::sys_superviseSystem() interrupted!";
|
||||
this->private_sendDiagEvent(DeviceController::State::E255);
|
||||
this->private_setDiagEvent(DeviceController::State::E255);
|
||||
this->flagInterruptDiag = false;
|
||||
this->isRequestRunning = false;
|
||||
if (this->E255counter > 5) { this->restartCArun(); }
|
||||
else { this->E255counter++; }
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -111,9 +165,12 @@ 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);
|
||||
hw->dc_autoRequest(true);
|
||||
this->private_setDiagEvent(DeviceController::State::M0254);
|
||||
this->diagRequestTimeoutTimer->stop();
|
||||
this->isRequestRunning = false;
|
||||
if (this->E255counter > 5) { this->restartCArun(); }
|
||||
else { this->E255counter++; }
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -126,7 +183,7 @@ void DeviceControllerDiag::sys_superviseSystem()
|
||||
{
|
||||
// noch keine Testergebnisse
|
||||
if (dynMaCond.startupTestIsRunning) {
|
||||
// TODO?
|
||||
qCritical() << " startupTestIsRunning --> call again";
|
||||
}
|
||||
|
||||
|
||||
@@ -136,18 +193,6 @@ void DeviceControllerDiag::sys_superviseSystem()
|
||||
return;
|
||||
}
|
||||
|
||||
// all doors: 99: undefined 0:closed 1:open
|
||||
if (dynMaCond.lowerDoor || dynMaCond.upperDoor) {
|
||||
// Service or battery door is open, goto INTRUSION MODE
|
||||
qCritical() << "DeviceControllerDiag::sys_superviseSystem() Service or battery door is open, goto INTRUSION MODE";
|
||||
this->private_sendDiagEvent(DeviceController::State::E253);
|
||||
}
|
||||
if (dynMaCond.middleDoor) {
|
||||
// vault door is open, goto INTRUSION MODE
|
||||
qCritical() << "DeviceControllerDiag::sys_superviseSystem() vault door is open, goto INTRUSION MODE";
|
||||
this->private_sendDiagEvent(DeviceController::State::E252);
|
||||
}
|
||||
|
||||
qCritical() << " --> call sub_componentAssessment()";
|
||||
|
||||
sub_componentAssessment();
|
||||
@@ -159,13 +204,13 @@ void DeviceControllerDiag::sub_componentAssessment()
|
||||
{
|
||||
bool flag_sendOperate = true;
|
||||
|
||||
struct T_moduleCondition modCond;
|
||||
struct T_moduleCondition modCond = {};
|
||||
hw->sys_getDeviceConditions(&modCond);
|
||||
|
||||
struct T_dynamicCondition dynMaCond;
|
||||
struct T_dynamicCondition dynMaCond = {};
|
||||
hw->sys_getDynMachineConditions(&dynMaCond);
|
||||
|
||||
struct T_devices devPara;
|
||||
struct T_devices devPara = {};
|
||||
hw->sys_restoreDeviceParameter(&devPara);
|
||||
|
||||
// store some interesting results:
|
||||
@@ -178,35 +223,50 @@ void DeviceControllerDiag::sub_componentAssessment()
|
||||
|
||||
if (dynMaCond.onAlarm>0) {
|
||||
flag_sendOperate = false;
|
||||
this->private_sendDiagEvent(DeviceController::State::A000);
|
||||
this->private_setDiagEvent(DeviceController::State::A000);
|
||||
}
|
||||
|
||||
// check for open doors
|
||||
// all doors: 99: undefined 0:closed 1:open
|
||||
if (dynMaCond.lowerDoor || dynMaCond.upperDoor) {
|
||||
// Service or battery door is open
|
||||
flag_sendOperate = false;
|
||||
qCritical() << "DeviceControllerDiag::sys_superviseSystem() Service or battery door is open, goto INTRUSION MODE";
|
||||
this->private_setDiagEvent(DeviceController::State::M0253);
|
||||
}
|
||||
if (dynMaCond.middleDoor) {
|
||||
// vault door is open
|
||||
flag_sendOperate = false;
|
||||
qCritical() << "DeviceControllerDiag::sys_superviseSystem() vault door is open, goto INTRUSION MODE";
|
||||
this->private_setDiagEvent(DeviceController::State::M0252);
|
||||
}
|
||||
|
||||
// check for invalid states:
|
||||
|
||||
if (modCond.rtc>=200) {
|
||||
flag_sendOperate = false;
|
||||
this->private_sendDiagEvent(DeviceController::State::E002);
|
||||
this->private_setDiagEvent(DeviceController::State::E002);
|
||||
}
|
||||
if (modCond.printer==200 || modCond.printer==201) { // 200: not connected 201: printer-HW-error 202: no paper
|
||||
flag_sendOperate = false;
|
||||
this->private_sendDiagEvent(DeviceController::State::E020);
|
||||
this->private_setDiagEvent(DeviceController::State::E020);
|
||||
}
|
||||
if (modCond.printer==202) {
|
||||
flag_sendOperate = false;
|
||||
this->private_sendDiagEvent(DeviceController::State::E018);
|
||||
this->private_setDiagEvent(DeviceController::State::E018);
|
||||
}
|
||||
|
||||
if (modCond.coinBlocker>=200) {
|
||||
flag_sendOperate = false;
|
||||
this->private_sendDiagEvent(DeviceController::State::E025);
|
||||
this->private_setDiagEvent(DeviceController::State::E025);
|
||||
}
|
||||
if (modCond.mdbBus>=200) {
|
||||
flag_sendOperate = false;
|
||||
this->private_sendDiagEvent(DeviceController::State::E034);
|
||||
this->private_setDiagEvent(DeviceController::State::E034);
|
||||
}
|
||||
if (modCond.intEe>=200) {
|
||||
flag_sendOperate = false;
|
||||
this->private_sendDiagEvent(DeviceController::State::E011);
|
||||
this->private_setDiagEvent(DeviceController::State::E011);
|
||||
}
|
||||
|
||||
// 2023-07-26: workaround for 00281/Szeged --------------------------------------------------------------
|
||||
@@ -216,20 +276,24 @@ void DeviceControllerDiag::sub_componentAssessment()
|
||||
if (devPara.kindOfCoinChecker > 0) {
|
||||
if (modCond.coinSafe==201) { // full
|
||||
flag_sendOperate = false;
|
||||
this->private_sendDiagEvent(DeviceController::State::E007);
|
||||
this->private_setDiagEvent(DeviceController::State::E007);
|
||||
}
|
||||
if (modCond.coinSafe==200) { // 200: kasse fehlt 201: voll 100:fast voll 1:ok
|
||||
flag_sendOperate = false;
|
||||
this->private_sendDiagEvent(DeviceController::State::E009);
|
||||
this->private_setDiagEvent(DeviceController::State::E009);
|
||||
}
|
||||
if (modCond.coinEscrow>=200) {
|
||||
flag_sendOperate = false;
|
||||
this->private_sendDiagEvent(DeviceController::State::E010);
|
||||
// coinEscrow>200 is considered a warning:
|
||||
this->private_setDiagEvent(DeviceController::State::W010);
|
||||
}
|
||||
}
|
||||
// -----------------------------------------------------------------------------------------------
|
||||
|
||||
switch (devPara.kindOfCoinChecker) {
|
||||
case 0:
|
||||
this->coinProcessorType = nsDeviceControllerInterface::COIN_PROCESSOR::NONE;
|
||||
break;
|
||||
case 1:
|
||||
case 2:
|
||||
this->coinProcessorType = nsDeviceControllerInterface::COIN_PROCESSOR::ESCROW;
|
||||
@@ -243,15 +307,16 @@ void DeviceControllerDiag::sub_componentAssessment()
|
||||
{
|
||||
if (modCond.coinEscrow>=200) {
|
||||
flag_sendOperate = false;
|
||||
this->private_sendDiagEvent(DeviceController::State::E010);
|
||||
// coinEscrow>200 is considered a warning:
|
||||
this->private_setDiagEvent(DeviceController::State::W010);
|
||||
}
|
||||
if (modCond.coinSafe==201) { // full
|
||||
flag_sendOperate = false;
|
||||
this->private_sendDiagEvent(DeviceController::State::E007);
|
||||
this->private_setDiagEvent(DeviceController::State::E007);
|
||||
}
|
||||
if (modCond.coinSafe==200) { // 200: kasse fehlt 201: voll 100:fast voll 1:ok
|
||||
flag_sendOperate = false;
|
||||
this->private_sendDiagEvent(DeviceController::State::E009);
|
||||
this->private_setDiagEvent(DeviceController::State::E009);
|
||||
}
|
||||
} else
|
||||
if (devPara.kindOfCoinChecker==3)
|
||||
@@ -259,15 +324,15 @@ void DeviceControllerDiag::sub_componentAssessment()
|
||||
if (modCond.changer>=200) {
|
||||
// Fehler Münzver.
|
||||
flag_sendOperate = false;
|
||||
this->private_sendDiagEvent(DeviceController::State::E026);
|
||||
this->private_setDiagEvent(DeviceController::State::E026);
|
||||
}
|
||||
if (modCond.coinSafe==201) { // full
|
||||
flag_sendOperate = false;
|
||||
this->private_sendDiagEvent(DeviceController::State::E007);
|
||||
this->private_setDiagEvent(DeviceController::State::E007);
|
||||
}
|
||||
if (modCond.coinSafe == 200) { // 200: kasse fehlt 201: voll 100:fast voll 1:ok
|
||||
flag_sendOperate = false;
|
||||
this->private_sendDiagEvent(DeviceController::State::E009);
|
||||
this->private_setDiagEvent(DeviceController::State::E009);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -296,61 +361,86 @@ void DeviceControllerDiag::sub_componentAssessment()
|
||||
|
||||
if (dynMaCond.modeAbrech>0) {
|
||||
flag_sendOperate = false;
|
||||
this->private_sendDiagEvent(DeviceController::State::E011);
|
||||
this->private_setDiagEvent(DeviceController::State::E011);
|
||||
}
|
||||
|
||||
if (dynMaCond.nowCardTest>0) {
|
||||
flag_sendOperate = false;
|
||||
this->private_sendDiagEvent(DeviceController::State::E072);
|
||||
this->private_setDiagEvent(DeviceController::State::M0072);
|
||||
}
|
||||
|
||||
if (dynMaCond.startupTestIsRunning>0) {
|
||||
flag_sendOperate = false;
|
||||
this->private_sendDiagEvent(DeviceController::State::E073);
|
||||
this->private_setDiagEvent(DeviceController::State::M0073);
|
||||
}
|
||||
|
||||
if (modCond.voltage>=200) {
|
||||
flag_sendOperate = false;
|
||||
this->private_sendDiagEvent(DeviceController::State::E003);
|
||||
this->private_setDiagEvent(DeviceController::State::E003);
|
||||
}
|
||||
if (modCond.temper>=200) {
|
||||
flag_sendOperate = false;
|
||||
this->private_sendDiagEvent(DeviceController::State::E004);
|
||||
this->private_setDiagEvent(DeviceController::State::W004);
|
||||
}
|
||||
|
||||
// check for warnings
|
||||
if (modCond.printer>=100 && modCond.printer<200) {
|
||||
flag_sendOperate = false;
|
||||
this->private_sendDiagEvent(DeviceController::State::W001);
|
||||
this->private_setDiagEvent(DeviceController::State::W001);
|
||||
}
|
||||
if (modCond.coinSafe>=100 && modCond.coinSafe<200) {
|
||||
flag_sendOperate = false;
|
||||
this->private_sendDiagEvent(DeviceController::State::W002);
|
||||
this->private_setDiagEvent(DeviceController::State::W002);
|
||||
}
|
||||
if (modCond.voltage>=100 && modCond.voltage<200) {
|
||||
flag_sendOperate = false;
|
||||
this->private_sendDiagEvent(DeviceController::State::W003);
|
||||
this->private_setDiagEvent(DeviceController::State::W003);
|
||||
}
|
||||
if (modCond.temper>=100 && modCond.temper<200) {
|
||||
flag_sendOperate = false;
|
||||
this->private_sendDiagEvent(DeviceController::State::W004);
|
||||
this->private_setDiagEvent(DeviceController::State::W004);
|
||||
}
|
||||
|
||||
if (flag_sendOperate) {
|
||||
this->private_sendDiagEvent(DeviceController::State::O000);
|
||||
this->private_setDiagEvent(DeviceController::State::O000);
|
||||
}
|
||||
|
||||
|
||||
// compare machineEventSets
|
||||
// New events: present in current but not previous
|
||||
QSet<DeviceController::State> newEvents = this->machineEventSet - this->previousMachineEventSet;
|
||||
|
||||
// Reset events: present in previous but not current
|
||||
QSet<DeviceController::State> resetEvents = this->previousMachineEventSet - this->machineEventSet;
|
||||
|
||||
// Triggering Actions
|
||||
// Iterate through the results
|
||||
for (const DeviceController::State& event : newEvents) {
|
||||
private_sendDiagEvent(event, DeviceController::Action::SET); // New event detected
|
||||
}
|
||||
|
||||
// Proposal: send reset
|
||||
/*
|
||||
for (const DeviceController::State& event : resetEvents) {
|
||||
private_sendDiagEvent(event, DeviceController::Action::RESET); // Event no longer present
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
|
||||
// finish diag
|
||||
|
||||
this->diagRequestTimeoutTimer->stop();
|
||||
this->isRequestRunning = false;
|
||||
this->flagInterruptDiag = false;
|
||||
|
||||
this->previousMachineEventSet = machineEventSet;
|
||||
this->machineEventSet.clear();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @brief DeviceControllerDiag::private_sendDiagEvent
|
||||
* @brief DeviceControllerDiag::private_setDiagEvent
|
||||
* @param result - result value from 'sub_componentAssessment()',
|
||||
* - 0x00 everything is fine
|
||||
* - 0xFF on timer interrupt
|
||||
@@ -358,26 +448,21 @@ void DeviceControllerDiag::sub_componentAssessment()
|
||||
* - 0xFD Service or battery door is open
|
||||
* - 0xFE vault door is open
|
||||
*/
|
||||
void DeviceControllerDiag::private_sendDiagEvent(DeviceController::State result)
|
||||
void DeviceControllerDiag::private_setDiagEvent(DeviceController::State result)
|
||||
{
|
||||
qCritical() << "DeviceControllerDiag::private_sendDiagEvent() result: " << result;
|
||||
|
||||
qCritical() << "DeviceControllerDiag::private_setDiagEvent() result: " << result;
|
||||
|
||||
if (this->eventReceiver == nullptr) {
|
||||
qCritical() << "DeviceControllerDiag: no eventReceiver";
|
||||
return;
|
||||
}
|
||||
|
||||
if (machineEventSet.contains(result)) {
|
||||
// do not send already sent events
|
||||
qCritical() << " ... is in machineEventList";
|
||||
return;
|
||||
}
|
||||
else {
|
||||
machineEventSet.insert(result);
|
||||
}
|
||||
machineEventSet.insert(result);
|
||||
}
|
||||
|
||||
|
||||
void DeviceControllerDiag::private_sendDiagEvent(DeviceController::State result, DeviceController::Action action)
|
||||
{
|
||||
QString eventId = QUuid::createUuid().toString(QUuid::WithoutBraces).mid(0, 8);
|
||||
|
||||
QString eventName = QMetaEnum::fromType<DeviceController::State>().valueToKey(result);;
|
||||
@@ -385,99 +470,124 @@ void DeviceControllerDiag::private_sendDiagEvent(DeviceController::State result)
|
||||
QString parameter;
|
||||
switch (result) {
|
||||
|
||||
case DeviceController::State::INITIAL_STATE:
|
||||
break;
|
||||
case DeviceController::State::A000: // alarm / intrusion
|
||||
eventClass = EVENT_CLASS::ALARM;
|
||||
parameter = "alarm / intrusion";
|
||||
this->_isErrorState = true;
|
||||
break;
|
||||
case DeviceController::State::E002: // real time clock error
|
||||
eventClass = EVENT_CLASS::ERROR;
|
||||
parameter = "real time clock error";
|
||||
this->_isErrorState = true;
|
||||
break;
|
||||
case DeviceController::State::E003: // voltage error
|
||||
eventClass = EVENT_CLASS::ERROR;
|
||||
parameter = "voltage error";
|
||||
this->_isErrorState = true;
|
||||
break;
|
||||
case DeviceController::State::E004: // temperature error
|
||||
eventClass = EVENT_CLASS::ERROR;
|
||||
parameter = "temperature error";
|
||||
this->_isErrorState = true;
|
||||
break;
|
||||
case DeviceController::State::E007: // coin safe full
|
||||
eventClass = EVENT_CLASS::ERROR;
|
||||
parameter = "coin safe full";
|
||||
this->_isErrorState = true;
|
||||
break;
|
||||
case DeviceController::State::E008: // bill acceptor full
|
||||
eventClass = EVENT_CLASS::ERROR;
|
||||
parameter = "bill acceptor full";
|
||||
this->_isErrorState = true;
|
||||
break;
|
||||
case DeviceController::State::E009: // no cash box
|
||||
eventClass = EVENT_CLASS::ERROR;
|
||||
parameter = "no cash box";
|
||||
this->_isErrorState = true;
|
||||
break;
|
||||
case DeviceController::State::E010: // coin escrow
|
||||
eventClass = EVENT_CLASS::ERROR;
|
||||
parameter = "coin escrow";
|
||||
this->_isErrorState = true;
|
||||
break;
|
||||
case DeviceController::State::W010: // coin escrow
|
||||
eventClass = EVENT_CLASS::WARNING;
|
||||
parameter = "coin escrow";
|
||||
break;
|
||||
case DeviceController::State::E011: // mem error int.ee.
|
||||
eventClass = EVENT_CLASS::ERROR;
|
||||
parameter = "mem error int.ee.";
|
||||
this->_isErrorState = true;
|
||||
break;
|
||||
case DeviceController::State::E018: // no paper
|
||||
eventClass = EVENT_CLASS::ERROR;
|
||||
parameter = "no paper";
|
||||
this->_isErrorState = true;
|
||||
break;
|
||||
case DeviceController::State::E020: // printer error
|
||||
eventClass = EVENT_CLASS::ERROR;
|
||||
parameter = "printer error";
|
||||
this->_isErrorState = true;
|
||||
break;
|
||||
case DeviceController::State::E025: // coin blocker
|
||||
eventClass = EVENT_CLASS::ERROR;
|
||||
parameter = "coin blocker";
|
||||
this->_isErrorState = true;
|
||||
break;
|
||||
case DeviceController::State::E026: // error coin validator
|
||||
eventClass = EVENT_CLASS::ERROR;
|
||||
parameter = "error coin validator";
|
||||
this->_isErrorState = true;
|
||||
break;
|
||||
case DeviceController::State::E034: // mdb error
|
||||
eventClass = EVENT_CLASS::ERROR;
|
||||
parameter = "mdb error";
|
||||
this->_isErrorState = true;
|
||||
break;
|
||||
|
||||
case DeviceController::State::E071: // cash box change is ongoing
|
||||
case DeviceController::State::M0071: // cash box change is ongoing
|
||||
eventClass = EVENT_CLASS::STATE;
|
||||
parameter = "cash box change is ongoing";
|
||||
break;
|
||||
case DeviceController::State::E072: // card test running
|
||||
case DeviceController::State::M0072: // card test running
|
||||
eventClass = EVENT_CLASS::STATE;
|
||||
parameter = "card test running";
|
||||
break;
|
||||
case DeviceController::State::E073: // startup-test is running
|
||||
case DeviceController::State::M0073: // startup-test is running
|
||||
eventClass = EVENT_CLASS::STATE;
|
||||
parameter = "startup-test is running";
|
||||
break;
|
||||
|
||||
case DeviceController::State::E252: // cash box door open
|
||||
case DeviceController::State::M0252: // cash box door open
|
||||
eventClass = EVENT_CLASS::STATE;
|
||||
parameter = "cash box door open";
|
||||
break;
|
||||
case DeviceController::State::E253: // service or battery door open
|
||||
case DeviceController::State::M0253: // service or battery door open
|
||||
eventClass = EVENT_CLASS::STATE;
|
||||
parameter = "service or battery door open";
|
||||
break;
|
||||
case DeviceController::State::E254: // no valid data from DeviceController
|
||||
case DeviceController::State::M0254: // no valid data from DeviceController
|
||||
eventClass = EVENT_CLASS::STATE;
|
||||
parameter = "no valid data from DeviceController";
|
||||
break;
|
||||
case DeviceController::State::E255: // no valid data from DeviceController
|
||||
eventClass = EVENT_CLASS::STATE;
|
||||
parameter = "";
|
||||
qCritical() << " ... ignore " << QMetaEnum::fromType<DeviceController::State>().valueToKey(result);
|
||||
return;
|
||||
eventClass = EVENT_CLASS::ERROR;
|
||||
parameter = "no valid data from DeviceController";
|
||||
break;
|
||||
case DeviceController::State::O000: // everything is fine
|
||||
this->machineEventSet.clear();
|
||||
this->_isErrorState = false;
|
||||
eventClass = EVENT_CLASS::OPERATE;
|
||||
parameter = "";
|
||||
qCritical() << " ... everything fine";
|
||||
if (this->lastState == DeviceController::State::O000) {
|
||||
qCritical() << " ... everything fine, no state change -> skip sending";
|
||||
return;
|
||||
}
|
||||
else {
|
||||
qCritical() << " ... everything fine";
|
||||
}
|
||||
break;
|
||||
|
||||
case DeviceController::State::W001: // paper low
|
||||
@@ -496,23 +606,46 @@ void DeviceControllerDiag::private_sendDiagEvent(DeviceController::State result)
|
||||
eventClass = EVENT_CLASS::WARNING;
|
||||
parameter = "temperatur warning";
|
||||
break;
|
||||
case DeviceController::State::W255: // restart carun
|
||||
eventClass = EVENT_CLASS::WARNING;
|
||||
parameter = "restart carun";
|
||||
break;
|
||||
}
|
||||
|
||||
this->lastState = result;
|
||||
|
||||
/**
|
||||
* Variant: send 'parameter' as JSON:
|
||||
*
|
||||
JSON::setPrettySerialize(false);
|
||||
JSON::JsonObject json = JSON::objectBuilder()
|
||||
->set("description", parameter)
|
||||
->create();
|
||||
QString parameterJsonString = JSON::serialize(json);
|
||||
*/
|
||||
|
||||
ATBMachineEvent *machineEvent = new ATBMachineEvent(
|
||||
eventId,
|
||||
"DC",
|
||||
eventClass,
|
||||
eventName,
|
||||
1,
|
||||
action, // eventState
|
||||
parameter,
|
||||
"" // second level info
|
||||
);
|
||||
|
||||
//emit diagResponse(machineEvent);
|
||||
|
||||
QCoreApplication::postEvent(eventReceiver, machineEvent);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* reset / restart / reinit deviceController
|
||||
*/
|
||||
void DeviceControllerDiag::restartCArun()
|
||||
{
|
||||
this->E255counter = 0;
|
||||
this->private_setDiagEvent(DeviceController::State::W255);
|
||||
QProcess::startDetached("/bin/systemctl", {"restart", "carun"});
|
||||
}
|
||||
|
@@ -29,6 +29,7 @@ namespace DeviceController {
|
||||
E008,
|
||||
E009,
|
||||
E010,
|
||||
W010, // Coin Escrow
|
||||
E011,
|
||||
|
||||
E018,
|
||||
@@ -40,21 +41,34 @@ namespace DeviceController {
|
||||
|
||||
E034,
|
||||
|
||||
E071,
|
||||
E072,
|
||||
E073,
|
||||
M0071, // cashbox change is ongoing
|
||||
M0072, // cardtest is running
|
||||
M0073, // startup-test is running
|
||||
|
||||
M0252, // cashbox door open
|
||||
M0253, // service or battery door is open
|
||||
M0254, // no valid data from DC
|
||||
|
||||
E252,
|
||||
E253,
|
||||
E254,
|
||||
E255,
|
||||
|
||||
W001,
|
||||
W002,
|
||||
W003,
|
||||
W004
|
||||
W004,
|
||||
|
||||
W255,
|
||||
|
||||
INITIAL_STATE
|
||||
};
|
||||
Q_ENUM_NS(State)
|
||||
|
||||
|
||||
enum Action {
|
||||
SET = 1,
|
||||
RESET = 0
|
||||
};
|
||||
Q_ENUM_NS(Action)
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -70,9 +84,32 @@ public:
|
||||
nsDeviceControllerInterface::COIN_PROCESSOR coinProcessorType;
|
||||
nsDeviceControllerInterface::BILL_ACCEPTOR billAcceptor;
|
||||
|
||||
/**
|
||||
* return true, if machineEventSet contains an error
|
||||
*/
|
||||
bool isErrorState();
|
||||
bool isOperatingState();
|
||||
QSet<DeviceController::State> getCurrentMachineState();
|
||||
|
||||
void setTimeout(int timeout);
|
||||
|
||||
public slots:
|
||||
/**
|
||||
* start diag request
|
||||
*/
|
||||
void diagRequest();
|
||||
|
||||
/**
|
||||
* reset / re-init diag request.
|
||||
* Called e.g. when doors are closed.
|
||||
*/
|
||||
void diagReInit();
|
||||
|
||||
/**
|
||||
* reset / restart / reinit deviceController
|
||||
*/
|
||||
void restartCArun();
|
||||
|
||||
signals:
|
||||
void diagResponse(ATBMachineEvent* machineEvent);
|
||||
|
||||
@@ -91,19 +128,24 @@ private:
|
||||
|
||||
int lastVoltage;
|
||||
|
||||
DeviceController::State lastState;
|
||||
QSet<DeviceController::State> machineEventSet;
|
||||
QSet<DeviceController::State> previousMachineEventSet;
|
||||
bool _isErrorState;
|
||||
|
||||
PersistentData* pData;
|
||||
|
||||
int E255counter;
|
||||
|
||||
private slots:
|
||||
void onDiagRequestTimeoutTimerTimeout();
|
||||
|
||||
void private_startDiag(); // diag entry method
|
||||
void private_sendDiagEvent(DeviceController::State result);
|
||||
void private_setDiagEvent(DeviceController::State result);
|
||||
void private_sendDiagEvent(DeviceController::State result, DeviceController::Action action);
|
||||
|
||||
void sys_superviseSystem();
|
||||
|
||||
|
||||
};
|
||||
|
||||
#endif // DEVICECONTROLLERDIAG_H
|
||||
|
@@ -5,6 +5,8 @@
|
||||
|
||||
#include <QSettings>
|
||||
#include <QString>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QHash>
|
||||
|
||||
#include "ATBAPPplugin.h"
|
||||
|
||||
@@ -39,6 +41,12 @@ public:
|
||||
virtual nsDeviceControllerInterface::PLUGIN_STATE initDCPlugin(QObject *eventReceiver,
|
||||
const QSettings & settings) = 0;
|
||||
|
||||
/**
|
||||
* e.g. send location
|
||||
*/
|
||||
virtual void sendDeviceParameter(const QJsonObject & jsonObject) = 0;
|
||||
|
||||
|
||||
// TASKS: Cash handling -------------------------------------------------------
|
||||
/**
|
||||
* enables coin input
|
||||
@@ -53,9 +61,10 @@ public:
|
||||
virtual void requestStopCashInput() = 0;
|
||||
|
||||
/**
|
||||
* called e.g. on Button "NEXT" in pay-up (direct coin input)
|
||||
* called e.g. after printing
|
||||
*/
|
||||
virtual void cashCollect() = 0;
|
||||
virtual void cashCollect(const QString & amount) = 0;
|
||||
virtual void cashAbort() = 0;
|
||||
|
||||
// TASKS: Account -------------------------------------------------------------
|
||||
@@ -131,6 +140,14 @@ signals:
|
||||
const QString & errorCode,
|
||||
const QString & errorDescription);
|
||||
|
||||
/**
|
||||
* emitted if cashPayment has been finished, e.g. in result to task cashCollect():
|
||||
* if coins in changer must be given back to user.
|
||||
*/
|
||||
void cashPaymentChanging(nsDeviceControllerInterface::RESULT_STATE resultState,
|
||||
const QString & changeValue, // amount changed by changer/escrow
|
||||
const QString & errorCode,
|
||||
const QString & errorDescription);
|
||||
/**
|
||||
* emitted if cashPayment has been finished, e.g. in result to task cashCollect():
|
||||
* -> ticket should be printed sucessfully
|
||||
@@ -138,7 +155,7 @@ signals:
|
||||
* Provides data for logging, especially changed value
|
||||
*/
|
||||
void cashPaymentFinished(nsDeviceControllerInterface::RESULT_STATE resultState,
|
||||
const QString & newCashValue, // total inserted amount amount
|
||||
const QString & newCashValue, // total inserted 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
|
||||
@@ -196,10 +213,11 @@ signals:
|
||||
|
||||
|
||||
Q_DECLARE_INTERFACE(DeviceControllerInterface,
|
||||
"eu.atb.ptu.plugin.DeviceControllerInterface/1.1.2")
|
||||
"eu.atb.ptu.plugin.DeviceControllerInterface/1.2.1")
|
||||
|
||||
|
||||
namespace nsDeviceControllerInterface {
|
||||
Q_NAMESPACE
|
||||
|
||||
enum class PLUGIN_STATE : quint8 {
|
||||
NOT_INITIALIZED = 0,
|
||||
@@ -224,16 +242,48 @@ namespace nsDeviceControllerInterface {
|
||||
|
||||
|
||||
enum class TICKET_VARIANT : quint8 {
|
||||
INVALID,
|
||||
NO_TICKET,
|
||||
PARKING_TICKET,
|
||||
PARKING_TICKET_CAR,
|
||||
PARKING_TICKET_VAN,
|
||||
PARKING_TICKET_CAMPER,
|
||||
DAY_TICKET,
|
||||
DAY_TICKET_ADULT,
|
||||
DAY_TICKET_TEEN,
|
||||
DAY_TICKET_CHILD,
|
||||
DAY_TICKET_CAR,
|
||||
DAY_TICKET_VAN,
|
||||
DAY_TICKET_CAMPER,
|
||||
RECEIPT,
|
||||
ERROR_RECEIPT,
|
||||
START_RECEIPT, // e.g. Szeged Start
|
||||
STOP_RECEIPT, // e.g. Szeged Stop
|
||||
FINE_PAYMENT, // e.g. Klaipeda
|
||||
FOOD_STAMP,
|
||||
FIXED_PRICE_1,
|
||||
FIXED_PRICE_2,
|
||||
FIXED_PRICE_3,
|
||||
FIXED_PRICE_4,
|
||||
FIXED_PRICE_5,
|
||||
FIXED_PRICE_6,
|
||||
FIXED_PRICE_7,
|
||||
FIXED_PRICE_8,
|
||||
FIXED_PRICE_9,
|
||||
FIXED_PRICE_10,
|
||||
FREE_TICKET
|
||||
};
|
||||
Q_ENUM_NS(TICKET_VARIANT)
|
||||
|
||||
inline uint qHash(const nsDeviceControllerInterface::TICKET_VARIANT &key, uint seed = 0)
|
||||
{
|
||||
return ::qHash(static_cast<quint8>(key), seed);
|
||||
}
|
||||
|
||||
enum class COIN_PROCESSOR : quint8 {
|
||||
CHANGER,
|
||||
ESCROW
|
||||
ESCROW,
|
||||
NONE
|
||||
};
|
||||
|
||||
enum class BILL_ACCEPTOR : quint8 {
|
||||
@@ -250,4 +300,6 @@ namespace nsDeviceControllerInterface {
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
|
||||
#endif // DEVICECONTROLLERINTERFACE_H
|
||||
|
@@ -30,7 +30,10 @@ PersistentData::PersistentData(const QString &datafileName, QObject *parent)
|
||||
|
||||
void PersistentData::serializeToFile()
|
||||
{
|
||||
this->save();
|
||||
if (this->isChangedFlag) {
|
||||
qCritical() << "PersistentData::isChanged -> save";
|
||||
this->save();
|
||||
}
|
||||
}
|
||||
|
||||
void PersistentData::save()
|
||||
@@ -44,6 +47,8 @@ void PersistentData::save()
|
||||
out << this->hash;
|
||||
fileOut.flush();
|
||||
fileOut.close();
|
||||
|
||||
this->isChangedFlag = false;
|
||||
}
|
||||
}
|
||||
|
||||
|
297
src/ATBAPP/support/Ticket.cpp
Normal file
297
src/ATBAPP/support/Ticket.cpp
Normal file
@@ -0,0 +1,297 @@
|
||||
#include "Ticket.h"
|
||||
|
||||
#include <QDebug>
|
||||
|
||||
Ticket::Ticket(TICKET_VARIANT ticketVariant, QObject *parent )
|
||||
: QObject(parent)
|
||||
, ticketVariant(ticketVariant)
|
||||
, _hasTemplateDynData(false)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
TICKET_VARIANT Ticket::variant()
|
||||
{
|
||||
return this->ticketVariant;
|
||||
}
|
||||
|
||||
QList<quint8> * Ticket::templateList()
|
||||
{
|
||||
return &(this->_templateList);
|
||||
}
|
||||
|
||||
bool Ticket::hasTemplateDynData()
|
||||
{
|
||||
return this->_hasTemplateDynData;
|
||||
}
|
||||
|
||||
quint8 Ticket::getCurrentProcessedTemplateNumber()
|
||||
{
|
||||
return this->currentProcessedTemplateNumber;
|
||||
}
|
||||
|
||||
void Ticket::setCurrentTemplateProcessed()
|
||||
{
|
||||
this->currentProcessedTemplateNumber++;
|
||||
}
|
||||
|
||||
|
||||
bool Ticket::initNew(TICKET_VARIANT ticketVariant, const QList<quint8> & templateList, const QHash<QString, QVariant> & printingData)
|
||||
{
|
||||
this->clear();
|
||||
|
||||
this->ticketVariant = ticketVariant;
|
||||
this->printingData = printingData;
|
||||
this->_templateList = templateList;
|
||||
this->currentProcessedTemplateNumber = 0;
|
||||
|
||||
// DEBUG
|
||||
qCritical() << "Ticket::initNew():";
|
||||
qCritical() << " -> " << ticketVariant;
|
||||
|
||||
int multiplicatorInt = 1; // default
|
||||
quint8 headerTemplate;
|
||||
quint8 multiTemplate;
|
||||
quint8 footerTemplate;
|
||||
|
||||
switch (this->ticketVariant) {
|
||||
case TICKET_VARIANT::START_RECEIPT:
|
||||
if (templateList.isEmpty()) {
|
||||
this->_templateList << 21 << 22 << 23;
|
||||
}
|
||||
else {
|
||||
this->_templateList = templateList;
|
||||
}
|
||||
break;
|
||||
case TICKET_VARIANT::STOP_RECEIPT:
|
||||
if (templateList.isEmpty()) {
|
||||
this->_templateList << 24 << 25 << 26;
|
||||
}
|
||||
else {
|
||||
this->_templateList = templateList;
|
||||
}
|
||||
break;
|
||||
case TICKET_VARIANT::FINE_PAYMENT:
|
||||
if (templateList.isEmpty()) {
|
||||
this->_templateList << 24 << 25 << 26;
|
||||
}
|
||||
else {
|
||||
this->_templateList = templateList;
|
||||
}
|
||||
break;
|
||||
case TICKET_VARIANT::FREE_TICKET:
|
||||
if (templateList.isEmpty()) {
|
||||
this->_templateList << 24 << 25 << 26;
|
||||
}
|
||||
else {
|
||||
this->_templateList = templateList;
|
||||
}
|
||||
break;
|
||||
case TICKET_VARIANT::FOOD_STAMP:
|
||||
if (printingData.contains("dyn1_list")) {
|
||||
this->_hasTemplateDynData = true;
|
||||
|
||||
this->dyn1List = printingData["dyn1_list"].toStringList();
|
||||
this->dyn2List = printingData["dyn2_list"].toStringList();
|
||||
}
|
||||
|
||||
if (templateList.isEmpty()) {
|
||||
headerTemplate = 0;
|
||||
multiTemplate = 1;
|
||||
footerTemplate = 2;
|
||||
}
|
||||
else
|
||||
if (templateList.size() == 2) {
|
||||
headerTemplate = 0;
|
||||
multiTemplate = templateList.at(0);
|
||||
footerTemplate = templateList.at(1);
|
||||
}
|
||||
else
|
||||
if (templateList.size() == 3) {
|
||||
headerTemplate = templateList.at(0);
|
||||
multiTemplate = templateList.at(1);
|
||||
footerTemplate = templateList.at(2);
|
||||
}
|
||||
else {
|
||||
headerTemplate = 0;
|
||||
multiTemplate = 1;
|
||||
footerTemplate = 2;
|
||||
}
|
||||
|
||||
// header is optional:
|
||||
if (headerTemplate != 0) {
|
||||
this->_templateList << headerTemplate;
|
||||
}
|
||||
|
||||
if (printingData.contains("multiplicator")) {
|
||||
multiplicatorInt = printingData["multiplicator"].toInt();
|
||||
for (int i = 1; i < multiplicatorInt; i++) {
|
||||
this->_templateList << multiTemplate;
|
||||
}
|
||||
// last template:
|
||||
this->_templateList << footerTemplate;
|
||||
}
|
||||
else {
|
||||
this->_templateList = templateList;
|
||||
}
|
||||
|
||||
// DEBUG FOOD_STAMP:
|
||||
qCritical() << " --> printingData[\"multiplicator\"]" << multiplicatorInt;
|
||||
|
||||
break;
|
||||
default:
|
||||
this->_templateList = templateList;
|
||||
}
|
||||
|
||||
|
||||
// DEBUG
|
||||
QString templateListString;
|
||||
for (int i =0; i < this->_templateList.size(); ++i) {
|
||||
templateListString.append(QString(" %1").arg(this->_templateList.at(i)));
|
||||
}
|
||||
qCritical() << " -> templates: " << templateListString;
|
||||
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void Ticket::clear()
|
||||
{
|
||||
this->ticketVariant = TICKET_VARIANT::PARKING_TICKET;
|
||||
this->printingData.clear();
|
||||
this->_templateList.clear();
|
||||
this->errorCode.clear();
|
||||
this->errorDescription.clear();
|
||||
|
||||
this->_hasTemplateDynData = false;
|
||||
this->dyn1List.clear();
|
||||
this->dyn1List.clear();
|
||||
}
|
||||
|
||||
QString Ticket::getErrorCode() { return this->errorCode; }
|
||||
QString Ticket::getErrorDescription() { return this->errorDescription; }
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
*/
|
||||
QStringList Ticket::getDyn1List()
|
||||
{
|
||||
return this->dyn1List;
|
||||
}
|
||||
|
||||
QStringList Ticket::getDyn2List()
|
||||
{
|
||||
return this->dyn2List;
|
||||
}
|
||||
|
||||
QHash<QString, QVariant> & Ticket::getPrintingData()
|
||||
{
|
||||
return this->printingData;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/************************************************************************************************
|
||||
* operator
|
||||
*
|
||||
*/
|
||||
QDebug operator<<(QDebug debug, TICKET_VARIANT ticketVariant)
|
||||
{
|
||||
switch (ticketVariant) {
|
||||
case TICKET_VARIANT::PARKING_TICKET:
|
||||
debug << "TICKET_VARIANT::PARKING_TICKET";
|
||||
break;
|
||||
case TICKET_VARIANT::PARKING_TICKET_CAR:
|
||||
debug << "TICKET_VARIANT::PARKING_TICKET_CAR";
|
||||
break;
|
||||
case TICKET_VARIANT::PARKING_TICKET_CAMPER:
|
||||
debug << "TICKET_VARIANT::PARKING_TICKET_CAMPER";
|
||||
break;
|
||||
case TICKET_VARIANT::PARKING_TICKET_VAN:
|
||||
debug << "TICKET_VARIANT::PARKING_TICKET_VAN";
|
||||
break;
|
||||
case TICKET_VARIANT::DAY_TICKET:
|
||||
debug << "TICKET_VARIANT::DAY_TICKET";
|
||||
break;
|
||||
case TICKET_VARIANT::DAY_TICKET_CHILD:
|
||||
debug << "TICKET_VARIANT::DAY_TICKET_CHILD";
|
||||
break;
|
||||
case TICKET_VARIANT::DAY_TICKET_TEEN:
|
||||
debug << "TICKET_VARIANT::DAY_TICKET_TEEN";
|
||||
break;
|
||||
case TICKET_VARIANT::DAY_TICKET_ADULT:
|
||||
debug << "TICKET_VARIANT::DAY_TICKET_ADULT";
|
||||
break;
|
||||
case TICKET_VARIANT::DAY_TICKET_CAR:
|
||||
debug << "TICKET_VARIANT::DAY_TICKET_CAR";
|
||||
break;
|
||||
case TICKET_VARIANT::DAY_TICKET_CAMPER:
|
||||
debug << "TICKET_VARIANT::DAY_TICKET_CAMPER";
|
||||
break;
|
||||
case TICKET_VARIANT::DAY_TICKET_VAN:
|
||||
debug << "TICKET_VARIANT::DAY_TICKET_VAN";
|
||||
break;
|
||||
case TICKET_VARIANT::FIXED_PRICE_1:
|
||||
debug << "TICKET_VARIANT::FIXED_PRICE_1";
|
||||
break;
|
||||
case TICKET_VARIANT::FIXED_PRICE_2:
|
||||
debug << "TICKET_VARIANT::FIXED_PRICE_2";
|
||||
break;
|
||||
case TICKET_VARIANT::FIXED_PRICE_3:
|
||||
debug << "TICKET_VARIANT::FIXED_PRICE_3";
|
||||
break;
|
||||
case TICKET_VARIANT::FIXED_PRICE_4:
|
||||
debug << "TICKET_VARIANT::FIXED_PRICE_4";
|
||||
break;
|
||||
case TICKET_VARIANT::FIXED_PRICE_5:
|
||||
debug << "TICKET_VARIANT::FIXED_PRICE_5";
|
||||
break;
|
||||
case TICKET_VARIANT::FIXED_PRICE_6:
|
||||
debug << "TICKET_VARIANT::FIXED_PRICE_6";
|
||||
break;
|
||||
case TICKET_VARIANT::FIXED_PRICE_7:
|
||||
debug << "TICKET_VARIANT::FIXED_PRICE_7";
|
||||
break;
|
||||
case TICKET_VARIANT::FIXED_PRICE_8:
|
||||
debug << "TICKET_VARIANT::FIXED_PRICE_8";
|
||||
break;
|
||||
case TICKET_VARIANT::FIXED_PRICE_9:
|
||||
debug << "TICKET_VARIANT::FIXED_PRICE_9";
|
||||
break;
|
||||
case TICKET_VARIANT::FIXED_PRICE_10:
|
||||
debug << "TICKET_VARIANT::FIXED_PRICE_10";
|
||||
break;
|
||||
case TICKET_VARIANT::RECEIPT:
|
||||
debug << "TICKET_VARIANT::RECEIPT";
|
||||
break;
|
||||
case TICKET_VARIANT::ERROR_RECEIPT:
|
||||
debug << "TICKET_VARIANT::ERROR_RECEIPT";
|
||||
break;
|
||||
case TICKET_VARIANT::START_RECEIPT:
|
||||
debug << "TICKET_VARIANT::START_RECEIPT";
|
||||
break;
|
||||
case TICKET_VARIANT::STOP_RECEIPT:
|
||||
debug << "TICKET_VARIANT::STOP_RECEIPT";
|
||||
break;
|
||||
case TICKET_VARIANT::FINE_PAYMENT:
|
||||
debug << "TICKET_VARIANT::FINE_PAYMENT";
|
||||
break;
|
||||
case TICKET_VARIANT::FOOD_STAMP:
|
||||
debug << "TICKET_VARIANT::FOOD_STAMP";
|
||||
break;
|
||||
case TICKET_VARIANT::FREE_TICKET:
|
||||
debug << "TICKET_VARIANT::FREE_TICKET";
|
||||
break;
|
||||
case TICKET_VARIANT::NO_TICKET:
|
||||
debug << "TICKET_VARIANT::NO_TICKET";
|
||||
break;
|
||||
case TICKET_VARIANT::INVALID:
|
||||
debug << "TICKET_VARIANT::INVALID";
|
||||
break;
|
||||
}
|
||||
|
||||
return debug;
|
||||
}
|
88
src/ATBAPP/support/Ticket.h
Normal file
88
src/ATBAPP/support/Ticket.h
Normal file
@@ -0,0 +1,88 @@
|
||||
#ifndef TICKET_H
|
||||
#define TICKET_H
|
||||
|
||||
#include <QObject>
|
||||
#include <QHash>
|
||||
|
||||
#include "../DeviceControllerInterface.h"
|
||||
|
||||
using namespace nsDeviceControllerInterface;
|
||||
|
||||
QDebug operator<<(QDebug debug, TICKET_VARIANT ticketVariant);
|
||||
|
||||
|
||||
|
||||
class Ticket : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
Ticket(TICKET_VARIANT ticketVariant, QObject *parent = nullptr);
|
||||
|
||||
bool initNew(TICKET_VARIANT ticketVariant, const QList<quint8> & templateList, const QHash<QString, QVariant> & printingData);
|
||||
void clear();
|
||||
|
||||
TICKET_VARIANT variant();
|
||||
|
||||
QList<quint8> * templateList();
|
||||
|
||||
/**
|
||||
* @brief getPrintingData - generic getter for printingData
|
||||
* Used mainly for simple tickets (single tickets e.g. ParkingTicket)
|
||||
* @return
|
||||
*/
|
||||
QHash<QString, QVariant> & getPrintingData();
|
||||
|
||||
/**
|
||||
* @brief hasTemplateDynData
|
||||
* @return true, if ticket has dynamic data for each template.
|
||||
*
|
||||
* This depends on TICKET_VARIANT and printingData
|
||||
*/
|
||||
bool hasTemplateDynData();
|
||||
|
||||
/**
|
||||
* @brief getDyn1List
|
||||
* contains dynamic template data
|
||||
* The size of the lists must be exactly the same as the number of templates.
|
||||
*/
|
||||
QStringList getDyn1List();
|
||||
QStringList getDyn2List();
|
||||
|
||||
quint8 getCurrentProcessedTemplateNumber();
|
||||
|
||||
/**
|
||||
* Mark current template as processed
|
||||
*/
|
||||
void setCurrentTemplateProcessed();
|
||||
|
||||
|
||||
// error handling
|
||||
QString getErrorCode();
|
||||
QString getErrorDescription();
|
||||
|
||||
|
||||
|
||||
|
||||
private:
|
||||
TICKET_VARIANT ticketVariant;
|
||||
|
||||
// printingData from application
|
||||
QHash<QString, QVariant> printingData;
|
||||
|
||||
// templateList, from .ini or created by ticketVariant...
|
||||
QList<quint8> _templateList;
|
||||
|
||||
bool _hasTemplateDynData;
|
||||
|
||||
quint8 currentProcessedTemplateNumber;
|
||||
|
||||
QStringList dyn1List;
|
||||
QStringList dyn2List;
|
||||
|
||||
// error handling
|
||||
QString errorCode;
|
||||
QString errorDescription;
|
||||
};
|
||||
|
||||
#endif // TICKET_H
|
26
src/ATBAPP/support/TicketUtils.cpp
Normal file
26
src/ATBAPP/support/TicketUtils.cpp
Normal file
@@ -0,0 +1,26 @@
|
||||
#include "TicketUtils.h"
|
||||
|
||||
#include <QLocale>
|
||||
#include <QDate>
|
||||
|
||||
TicketUtils::TicketUtils(QObject *parent) : QObject(parent)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
|
||||
QString TicketUtils::getLocaleDateString(const QLocale & qLocale, const QDate & qDate)
|
||||
{
|
||||
QString dateString;
|
||||
|
||||
if (qLocale.language() == QLocale::Lithuanian) {
|
||||
// QLocale::ShortFormat produces date string: "yyyy-mm-dd" ...
|
||||
// this is to long for the printer.
|
||||
dateString = qDate.toString("yy-MM-dd");
|
||||
}
|
||||
else {
|
||||
dateString = qLocale.toString(qDate, QLocale::ShortFormat);
|
||||
}
|
||||
|
||||
return dateString;
|
||||
}
|
34
src/ATBAPP/support/TicketUtils.h
Normal file
34
src/ATBAPP/support/TicketUtils.h
Normal file
@@ -0,0 +1,34 @@
|
||||
#ifndef TICKETUTILS_H
|
||||
#define TICKETUTILS_H
|
||||
|
||||
#include <QObject>
|
||||
|
||||
class TicketUtils : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit TicketUtils(QObject *parent = nullptr);
|
||||
|
||||
/**
|
||||
* @brief getLocaleDateString
|
||||
* @param qLocale
|
||||
* @param qDate
|
||||
* @return a localized date string short format
|
||||
*
|
||||
* Note QLocale::ShortFormat does not result to the
|
||||
* string we need for ticket printing therefore this
|
||||
* helper method was created.
|
||||
*
|
||||
* e.g. using Lithuanian (lt_LT) we get a date in short format:
|
||||
* "2024-08-08" unfortunately this is to long, we need
|
||||
* the year with only two digits.
|
||||
* e.g. in German (de_DE) it is enought: "08.08.24"
|
||||
*
|
||||
*/
|
||||
static QString getLocaleDateString(const QLocale &qLocale, const QDate &qDate);
|
||||
|
||||
signals:
|
||||
|
||||
};
|
||||
|
||||
#endif // TICKETUTILS_H
|
Reference in New Issue
Block a user