Compare commits
72 Commits
szeged_rel
...
1.2.3
Author | SHA1 | Date | |
---|---|---|---|
0cc89cefab
|
|||
14755cd5b4
|
|||
d2efe566c5
|
|||
b058b6aee0
|
|||
bdb0f9911b
|
|||
c679b489ba
|
|||
1c643c6caf
|
|||
246e23bffd
|
|||
07bb1bde50
|
|||
81a70bf387
|
|||
012f3430c5
|
|||
80c7992d5b
|
|||
c603313d73
|
|||
b3ad8e1ee9
|
|||
bee611651c
|
|||
25cb23a587
|
|||
05113057b0
|
|||
7affcb0313
|
|||
60c4d5896a
|
|||
d2a0491bba
|
|||
96db7be126
|
|||
247abb7520
|
|||
e95de7f9e4
|
|||
8c1aa26145
|
|||
30de664991
|
|||
f938a75742
|
|||
49a13fd333
|
|||
07d812f5d9
|
|||
350c2351b1
|
|||
3dac861ca0
|
|||
539e392c0d
|
|||
ed5001c3a3
|
|||
48d65b679f
|
|||
2221463fe5
|
|||
3b32d04bac
|
|||
6fbde29cad
|
|||
479582a9e2
|
|||
e5f6405a19
|
|||
d16234f8e9
|
|||
6b807fd636
|
|||
3bc68ff0ae
|
|||
39f575ceea
|
|||
8c2d764698
|
|||
acb1941d94
|
|||
13f1d84cc0
|
|||
4187d8044d
|
|||
94d22c3bb5
|
|||
4df87873ce
|
|||
0fd20d1dc4
|
|||
df3a83521f
|
|||
ffa91a216c
|
|||
d868c15359
|
|||
6312d133db
|
|||
6a39aae7a6
|
|||
34ec52250b
|
|||
2a5a318c1a
|
|||
be76bfc3fd
|
|||
d02909fb97
|
|||
e3d73cbb66
|
|||
f790d327e9
|
|||
33445c1249
|
|||
3c235d2ec1
|
|||
da7058a9bd
|
|||
25e343cb5b
|
|||
76ce6e0c26
|
|||
334d67fd22
|
|||
488152c37d
|
|||
a0d7f98175
|
|||
efa595edb9
|
|||
3071a92a3c
|
|||
54e3e76789
|
|||
99188b0b7a
|
16
DCPlugin.pro
16
DCPlugin.pro
@@ -45,7 +45,7 @@ contains( CONFIG, PTU5_YOCTO ) {
|
|||||||
TARGET = ATBDeviceControllerPlugin
|
TARGET = ATBDeviceControllerPlugin
|
||||||
#DESTDIR = ../plugins
|
#DESTDIR = ../plugins
|
||||||
INTERFACE = DeviceController
|
INTERFACE = DeviceController
|
||||||
INTERFACE_DEFINITION = $${PWD}/include/ATBAPP/DeviceControllerInterface.h
|
INTERFACE_DEFINITION = $${PWD}/src/ATBAPP/DeviceControllerInterface.h
|
||||||
|
|
||||||
DEFINES += DEVICECONTROLLERPLUGIN_LIBRARY
|
DEFINES += DEVICECONTROLLERPLUGIN_LIBRARY
|
||||||
|
|
||||||
@@ -76,14 +76,24 @@ HEADERS += \
|
|||||||
src/ATBAPP/ATBHealthEvent.h \
|
src/ATBAPP/ATBHealthEvent.h \
|
||||||
src/ATBAPP/ATBMachineEvent.h \
|
src/ATBAPP/ATBMachineEvent.h \
|
||||||
src/ATBAPP/ATBDeviceControllerPlugin.h \
|
src/ATBAPP/ATBDeviceControllerPlugin.h \
|
||||||
src/ATBAPP/Utils.h
|
src/ATBAPP/Utils.h \
|
||||||
|
src/ATBAPP/support/CashUtils.h \
|
||||||
|
src/ATBAPP/support/DBusControllerInterface.h \
|
||||||
|
src/ATBAPP/support/JSON.h \
|
||||||
|
src/ATBAPP/support/PTUSystem.h \
|
||||||
|
src/ATBAPP/support/PersistentData.h
|
||||||
|
|
||||||
SOURCES += \
|
SOURCES += \
|
||||||
src/ATBAPP/ATBHealthEvent.cpp \
|
src/ATBAPP/ATBHealthEvent.cpp \
|
||||||
src/ATBAPP/ATBMachineEvent.cpp \
|
src/ATBAPP/ATBMachineEvent.cpp \
|
||||||
src/ATBAPP/ATBDeviceControllerPlugin.cpp \
|
src/ATBAPP/ATBDeviceControllerPlugin.cpp \
|
||||||
src/ATBAPP/DeviceControllerDiag.cpp \
|
src/ATBAPP/DeviceControllerDiag.cpp \
|
||||||
src/ATBAPP/Utils.cpp
|
src/ATBAPP/Utils.cpp \
|
||||||
|
src/ATBAPP/support/CashUtils.cpp \
|
||||||
|
src/ATBAPP/support/DBusControllerInterface.cpp \
|
||||||
|
src/ATBAPP/support/JSON.cpp \
|
||||||
|
src/ATBAPP/support/PTUSystem.cpp \
|
||||||
|
src/ATBAPP/support/PersistentData.cpp
|
||||||
|
|
||||||
DISTFILES += \
|
DISTFILES += \
|
||||||
generate-version.sh
|
generate-version.sh
|
||||||
|
@@ -70,6 +70,8 @@ fi
|
|||||||
#
|
#
|
||||||
#Q_DECLARE_INTERFACE(CCInterface,
|
#Q_DECLARE_INTERFACE(CCInterface,
|
||||||
# "eu.atb.ptu.plugin.CCInterface/2.9.0")
|
# "eu.atb.ptu.plugin.CCInterface/2.9.0")
|
||||||
|
#Q_DECLARE_INTERFACE(DeviceControllerInterface,
|
||||||
|
# "eu.atb.ptu.plugin.DeviceControllerInterface/1.0")
|
||||||
# -> extract whole string within quotation marks
|
# -> extract whole string within quotation marks
|
||||||
INTERFACE_VERSION=$(grep 'eu.atb.ptu.plugin.' ${INTERFACE_DEFINITION})
|
INTERFACE_VERSION=$(grep 'eu.atb.ptu.plugin.' ${INTERFACE_DEFINITION})
|
||||||
# get string within quotes:
|
# get string within quotes:
|
||||||
|
1865
include/interfaces.h
1865
include/interfaces.h
File diff suppressed because it is too large
Load Diff
@@ -2,8 +2,13 @@
|
|||||||
#include "src/ATBAPP/ATBHealthEvent.h"
|
#include "src/ATBAPP/ATBHealthEvent.h"
|
||||||
#include "src/ATBAPP/ATBMachineEvent.h"
|
#include "src/ATBAPP/ATBMachineEvent.h"
|
||||||
#include "src/ATBAPP/Utils.h"
|
#include "src/ATBAPP/Utils.h"
|
||||||
|
#include "src/ATBAPP/support/JSON.h"
|
||||||
|
#include "src/ATBAPP/support/DBusControllerInterface.h"
|
||||||
|
#include "src/ATBAPP/support/PTUSystem.h"
|
||||||
|
#include "src/ATBAPP/support/CashUtils.h"
|
||||||
|
|
||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
|
#include <QThread>
|
||||||
#include <QTextCodec>
|
#include <QTextCodec>
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
|
|
||||||
@@ -18,7 +23,8 @@
|
|||||||
|
|
||||||
|
|
||||||
ATBDeviceControllerPlugin::ATBDeviceControllerPlugin(QObject *parent)
|
ATBDeviceControllerPlugin::ATBDeviceControllerPlugin(QObject *parent)
|
||||||
: pluginState(PLUGIN_STATE::NOT_INITIALIZED)
|
: isMaster(false)
|
||||||
|
, pluginState(PLUGIN_STATE::NOT_INITIALIZED)
|
||||||
, eventReceiver(nullptr)
|
, eventReceiver(nullptr)
|
||||||
{
|
{
|
||||||
this->setParent(parent);
|
this->setParent(parent);
|
||||||
@@ -29,14 +35,18 @@ ATBDeviceControllerPlugin::ATBDeviceControllerPlugin(QObject *parent)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this->init_sc_dbus();
|
||||||
|
|
||||||
|
|
||||||
//connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_templatePrintFinished_OK()), this, SLOT(onPrintFinishedOK()), Qt::QueuedConnection);
|
//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_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_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
|
connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_doorVaultDoorOpened()), this, SLOT(onVaultDoorOpened()), Qt::QueuedConnection); // Screen?? with message
|
||||||
@@ -45,12 +55,21 @@ ATBDeviceControllerPlugin::ATBDeviceControllerPlugin(QObject *parent)
|
|||||||
connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_doorCBinAndAllDoorsClosed()), this, SLOT(onCBinAndAllDoorsClosed()), Qt::QueuedConnection);
|
connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_doorCBinAndAllDoorsClosed()), this, SLOT(onCBinAndAllDoorsClosed()), Qt::QueuedConnection);
|
||||||
connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_doorAllDoorsClosed()), this, SLOT(onAllDoorsClosed()), Qt::QueuedConnection); // check for errors, switch to mode IDLE
|
connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_doorAllDoorsClosed()), this, SLOT(onAllDoorsClosed()), Qt::QueuedConnection); // check for errors, switch to mode IDLE
|
||||||
|
|
||||||
|
// move hw object to separate thread:
|
||||||
|
auto hwThread = new QThread;
|
||||||
|
dynamic_cast<QObject*>(hw)->moveToThread(hwThread);
|
||||||
|
hwThread->start();
|
||||||
|
|
||||||
this->diag = new DeviceControllerDiag(this);
|
QString persistentDataFile = "/mnt/system_data/dc_persistentData.dat";
|
||||||
|
this->persistentData = new PersistentData(persistentDataFile);
|
||||||
|
|
||||||
|
this->diag = new DeviceControllerDiag(this->persistentData, this);
|
||||||
|
connect(this->diag, &DeviceControllerDiag::newVoltage, this, &ATBDeviceControllerPlugin::onNewVoltage);
|
||||||
|
|
||||||
this->currentSelectedTicketType = 0;
|
this->currentSelectedTicketType = 0;
|
||||||
this->currentCashState = CASH_STATE::CACHE_EMPTY;
|
this->currentCashState = CASH_STATE::CACHE_EMPTY;
|
||||||
|
|
||||||
|
this->cashStartAmountInt = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
ATBDeviceControllerPlugin::~ATBDeviceControllerPlugin() {}
|
ATBDeviceControllerPlugin::~ATBDeviceControllerPlugin() {}
|
||||||
@@ -60,23 +79,48 @@ PLUGIN_STATE ATBDeviceControllerPlugin::initDCPlugin(QObject *eventReceiver, con
|
|||||||
this->eventReceiver = eventReceiver;
|
this->eventReceiver = eventReceiver;
|
||||||
|
|
||||||
// read variables from setting
|
// 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();
|
||||||
|
QString printerLocaleString = settings.value("ATBDeviceControllerPlugin/printerLocale", "de_DE").toString().toLatin1();
|
||||||
|
this->printerLocale = QLocale(printerLocaleString);
|
||||||
|
|
||||||
// open serial port
|
|
||||||
hw->dc_openSerial(5, "115200", this->serialPortName, 1);
|
if (this->isMaster) {
|
||||||
|
// 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());
|
||||||
|
hw->dc_setNewZone(PTUSystem::readZoneNumber());
|
||||||
|
hw->dc_setNewBorough(PTUSystem::readGroupNumber());
|
||||||
|
|
||||||
hw->rtc_setDateTime();
|
hw->rtc_setDateTime();
|
||||||
|
|
||||||
// this is necessary to init the CashAgentLib (!)
|
// this is necessary to init the CashAgentLib (!)
|
||||||
hw->vend_failed();
|
hw->vend_failed();
|
||||||
|
|
||||||
|
// read sw-version and store it in persistentData, if changed
|
||||||
|
QString dc_fw_version = hw->dc_getSWversion().remove(QChar('\0'));
|
||||||
|
qCritical() << "ATBDeviceControllerPlugin: DC firmware version: " << dc_fw_version;
|
||||||
|
this->persistentData->setDCFirmwareVersion(dc_fw_version);
|
||||||
|
this->persistentData->serializeToFile();
|
||||||
|
|
||||||
// text encoding for printer
|
// text encoding for printer
|
||||||
this->codec = QTextCodec::codecForName(printerEncoding);
|
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->diag->init(this->hw, this->eventReceiver);
|
||||||
|
|
||||||
this->pluginState = PLUGIN_STATE::INITIALIZED;
|
this->pluginState = PLUGIN_STATE::INITIALIZED;
|
||||||
@@ -87,12 +131,19 @@ PLUGIN_STATE ATBDeviceControllerPlugin::initDCPlugin(QObject *eventReceiver, con
|
|||||||
|
|
||||||
void ATBDeviceControllerPlugin::startPhysicalLayer()
|
void ATBDeviceControllerPlugin::startPhysicalLayer()
|
||||||
{
|
{
|
||||||
|
if (!this->isMaster) return;
|
||||||
|
|
||||||
if (this->pluginState == PLUGIN_STATE::NOT_INITIALIZED)
|
if (this->pluginState == PLUGIN_STATE::NOT_INITIALIZED)
|
||||||
{
|
{
|
||||||
qCritical() << "ATBDeviceControllerPlugin::startPhysicalLayer(): plugin is not initialized";
|
qCritical() << "ATBDeviceControllerPlugin::startPhysicalLayer(): plugin is not initialized";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
qCritical() << "ATBDeviceControllerPlugin::startPhysicalLayer() " << endl
|
||||||
|
<< " -> use master lib " << endl
|
||||||
|
<< " -> start physical layer";
|
||||||
|
|
||||||
|
|
||||||
// open serial port
|
// open serial port
|
||||||
hw->dc_openSerial(5, "115200", this->serialPortName, 1);
|
hw->dc_openSerial(5, "115200", this->serialPortName, 1);
|
||||||
|
|
||||||
@@ -101,6 +152,12 @@ void ATBDeviceControllerPlugin::startPhysicalLayer()
|
|||||||
|
|
||||||
void ATBDeviceControllerPlugin::stopPhysicalLayer()
|
void ATBDeviceControllerPlugin::stopPhysicalLayer()
|
||||||
{
|
{
|
||||||
|
// store persistent data
|
||||||
|
this->persistentData->serializeToFile();
|
||||||
|
|
||||||
|
// skip, if we use slave lib
|
||||||
|
if (!this->isMaster) return;
|
||||||
|
|
||||||
if (this->pluginState == PLUGIN_STATE::NOT_INITIALIZED)
|
if (this->pluginState == PLUGIN_STATE::NOT_INITIALIZED)
|
||||||
{
|
{
|
||||||
qCritical() << "ATBDeviceControllerPlugin::startPhysicalLayer(): plugin is not initialized";
|
qCritical() << "ATBDeviceControllerPlugin::startPhysicalLayer(): plugin is not initialized";
|
||||||
@@ -113,7 +170,21 @@ void ATBDeviceControllerPlugin::stopPhysicalLayer()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void ATBDeviceControllerPlugin::reboot()
|
||||||
|
{
|
||||||
|
// note:
|
||||||
|
// - dc reset lasts about ~5s !
|
||||||
|
// - makes a power cycle to certain components, e.g. card terminal
|
||||||
|
hw->bl_rebootDC();
|
||||||
|
}
|
||||||
|
|
||||||
|
void ATBDeviceControllerPlugin::reset()
|
||||||
|
{
|
||||||
|
// note:
|
||||||
|
// - dc reset lasts about ~5s !
|
||||||
|
// - makes a power cycle to certain components, e.g. card terminal
|
||||||
|
hw->dc_OrderToReset();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -121,19 +192,22 @@ void ATBDeviceControllerPlugin::stopPhysicalLayer()
|
|||||||
|
|
||||||
void ATBDeviceControllerPlugin::onChangedProgramModeToSELL()
|
void ATBDeviceControllerPlugin::onChangedProgramModeToSELL()
|
||||||
{
|
{
|
||||||
//hw->dc_autoRequest(true);
|
hw->dc_autoRequest(true);
|
||||||
|
hw->rtc_setDateTime();
|
||||||
|
hw->mdb_switchWake(0); // wakeup MDB components
|
||||||
}
|
}
|
||||||
|
|
||||||
void ATBDeviceControllerPlugin::onChangedProgramModeToSERVICE()
|
void ATBDeviceControllerPlugin::onChangedProgramModeToSERVICE()
|
||||||
{
|
{
|
||||||
//hw->dc_autoRequest(true);
|
hw->dc_autoRequest(true);
|
||||||
|
hw->mdb_switchWake(0); // wakeup MDB components
|
||||||
}
|
}
|
||||||
|
|
||||||
void ATBDeviceControllerPlugin::onChangedProgramModeToIDLE()
|
void ATBDeviceControllerPlugin::onChangedProgramModeToIDLE()
|
||||||
{
|
{
|
||||||
//hw->dc_autoRequest(false); // <-- TODO: ???
|
hw->dc_autoRequest(true);
|
||||||
|
|
||||||
this->diag->diagRequest();
|
this->diag->diagRequest();
|
||||||
|
hw->mdb_switchWake(1);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -148,11 +222,11 @@ void ATBDeviceControllerPlugin::requestStartCashInput(const QString & amount)
|
|||||||
{
|
{
|
||||||
qCritical() << "Start Cash vending with amount = " << amount;
|
qCritical() << "Start Cash vending with amount = " << amount;
|
||||||
|
|
||||||
uint32_t amountInt = static_cast<uint32_t>(amount.toUInt());
|
this->cashStartAmountInt = static_cast<uint32_t>(amount.toUInt());
|
||||||
|
|
||||||
if (amountInt == 0) amountInt = UINT_MAX;
|
if (this->cashStartAmountInt == 0) this->cashStartAmountInt = UINT_MAX;
|
||||||
|
|
||||||
hw->cash_startPayment(amountInt);
|
hw->cash_startPayment(this->cashStartAmountInt);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ATBDeviceControllerPlugin::requestStopCashInput()
|
void ATBDeviceControllerPlugin::requestStopCashInput()
|
||||||
@@ -166,7 +240,33 @@ void ATBDeviceControllerPlugin::requestStopCashInput()
|
|||||||
void ATBDeviceControllerPlugin::cashCollect()
|
void ATBDeviceControllerPlugin::cashCollect()
|
||||||
{
|
{
|
||||||
hw->vend_success();
|
hw->vend_success();
|
||||||
this->currentCashState = CASH_STATE::CACHE_EMPTY;
|
|
||||||
|
// inserted amount
|
||||||
|
uint32_t amountInt = this->hw->getInsertedAmount();
|
||||||
|
QString amountString = QString::number(amountInt);
|
||||||
|
|
||||||
|
// inserted coins
|
||||||
|
uint32_t amountCoinsInt = CashUtils::getAmountOfInsertedCoins(this->hw);
|
||||||
|
QString amountCoinsString = QString::number(amountCoinsInt);
|
||||||
|
|
||||||
|
// inserted notes
|
||||||
|
uint32_t amountNotesInt = CashUtils::getAmountOfInsertedNotes(this->hw);
|
||||||
|
QString amountNotesString = QString::number(amountNotesInt);
|
||||||
|
|
||||||
|
|
||||||
|
if (this->coinProcessor() == nsDeviceControllerInterface::COIN_PROCESSOR::CHANGER) {
|
||||||
|
QTimer::singleShot(1000, this, &ATBDeviceControllerPlugin::onCashChangerState);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
emit this->cashPaymentFinished(nsDeviceControllerInterface::RESULT_STATE::SUCCESS,
|
||||||
|
amountString,
|
||||||
|
amountCoinsString, // coins
|
||||||
|
amountNotesString, // notes
|
||||||
|
0, // proposed change
|
||||||
|
"",
|
||||||
|
"");
|
||||||
|
this->currentCashState = CASH_STATE::CACHE_EMPTY;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ATBDeviceControllerPlugin::cashAbort()
|
void ATBDeviceControllerPlugin::cashAbort()
|
||||||
@@ -175,6 +275,19 @@ void ATBDeviceControllerPlugin::cashAbort()
|
|||||||
this->currentCashState = CASH_STATE::CACHE_EMPTY;
|
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 -------------------------------------------------------------
|
// TASKS: Account -------------------------------------------------------------
|
||||||
|
|
||||||
// for an external account request, e.g. by an ui-button:
|
// for an external account request, e.g. by an ui-button:
|
||||||
@@ -197,7 +310,7 @@ void ATBDeviceControllerPlugin::private_startAccount()
|
|||||||
qCritical() << "Start account: ";
|
qCritical() << "Start account: ";
|
||||||
qCritical() << " nrOfVals = " << nrOfVals;
|
qCritical() << " nrOfVals = " << nrOfVals;
|
||||||
for (int i=0; i<nrOfVals; ++i) {
|
for (int i=0; i<nrOfVals; ++i) {
|
||||||
qCritical() << " backupedAccNumbers[" << i << "] = " << backupedAccNumbers[0];
|
qCritical() << " backupedAccNumbers[" << i << "] = " << backupedAccNumbers[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
qsort( backupedAccNumbers, nrOfVals, sizeof (uint16_t), Utils::compare );
|
qsort( backupedAccNumbers, nrOfVals, sizeof (uint16_t), Utils::compare );
|
||||||
@@ -254,7 +367,33 @@ void ATBDeviceControllerPlugin::private_getAccountData()
|
|||||||
|
|
||||||
accountData.insert("AccountingNumber", QString::number(retVR.AccountingNumber));
|
accountData.insert("AccountingNumber", QString::number(retVR.AccountingNumber));
|
||||||
|
|
||||||
int numberOfCoinVariants = sizeof(retVR.coinsInVault);
|
|
||||||
|
// build dateTime: -------------------------------------------------------
|
||||||
|
// Example: "2023-07-19T18:24:01.063+02:00"
|
||||||
|
QString startDateTimeString;
|
||||||
|
QString formatString = "yyyy-MM-ddThh:mm:ss";
|
||||||
|
uint year = retVR.year + 2000;
|
||||||
|
startDateTimeString.append(QString::number(year)).append("-");
|
||||||
|
uint month = retVR.month;
|
||||||
|
startDateTimeString.append(QString::number(month).rightJustified(2, '0')).append("-");
|
||||||
|
uint day = retVR.dom;
|
||||||
|
startDateTimeString.append(QString::number(day).rightJustified(2, '0')).append("T");
|
||||||
|
uint hour = retVR.hour;
|
||||||
|
startDateTimeString.append(QString::number(hour).rightJustified(2, '0')).append(":");
|
||||||
|
uint minute = retVR.min;
|
||||||
|
startDateTimeString.append(QString::number(minute).rightJustified(2, '0')).append(":");
|
||||||
|
uint seconds = retVR.sec;
|
||||||
|
startDateTimeString.append(QString::number(seconds).rightJustified(2, '0'));
|
||||||
|
|
||||||
|
qCritical() << " startDateTimeString = " << startDateTimeString;
|
||||||
|
|
||||||
|
QDateTime startDateTime = QDateTime::fromString(startDateTimeString, formatString);
|
||||||
|
accountData.insert("accountStartTime", startDateTime);
|
||||||
|
//-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
// COINS in Vault: --------------------------------------------------------
|
||||||
|
|
||||||
|
int numberOfCoinVariants = sizeof(retVR.coinsInVault)/sizeof(retVR.coinsInVault[0]);
|
||||||
|
|
||||||
// DEBUG
|
// DEBUG
|
||||||
qCritical() << " NumberOfCoinVariants = " << numberOfCoinVariants;
|
qCritical() << " NumberOfCoinVariants = " << numberOfCoinVariants;
|
||||||
@@ -264,14 +403,36 @@ void ATBDeviceControllerPlugin::private_getAccountData()
|
|||||||
|
|
||||||
accountData.insert("NumberOfCoinVariants", numberOfCoinVariants);
|
accountData.insert("NumberOfCoinVariants", numberOfCoinVariants);
|
||||||
for (int i = 0; i < numberOfCoinVariants; ++i) {
|
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
|
// 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);
|
emit requestAccountResponse(accountData);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -281,6 +442,9 @@ void ATBDeviceControllerPlugin::onServiceDoorOpened()
|
|||||||
{
|
{
|
||||||
qCritical() << "ATBDeviceControllerPlugin::onServiceDoorOpened()";
|
qCritical() << "ATBDeviceControllerPlugin::onServiceDoorOpened()";
|
||||||
|
|
||||||
|
// ... to detect alarm etc.
|
||||||
|
this->diag->diagRequest();
|
||||||
|
|
||||||
// switch to mode service
|
// switch to mode service
|
||||||
emit this->requestModeSERVICE();
|
emit this->requestModeSERVICE();
|
||||||
|
|
||||||
@@ -290,47 +454,100 @@ void ATBDeviceControllerPlugin::onServiceDoorOpened()
|
|||||||
|
|
||||||
void ATBDeviceControllerPlugin::onVaultDoorOpened()
|
void ATBDeviceControllerPlugin::onVaultDoorOpened()
|
||||||
{
|
{
|
||||||
// TODO:
|
|
||||||
// - show special screen / message on screen
|
|
||||||
// - create an HealthEvent (-> ISMAS-Event)
|
|
||||||
qCritical() << "ATBDeviceControllerPlugin::onVaultDoorOpened()";
|
qCritical() << "ATBDeviceControllerPlugin::onVaultDoorOpened()";
|
||||||
|
|
||||||
// TODO: Start background task "ACCOUNT"
|
// ... to detect alarm etc.
|
||||||
|
this->diag->diagRequest();
|
||||||
|
|
||||||
// do not: emit this->requestModeSERVICE();
|
// 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("DOOR_OPEN");
|
||||||
|
|
||||||
|
emit this->requestModeACCOUNT();
|
||||||
|
|
||||||
|
// send service message, delayed:
|
||||||
|
QTimer::singleShot(1000, this, [this](){
|
||||||
|
emit this->showServiceText(nsDeviceControllerInterface::SERVICE_TEXT::VAULT_DOOR_OPENED, "Please remove coinbox");
|
||||||
|
hw->prn_cut(3);
|
||||||
|
} );
|
||||||
}
|
}
|
||||||
|
|
||||||
void ATBDeviceControllerPlugin::onCoinBoxRemoved()
|
void ATBDeviceControllerPlugin::onCoinBoxRemoved()
|
||||||
{
|
{
|
||||||
qCritical() << "ATBDeviceControllerPlugin::onCoinBoxRemoved()";
|
qCritical() << "ATBDeviceControllerPlugin::onCoinBoxRemoved()";
|
||||||
|
|
||||||
this->private_startAccount();
|
// BackgroundTask("ACCOUNT") is finished, if account message is sent to ISMAS!
|
||||||
|
this->dbus->startBackgroundTask("ACCOUNT");
|
||||||
|
|
||||||
|
emit this->showServiceText(nsDeviceControllerInterface::SERVICE_TEXT::COIN_BOX_REMOVED, "Please insert coinbox");
|
||||||
|
|
||||||
|
QTimer::singleShot(4000, this, SLOT(private_startAccount()));
|
||||||
}
|
}
|
||||||
|
|
||||||
void ATBDeviceControllerPlugin::onCoinBoxInserted()
|
void ATBDeviceControllerPlugin::onCoinBoxInserted()
|
||||||
{
|
{
|
||||||
qCritical() << "ATBDeviceControllerPlugin::onCoinBoxInserted()";
|
qCritical() << "ATBDeviceControllerPlugin::onCoinBoxInserted()";
|
||||||
|
|
||||||
|
emit this->showServiceText(nsDeviceControllerInterface::SERVICE_TEXT::COIN_BOX_INSERTED, "Please close vault door");
|
||||||
|
// emit this->showServiceText(0x1234);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This is called, when all CoinBox is inserted and all doors
|
||||||
|
* are closed.
|
||||||
|
*/
|
||||||
void ATBDeviceControllerPlugin::onCBinAndAllDoorsClosed()
|
void ATBDeviceControllerPlugin::onCBinAndAllDoorsClosed()
|
||||||
{
|
{
|
||||||
qCritical() << "ATBDeviceControllerPlugin::onCBinAndAllDoorsClosed()";
|
qCritical() << "ATBDeviceControllerPlugin::onCBinAndAllDoorsClosed()";
|
||||||
|
|
||||||
this->diag->diagRequest();
|
|
||||||
|
|
||||||
// TODO: Stop background task "ACCOUNT"
|
|
||||||
|
|
||||||
QTimer::singleShot(2000, this, SIGNAL(requestModeIDLE()));
|
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()
|
void ATBDeviceControllerPlugin::onAllDoorsClosed()
|
||||||
{
|
{
|
||||||
qCritical() << "ATBDeviceControllerPlugin::onAllDoorsClosed()";
|
qCritical() << "ATBDeviceControllerPlugin::onAllDoorsClosed()";
|
||||||
|
|
||||||
emit this->requestModeIDLE();
|
emit this->requestModeIDLE();
|
||||||
|
this->dbus->finishedBackgroundTask("DOOR_OPEN");
|
||||||
|
|
||||||
|
// TODO: check for errors and create a machine event
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ATBDeviceControllerPlugin::onNewVoltage(uint32_t voltage)
|
||||||
|
{
|
||||||
|
qCritical() << "ATBDeviceControllerPlugin::onNewVoltage() = " << voltage;
|
||||||
|
|
||||||
|
QString voltageString = QString::number(voltage);
|
||||||
|
|
||||||
|
JSON::setPrettySerialize(true);
|
||||||
|
JSON::JsonObject json;
|
||||||
|
|
||||||
|
json = JSON::objectBuilder()
|
||||||
|
->set("Name", "batt")
|
||||||
|
->set("Value", voltageString)
|
||||||
|
->set("Unit", "V")
|
||||||
|
->create();
|
||||||
|
|
||||||
|
|
||||||
|
ATBHealthEvent *healthEvent = new ATBHealthEvent(
|
||||||
|
ATB_HEALTH_MODE::STATE,
|
||||||
|
"VOLTAGE",
|
||||||
|
JSON::serialize(json)
|
||||||
|
);
|
||||||
|
|
||||||
|
QCoreApplication::postEvent(eventReceiver, healthEvent);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// TASKS: printing ------------------------------------------------------------
|
// TASKS: printing ------------------------------------------------------------
|
||||||
|
|
||||||
@@ -345,21 +562,26 @@ void ATBDeviceControllerPlugin::requestPrintTicket(nsDeviceControllerInterface::
|
|||||||
QDateTime parkingEndDateTime = QDateTime::fromString(printingData["parkingEnd"].toString(), Qt::ISODate);
|
QDateTime parkingEndDateTime = QDateTime::fromString(printingData["parkingEnd"].toString(), Qt::ISODate);
|
||||||
QDateTime currentDateTime = QDateTime::fromString(printingData["currentDateTime"].toString(), Qt::ISODate);
|
QDateTime currentDateTime = QDateTime::fromString(printingData["currentDateTime"].toString(), Qt::ISODate);
|
||||||
|
|
||||||
|
QString parkingEndDateString = this->printerLocale.toString(parkingEndDateTime.date(), QLocale::ShortFormat);
|
||||||
|
QString currentDateString = this->printerLocale.toString(currentDateTime.date(), QLocale::ShortFormat);
|
||||||
|
|
||||||
|
|
||||||
// set dynamic printer data:
|
// set dynamic printer data:
|
||||||
QByteArray ba_licenseplate = codec->fromUnicode(printingData["licenseplate"].toString());
|
QByteArray ba_licenseplate = codec->fromUnicode(printingData["licenseplate"].toString());
|
||||||
memcpy((char*)dynTicketData->licensePlate, ba_licenseplate.data(), std::min(ba_licenseplate.size(),8));
|
memcpy((char*)dynTicketData->licensePlate, ba_licenseplate.data(), std::min(ba_licenseplate.size(),8));
|
||||||
|
|
||||||
QByteArray ba_amount = codec->fromUnicode(printingData["amount"].toString());
|
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"));
|
QByteArray ba_parkingEndTime = codec->fromUnicode(parkingEndDateTime.toString("hh:mm"));
|
||||||
memcpy((char*)dynTicketData->parkingEnd, ba_parkingEndTime.data(), std::min(ba_parkingEndTime.size(),8));
|
memcpy((char*)dynTicketData->parkingEnd, ba_parkingEndTime.data(), std::min(ba_parkingEndTime.size(),8));
|
||||||
|
|
||||||
QByteArray ba_parkingEndDate = codec->fromUnicode(parkingEndDateTime.toString("dd.MM.yy"));
|
QByteArray ba_parkingEndDate = codec->fromUnicode(parkingEndDateString);
|
||||||
memcpy((char*)dynTicketData->currentTime, ba_parkingEndDate.data(), std::min(ba_parkingEndDate.size(),8));
|
memcpy((char*)dynTicketData->currentTime, ba_parkingEndDate.data(), std::min(ba_parkingEndDate.size(),8));
|
||||||
// ! and yes... 'ParkingEndDate' is 'currentTime'
|
// ! and yes... 'ParkingEndDate' is 'currentTime'
|
||||||
|
|
||||||
QByteArray ba_currentDate = codec->fromUnicode(currentDateTime.toString("dd.MM.yy"));
|
QByteArray ba_currentDate = codec->fromUnicode(currentDateString);
|
||||||
memcpy((char*)dynTicketData->currentDate, ba_currentDate.data(), std::min(ba_currentDate.size(),8));
|
memcpy((char*)dynTicketData->currentDate, ba_currentDate.data(), std::min(ba_currentDate.size(),8));
|
||||||
|
|
||||||
// STAN for Szeged Start/Stop: must be 9 digits
|
// STAN for Szeged Start/Stop: must be 9 digits
|
||||||
@@ -411,11 +633,13 @@ void ATBDeviceControllerPlugin::requestPrintTicket(nsDeviceControllerInterface::
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
if (!this->hw->dc_isPortOpen()) {
|
if (!this->hw->dc_isPortOpen()) {
|
||||||
qCritical() << " ... serial port is not open!";
|
qCritical() << " ... serial port is not open!";
|
||||||
this->onPrintFinishedERR();
|
this->onPrintFinishedERR();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
// TODO: wird hier nur 'licensePlate' gedruckt?
|
// TODO: wird hier nur 'licensePlate' gedruckt?
|
||||||
if (!this->hw->prn_sendDynamicPrnValues(dynTicketData->licensePlate)) {
|
if (!this->hw->prn_sendDynamicPrnValues(dynTicketData->licensePlate)) {
|
||||||
@@ -446,6 +670,57 @@ void ATBDeviceControllerPlugin::requestPrintReceipt(const QHash<QString, QVarian
|
|||||||
qCritical() << "ATBDeviceControllerPlugin::requestPrintReceipt() is currently not implemented";
|
qCritical() << "ATBDeviceControllerPlugin::requestPrintReceipt() is currently not implemented";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ATBDeviceControllerPlugin::requestPrintReceipt(const QString & printingString)
|
||||||
|
{
|
||||||
|
QByteArray ba = printingString.toUtf8();
|
||||||
|
hw->prn_switchPower(true);
|
||||||
|
hw->prn_setFonts(8,12,0,0);
|
||||||
|
hw->prn_sendText(&ba);
|
||||||
|
QTimer::singleShot(4000, this, SLOT(onPrinterWaitForPrintingReceipt()));
|
||||||
|
|
||||||
|
//QTimer::singleShot(2000, this, [this](){ hw->prn_cut(3); } );
|
||||||
|
}
|
||||||
|
|
||||||
|
void ATBDeviceControllerPlugin::onPrinterWaitForPrintingReceipt()
|
||||||
|
{
|
||||||
|
quint8 printerResult = this->hw->prn_getPrintResult();
|
||||||
|
|
||||||
|
switch (printerResult) {
|
||||||
|
case 0: // still printing
|
||||||
|
qCritical() << "--> printer: WaitForPrintingReceipt";
|
||||||
|
QTimer::singleShot(2000, this, SLOT(onPrinterWaitForPrintingReceipt()));
|
||||||
|
break;
|
||||||
|
case 1: // printing finished, Ok
|
||||||
|
qCritical() << "DC Finished printing receipt";
|
||||||
|
emit this->printReceiptFinished(nsDeviceControllerInterface::RESULT_STATE::SUCCESS,
|
||||||
|
// TODO: TicketNumber
|
||||||
|
"",
|
||||||
|
"");
|
||||||
|
hw->prn_switchPower(true);
|
||||||
|
hw->prn_cut(3);
|
||||||
|
break;
|
||||||
|
case 2: // printing finished, Error
|
||||||
|
qCritical() << "DC Error: wait for printing receipt";
|
||||||
|
this->errorCode = "PRINTER"; // TODO: get more detailed error code from low level API
|
||||||
|
this->errorDescription = "Printer error"; // TODO: get more detailed error description from low level API
|
||||||
|
|
||||||
|
emit this->printReceiptFinished(nsDeviceControllerInterface::RESULT_STATE::ERROR_BACKEND,
|
||||||
|
this->errorCode,
|
||||||
|
this->errorDescription);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
qCritical() << "DC Error: wait for printing receipt";
|
||||||
|
this->errorCode = "PRINTER"; // TODO: get more detailed error code from low level API
|
||||||
|
this->errorDescription = "Printer error"; // TODO: get more detailed error description from low level API
|
||||||
|
|
||||||
|
emit this->printReceiptFinished(nsDeviceControllerInterface::RESULT_STATE::ERROR_BACKEND,
|
||||||
|
this->errorCode,
|
||||||
|
this->errorDescription);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
void ATBDeviceControllerPlugin::requestPrintTicket(const QHash<QString, QVariant> & printingData)
|
void ATBDeviceControllerPlugin::requestPrintTicket(const QHash<QString, QVariant> & printingData)
|
||||||
{
|
{
|
||||||
@@ -461,6 +736,9 @@ void ATBDeviceControllerPlugin::requestPrintTicket(const QHash<QString, QVariant
|
|||||||
QDateTime parkingEndDateTime = QDateTime::fromString(printingData["parkingEnd"].toString(), Qt::ISODate);
|
QDateTime parkingEndDateTime = QDateTime::fromString(printingData["parkingEnd"].toString(), Qt::ISODate);
|
||||||
QDateTime currentDateTime = QDateTime::fromString(printingData["currentDateTime"].toString(), Qt::ISODate);
|
QDateTime currentDateTime = QDateTime::fromString(printingData["currentDateTime"].toString(), Qt::ISODate);
|
||||||
|
|
||||||
|
QString parkingEndDateString = this->printerLocale.toString(parkingEndDateTime.date(), QLocale::ShortFormat);
|
||||||
|
QString currentDateString = this->printerLocale.toString(currentDateTime.date(), QLocale::ShortFormat);
|
||||||
|
|
||||||
/* -----------------------------------------------------------------------------------------
|
/* -----------------------------------------------------------------------------------------
|
||||||
* note: the following highly depends on printer template files!
|
* note: the following highly depends on printer template files!
|
||||||
* -----------------------------------------------------------------------------------------
|
* -----------------------------------------------------------------------------------------
|
||||||
@@ -471,16 +749,18 @@ void ATBDeviceControllerPlugin::requestPrintTicket(const QHash<QString, QVariant
|
|||||||
memcpy((char*)dynTicketData->licensePlate, ba_licenseplate.data(), std::min(ba_licenseplate.size(),8));
|
memcpy((char*)dynTicketData->licensePlate, ba_licenseplate.data(), std::min(ba_licenseplate.size(),8));
|
||||||
|
|
||||||
QByteArray ba_amount = codec->fromUnicode(printingData["amount"].toString());
|
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"));
|
QByteArray ba_parkingEndTime = codec->fromUnicode(parkingEndDateTime.toString("hh:mm"));
|
||||||
memcpy((char*)dynTicketData->parkingEnd, ba_parkingEndTime.data(), std::min(ba_parkingEndTime.size(),8));
|
memcpy((char*)dynTicketData->parkingEnd, ba_parkingEndTime.data(), std::min(ba_parkingEndTime.size(),8));
|
||||||
|
|
||||||
QByteArray ba_parkingEndDate = codec->fromUnicode(parkingEndDateTime.toString("dd.MM.yy"));
|
QByteArray ba_parkingEndDate = codec->fromUnicode(parkingEndDateString);
|
||||||
memcpy((char*)dynTicketData->currentTime, ba_parkingEndDate.data(), std::min(ba_parkingEndDate.size(),8));
|
memcpy((char*)dynTicketData->currentTime, ba_parkingEndDate.data(), std::min(ba_parkingEndDate.size(),8));
|
||||||
// ! and yes... 'ParkingEndDate' is 'currentTime'
|
// ! and yes... 'ParkingEndDate' is 'currentTime'
|
||||||
|
|
||||||
QByteArray ba_currentDate = codec->fromUnicode(currentDateTime.toString("dd.MM.yy"));
|
QByteArray ba_currentDate = codec->fromUnicode(currentDateString);
|
||||||
memcpy((char*)dynTicketData->currentDate, ba_currentDate.data(), std::min(ba_currentDate.size(),8));
|
memcpy((char*)dynTicketData->currentDate, ba_currentDate.data(), std::min(ba_currentDate.size(),8));
|
||||||
|
|
||||||
|
|
||||||
@@ -497,12 +777,13 @@ void ATBDeviceControllerPlugin::requestPrintTicket(const QHash<QString, QVariant
|
|||||||
// DEBUG
|
// DEBUG
|
||||||
qCritical() << "ATBDeviceControllerPlugin::requestPrintTicket()";
|
qCritical() << "ATBDeviceControllerPlugin::requestPrintTicket()";
|
||||||
|
|
||||||
|
/*
|
||||||
if (!this->hw->dc_isPortOpen()) {
|
if (!this->hw->dc_isPortOpen()) {
|
||||||
qCritical() << " ... serial port is not open!";
|
qCritical() << " ... serial port is not open!";
|
||||||
this->onPrintFinishedERR();
|
this->onPrintFinishedERR();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
// TODO: wird hier nur 'licensePlate' gedruckt?
|
// TODO: wird hier nur 'licensePlate' gedruckt?
|
||||||
if (!this->hw->prn_sendDynamicPrnValues(dynTicketData->licensePlate)) {
|
if (!this->hw->prn_sendDynamicPrnValues(dynTicketData->licensePlate)) {
|
||||||
@@ -571,21 +852,21 @@ void ATBDeviceControllerPlugin::onPrinterDataPrepared()
|
|||||||
|
|
||||||
// note: calling prn_getPrintResult() immediately may result in wrong answer!
|
// note: calling prn_getPrintResult() immediately may result in wrong answer!
|
||||||
// We have to wait "about some seconds" until calling this function!
|
// We have to wait "about some seconds" until calling this function!
|
||||||
QTimer::singleShot(4000, this, SLOT(onPrinterWaitForPrinting()));
|
QTimer::singleShot(4000, this, SLOT(onPrinterWaitForPrintingTicket()));
|
||||||
|
|
||||||
// old: use printer templates:
|
// old: use printer templates:
|
||||||
// this->currentTemplate = 1;
|
// this->currentTemplate = 1;
|
||||||
// this->onPrinterPrintNextTemplate();
|
// this->onPrinterPrintNextTemplate();
|
||||||
}
|
}
|
||||||
|
|
||||||
void ATBDeviceControllerPlugin::onPrinterWaitForPrinting()
|
void ATBDeviceControllerPlugin::onPrinterWaitForPrintingTicket()
|
||||||
{
|
{
|
||||||
quint8 printerResult = this->hw->prn_getPrintResult();
|
quint8 printerResult = this->hw->prn_getPrintResult();
|
||||||
|
|
||||||
switch (printerResult) {
|
switch (printerResult) {
|
||||||
case 0: // still printing
|
case 0: // still printing
|
||||||
qCritical() << "--> printer: WaitForPrinting";
|
qCritical() << "--> printer: WaitForPrintingTicket";
|
||||||
QTimer::singleShot(2000, this, SLOT(onPrinterWaitForPrinting()));
|
QTimer::singleShot(2000, this, SLOT(onPrinterWaitForPrintingTicket()));
|
||||||
break;
|
break;
|
||||||
case 1: // printing finished, Ok
|
case 1: // printing finished, Ok
|
||||||
this->onPrintFinishedOK();
|
this->onPrintFinishedOK();
|
||||||
@@ -622,9 +903,7 @@ void ATBDeviceControllerPlugin::onPrinterPrintNextTemplate()
|
|||||||
|
|
||||||
if (templateList.isEmpty()) {
|
if (templateList.isEmpty()) {
|
||||||
// all templates are printed
|
// all templates are printed
|
||||||
|
QTimer::singleShot(2000, this, SLOT(onPrinterWaitForPrintingTicket()));
|
||||||
// FAKE SIGNAL:
|
|
||||||
QTimer::singleShot(2000, this, SLOT(onPrintFinishedOK()));
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// print next template
|
// print next template
|
||||||
@@ -685,6 +964,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()
|
void ATBDeviceControllerPlugin::onCashPayStopByMax()
|
||||||
{
|
{
|
||||||
@@ -708,6 +996,9 @@ void ATBDeviceControllerPlugin::onCashPayStopByEscrow()
|
|||||||
emit this->cashInputFinished(nsDeviceControllerInterface::RESULT_STATE::ERROR_BACKEND,
|
emit this->cashInputFinished(nsDeviceControllerInterface::RESULT_STATE::ERROR_BACKEND,
|
||||||
amountString,
|
amountString,
|
||||||
"",
|
"",
|
||||||
|
"",
|
||||||
|
"",
|
||||||
|
"",
|
||||||
"");
|
"");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -723,6 +1014,9 @@ void ATBDeviceControllerPlugin::onCashPayStopByError()
|
|||||||
emit this->cashInputFinished(nsDeviceControllerInterface::RESULT_STATE::ERROR_BACKEND,
|
emit this->cashInputFinished(nsDeviceControllerInterface::RESULT_STATE::ERROR_BACKEND,
|
||||||
amountString,
|
amountString,
|
||||||
"",
|
"",
|
||||||
|
"",
|
||||||
|
"",
|
||||||
|
"",
|
||||||
"");
|
"");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -738,27 +1032,217 @@ void ATBDeviceControllerPlugin::onCashPayStopByTimeout()
|
|||||||
emit this->cashInputFinished(nsDeviceControllerInterface::RESULT_STATE::ERROR_BACKEND,
|
emit this->cashInputFinished(nsDeviceControllerInterface::RESULT_STATE::ERROR_BACKEND,
|
||||||
amountString,
|
amountString,
|
||||||
"",
|
"",
|
||||||
|
"",
|
||||||
|
"",
|
||||||
|
"",
|
||||||
"");
|
"");
|
||||||
}
|
}
|
||||||
|
|
||||||
void ATBDeviceControllerPlugin::onCashPayStopedSuccess()
|
void ATBDeviceControllerPlugin::onCashPayStopedSuccess()
|
||||||
{
|
{
|
||||||
// DEBUG
|
// DEBUG
|
||||||
qCritical() << "ATBDeviceControllerPlugin::onCashPayStoped()";
|
qCritical() << "ATBDeviceControllerPlugin::onCashPayStopedSuccess()";
|
||||||
|
|
||||||
|
// inserted amount
|
||||||
uint32_t amountInt = this->hw->getInsertedAmount();
|
uint32_t amountInt = this->hw->getInsertedAmount();
|
||||||
|
|
||||||
QString amountString = QString::number(amountInt);
|
QString amountString = QString::number(amountInt);
|
||||||
|
|
||||||
qCritical() << " insertedAmount (int) = " << amountInt;
|
// inserted coins
|
||||||
qCritical() << " insertedAmount = " << amountString;
|
uint32_t amountCoinsInt = CashUtils::getAmountOfInsertedCoins(this->hw);
|
||||||
|
QString amountCoinsString = QString::number(amountCoinsInt);
|
||||||
|
|
||||||
|
// inserted notes
|
||||||
|
uint32_t amountNotesInt = CashUtils::getAmountOfInsertedNotes(this->hw);
|
||||||
|
QString amountNotesString = QString::number(amountNotesInt);
|
||||||
|
|
||||||
|
// amount due to change
|
||||||
|
uint32_t amountDueToChangeInt;
|
||||||
|
if (amountInt > this->cashStartAmountInt) {
|
||||||
|
amountDueToChangeInt = amountInt - this->cashStartAmountInt;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
amountDueToChangeInt = 0;
|
||||||
|
}
|
||||||
|
QString amountDueToChangeString = QString::number(amountDueToChangeInt);
|
||||||
|
|
||||||
|
|
||||||
|
// DEBUG
|
||||||
|
qCritical() << "---------------------------------------------------------";
|
||||||
|
qCritical() << "ATBDeviceControllerPlugin::onCashPayStopedSuccess()";
|
||||||
|
qCritical() << "";
|
||||||
|
qCritical() << " amountInt: " << amountInt;
|
||||||
|
qCritical() << " amountString: " << amountString;
|
||||||
|
qCritical() << "";
|
||||||
|
qCritical() << " amountNotesInt: " << amountNotesInt;
|
||||||
|
qCritical() << " amountNotesString: " << amountNotesString;
|
||||||
|
qCritical() << "";
|
||||||
|
qCritical() << " amountCoinsInt: " << amountCoinsInt;
|
||||||
|
qCritical() << " amountCoinsString: " << amountCoinsString;
|
||||||
|
qCritical() << "";
|
||||||
|
qCritical() << " this->cashStartAmountInt: " << this->cashStartAmountInt;
|
||||||
|
qCritical() << " amountDueToChangeInt: " << amountDueToChangeInt;
|
||||||
|
qCritical() << " amountDueToChangeString: " << amountDueToChangeString;
|
||||||
|
qCritical() << "---------------------------------------------------------";
|
||||||
|
|
||||||
|
|
||||||
emit this->cashInputFinished(nsDeviceControllerInterface::RESULT_STATE::SUCCESS,
|
emit this->cashInputFinished(nsDeviceControllerInterface::RESULT_STATE::SUCCESS,
|
||||||
amountString,
|
amountString,
|
||||||
|
amountCoinsString, // coins
|
||||||
|
amountNotesString, // notes
|
||||||
|
amountDueToChangeString, // proposed change
|
||||||
"",
|
"",
|
||||||
"");
|
"");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ATBDeviceControllerPlugin::onCashChangerState()
|
||||||
|
{
|
||||||
|
uint32_t amountThatCouldNotBeChangedInt;
|
||||||
|
|
||||||
|
static int changerStateRequestCounter = 0;
|
||||||
|
static uint8_t lastChangerResult = 0;
|
||||||
|
|
||||||
|
|
||||||
|
// inserted amount
|
||||||
|
uint32_t amountInt = this->hw->getInsertedAmount();
|
||||||
|
QString amountString = QString::number(amountInt);
|
||||||
|
|
||||||
|
// inserted coins
|
||||||
|
uint32_t amountCoinsInt = CashUtils::getAmountOfInsertedCoins(this->hw);
|
||||||
|
QString amountCoinsString = QString::number(amountCoinsInt);
|
||||||
|
|
||||||
|
// inserted notes
|
||||||
|
uint32_t amountNotesInt = CashUtils::getAmountOfInsertedNotes(this->hw);
|
||||||
|
QString amountNotesString = QString::number(amountNotesInt);
|
||||||
|
|
||||||
|
// amount due to change
|
||||||
|
uint32_t amountCoinsChangedInt;
|
||||||
|
if (amountInt > this->cashStartAmountInt) {
|
||||||
|
amountCoinsChangedInt = amountInt - this->cashStartAmountInt;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
amountCoinsChangedInt = 0;
|
||||||
|
}
|
||||||
|
QString amountCoinsChangedString = QString::number(amountCoinsChangedInt);
|
||||||
|
|
||||||
|
// if we do not need to give change:
|
||||||
|
if (amountCoinsChangedInt == 0) {
|
||||||
|
emit this->cashPaymentFinished(nsDeviceControllerInterface::RESULT_STATE::SUCCESS,
|
||||||
|
amountString,
|
||||||
|
amountCoinsString, // coins
|
||||||
|
amountNotesString, // notes
|
||||||
|
amountCoinsChangedString, // change
|
||||||
|
"",
|
||||||
|
"");
|
||||||
|
changerStateRequestCounter = 0;
|
||||||
|
lastChangerResult = 0;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// get changer state ------------------------------------------------
|
||||||
|
// Note: 'returnedAmount'-parameter is missleading here!
|
||||||
|
// 'returnedAmount' is the amount which could not be changed!
|
||||||
|
|
||||||
|
lastChangerResult = hw->changer_getChangeResult(&amountThatCouldNotBeChangedInt);
|
||||||
|
|
||||||
|
// DEBUG
|
||||||
|
qCritical() << "---------------------------------------------------------";
|
||||||
|
qCritical() << "ATBDeviceControllerPlugin::onCashChangerState()";
|
||||||
|
qCritical() << " changerStateRequestCounter: " << changerStateRequestCounter;
|
||||||
|
qCritical() << " lastChangerResult: " << lastChangerResult;
|
||||||
|
qCritical() << " amountThatCouldNotBeChangedInt: " << amountThatCouldNotBeChangedInt;
|
||||||
|
qCritical() << "";
|
||||||
|
qCritical() << " amountInt: " << amountInt;
|
||||||
|
qCritical() << " amountString: " << amountString;
|
||||||
|
qCritical() << "";
|
||||||
|
qCritical() << " amountCoinsInt: " << amountCoinsInt;
|
||||||
|
qCritical() << " amountCoinsString: " << amountCoinsString;
|
||||||
|
qCritical() << "";
|
||||||
|
qCritical() << " amountNotesInt: " << amountNotesInt;
|
||||||
|
qCritical() << " amountNotesString: " << amountNotesString;
|
||||||
|
qCritical() << "";
|
||||||
|
qCritical() << " this->cashStartAmountInt: " << this->cashStartAmountInt;
|
||||||
|
qCritical() << " amountCoinsChangedInt: " << amountCoinsChangedInt;
|
||||||
|
qCritical() << " amountCoinsChangedString: " << amountCoinsChangedString;
|
||||||
|
qCritical() << "---------------------------------------------------------";
|
||||||
|
|
||||||
|
if (lastChangerResult == 1) { // change is returned
|
||||||
|
|
||||||
|
|
||||||
|
QString amountCoinsChangedString = QString::number(amountCoinsChangedInt);
|
||||||
|
|
||||||
|
emit this->cashPaymentFinished(nsDeviceControllerInterface::RESULT_STATE::SUCCESS,
|
||||||
|
amountString,
|
||||||
|
amountCoinsString, // coins
|
||||||
|
amountNotesString, // notes
|
||||||
|
amountCoinsChangedString, // change
|
||||||
|
"",
|
||||||
|
"");
|
||||||
|
changerStateRequestCounter = 0;
|
||||||
|
lastChangerResult = 0;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
if (lastChangerResult == 0) { // not yet started
|
||||||
|
qCritical() << "ATBDeviceControllerPlugin::onCashChangerState(): ERROR: change not yet started: amount due to return: " << amountCoinsChangedString;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
if (lastChangerResult == 2) { // only partial return
|
||||||
|
qCritical() << "ATBDeviceControllerPlugin::onCashChangerState(): ERROR: only partial return: amount due to return: " << amountCoinsChangedString;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
if (lastChangerResult == 3) { // no return possible
|
||||||
|
qCritical() << "ATBDeviceControllerPlugin::onCashChangerState(): ERROR: no return possible: amount due to return: " << amountCoinsChangedString;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
qCritical() << "ATBDeviceControllerPlugin::onCashChangerState(): ERROR: invalid changerState (" << lastChangerResult << ")";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// handle timeout ------------------------------------------------
|
||||||
|
if (changerStateRequestCounter > 15) {
|
||||||
|
QString errorCode;
|
||||||
|
QString errorDescription;
|
||||||
|
switch (lastChangerResult) {
|
||||||
|
case 0: // not yet started
|
||||||
|
errorCode = "DC::CHANGER::START";
|
||||||
|
errorDescription = "Changer does not start";
|
||||||
|
break;
|
||||||
|
case 1: // amount returned
|
||||||
|
// This error should not occur!
|
||||||
|
errorCode = "DC::CHANGER::INVALID";
|
||||||
|
errorDescription = "Changer returned amount";
|
||||||
|
break;
|
||||||
|
case 2: // only partial return
|
||||||
|
errorCode = "DC::CHANGER::CHANGE";
|
||||||
|
errorDescription = "Changer does only partial return";
|
||||||
|
break;
|
||||||
|
case 3: // no return possible
|
||||||
|
errorCode = "DC::CHANGER::CHANGE_NOT_POSSIBLE";
|
||||||
|
errorDescription = "Changing not possible";
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
emit this->cashPaymentFinished(nsDeviceControllerInterface::RESULT_STATE::ERROR_BACKEND,
|
||||||
|
amountString,
|
||||||
|
amountCoinsString,
|
||||||
|
amountNotesString,
|
||||||
|
0,
|
||||||
|
errorCode,
|
||||||
|
errorDescription);
|
||||||
|
changerStateRequestCounter = 0;
|
||||||
|
lastChangerResult = 0;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// restart changer check:
|
||||||
|
changerStateRequestCounter++;
|
||||||
|
QTimer::singleShot(1000, this, &ATBDeviceControllerPlugin::onCashChangerState);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -773,7 +1257,8 @@ bool ATBDeviceControllerPlugin::private_loadCashAgentLib(QString pluginName)
|
|||||||
|
|
||||||
// search list for plugin (.so) file:
|
// search list for plugin (.so) file:
|
||||||
QStringList pluginNameList;
|
QStringList pluginNameList;
|
||||||
pluginNameList << "/usr/lib/libCAmaster.so"
|
pluginNameList << "/usr/lib/libCAslave.so"
|
||||||
|
<< "/usr/lib/libCAmaster.so"
|
||||||
<< "/usr/lib/libCashAgentLib.so";
|
<< "/usr/lib/libCashAgentLib.so";
|
||||||
// using C++11 range based loop:
|
// using C++11 range based loop:
|
||||||
for (const auto& filename : pluginNameList) {
|
for (const auto& filename : pluginNameList) {
|
||||||
@@ -799,6 +1284,14 @@ bool ATBDeviceControllerPlugin::private_loadCashAgentLib(QString pluginName)
|
|||||||
return false;
|
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();
|
QPluginLoader* pluginLoader = new QPluginLoader();
|
||||||
pluginLoader->setFileName(pluginName);
|
pluginLoader->setFileName(pluginName);
|
||||||
|
|
||||||
@@ -830,11 +1323,61 @@ bool ATBDeviceControllerPlugin::private_loadCashAgentLib(QString pluginName)
|
|||||||
|
|
||||||
qCritical() << "ATBDeviceControllerPlugin: loaded CashAgentLib";
|
qCritical() << "ATBDeviceControllerPlugin: loaded CashAgentLib";
|
||||||
|
|
||||||
|
if (this->isMaster) {
|
||||||
|
QTimer::singleShot(500, this, &ATBDeviceControllerPlugin::startPhysicalLayer);
|
||||||
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/***********************************************************************************************
|
||||||
|
* dbus
|
||||||
|
*/
|
||||||
|
int ATBDeviceControllerPlugin::init_sc_dbus()
|
||||||
|
{
|
||||||
|
#if defined (ARCH_PTU4)
|
||||||
|
this->dbus = new DBusControllerInterface("eu.atb.ptu", "/systemcontrol", QDBusConnection::systemBus(), 0);
|
||||||
|
#elif defined (ARCH_PTU5)
|
||||||
|
this->dbus = new DBusControllerInterface("eu.atb.ptu.systemcontrol", "/systemcontrol", QDBusConnection::systemBus(), 0);
|
||||||
|
#else
|
||||||
|
this->dbus = new DBusControllerInterface("eu.atb.ptu", "/systemcontrol", QDBusConnection::sessionBus(), 0);
|
||||||
|
#endif
|
||||||
|
if (!dbus->isValid()) {
|
||||||
|
QString errorString = QDBusError::errorString(dbus->lastError().type());
|
||||||
|
qCritical() << errorString;
|
||||||
|
|
||||||
|
if (dbus->lastError().isValid()){
|
||||||
|
qCritical() << "last error is valid.";
|
||||||
|
}
|
||||||
|
|
||||||
|
qCritical() << "message: " << dbus->lastError().message();
|
||||||
|
qCritical() << "SystemController is not valid.";
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!dbus->connection().isConnected()) {
|
||||||
|
qCritical() << "SystemController is not connected.";
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
connect(this->dbus, SIGNAL(wokeUpFrom(uchar)), this, SLOT(onWokeUp(uchar)));
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
void ATBDeviceControllerPlugin::onWokeUp(uchar source)
|
||||||
|
{
|
||||||
|
if (source == 0x01) {
|
||||||
|
// woke up from device controller
|
||||||
|
this->diag->diagRequest();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/************************************************************************************************
|
/************************************************************************************************
|
||||||
* Mandatory plugin methods
|
* Mandatory plugin methods
|
||||||
*
|
*
|
||||||
|
@@ -2,6 +2,7 @@
|
|||||||
#define ATBDEVICECONTROLLERPLUGIN_H
|
#define ATBDEVICECONTROLLERPLUGIN_H
|
||||||
|
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
|
#include <QLocale>
|
||||||
|
|
||||||
#include "src/ATBAPP/DeviceControllerInterface.h"
|
#include "src/ATBAPP/DeviceControllerInterface.h"
|
||||||
#include "src/ATBAPP/ATBAPPplugin.h"
|
#include "src/ATBAPP/ATBAPPplugin.h"
|
||||||
@@ -9,13 +10,14 @@
|
|||||||
|
|
||||||
#include "version.h"
|
#include "version.h"
|
||||||
|
|
||||||
|
#include "support/PersistentData.h"
|
||||||
|
|
||||||
#include "interfaces.h"
|
#include "interfaces.h"
|
||||||
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
|
|
||||||
|
class DBusControllerInterface;
|
||||||
class QTextCodec;
|
class QTextCodec;
|
||||||
|
|
||||||
|
|
||||||
@@ -47,10 +49,15 @@ public:
|
|||||||
void cashCollect();
|
void cashCollect();
|
||||||
void cashAbort();
|
void cashAbort();
|
||||||
|
|
||||||
|
// read coin/cash processing variants -----------------------------------------
|
||||||
|
nsDeviceControllerInterface::COIN_PROCESSOR coinProcessor();
|
||||||
|
nsDeviceControllerInterface::BILL_ACCEPTOR billAcceptor();
|
||||||
|
|
||||||
// TASKS: printing ------------------------------------------------------------
|
// TASKS: printing ------------------------------------------------------------
|
||||||
void requestPrintTicket(const QHash<QString, QVariant> & printingData);
|
void requestPrintTicket(const QHash<QString, QVariant> & printingData);
|
||||||
void requestPrintTicket(nsDeviceControllerInterface::TICKET_VARIANT ticketVariant, const QHash<QString, QVariant> & printingData);
|
void requestPrintTicket(nsDeviceControllerInterface::TICKET_VARIANT ticketVariant, const QHash<QString, QVariant> & printingData);
|
||||||
void requestPrintReceipt(const QHash<QString, QVariant> & printingData);
|
void requestPrintReceipt(const QHash<QString, QVariant> & printingData);
|
||||||
|
void requestPrintReceipt(const QString & printingString);
|
||||||
|
|
||||||
// TASKS: Account -------------------------------------------------------------
|
// TASKS: Account -------------------------------------------------------------
|
||||||
void requestAccount();
|
void requestAccount();
|
||||||
@@ -73,11 +80,13 @@ public slots:
|
|||||||
|
|
||||||
void startPhysicalLayer();
|
void startPhysicalLayer();
|
||||||
void stopPhysicalLayer();
|
void stopPhysicalLayer();
|
||||||
|
void reboot();
|
||||||
|
void reset();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
|
// public Signals are defined in interface
|
||||||
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
@@ -91,14 +100,22 @@ private:
|
|||||||
|
|
||||||
bool useDebug;
|
bool useDebug;
|
||||||
|
|
||||||
|
bool isMaster;
|
||||||
|
|
||||||
PLUGIN_STATE pluginState;
|
PLUGIN_STATE pluginState;
|
||||||
|
|
||||||
QObject* eventReceiver;
|
QObject* eventReceiver;
|
||||||
|
|
||||||
|
DBusControllerInterface* dbus;
|
||||||
|
|
||||||
hwinf* hw;
|
hwinf* hw;
|
||||||
|
|
||||||
DeviceControllerDiag* diag;
|
DeviceControllerDiag* diag;
|
||||||
|
|
||||||
|
PersistentData *persistentData;
|
||||||
|
|
||||||
|
uint32_t cashStartAmountInt;
|
||||||
|
|
||||||
|
|
||||||
QTextCodec *codec;
|
QTextCodec *codec;
|
||||||
|
|
||||||
@@ -111,6 +128,10 @@ private:
|
|||||||
// counts failed hw->log_chkIfVaultRecordAvailable()
|
// counts failed hw->log_chkIfVaultRecordAvailable()
|
||||||
int accountCheckCounter;
|
int accountCheckCounter;
|
||||||
|
|
||||||
|
// dbus
|
||||||
|
int init_sc_dbus();
|
||||||
|
|
||||||
|
QLocale printerLocale;
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
// printer
|
// printer
|
||||||
@@ -118,7 +139,8 @@ private slots:
|
|||||||
void onPrinterDataPrepared();
|
void onPrinterDataPrepared();
|
||||||
void onPrinterDataPreparedForTemplates();
|
void onPrinterDataPreparedForTemplates();
|
||||||
void onPrinterPrintNextTemplate();
|
void onPrinterPrintNextTemplate();
|
||||||
void onPrinterWaitForPrinting();
|
void onPrinterWaitForPrintingTicket();
|
||||||
|
void onPrinterWaitForPrintingReceipt();
|
||||||
|
|
||||||
void onPrintFinishedOK();
|
void onPrintFinishedOK();
|
||||||
void onPrintFinishedERR();
|
void onPrintFinishedERR();
|
||||||
@@ -127,9 +149,11 @@ private slots:
|
|||||||
void onCashGotCoin();
|
void onCashGotCoin();
|
||||||
void onCashPayStopedSuccess();
|
void onCashPayStopedSuccess();
|
||||||
void onCashPayStopByMax();
|
void onCashPayStopByMax();
|
||||||
|
void onCashPayStopByPushbutton();
|
||||||
void onCashPayStopByEscrow();
|
void onCashPayStopByEscrow();
|
||||||
void onCashPayStopByError();
|
void onCashPayStopByError();
|
||||||
void onCashPayStopByTimeout();
|
void onCashPayStopByTimeout();
|
||||||
|
void onCashChangerState();
|
||||||
|
|
||||||
// doors and hardware contacts
|
// doors and hardware contacts
|
||||||
void onServiceDoorOpened();
|
void onServiceDoorOpened();
|
||||||
@@ -143,6 +167,11 @@ private slots:
|
|||||||
void private_startAccount();
|
void private_startAccount();
|
||||||
void private_checkAccountData();
|
void private_checkAccountData();
|
||||||
void private_getAccountData();
|
void private_getAccountData();
|
||||||
|
|
||||||
|
// measurement values
|
||||||
|
void onNewVoltage(uint32_t voltage);
|
||||||
|
|
||||||
|
void onWokeUp(uchar source);
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // ATBDEVICECONTROLLERPLUGIN_H
|
#endif // ATBDEVICECONTROLLERPLUGIN_H
|
||||||
|
@@ -56,6 +56,9 @@ QString ATBMachineEvent::getEventClassString(EVENT_CLASS eventClass)
|
|||||||
case EVENT_CLASS::STATE:
|
case EVENT_CLASS::STATE:
|
||||||
return "STATE";
|
return "STATE";
|
||||||
break;
|
break;
|
||||||
|
case EVENT_CLASS::OPERATE:
|
||||||
|
return "OPERATE";
|
||||||
|
break;
|
||||||
case EVENT_CLASS::NOT_DEFINED:
|
case EVENT_CLASS::NOT_DEFINED:
|
||||||
return "NOT_DEFINED";
|
return "NOT_DEFINED";
|
||||||
break;
|
break;
|
||||||
|
@@ -41,6 +41,7 @@ enum class EVENT_CLASS : quint8 {
|
|||||||
ALARM,
|
ALARM,
|
||||||
DEBUG,
|
DEBUG,
|
||||||
STATE,
|
STATE,
|
||||||
|
OPERATE,
|
||||||
NOT_DEFINED
|
NOT_DEFINED
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -1,14 +1,18 @@
|
|||||||
#include "DeviceControllerDiag.h"
|
#include "DeviceControllerDiag.h"
|
||||||
|
|
||||||
#include <QCoreApplication>
|
#include <QCoreApplication>
|
||||||
|
#include <QMetaEnum>
|
||||||
#include <QUuid>
|
#include <QUuid>
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
|
|
||||||
DeviceControllerDiag::DeviceControllerDiag(QObject *parent)
|
DeviceControllerDiag::DeviceControllerDiag(PersistentData *pData, QObject *parent)
|
||||||
: QObject(parent)
|
: QObject(parent)
|
||||||
|
, coinProcessorType(nsDeviceControllerInterface::COIN_PROCESSOR::ESCROW)
|
||||||
|
, billAcceptor(nsDeviceControllerInterface::BILL_ACCEPTOR::NO)
|
||||||
, eventReceiver(nullptr)
|
, eventReceiver(nullptr)
|
||||||
, isRequestRunning(false)
|
, isRequestRunning(false)
|
||||||
, flagInterruptDiag(false)
|
, flagInterruptDiag(false)
|
||||||
|
, pData(pData)
|
||||||
{
|
{
|
||||||
diagRequestTimeoutTimer = new QTimer(this);
|
diagRequestTimeoutTimer = new QTimer(this);
|
||||||
diagRequestTimeoutTimer->setInterval(1000*20); // 20s
|
diagRequestTimeoutTimer->setInterval(1000*20); // 20s
|
||||||
@@ -39,6 +43,16 @@ void DeviceControllerDiag::diagRequest()
|
|||||||
this->diagRequestTimeoutTimer->start();
|
this->diagRequestTimeoutTimer->start();
|
||||||
|
|
||||||
this->private_startDiag();
|
this->private_startDiag();
|
||||||
|
|
||||||
|
// read dc-fw-version:
|
||||||
|
/* note: dc_getSWVersion() returns always 32 characters (QString)...
|
||||||
|
* if no version string could be read it will contain 32 null-characters:
|
||||||
|
* "\u0000\u0000..."
|
||||||
|
*/
|
||||||
|
QString dc_fw_version = hw->dc_getSWversion().remove(QChar('\0'));
|
||||||
|
qCritical() << "ATBDeviceControllerPlugin: DC firmware version: " << dc_fw_version;
|
||||||
|
this->pData->setDCFirmwareVersion(dc_fw_version);
|
||||||
|
this->pData->serializeToFile();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -53,7 +67,9 @@ void DeviceControllerDiag::private_startDiag()
|
|||||||
// check for DiagRequestTimeoutTimerTimeout:
|
// check for DiagRequestTimeoutTimerTimeout:
|
||||||
if (this->flagInterruptDiag) {
|
if (this->flagInterruptDiag) {
|
||||||
qCritical() << "DeviceControllerDiag::private_startDiag() interrupted!";
|
qCritical() << "DeviceControllerDiag::private_startDiag() interrupted!";
|
||||||
this->private_finishedDiag(0xff);
|
this->private_sendDiagEvent(DeviceController::State::E255);
|
||||||
|
this->isRequestRunning = false;
|
||||||
|
this->flagInterruptDiag = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -85,7 +101,9 @@ void DeviceControllerDiag::sys_superviseSystem()
|
|||||||
// check for DiagRequestTimeoutTimerTimeout:
|
// check for DiagRequestTimeoutTimerTimeout:
|
||||||
if (this->flagInterruptDiag) {
|
if (this->flagInterruptDiag) {
|
||||||
qCritical() << "DeviceControllerDiag::sys_superviseSystem() interrupted!";
|
qCritical() << "DeviceControllerDiag::sys_superviseSystem() interrupted!";
|
||||||
this->private_finishedDiag(0xff);
|
this->private_sendDiagEvent(DeviceController::State::E255);
|
||||||
|
this->flagInterruptDiag = false;
|
||||||
|
this->isRequestRunning = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -93,7 +111,9 @@ void DeviceControllerDiag::sys_superviseSystem()
|
|||||||
{
|
{
|
||||||
// es gibt keinerlei gültige Daten vom DC
|
// es gibt keinerlei gültige Daten vom DC
|
||||||
qCritical() << "DeviceControllerDiag::sys_superviseSystem() no valid data!";
|
qCritical() << "DeviceControllerDiag::sys_superviseSystem() no valid data!";
|
||||||
this->private_finishedDiag(0xfe);
|
this->private_sendDiagEvent(DeviceController::State::E254);
|
||||||
|
this->diagRequestTimeoutTimer->stop();
|
||||||
|
this->isRequestRunning = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -120,37 +140,24 @@ void DeviceControllerDiag::sys_superviseSystem()
|
|||||||
if (dynMaCond.lowerDoor || dynMaCond.upperDoor) {
|
if (dynMaCond.lowerDoor || dynMaCond.upperDoor) {
|
||||||
// Service or battery door is open, goto INTRUSION MODE
|
// Service or battery door is open, goto INTRUSION MODE
|
||||||
qCritical() << "DeviceControllerDiag::sys_superviseSystem() Service or battery door is open, goto INTRUSION MODE";
|
qCritical() << "DeviceControllerDiag::sys_superviseSystem() Service or battery door is open, goto INTRUSION MODE";
|
||||||
this->private_finishedDiag(0xFD);
|
this->private_sendDiagEvent(DeviceController::State::E253);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
if (dynMaCond.middleDoor) {
|
if (dynMaCond.middleDoor) {
|
||||||
// vault door is open, goto INTRUSION MODE
|
// vault door is open, goto INTRUSION MODE
|
||||||
qCritical() << "DeviceControllerDiag::sys_superviseSystem() vault door is open, goto INTRUSION MODE";
|
qCritical() << "DeviceControllerDiag::sys_superviseSystem() vault door is open, goto INTRUSION MODE";
|
||||||
this->private_finishedDiag(0xFC);
|
this->private_sendDiagEvent(DeviceController::State::E252);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
qCritical() << " --> call sub_componentAssessment()";
|
qCritical() << " --> call sub_componentAssessment()";
|
||||||
|
|
||||||
uint8_t proposedError = sub_componentAssessment();
|
sub_componentAssessment();
|
||||||
if (proposedError) {
|
|
||||||
// All doors are closed but errors found, goto OOO MODE (out-of-order)
|
|
||||||
qCritical() << "DeviceControllerDiag::sys_superviseSystem() All doors are closed but errors found, goto OOO MODE (out-of-order)";
|
|
||||||
this->private_finishedDiag(proposedError);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// everything fine
|
|
||||||
qCritical() << "DeviceControllerDiag::sys_superviseSystem() everything fine";
|
|
||||||
this->private_finishedDiag(0x00);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
uint8_t DeviceControllerDiag::sub_componentAssessment()
|
void DeviceControllerDiag::sub_componentAssessment()
|
||||||
{
|
{
|
||||||
// this function decides if vending mode is possible, independant from door
|
bool flag_sendOperate = true;
|
||||||
// return >0 in case of error
|
|
||||||
|
|
||||||
struct T_moduleCondition modCond;
|
struct T_moduleCondition modCond;
|
||||||
hw->sys_getDeviceConditions(&modCond);
|
hw->sys_getDeviceConditions(&modCond);
|
||||||
@@ -161,111 +168,199 @@ uint8_t DeviceControllerDiag::sub_componentAssessment()
|
|||||||
struct T_devices devPara;
|
struct T_devices devPara;
|
||||||
hw->sys_restoreDeviceParameter(&devPara);
|
hw->sys_restoreDeviceParameter(&devPara);
|
||||||
|
|
||||||
if (modCond.rtc>=200)
|
// store some interesting results:
|
||||||
return 1;
|
// -> voltage:
|
||||||
if (modCond.printer==200 || modCond.printer==201) // 200: not connected 201: printer-HW-error 202: no paper
|
uint32_t voltage = hw->dc_getVoltage();
|
||||||
return 2;
|
emit newVoltage(voltage);
|
||||||
if (modCond.printer==202)
|
|
||||||
return 3;
|
|
||||||
|
|
||||||
if (modCond.coinBlocker>=200)
|
|
||||||
return 4;
|
// check for alarm:
|
||||||
if (modCond.mdbBus>=200)
|
|
||||||
return 5;
|
if (dynMaCond.onAlarm>0) {
|
||||||
if (modCond.intEe>=200)
|
flag_sendOperate = false;
|
||||||
return 6;
|
this->private_sendDiagEvent(DeviceController::State::A000);
|
||||||
|
}
|
||||||
|
|
||||||
|
// check for invalid states:
|
||||||
|
|
||||||
|
if (modCond.rtc>=200) {
|
||||||
|
flag_sendOperate = false;
|
||||||
|
this->private_sendDiagEvent(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);
|
||||||
|
}
|
||||||
|
if (modCond.printer==202) {
|
||||||
|
flag_sendOperate = false;
|
||||||
|
this->private_sendDiagEvent(DeviceController::State::E018);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (modCond.coinBlocker>=200) {
|
||||||
|
flag_sendOperate = false;
|
||||||
|
this->private_sendDiagEvent(DeviceController::State::E025);
|
||||||
|
}
|
||||||
|
if (modCond.mdbBus>=200) {
|
||||||
|
flag_sendOperate = false;
|
||||||
|
this->private_sendDiagEvent(DeviceController::State::E034);
|
||||||
|
}
|
||||||
|
if (modCond.intEe>=200) {
|
||||||
|
flag_sendOperate = false;
|
||||||
|
this->private_sendDiagEvent(DeviceController::State::E011);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2023-07-26: workaround for 00281/Szeged --------------------------------------------------------------
|
||||||
|
// because we need certain errors and we do get for 'kindOfCoinChecker' -> 16 !
|
||||||
|
qCritical() << "-----------diag: kindOfCoinChecker = " << devPara.kindOfCoinChecker;
|
||||||
|
qCritical() << " modCond.coinSafe = " << modCond.coinSafe;
|
||||||
|
if (devPara.kindOfCoinChecker > 0) {
|
||||||
|
if (modCond.coinSafe==201) { // full
|
||||||
|
flag_sendOperate = false;
|
||||||
|
this->private_sendDiagEvent(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);
|
||||||
|
}
|
||||||
|
if (modCond.coinEscrow>=200) {
|
||||||
|
flag_sendOperate = false;
|
||||||
|
this->private_sendDiagEvent(DeviceController::State::E010);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// -----------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
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 (devPara.kindOfCoinChecker==1 || devPara.kindOfCoinChecker==2) // 0: without 1=EMP820 2=EMP900 3=currenza c² (MW)
|
||||||
{
|
{
|
||||||
if (modCond.coinChecker>=200 || modCond.coinEscrow>=200)
|
if (modCond.coinEscrow>=200) {
|
||||||
{
|
flag_sendOperate = false;
|
||||||
// Fehler Münzver.
|
this->private_sendDiagEvent(DeviceController::State::E010);
|
||||||
return 7;
|
|
||||||
}
|
}
|
||||||
if (modCond.coinSafe>200) // 200: kasse fehlt 201: voll 100:fast voll 1:ok
|
if (modCond.coinSafe==201) { // full
|
||||||
{
|
flag_sendOperate = false;
|
||||||
return 8;
|
this->private_sendDiagEvent(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);
|
||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
if (devPara.kindOfCoinChecker==3)
|
if (devPara.kindOfCoinChecker==3)
|
||||||
{
|
{
|
||||||
if (modCond.changer>=200)
|
if (modCond.changer>=200) {
|
||||||
{
|
|
||||||
// Fehler Münzver.
|
// Fehler Münzver.
|
||||||
return 7;
|
flag_sendOperate = false;
|
||||||
|
this->private_sendDiagEvent(DeviceController::State::E026);
|
||||||
}
|
}
|
||||||
if (modCond.coinSafe>200) // 200: kasse fehlt 201: voll 100:fast voll 1:ok
|
if (modCond.coinSafe==201) { // full
|
||||||
{
|
flag_sendOperate = false;
|
||||||
return 8;
|
this->private_sendDiagEvent(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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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)
|
if ( modCond.billReader>=200 && devPara.BillAcceptor>0)
|
||||||
{
|
{
|
||||||
// Fehler BNA
|
if (modCond.billReader == 200) // 200: kasse fehlt 201: voll 100:fast voll 1:ok
|
||||||
return 9;
|
{
|
||||||
|
return TODO;
|
||||||
|
}
|
||||||
|
if (modCond.billReader == 201) // 200: kasse fehlt 201: voll 100:fast voll 1:ok
|
||||||
|
{
|
||||||
|
return TODO;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
|
if (dynMaCond.modeAbrech>0) {
|
||||||
|
flag_sendOperate = false;
|
||||||
|
this->private_sendDiagEvent(DeviceController::State::E011);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dynMaCond.onAlarm>0)
|
if (dynMaCond.nowCardTest>0) {
|
||||||
return 10;
|
flag_sendOperate = false;
|
||||||
|
this->private_sendDiagEvent(DeviceController::State::E072);
|
||||||
|
}
|
||||||
|
|
||||||
if (dynMaCond.modeAbrech>0)
|
if (dynMaCond.startupTestIsRunning>0) {
|
||||||
return 11;
|
flag_sendOperate = false;
|
||||||
|
this->private_sendDiagEvent(DeviceController::State::E073);
|
||||||
|
}
|
||||||
|
|
||||||
if (dynMaCond.nowCardTest>0)
|
if (modCond.voltage>=200) {
|
||||||
return 12;
|
flag_sendOperate = false;
|
||||||
|
this->private_sendDiagEvent(DeviceController::State::E003);
|
||||||
|
}
|
||||||
|
if (modCond.temper>=200) {
|
||||||
|
flag_sendOperate = false;
|
||||||
|
this->private_sendDiagEvent(DeviceController::State::E004);
|
||||||
|
}
|
||||||
|
|
||||||
if (dynMaCond.startupTestIsRunning>0)
|
// check for warnings
|
||||||
return 13;
|
if (modCond.printer>=100 && modCond.printer<200) {
|
||||||
|
flag_sendOperate = false;
|
||||||
|
this->private_sendDiagEvent(DeviceController::State::W001);
|
||||||
|
}
|
||||||
|
if (modCond.coinSafe>=100 && modCond.coinSafe<200) {
|
||||||
|
flag_sendOperate = false;
|
||||||
|
this->private_sendDiagEvent(DeviceController::State::W002);
|
||||||
|
}
|
||||||
|
if (modCond.voltage>=100 && modCond.voltage<200) {
|
||||||
|
flag_sendOperate = false;
|
||||||
|
this->private_sendDiagEvent(DeviceController::State::W003);
|
||||||
|
}
|
||||||
|
if (modCond.temper>=100 && modCond.temper<200) {
|
||||||
|
flag_sendOperate = false;
|
||||||
|
this->private_sendDiagEvent(DeviceController::State::W004);
|
||||||
|
}
|
||||||
|
|
||||||
if (modCond.voltage>=200)
|
if (flag_sendOperate) {
|
||||||
return 14;
|
this->private_sendDiagEvent(DeviceController::State::O000);
|
||||||
if (modCond.temper>=200)
|
}
|
||||||
return 15;
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
|
// finish diag
|
||||||
|
|
||||||
|
this->diagRequestTimeoutTimer->stop();
|
||||||
|
this->isRequestRunning = false;
|
||||||
|
this->flagInterruptDiag = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
uint8_t DeviceControllerDiag::sys_getSystemErrors()
|
|
||||||
{
|
|
||||||
// 0: everything fine 1..15: errors
|
|
||||||
/* 1: real time clock error
|
|
||||||
2: printer error
|
|
||||||
3: no paper
|
|
||||||
4: coin blocker
|
|
||||||
5: mdb error
|
|
||||||
6: mem error int.ee.
|
|
||||||
7: error coin validator
|
|
||||||
8: coin safe missed or full
|
|
||||||
9: bill acceptor error
|
|
||||||
10: alarm / intrusion
|
|
||||||
11: cash box change is ongoing
|
|
||||||
12: card test running
|
|
||||||
13: startup-test is running
|
|
||||||
14: voltage error
|
|
||||||
15: temperature error
|
|
||||||
*/
|
|
||||||
return this->sub_componentAssessment();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief DeviceControllerDiag::private_finishedDiag
|
* @brief DeviceControllerDiag::private_sendDiagEvent
|
||||||
* @param result - result value from 'sub_componentAssessment()',
|
* @param result - result value from 'sub_componentAssessment()',
|
||||||
|
* - 0x00 everything is fine
|
||||||
* - 0xFF on timer interrupt
|
* - 0xFF on timer interrupt
|
||||||
* - 0xFE no valid data from DeviceController
|
* - 0xFE no valid data from DeviceController
|
||||||
* - 0xFD Service or battery door is open
|
* - 0xFD Service or battery door is open
|
||||||
* - 0xFE vault door is open
|
* - 0xFE vault door is open
|
||||||
*/
|
*/
|
||||||
void DeviceControllerDiag::private_finishedDiag(uint8_t result)
|
void DeviceControllerDiag::private_sendDiagEvent(DeviceController::State result)
|
||||||
{
|
{
|
||||||
this->diagRequestTimeoutTimer->stop();
|
qCritical() << "DeviceControllerDiag::private_sendDiagEvent() result: " << result;
|
||||||
this->isRequestRunning = false;
|
|
||||||
this->flagInterruptDiag = false;
|
|
||||||
|
|
||||||
if (result == 0) return;
|
|
||||||
|
|
||||||
qCritical() << "DeviceControllerDiag::private_finishedDiag() result: " << result;
|
|
||||||
|
|
||||||
|
|
||||||
if (this->eventReceiver == nullptr) {
|
if (this->eventReceiver == nullptr) {
|
||||||
@@ -273,95 +368,134 @@ void DeviceControllerDiag::private_finishedDiag(uint8_t result)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (result > 15 && result != 0xFE) return;
|
if (machineEventSet.contains(result)) {
|
||||||
|
// do not send already sent events
|
||||||
|
qCritical() << " ... is in machineEventList";
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
machineEventSet.insert(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// Errors are in this range 1...15:
|
|
||||||
QString eventId = QUuid::createUuid().toString(QUuid::WithoutBraces).mid(0, 8);
|
QString eventId = QUuid::createUuid().toString(QUuid::WithoutBraces).mid(0, 8);
|
||||||
QString eventName;
|
|
||||||
|
QString eventName = QMetaEnum::fromType<DeviceController::State>().valueToKey(result);;
|
||||||
EVENT_CLASS eventClass = EVENT_CLASS::STATE;
|
EVENT_CLASS eventClass = EVENT_CLASS::STATE;
|
||||||
QString parameter;
|
QString parameter;
|
||||||
switch (result) {
|
switch (result) {
|
||||||
case 1: // real time clock error
|
|
||||||
eventName = "E001";
|
case DeviceController::State::A000: // alarm / intrusion
|
||||||
|
eventClass = EVENT_CLASS::ALARM;
|
||||||
|
parameter = "alarm / intrusion";
|
||||||
|
break;
|
||||||
|
case DeviceController::State::E002: // real time clock error
|
||||||
eventClass = EVENT_CLASS::ERROR;
|
eventClass = EVENT_CLASS::ERROR;
|
||||||
parameter = "real time clock error";
|
parameter = "real time clock error";
|
||||||
break;
|
break;
|
||||||
case 2: // printer error
|
case DeviceController::State::E003: // voltage error
|
||||||
eventName = "E002";
|
|
||||||
eventClass = EVENT_CLASS::ERROR;
|
|
||||||
parameter = "printer error";
|
|
||||||
break;
|
|
||||||
case 3: // no paper
|
|
||||||
eventName = "E003";
|
|
||||||
eventClass = EVENT_CLASS::ERROR;
|
|
||||||
parameter = "no paper";
|
|
||||||
break;
|
|
||||||
case 4: // coin blocker
|
|
||||||
eventName = "E004";
|
|
||||||
eventClass = EVENT_CLASS::ERROR;
|
|
||||||
parameter = "coin blocker";
|
|
||||||
break;
|
|
||||||
case 5: // mdb error
|
|
||||||
eventName = "E005";
|
|
||||||
eventClass = EVENT_CLASS::ERROR;
|
|
||||||
parameter = "mdb error";
|
|
||||||
break;
|
|
||||||
case 6: // mem error int.ee.
|
|
||||||
eventName = "E006";
|
|
||||||
eventClass = EVENT_CLASS::ERROR;
|
|
||||||
parameter = "mem error int.ee.";
|
|
||||||
break;
|
|
||||||
case 7: // error coin validator
|
|
||||||
eventName = "E007";
|
|
||||||
eventClass = EVENT_CLASS::ERROR;
|
|
||||||
parameter = "error coin validator";
|
|
||||||
break;
|
|
||||||
case 8: // coin safe missed or full
|
|
||||||
eventName = "E008";
|
|
||||||
eventClass = EVENT_CLASS::ERROR;
|
|
||||||
parameter = "coin safe missed or full";
|
|
||||||
break;
|
|
||||||
case 9: // bill acceptor error
|
|
||||||
eventName = "E009";
|
|
||||||
eventClass = EVENT_CLASS::ERROR;
|
|
||||||
parameter = "bill acceptor error";
|
|
||||||
break;
|
|
||||||
case 10: // alarm / intrusion
|
|
||||||
eventName = "E010";
|
|
||||||
eventClass = EVENT_CLASS::ERROR;
|
|
||||||
parameter = "alarm / intrusion";
|
|
||||||
break;
|
|
||||||
case 11: // cash box change is ongoing
|
|
||||||
eventName = "E011";
|
|
||||||
eventClass = EVENT_CLASS::STATE;
|
|
||||||
parameter = "cash box change is ongoing";
|
|
||||||
break;
|
|
||||||
case 12: // card test running
|
|
||||||
eventName = "E012";
|
|
||||||
eventClass = EVENT_CLASS::STATE;
|
|
||||||
parameter = "card test running";
|
|
||||||
break;
|
|
||||||
case 13: // startup-test is running
|
|
||||||
eventName = "E013";
|
|
||||||
eventClass = EVENT_CLASS::STATE;
|
|
||||||
parameter = "startup-test is running";
|
|
||||||
break;
|
|
||||||
case 14: // voltage error
|
|
||||||
eventName = "E014";
|
|
||||||
eventClass = EVENT_CLASS::ERROR;
|
eventClass = EVENT_CLASS::ERROR;
|
||||||
parameter = "voltage error";
|
parameter = "voltage error";
|
||||||
break;
|
break;
|
||||||
case 15: // temperature error
|
case DeviceController::State::E004: // temperature error
|
||||||
eventName = "E015";
|
eventClass = EVENT_CLASS::ERROR;
|
||||||
eventClass = EVENT_CLASS::STATE;
|
|
||||||
parameter = "temperature error";
|
parameter = "temperature error";
|
||||||
break;
|
break;
|
||||||
case 0xFE: // no valid data from DeviceController
|
case DeviceController::State::E007: // coin safe full
|
||||||
eventName = "E254";
|
eventClass = EVENT_CLASS::ERROR;
|
||||||
|
parameter = "coin safe full";
|
||||||
|
break;
|
||||||
|
case DeviceController::State::E008: // bill acceptor full
|
||||||
|
eventClass = EVENT_CLASS::ERROR;
|
||||||
|
parameter = "bill acceptor full";
|
||||||
|
break;
|
||||||
|
case DeviceController::State::E009: // no cash box
|
||||||
|
eventClass = EVENT_CLASS::ERROR;
|
||||||
|
parameter = "no cash box";
|
||||||
|
break;
|
||||||
|
case DeviceController::State::E010: // coin escrow
|
||||||
|
eventClass = EVENT_CLASS::ERROR;
|
||||||
|
parameter = "coin escrow";
|
||||||
|
break;
|
||||||
|
case DeviceController::State::E011: // mem error int.ee.
|
||||||
|
eventClass = EVENT_CLASS::ERROR;
|
||||||
|
parameter = "mem error int.ee.";
|
||||||
|
break;
|
||||||
|
case DeviceController::State::E018: // no paper
|
||||||
|
eventClass = EVENT_CLASS::ERROR;
|
||||||
|
parameter = "no paper";
|
||||||
|
break;
|
||||||
|
case DeviceController::State::E020: // printer error
|
||||||
|
eventClass = EVENT_CLASS::ERROR;
|
||||||
|
parameter = "printer error";
|
||||||
|
break;
|
||||||
|
case DeviceController::State::E025: // coin blocker
|
||||||
|
eventClass = EVENT_CLASS::ERROR;
|
||||||
|
parameter = "coin blocker";
|
||||||
|
break;
|
||||||
|
case DeviceController::State::E026: // error coin validator
|
||||||
|
eventClass = EVENT_CLASS::ERROR;
|
||||||
|
parameter = "error coin validator";
|
||||||
|
break;
|
||||||
|
case DeviceController::State::E034: // mdb error
|
||||||
|
eventClass = EVENT_CLASS::ERROR;
|
||||||
|
parameter = "mdb error";
|
||||||
|
break;
|
||||||
|
|
||||||
|
case DeviceController::State::E071: // cash box change is ongoing
|
||||||
|
eventClass = EVENT_CLASS::STATE;
|
||||||
|
parameter = "cash box change is ongoing";
|
||||||
|
break;
|
||||||
|
case DeviceController::State::E072: // card test running
|
||||||
|
eventClass = EVENT_CLASS::STATE;
|
||||||
|
parameter = "card test running";
|
||||||
|
break;
|
||||||
|
case DeviceController::State::E073: // startup-test is running
|
||||||
|
eventClass = EVENT_CLASS::STATE;
|
||||||
|
parameter = "startup-test is running";
|
||||||
|
break;
|
||||||
|
|
||||||
|
case DeviceController::State::E252: // cash box door open
|
||||||
|
eventClass = EVENT_CLASS::STATE;
|
||||||
|
parameter = "cash box door open";
|
||||||
|
break;
|
||||||
|
case DeviceController::State::E253: // 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
|
||||||
eventClass = EVENT_CLASS::STATE;
|
eventClass = EVENT_CLASS::STATE;
|
||||||
parameter = "no valid data from DeviceController";
|
parameter = "no valid data from DeviceController";
|
||||||
break;
|
break;
|
||||||
|
case DeviceController::State::E255: // no valid data from DeviceController
|
||||||
|
eventClass = EVENT_CLASS::STATE;
|
||||||
|
parameter = "";
|
||||||
|
qCritical() << " ... ignore " << QMetaEnum::fromType<DeviceController::State>().valueToKey(result);
|
||||||
|
return;
|
||||||
|
break;
|
||||||
|
case DeviceController::State::O000: // everything is fine
|
||||||
|
this->machineEventSet.clear();
|
||||||
|
eventClass = EVENT_CLASS::OPERATE;
|
||||||
|
parameter = "";
|
||||||
|
qCritical() << " ... everything fine";
|
||||||
|
break;
|
||||||
|
|
||||||
|
case DeviceController::State::W001: // paper low
|
||||||
|
eventClass = EVENT_CLASS::WARNING;
|
||||||
|
parameter = "paper low";
|
||||||
|
break;
|
||||||
|
case DeviceController::State::W002: // cashbox almost full
|
||||||
|
eventClass = EVENT_CLASS::WARNING;
|
||||||
|
parameter = "cashbox almost full";
|
||||||
|
break;
|
||||||
|
case DeviceController::State::W003: // voltage low
|
||||||
|
eventClass = EVENT_CLASS::WARNING;
|
||||||
|
parameter = "voltage low";
|
||||||
|
break;
|
||||||
|
case DeviceController::State::W004: // temperatur warning
|
||||||
|
eventClass = EVENT_CLASS::WARNING;
|
||||||
|
parameter = "temperatur warning";
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -380,3 +514,5 @@ void DeviceControllerDiag::private_finishedDiag(uint8_t result)
|
|||||||
QCoreApplication::postEvent(eventReceiver, machineEvent);
|
QCoreApplication::postEvent(eventReceiver, machineEvent);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -2,26 +2,80 @@
|
|||||||
#define DEVICECONTROLLERDIAG_H
|
#define DEVICECONTROLLERDIAG_H
|
||||||
|
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
|
#include <QSet>
|
||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
|
|
||||||
#include "ATBMachineEvent.h"
|
#include "ATBMachineEvent.h"
|
||||||
#include "interfaces.h"
|
#include "interfaces.h"
|
||||||
|
#include "DeviceControllerInterface.h"
|
||||||
|
|
||||||
|
#include "support/PersistentData.h"
|
||||||
|
|
||||||
|
|
||||||
|
namespace DeviceController {
|
||||||
|
Q_NAMESPACE
|
||||||
|
|
||||||
|
enum State {
|
||||||
|
O000,
|
||||||
|
|
||||||
|
A000,
|
||||||
|
|
||||||
|
E002,
|
||||||
|
E003,
|
||||||
|
E004,
|
||||||
|
|
||||||
|
E007,
|
||||||
|
E008,
|
||||||
|
E009,
|
||||||
|
E010,
|
||||||
|
E011,
|
||||||
|
|
||||||
|
E018,
|
||||||
|
|
||||||
|
E020,
|
||||||
|
|
||||||
|
E025,
|
||||||
|
E026,
|
||||||
|
|
||||||
|
E034,
|
||||||
|
|
||||||
|
E071,
|
||||||
|
E072,
|
||||||
|
E073,
|
||||||
|
|
||||||
|
E252,
|
||||||
|
E253,
|
||||||
|
E254,
|
||||||
|
E255,
|
||||||
|
|
||||||
|
W001,
|
||||||
|
W002,
|
||||||
|
W003,
|
||||||
|
W004
|
||||||
|
};
|
||||||
|
Q_ENUM_NS(State)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
class DeviceControllerDiag : public QObject
|
class DeviceControllerDiag : public QObject
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
DeviceControllerDiag(QObject *parent = nullptr);
|
DeviceControllerDiag(PersistentData *pData, QObject *parent = nullptr);
|
||||||
|
|
||||||
void init(hwinf* hw, QObject* eventReceiver);
|
void init(hwinf* hw, QObject* eventReceiver);
|
||||||
|
|
||||||
|
nsDeviceControllerInterface::COIN_PROCESSOR coinProcessorType;
|
||||||
|
nsDeviceControllerInterface::BILL_ACCEPTOR billAcceptor;
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void diagRequest();
|
void diagRequest();
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void diagResponse(ATBMachineEvent* machineEvent);
|
void diagResponse(ATBMachineEvent* machineEvent);
|
||||||
|
|
||||||
|
void newVoltage(uint32_t voltage);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QObject *eventReceiver;
|
QObject *eventReceiver;
|
||||||
@@ -32,14 +86,19 @@ private:
|
|||||||
|
|
||||||
QTimer *diagRequestTimeoutTimer;
|
QTimer *diagRequestTimeoutTimer;
|
||||||
|
|
||||||
uint8_t sub_componentAssessment();
|
void sub_componentAssessment(); // diag exit method
|
||||||
uint8_t sys_getSystemErrors();
|
|
||||||
|
int lastVoltage;
|
||||||
|
|
||||||
|
QSet<DeviceController::State> machineEventSet;
|
||||||
|
|
||||||
|
PersistentData* pData;
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void onDiagRequestTimeoutTimerTimeout();
|
void onDiagRequestTimeoutTimerTimeout();
|
||||||
|
|
||||||
void private_startDiag(); // diag entry method
|
void private_startDiag(); // diag entry method
|
||||||
void private_finishedDiag(uint8_t result); // diag exit method
|
void private_sendDiagEvent(DeviceController::State result);
|
||||||
|
|
||||||
void sys_superviseSystem();
|
void sys_superviseSystem();
|
||||||
|
|
||||||
|
@@ -13,6 +13,11 @@ namespace nsDeviceControllerInterface {
|
|||||||
enum class RESULT_STATE : quint8;
|
enum class RESULT_STATE : quint8;
|
||||||
enum class CASH_STATE : quint8;
|
enum class CASH_STATE : quint8;
|
||||||
enum class TICKET_VARIANT : quint8;
|
enum class TICKET_VARIANT : quint8;
|
||||||
|
enum class COIN_PROCESSOR : quint8;
|
||||||
|
enum class BILL_ACCEPTOR : quint8;
|
||||||
|
|
||||||
|
|
||||||
|
enum class SERVICE_TEXT : quint16;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -62,7 +67,11 @@ public:
|
|||||||
virtual void requestPrintTicket(const QHash<QString, QVariant> & printingData) = 0;
|
virtual void requestPrintTicket(const QHash<QString, QVariant> & printingData) = 0;
|
||||||
virtual void requestPrintTicket(nsDeviceControllerInterface::TICKET_VARIANT ticketVariant, const QHash<QString, QVariant> & printingData) = 0;
|
virtual void requestPrintTicket(nsDeviceControllerInterface::TICKET_VARIANT ticketVariant, const QHash<QString, QVariant> & printingData) = 0;
|
||||||
virtual void requestPrintReceipt(const QHash<QString, QVariant> & printingData) = 0;
|
virtual void requestPrintReceipt(const QHash<QString, QVariant> & printingData) = 0;
|
||||||
|
virtual void requestPrintReceipt(const QString & printingString) = 0;
|
||||||
|
|
||||||
|
// read coin/cash processing variants
|
||||||
|
virtual nsDeviceControllerInterface::COIN_PROCESSOR coinProcessor() = 0;
|
||||||
|
virtual nsDeviceControllerInterface::BILL_ACCEPTOR billAcceptor() = 0;
|
||||||
|
|
||||||
// mandantory ATBAPP plugin methods:
|
// mandantory ATBAPP plugin methods:
|
||||||
virtual nsDeviceControllerInterface::PLUGIN_STATE getState() = 0;
|
virtual nsDeviceControllerInterface::PLUGIN_STATE getState() = 0;
|
||||||
@@ -83,12 +92,17 @@ public slots:
|
|||||||
|
|
||||||
virtual void startPhysicalLayer() = 0;
|
virtual void startPhysicalLayer() = 0;
|
||||||
virtual void stopPhysicalLayer() = 0;
|
virtual void stopPhysicalLayer() = 0;
|
||||||
|
virtual void reboot() = 0;
|
||||||
|
virtual void reset() = 0;
|
||||||
|
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void printTicketFinished(nsDeviceControllerInterface::RESULT_STATE resultState,
|
void printTicketFinished(nsDeviceControllerInterface::RESULT_STATE resultState,
|
||||||
const QString & errorCode,
|
const QString & errorCode,
|
||||||
const QString & errorDescription);
|
const QString & errorDescription);
|
||||||
|
void printReceiptFinished(nsDeviceControllerInterface::RESULT_STATE resultState,
|
||||||
|
const QString & errorCode,
|
||||||
|
const QString & errorDescription);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* emitted on e.g. a coin input
|
* emitted on e.g. a coin input
|
||||||
@@ -108,16 +122,38 @@ signals:
|
|||||||
*/
|
*/
|
||||||
void cashInputFinished(nsDeviceControllerInterface::RESULT_STATE resultState,
|
void cashInputFinished(nsDeviceControllerInterface::RESULT_STATE resultState,
|
||||||
const QString & newCashValue,
|
const QString & newCashValue,
|
||||||
/* additional variables? */
|
const QString & coinValue,
|
||||||
|
const QString & noteValue,
|
||||||
|
const QString & changeValue,
|
||||||
const QString & errorCode,
|
const QString & errorCode,
|
||||||
const QString & errorDescription);
|
const QString & errorDescription);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* emitted if cashPayment has been finished, e.g. in result to task cashCollect():
|
||||||
|
* -> ticket should be printed sucessfully
|
||||||
|
* -> coins in excrow or changer are given back to user
|
||||||
|
* Provides data for logging, especially changed value
|
||||||
|
*/
|
||||||
|
void cashPaymentFinished(nsDeviceControllerInterface::RESULT_STATE resultState,
|
||||||
|
const QString & newCashValue, // total inserted amount amount
|
||||||
|
const QString & coinValue, // inserted amount, paid with coins
|
||||||
|
const QString & noteValue, // inserted amount, paid with notes
|
||||||
|
const QString & changeValue, // amount changed by changer/escrow
|
||||||
|
const QString & errorCode,
|
||||||
|
const QString & errorDescription);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* emitted e.g. if service door is opened
|
* emitted e.g. if service door is opened
|
||||||
*/
|
*/
|
||||||
void requestModeSERVICE();
|
void requestModeSERVICE();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* emitted e.g. if vault door is opened
|
||||||
|
*/
|
||||||
|
void requestModeACCOUNT();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* emitted e.g. if doors are closed
|
* emitted e.g. if doors are closed
|
||||||
*/
|
*/
|
||||||
@@ -133,6 +169,13 @@ signals:
|
|||||||
*/
|
*/
|
||||||
void requestAccountResponse(const QHash<QString, QVariant> & accountData);
|
void requestAccountResponse(const QHash<QString, QVariant> & accountData);
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* show text messages in service mode
|
||||||
|
*/
|
||||||
|
void showServiceText(nsDeviceControllerInterface::SERVICE_TEXT serviceText, const QString & text);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* emitted on error
|
* emitted on error
|
||||||
* depending on errorCode:
|
* depending on errorCode:
|
||||||
@@ -150,7 +193,7 @@ signals:
|
|||||||
|
|
||||||
|
|
||||||
Q_DECLARE_INTERFACE(DeviceControllerInterface,
|
Q_DECLARE_INTERFACE(DeviceControllerInterface,
|
||||||
"eu.atb.ptu.plugin.DeviceControllerInterface/1.0")
|
"eu.atb.ptu.plugin.DeviceControllerInterface/1.1.1")
|
||||||
|
|
||||||
|
|
||||||
namespace nsDeviceControllerInterface {
|
namespace nsDeviceControllerInterface {
|
||||||
@@ -185,6 +228,23 @@ namespace nsDeviceControllerInterface {
|
|||||||
STOP_RECEIPT, // e.g. Szeged Stop
|
STOP_RECEIPT, // e.g. Szeged Stop
|
||||||
};
|
};
|
||||||
|
|
||||||
|
enum class COIN_PROCESSOR : quint8 {
|
||||||
|
CHANGER,
|
||||||
|
ESCROW
|
||||||
|
};
|
||||||
|
|
||||||
|
enum class BILL_ACCEPTOR : quint8 {
|
||||||
|
YES,
|
||||||
|
NO
|
||||||
|
};
|
||||||
|
|
||||||
|
enum class SERVICE_TEXT : quint16 {
|
||||||
|
SERVICE_DOOR_OPENED,
|
||||||
|
VAULT_DOOR_OPENED,
|
||||||
|
COIN_BOX_REMOVED,
|
||||||
|
COIN_BOX_INSERTED
|
||||||
|
/* t.b.d. */
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // DEVICECONTROLLERINTERFACE_H
|
#endif // DEVICECONTROLLERINTERFACE_H
|
||||||
|
@@ -9,8 +9,8 @@ Utils::Utils(QObject *parent) : QObject(parent)
|
|||||||
|
|
||||||
int Utils::compare(const void* a, const void* b)
|
int Utils::compare(const void* a, const void* b)
|
||||||
{
|
{
|
||||||
int int_a = * ( (int*) a );
|
uint16_t int_a = * ( (uint16_t*) a );
|
||||||
int int_b = * ( (int*) b );
|
uint16_t int_b = * ( (uint16_t*) b );
|
||||||
|
|
||||||
if ( int_a == int_b ) return 0;
|
if ( int_a == int_b ) return 0;
|
||||||
else if ( int_a < int_b ) return -1;
|
else if ( int_a < int_b ) return -1;
|
||||||
|
74
src/ATBAPP/support/CashUtils.cpp
Normal file
74
src/ATBAPP/support/CashUtils.cpp
Normal file
@@ -0,0 +1,74 @@
|
|||||||
|
#include "CashUtils.h"
|
||||||
|
|
||||||
|
#include <QDebug>
|
||||||
|
|
||||||
|
#define MAX_COINS 64
|
||||||
|
#define MAX_NOTES 16
|
||||||
|
|
||||||
|
/*****************************************************************************
|
||||||
|
* Get current inserted coins
|
||||||
|
*
|
||||||
|
* getAllInsertedCoins(uint16_t *types, uint16_t *values)
|
||||||
|
* all inserted coins of this past transaction are stored, max 64
|
||||||
|
*/
|
||||||
|
uint32_t CashUtils::getAmountOfInsertedCoins(hwinf* hw)
|
||||||
|
{
|
||||||
|
uint32_t result = 0;
|
||||||
|
|
||||||
|
uint16_t types[MAX_COINS];
|
||||||
|
uint16_t values[MAX_COINS];
|
||||||
|
hw->getAllInsertedCoins(types, values);
|
||||||
|
|
||||||
|
for (int i = 0; i < MAX_COINS; i++) {
|
||||||
|
result += values[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*****************************************************************************
|
||||||
|
* Get current inserted notes
|
||||||
|
*
|
||||||
|
* virtual uint8_t bna_getCurrentNotes(uint16_t latestBill, uint16_t *currentNotes) const =0;
|
||||||
|
* returns number of collected bank notes since start-command (current transaction)
|
||||||
|
* latestBill: last accepted bank note, value in cent
|
||||||
|
* currentNotes an array with up to 16 (further) notes collected
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
uint32_t CashUtils::getAmountOfInsertedNotes(hwinf* hw)
|
||||||
|
{
|
||||||
|
uint32_t result = 0;
|
||||||
|
uint8_t numberOfInsertedNotes;
|
||||||
|
|
||||||
|
uint16_t beforeArray = 0;
|
||||||
|
uint16_t currentNotes[4];
|
||||||
|
uint16_t afterArray = 0;
|
||||||
|
numberOfInsertedNotes = hw->bna_getCurrentNotes(0, currentNotes);
|
||||||
|
|
||||||
|
if ( (beforeArray != 0) || (afterArray != 0) ) {
|
||||||
|
qCritical() << "CashUtils::getAmountOfInsertedNotes() ERROR: Array";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (numberOfInsertedNotes == 99) {
|
||||||
|
// Error
|
||||||
|
qCritical() << "CashUtils::getAmountOfInsertedNotes() ERROR: ";
|
||||||
|
for (int i = 0; i < 4; i++) {
|
||||||
|
qCritical() << " currentNotes[" << i << "] = " << currentNotes[i];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
// no error
|
||||||
|
result = currentNotes[3];
|
||||||
|
result = ( result << 16 ) | currentNotes[2];
|
||||||
|
}
|
||||||
|
|
||||||
|
// DEBUG
|
||||||
|
qCritical() << "--------------------------------------------------";
|
||||||
|
qCritical() << "CashUtils::getAmountOfInsertedNotes()";
|
||||||
|
qCritical() << " numberOfInsertedNotes = " << numberOfInsertedNotes;
|
||||||
|
qCritical() << " result = " << result;
|
||||||
|
qCritical() << "--------------------------------------------------";
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
14
src/ATBAPP/support/CashUtils.h
Normal file
14
src/ATBAPP/support/CashUtils.h
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
#ifndef CASHUTILS_H
|
||||||
|
#define CASHUTILS_H
|
||||||
|
|
||||||
|
#include <QObject>
|
||||||
|
#include "interfaces.h"
|
||||||
|
|
||||||
|
namespace CashUtils {
|
||||||
|
|
||||||
|
uint32_t getAmountOfInsertedCoins(hwinf* hw);
|
||||||
|
uint32_t getAmountOfInsertedNotes(hwinf* hw);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif // CASHUTILS_H
|
14
src/ATBAPP/support/DBusController.xml
Normal file
14
src/ATBAPP/support/DBusController.xml
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
|
||||||
|
<node>
|
||||||
|
<interface name="eu.atb.ptu.systemcontrol">
|
||||||
|
<signal name="wokeUpFrom">
|
||||||
|
<arg name="source" type="y" direction="out"/>
|
||||||
|
</signal>
|
||||||
|
<method name="startBackgroundTask">
|
||||||
|
<arg name="id" type="s" direction="in"/>
|
||||||
|
</method>
|
||||||
|
<method name="finishedBackgroundTask">
|
||||||
|
<arg name="id" type="s" direction="in"/>
|
||||||
|
</method>
|
||||||
|
</interface>
|
||||||
|
</node>
|
26
src/ATBAPP/support/DBusControllerInterface.cpp
Normal file
26
src/ATBAPP/support/DBusControllerInterface.cpp
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
/*
|
||||||
|
* This file was generated by qdbusxml2cpp version 0.7
|
||||||
|
* Command line was: qdbusxml2cpp -p DBusControllerInterface -c DBusControllerInterface DBusController.xml
|
||||||
|
*
|
||||||
|
* qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
|
||||||
|
*
|
||||||
|
* This is an auto-generated file.
|
||||||
|
* This file may have been hand-edited. Look for HAND-EDIT comments
|
||||||
|
* before re-generating it.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "DBusControllerInterface.h"
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Implementation of interface class DBusControllerInterface
|
||||||
|
*/
|
||||||
|
|
||||||
|
DBusControllerInterface::DBusControllerInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
|
||||||
|
: QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
DBusControllerInterface::~DBusControllerInterface()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
64
src/ATBAPP/support/DBusControllerInterface.h
Normal file
64
src/ATBAPP/support/DBusControllerInterface.h
Normal file
@@ -0,0 +1,64 @@
|
|||||||
|
/*
|
||||||
|
* This file was generated by qdbusxml2cpp version 0.7
|
||||||
|
* Command line was: qdbusxml2cpp -p DBusControllerInterface -c DBusControllerInterface DBusController.xml
|
||||||
|
*
|
||||||
|
* qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
|
||||||
|
*
|
||||||
|
* This is an auto-generated file.
|
||||||
|
* Do not edit! All changes made to it will be lost.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef DBUSCONTROLLERINTERFACE_H
|
||||||
|
#define DBUSCONTROLLERINTERFACE_H
|
||||||
|
|
||||||
|
#include <QtCore/QObject>
|
||||||
|
#include <QtCore/QByteArray>
|
||||||
|
#include <QtCore/QList>
|
||||||
|
#include <QtCore/QMap>
|
||||||
|
#include <QtCore/QString>
|
||||||
|
#include <QtCore/QStringList>
|
||||||
|
#include <QtCore/QVariant>
|
||||||
|
#include <QtDBus/QtDBus>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Proxy class for interface eu.atb.ptu.systemcontrol
|
||||||
|
*/
|
||||||
|
class DBusControllerInterface: public QDBusAbstractInterface
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
static inline const char *staticInterfaceName()
|
||||||
|
{ return "eu.atb.ptu.systemcontrol"; }
|
||||||
|
|
||||||
|
public:
|
||||||
|
DBusControllerInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
|
||||||
|
|
||||||
|
~DBusControllerInterface();
|
||||||
|
|
||||||
|
public Q_SLOTS: // METHODS
|
||||||
|
inline QDBusPendingReply<> finishedBackgroundTask(const QString &id)
|
||||||
|
{
|
||||||
|
QList<QVariant> argumentList;
|
||||||
|
argumentList << QVariant::fromValue(id);
|
||||||
|
return asyncCallWithArgumentList(QLatin1String("finishedBackgroundTask"), argumentList);
|
||||||
|
}
|
||||||
|
|
||||||
|
inline QDBusPendingReply<> startBackgroundTask(const QString &id)
|
||||||
|
{
|
||||||
|
QList<QVariant> argumentList;
|
||||||
|
argumentList << QVariant::fromValue(id);
|
||||||
|
return asyncCallWithArgumentList(QLatin1String("startBackgroundTask"), argumentList);
|
||||||
|
}
|
||||||
|
|
||||||
|
Q_SIGNALS: // SIGNALS
|
||||||
|
void wokeUpFrom(uchar source);
|
||||||
|
};
|
||||||
|
|
||||||
|
namespace eu {
|
||||||
|
namespace atb {
|
||||||
|
namespace ptu {
|
||||||
|
typedef ::DBusControllerInterface systemcontrol;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
735
src/ATBAPP/support/JSON.cpp
Normal file
735
src/ATBAPP/support/JSON.cpp
Normal file
@@ -0,0 +1,735 @@
|
|||||||
|
#include <QDateTime>
|
||||||
|
#include <QStringList>
|
||||||
|
#include "JSON.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
namespace JSON {
|
||||||
|
static QString dateFormat, dateTimeFormat;
|
||||||
|
static bool prettySerialize = false;
|
||||||
|
|
||||||
|
static QString sanitizeString(QString str);
|
||||||
|
static QByteArray join(const QList<QByteArray> &list, const QByteArray &sep);
|
||||||
|
static QVariant parseValue(const QString &json, int &index, bool &success);
|
||||||
|
static QVariant parseObject(const QString &json, int &index, bool &success);
|
||||||
|
static QVariant parseArray(const QString &json, int &index, bool &success);
|
||||||
|
static QVariant parseString(const QString &json, int &index, bool &success);
|
||||||
|
static QVariant parseNumber(const QString &json, int &index);
|
||||||
|
static int lastIndexOfNumber(const QString &json, int index);
|
||||||
|
static void eatWhitespace(const QString &json, int &index);
|
||||||
|
static int lookAhead(const QString &json, int index);
|
||||||
|
static int nextToken(const QString &json, int &index);
|
||||||
|
|
||||||
|
|
||||||
|
template<typename T>
|
||||||
|
QByteArray serializeMap(const T &map, bool &success, int _level = 0) {
|
||||||
|
QByteArray newline;
|
||||||
|
QByteArray tabs;
|
||||||
|
QByteArray tabsFields;
|
||||||
|
if (prettySerialize && !map.isEmpty()) {
|
||||||
|
newline = "\n";
|
||||||
|
for (int l=1; l<_level; l++) {
|
||||||
|
tabs += " ";
|
||||||
|
}
|
||||||
|
tabsFields = tabs + " ";
|
||||||
|
}
|
||||||
|
|
||||||
|
QByteArray str = "{" + newline;
|
||||||
|
QList<QByteArray> pairs;
|
||||||
|
for (typename T::const_iterator it = map.begin(), itend = map.end(); it != itend; ++it) {
|
||||||
|
bool otherSuccess = true;
|
||||||
|
QByteArray serializedValue = serialize(it.value(), otherSuccess, _level);
|
||||||
|
if (serializedValue.isNull()) {
|
||||||
|
success = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
pairs << tabsFields + sanitizeString(it.key()).toUtf8() + ":" + (prettySerialize ? " " : "") + serializedValue;
|
||||||
|
}
|
||||||
|
|
||||||
|
str += join(pairs, "," + newline) + newline;
|
||||||
|
str += tabs + "}";
|
||||||
|
return str;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void insert(QVariant &v, const QString &key, const QVariant &value);
|
||||||
|
void append(QVariant &v, const QVariant &value);
|
||||||
|
|
||||||
|
template<typename T>
|
||||||
|
void cloneMap(QVariant &json, const T &map) {
|
||||||
|
for (typename T::const_iterator it = map.begin(), itend = map.end(); it != itend; ++it) {
|
||||||
|
insert(json, it.key(), (*it));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
template<typename T>
|
||||||
|
void cloneList(QVariant &json, const T &list) {
|
||||||
|
for (typename T::const_iterator it = list.begin(), itend = list.end(); it != itend; ++it) {
|
||||||
|
append(json, (*it));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* parse
|
||||||
|
*/
|
||||||
|
QVariant parse(const QString &json) {
|
||||||
|
bool success = true;
|
||||||
|
return parse(json, success);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* parse
|
||||||
|
*/
|
||||||
|
QVariant parse(const QString &json, bool &success) {
|
||||||
|
success = true;
|
||||||
|
|
||||||
|
// Return an empty QVariant if the JSON data is either null or empty
|
||||||
|
if (!json.isNull() || !json.isEmpty()) {
|
||||||
|
QString data = json;
|
||||||
|
// We'll start from index 0
|
||||||
|
int index = 0;
|
||||||
|
|
||||||
|
// Parse the first value
|
||||||
|
QVariant value = parseValue(data, index, success);
|
||||||
|
|
||||||
|
// Return the parsed value
|
||||||
|
return value;
|
||||||
|
} else {
|
||||||
|
// Return the empty QVariant
|
||||||
|
return QVariant();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* clone
|
||||||
|
*/
|
||||||
|
QVariant clone(const QVariant &data) {
|
||||||
|
QVariant v;
|
||||||
|
|
||||||
|
if (data.type() == QVariant::Map) {
|
||||||
|
cloneMap(v, data.toMap());
|
||||||
|
} else if (data.type() == QVariant::Hash) {
|
||||||
|
cloneMap(v, data.toHash());
|
||||||
|
} else if (data.type() == QVariant::List) {
|
||||||
|
cloneList(v, data.toList());
|
||||||
|
} else if (data.type() == QVariant::StringList) {
|
||||||
|
cloneList(v, data.toStringList());
|
||||||
|
} else {
|
||||||
|
v = QVariant(data);
|
||||||
|
}
|
||||||
|
|
||||||
|
return v;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* insert value (map case)
|
||||||
|
*/
|
||||||
|
void insert(QVariant &v, const QString &key, const QVariant &value) {
|
||||||
|
if (!v.canConvert<QVariantMap>()) v = QVariantMap();
|
||||||
|
QVariantMap *p = (QVariantMap *)v.data();
|
||||||
|
p->insert(key, clone(value));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* append value (list case)
|
||||||
|
*/
|
||||||
|
void append(QVariant &v, const QVariant &value) {
|
||||||
|
if (!v.canConvert<QVariantList>()) v = QVariantList();
|
||||||
|
QVariantList *p = (QVariantList *)v.data();
|
||||||
|
p->append(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
QByteArray serialize(const QVariant &data) {
|
||||||
|
bool success = true;
|
||||||
|
return serialize(data, success);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
QByteArray serialize(const QVariant &data, bool &success, int _level /*= 0*/) {
|
||||||
|
QByteArray newline;
|
||||||
|
QByteArray tabs;
|
||||||
|
QByteArray tabsFields;
|
||||||
|
if (prettySerialize) {
|
||||||
|
newline = "\n";
|
||||||
|
for (int l=0; l<_level; l++) {
|
||||||
|
tabs += " ";
|
||||||
|
}
|
||||||
|
tabsFields = tabs + " ";
|
||||||
|
}
|
||||||
|
|
||||||
|
QByteArray str;
|
||||||
|
success = true;
|
||||||
|
|
||||||
|
if (!data.isValid()) { // invalid or null?
|
||||||
|
str = "null";
|
||||||
|
} else if ((data.type() == QVariant::List) ||
|
||||||
|
(data.type() == QVariant::StringList)) { // variant is a list?
|
||||||
|
QList<QByteArray> values;
|
||||||
|
const QVariantList list = data.toList();
|
||||||
|
Q_FOREACH(const QVariant& v, list) {
|
||||||
|
bool otherSuccess = true;
|
||||||
|
QByteArray serializedValue = serialize(v, otherSuccess, _level+1);
|
||||||
|
if (serializedValue.isNull()) {
|
||||||
|
success = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
values << tabsFields + serializedValue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!values.isEmpty()) {
|
||||||
|
str = "[" + newline + join( values, "," + newline ) + newline + tabs + "]";
|
||||||
|
} else {
|
||||||
|
str = "[]";
|
||||||
|
}
|
||||||
|
} else if (data.type() == QVariant::Hash) { // variant is a hash?
|
||||||
|
str = serializeMap<>(data.toHash(), success, _level+1);
|
||||||
|
} else if (data.type() == QVariant::Map) { // variant is a map?
|
||||||
|
str = serializeMap<>(data.toMap(), success, _level+1);
|
||||||
|
} else if ((data.type() == QVariant::String) ||
|
||||||
|
(data.type() == QVariant::ByteArray)) {// a string or a byte array?
|
||||||
|
str = sanitizeString(data.toString()).toUtf8();
|
||||||
|
} else if (data.type() == QVariant::Double) { // double?
|
||||||
|
double value = data.toDouble(&success);
|
||||||
|
if (success) {
|
||||||
|
str = QByteArray::number(value, 'g');
|
||||||
|
if (!str.contains(".") && ! str.contains("e")) {
|
||||||
|
str += ".0";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if (data.type() == QVariant::Bool) { // boolean value?
|
||||||
|
str = data.toBool() ? "true" : "false";
|
||||||
|
} else if (data.type() == QVariant::ULongLong) { // large unsigned number?
|
||||||
|
str = QByteArray::number(data.value<qulonglong>());
|
||||||
|
} else if (data.canConvert<qlonglong>()) { // any signed number?
|
||||||
|
str = QByteArray::number(data.value<qlonglong>());
|
||||||
|
} else if (data.canConvert<long>()) { //TODO: this code is never executed because all smaller types can be converted to qlonglong
|
||||||
|
str = QString::number(data.value<long>()).toUtf8();
|
||||||
|
} else if (data.type() == QVariant::DateTime) { // datetime value?
|
||||||
|
str = sanitizeString(dateTimeFormat.isEmpty()
|
||||||
|
? data.toDateTime().toString()
|
||||||
|
: data.toDateTime().toString(dateTimeFormat)).toUtf8();
|
||||||
|
} else if (data.type() == QVariant::Date) { // date value?
|
||||||
|
str = sanitizeString(dateTimeFormat.isEmpty()
|
||||||
|
? data.toDate().toString()
|
||||||
|
: data.toDate().toString(dateFormat)).toUtf8();
|
||||||
|
} else if (data.canConvert<QString>()) { // can value be converted to string?
|
||||||
|
// this will catch QUrl, ... (all other types which can be converted to string)
|
||||||
|
str = sanitizeString(data.toString()).toUtf8();
|
||||||
|
} else {
|
||||||
|
success = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (success) {
|
||||||
|
return str;
|
||||||
|
}
|
||||||
|
return QByteArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
QString serializeStr(const QVariant &data) {
|
||||||
|
return QString::fromUtf8(serialize(data));
|
||||||
|
}
|
||||||
|
|
||||||
|
QString serializeStr(const QVariant &data, bool &success) {
|
||||||
|
return QString::fromUtf8(serialize(data, success));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* \enum JsonToken
|
||||||
|
*/
|
||||||
|
enum JsonToken {
|
||||||
|
JsonTokenNone = 0,
|
||||||
|
JsonTokenCurlyOpen = 1,
|
||||||
|
JsonTokenCurlyClose = 2,
|
||||||
|
JsonTokenSquaredOpen = 3,
|
||||||
|
JsonTokenSquaredClose = 4,
|
||||||
|
JsonTokenColon = 5,
|
||||||
|
JsonTokenComma = 6,
|
||||||
|
JsonTokenString = 7,
|
||||||
|
JsonTokenNumber = 8,
|
||||||
|
JsonTokenTrue = 9,
|
||||||
|
JsonTokenFalse = 10,
|
||||||
|
JsonTokenNull = 11
|
||||||
|
};
|
||||||
|
|
||||||
|
static QString sanitizeString(QString str) {
|
||||||
|
str.replace(QLatin1String("\\"), QLatin1String("\\\\"));
|
||||||
|
str.replace(QLatin1String("\""), QLatin1String("\\\""));
|
||||||
|
str.replace(QLatin1String("\b"), QLatin1String("\\b"));
|
||||||
|
str.replace(QLatin1String("\f"), QLatin1String("\\f"));
|
||||||
|
str.replace(QLatin1String("\n"), QLatin1String("\\n"));
|
||||||
|
str.replace(QLatin1String("\r"), QLatin1String("\\r"));
|
||||||
|
str.replace(QLatin1String("\t"), QLatin1String("\\t"));
|
||||||
|
return QString(QLatin1String("\"%1\"")).arg(str);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
static QByteArray join(const QList<QByteArray> &list, const QByteArray &sep) {
|
||||||
|
QByteArray res;
|
||||||
|
Q_FOREACH(const QByteArray &i, list) {
|
||||||
|
if (!res.isEmpty()) {
|
||||||
|
res += sep;
|
||||||
|
}
|
||||||
|
res += i;
|
||||||
|
}
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* parseValue
|
||||||
|
*/
|
||||||
|
static QVariant parseValue(const QString &json, int &index, bool &success) {
|
||||||
|
// Determine what kind of data we should parse by
|
||||||
|
// checking out the upcoming token
|
||||||
|
switch(lookAhead(json, index)) {
|
||||||
|
case JsonTokenString:
|
||||||
|
return parseString(json, index, success);
|
||||||
|
case JsonTokenNumber:
|
||||||
|
return parseNumber(json, index);
|
||||||
|
case JsonTokenCurlyOpen:
|
||||||
|
return parseObject(json, index, success);
|
||||||
|
case JsonTokenSquaredOpen:
|
||||||
|
return parseArray(json, index, success);
|
||||||
|
case JsonTokenTrue:
|
||||||
|
nextToken(json, index);
|
||||||
|
return QVariant(true);
|
||||||
|
case JsonTokenFalse:
|
||||||
|
nextToken(json, index);
|
||||||
|
return QVariant(false);
|
||||||
|
case JsonTokenNull:
|
||||||
|
nextToken(json, index);
|
||||||
|
return QVariant();
|
||||||
|
case JsonTokenNone:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
// If there were no tokens, flag the failure and return an empty QVariant
|
||||||
|
success = false;
|
||||||
|
return QVariant();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* parseObject
|
||||||
|
*/
|
||||||
|
static QVariant parseObject(const QString &json, int &index, bool &success) {
|
||||||
|
QVariantMap map;
|
||||||
|
int token;
|
||||||
|
|
||||||
|
// Get rid of the whitespace and increment index
|
||||||
|
nextToken(json, index);
|
||||||
|
|
||||||
|
// Loop through all of the key/value pairs of the object
|
||||||
|
bool done = false;
|
||||||
|
while (!done) {
|
||||||
|
// Get the upcoming token
|
||||||
|
token = lookAhead(json, index);
|
||||||
|
|
||||||
|
if (token == JsonTokenNone) {
|
||||||
|
success = false;
|
||||||
|
return QVariantMap();
|
||||||
|
} else if (token == JsonTokenComma) {
|
||||||
|
nextToken(json, index);
|
||||||
|
} else if (token == JsonTokenCurlyClose) {
|
||||||
|
nextToken(json, index);
|
||||||
|
return map;
|
||||||
|
} else {
|
||||||
|
// Parse the key/value pair's name
|
||||||
|
QString name = parseString(json, index, success).toString();
|
||||||
|
|
||||||
|
if (!success) {
|
||||||
|
return QVariantMap();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get the next token
|
||||||
|
token = nextToken(json, index);
|
||||||
|
|
||||||
|
// If the next token is not a colon, flag the failure
|
||||||
|
// return an empty QVariant
|
||||||
|
if (token != JsonTokenColon) {
|
||||||
|
success = false;
|
||||||
|
return QVariant(QVariantMap());
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse the key/value pair's value
|
||||||
|
QVariant value = parseValue(json, index, success);
|
||||||
|
|
||||||
|
if (!success) {
|
||||||
|
return QVariantMap();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Assign the value to the key in the map
|
||||||
|
map[name] = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Return the map successfully
|
||||||
|
return QVariant(map);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* parseArray
|
||||||
|
*/
|
||||||
|
static QVariant parseArray(const QString &json, int &index, bool &success) {
|
||||||
|
QVariantList list;
|
||||||
|
|
||||||
|
nextToken(json, index);
|
||||||
|
|
||||||
|
bool done = false;
|
||||||
|
while(!done) {
|
||||||
|
int token = lookAhead(json, index);
|
||||||
|
|
||||||
|
if (token == JsonTokenNone) {
|
||||||
|
success = false;
|
||||||
|
return QVariantList();
|
||||||
|
} else if (token == JsonTokenComma) {
|
||||||
|
nextToken(json, index);
|
||||||
|
} else if (token == JsonTokenSquaredClose) {
|
||||||
|
nextToken(json, index);
|
||||||
|
break;
|
||||||
|
} else {
|
||||||
|
QVariant value = parseValue(json, index, success);
|
||||||
|
if (!success) {
|
||||||
|
return QVariantList();
|
||||||
|
}
|
||||||
|
list.push_back(value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return QVariant(list);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* parseString
|
||||||
|
*/
|
||||||
|
static QVariant parseString(const QString &json, int &index, bool &success) {
|
||||||
|
QString s;
|
||||||
|
QChar c;
|
||||||
|
|
||||||
|
eatWhitespace(json, index);
|
||||||
|
|
||||||
|
c = json[index++];
|
||||||
|
|
||||||
|
bool complete = false;
|
||||||
|
while(!complete) {
|
||||||
|
if (index == json.size()) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
c = json[index++];
|
||||||
|
|
||||||
|
if (c == '\"') {
|
||||||
|
complete = true;
|
||||||
|
break;
|
||||||
|
} else if (c == '\\') {
|
||||||
|
if (index == json.size()) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
c = json[index++];
|
||||||
|
|
||||||
|
if (c == '\"') {
|
||||||
|
s.append('\"');
|
||||||
|
} else if (c == '\\') {
|
||||||
|
s.append('\\');
|
||||||
|
} else if (c == '/') {
|
||||||
|
s.append('/');
|
||||||
|
} else if (c == 'b') {
|
||||||
|
s.append('\b');
|
||||||
|
} else if (c == 'f') {
|
||||||
|
s.append('\f');
|
||||||
|
} else if (c == 'n') {
|
||||||
|
s.append('\n');
|
||||||
|
} else if (c == 'r') {
|
||||||
|
s.append('\r');
|
||||||
|
} else if (c == 't') {
|
||||||
|
s.append('\t');
|
||||||
|
} else if (c == 'u') {
|
||||||
|
int remainingLength = json.size() - index;
|
||||||
|
if (remainingLength >= 4) {
|
||||||
|
QString unicodeStr = json.mid(index, 4);
|
||||||
|
|
||||||
|
int symbol = unicodeStr.toInt(0, 16);
|
||||||
|
|
||||||
|
s.append(QChar(symbol));
|
||||||
|
|
||||||
|
index += 4;
|
||||||
|
} else {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
s.append(c);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!complete) {
|
||||||
|
success = false;
|
||||||
|
return QVariant();
|
||||||
|
}
|
||||||
|
|
||||||
|
return QVariant(s);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* parseNumber
|
||||||
|
*/
|
||||||
|
static QVariant parseNumber(const QString &json, int &index) {
|
||||||
|
eatWhitespace(json, index);
|
||||||
|
|
||||||
|
int lastIndex = lastIndexOfNumber(json, index);
|
||||||
|
int charLength = (lastIndex - index) + 1;
|
||||||
|
QString numberStr;
|
||||||
|
|
||||||
|
numberStr = json.mid(index, charLength);
|
||||||
|
|
||||||
|
index = lastIndex + 1;
|
||||||
|
bool ok;
|
||||||
|
|
||||||
|
if (numberStr.contains('.')) {
|
||||||
|
return QVariant(numberStr.toDouble(NULL));
|
||||||
|
} else if (numberStr.startsWith('-')) {
|
||||||
|
int i = numberStr.toInt(&ok);
|
||||||
|
if (!ok) {
|
||||||
|
qlonglong ll = numberStr.toLongLong(&ok);
|
||||||
|
return ok ? ll : QVariant(numberStr);
|
||||||
|
}
|
||||||
|
return i;
|
||||||
|
} else {
|
||||||
|
uint u = numberStr.toUInt(&ok);
|
||||||
|
if (!ok) {
|
||||||
|
qulonglong ull = numberStr.toULongLong(&ok);
|
||||||
|
return ok ? ull : QVariant(numberStr);
|
||||||
|
}
|
||||||
|
return u;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* lastIndexOfNumber
|
||||||
|
*/
|
||||||
|
static int lastIndexOfNumber(const QString &json, int index) {
|
||||||
|
int lastIndex;
|
||||||
|
|
||||||
|
for(lastIndex = index; lastIndex < json.size(); lastIndex++) {
|
||||||
|
if (QString("0123456789+-.eE").indexOf(json[lastIndex]) == -1) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return lastIndex -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* eatWhitespace
|
||||||
|
*/
|
||||||
|
static void eatWhitespace(const QString &json, int &index) {
|
||||||
|
for(; index < json.size(); index++) {
|
||||||
|
if (QString(" \t\n\r").indexOf(json[index]) == -1) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* lookAhead
|
||||||
|
*/
|
||||||
|
static int lookAhead(const QString &json, int index) {
|
||||||
|
int saveIndex = index;
|
||||||
|
return nextToken(json, saveIndex);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* nextToken
|
||||||
|
*/
|
||||||
|
static int nextToken(const QString &json, int &index) {
|
||||||
|
eatWhitespace(json, index);
|
||||||
|
|
||||||
|
if (index == json.size()) {
|
||||||
|
return JsonTokenNone;
|
||||||
|
}
|
||||||
|
|
||||||
|
QChar c = json[index];
|
||||||
|
index++;
|
||||||
|
switch(c.toLatin1()) {
|
||||||
|
case '{': return JsonTokenCurlyOpen;
|
||||||
|
case '}': return JsonTokenCurlyClose;
|
||||||
|
case '[': return JsonTokenSquaredOpen;
|
||||||
|
case ']': return JsonTokenSquaredClose;
|
||||||
|
case ',': return JsonTokenComma;
|
||||||
|
case '"': return JsonTokenString;
|
||||||
|
case '0': case '1': case '2': case '3': case '4':
|
||||||
|
case '5': case '6': case '7': case '8': case '9':
|
||||||
|
case '-': return JsonTokenNumber;
|
||||||
|
case ':': return JsonTokenColon;
|
||||||
|
}
|
||||||
|
index--; // ^ WTF?
|
||||||
|
|
||||||
|
int remainingLength = json.size() - index;
|
||||||
|
|
||||||
|
// True
|
||||||
|
if (remainingLength >= 4) {
|
||||||
|
if (json[index] == 't' && json[index + 1] == 'r' &&
|
||||||
|
json[index + 2] == 'u' && json[index + 3] == 'e') {
|
||||||
|
index += 4;
|
||||||
|
return JsonTokenTrue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// False
|
||||||
|
if (remainingLength >= 5) {
|
||||||
|
if (json[index] == 'f' && json[index + 1] == 'a' &&
|
||||||
|
json[index + 2] == 'l' && json[index + 3] == 's' &&
|
||||||
|
json[index + 4] == 'e') {
|
||||||
|
index += 5;
|
||||||
|
return JsonTokenFalse;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Null
|
||||||
|
if (remainingLength >= 4) {
|
||||||
|
if (json[index] == 'n' && json[index + 1] == 'u' &&
|
||||||
|
json[index + 2] == 'l' && json[index + 3] == 'l') {
|
||||||
|
index += 4;
|
||||||
|
return JsonTokenNull;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return JsonTokenNone;
|
||||||
|
}
|
||||||
|
|
||||||
|
void setDateTimeFormat(const QString &format) {
|
||||||
|
dateTimeFormat = format;
|
||||||
|
}
|
||||||
|
|
||||||
|
void setDateFormat(const QString &format) {
|
||||||
|
dateFormat = format;
|
||||||
|
}
|
||||||
|
|
||||||
|
QString getDateTimeFormat() {
|
||||||
|
return dateTimeFormat;
|
||||||
|
}
|
||||||
|
|
||||||
|
QString getDateFormat() {
|
||||||
|
return dateFormat;
|
||||||
|
}
|
||||||
|
|
||||||
|
void setPrettySerialize(bool enabled) {
|
||||||
|
prettySerialize = enabled;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool isPrettySerialize() {
|
||||||
|
return prettySerialize;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
QQueue<BuilderJsonObject *> BuilderJsonObject::created_list;
|
||||||
|
|
||||||
|
BuilderJsonObject::BuilderJsonObject() {
|
||||||
|
// clean objects previous "created"
|
||||||
|
while (!BuilderJsonObject::created_list.isEmpty()) {
|
||||||
|
delete BuilderJsonObject::created_list.dequeue();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
BuilderJsonObject::BuilderJsonObject(JsonObject &json) {
|
||||||
|
BuilderJsonObject();
|
||||||
|
|
||||||
|
obj = json;
|
||||||
|
}
|
||||||
|
|
||||||
|
BuilderJsonObject *BuilderJsonObject::set(const QString &key, const QVariant &value) {
|
||||||
|
obj[key] = value;
|
||||||
|
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
BuilderJsonObject *BuilderJsonObject::set(const QString &key, BuilderJsonObject *builder) {
|
||||||
|
return set(key, builder->create());
|
||||||
|
}
|
||||||
|
|
||||||
|
BuilderJsonObject *BuilderJsonObject::set(const QString &key, BuilderJsonArray *builder) {
|
||||||
|
return set(key, builder->create());
|
||||||
|
}
|
||||||
|
|
||||||
|
JsonObject BuilderJsonObject::create() {
|
||||||
|
BuilderJsonObject::created_list.enqueue(this);
|
||||||
|
|
||||||
|
return obj;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QQueue<BuilderJsonArray *> BuilderJsonArray::created_list;
|
||||||
|
|
||||||
|
BuilderJsonArray::BuilderJsonArray() {
|
||||||
|
// clean objects previous "created"
|
||||||
|
while (!BuilderJsonArray::created_list.isEmpty()) {
|
||||||
|
delete BuilderJsonArray::created_list.dequeue();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
BuilderJsonArray::BuilderJsonArray(JsonArray &json) {
|
||||||
|
BuilderJsonArray();
|
||||||
|
|
||||||
|
array = json;
|
||||||
|
}
|
||||||
|
|
||||||
|
BuilderJsonArray *BuilderJsonArray::add(const QVariant &element) {
|
||||||
|
array.append(element);
|
||||||
|
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
BuilderJsonArray *BuilderJsonArray::add(BuilderJsonObject *builder) {
|
||||||
|
return add(builder->create());
|
||||||
|
}
|
||||||
|
|
||||||
|
BuilderJsonArray *BuilderJsonArray::add(BuilderJsonArray *builder) {
|
||||||
|
return add(builder->create());
|
||||||
|
}
|
||||||
|
|
||||||
|
JsonArray BuilderJsonArray::create() {
|
||||||
|
BuilderJsonArray::created_list.enqueue(this);
|
||||||
|
|
||||||
|
return array;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
BuilderJsonObject *objectBuilder() {
|
||||||
|
return new BuilderJsonObject();
|
||||||
|
}
|
||||||
|
|
||||||
|
BuilderJsonObject *objectBuilder(JsonObject &json) {
|
||||||
|
return new BuilderJsonObject(json);
|
||||||
|
}
|
||||||
|
|
||||||
|
BuilderJsonArray *arrayBuilder() {
|
||||||
|
return new BuilderJsonArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
BuilderJsonArray *arrayBuilder(JsonArray &json) {
|
||||||
|
return new BuilderJsonArray(json);
|
||||||
|
}
|
||||||
|
|
||||||
|
} //end namespace
|
250
src/ATBAPP/support/JSON.h
Normal file
250
src/ATBAPP/support/JSON.h
Normal file
@@ -0,0 +1,250 @@
|
|||||||
|
#ifndef JSON_H
|
||||||
|
#define JSON_H
|
||||||
|
|
||||||
|
|
||||||
|
#include <QVariant>
|
||||||
|
#include <QString>
|
||||||
|
#include <QQueue>
|
||||||
|
|
||||||
|
/**********************************************
|
||||||
|
* based on: https://github.com/qt-json/qt-json
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* \namespace JSON
|
||||||
|
* \brief A JSON data parser
|
||||||
|
*
|
||||||
|
* Json parses a JSON data into a QVariant hierarchy.
|
||||||
|
*/
|
||||||
|
namespace JSON {
|
||||||
|
typedef QVariantMap JsonObject;
|
||||||
|
typedef QVariantList JsonArray;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Clone a JSON object (makes a deep copy)
|
||||||
|
*
|
||||||
|
* \param data The JSON object
|
||||||
|
*/
|
||||||
|
QVariant clone(const QVariant &data);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Insert value to JSON object (QVariantMap)
|
||||||
|
*
|
||||||
|
* \param v The JSON object
|
||||||
|
* \param key The key
|
||||||
|
* \param value The value
|
||||||
|
*/
|
||||||
|
void insert(QVariant &v, const QString &key, const QVariant &value);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Append value to JSON array (QVariantList)
|
||||||
|
*
|
||||||
|
* \param v The JSON array
|
||||||
|
* \param value The value
|
||||||
|
*/
|
||||||
|
void append(QVariant &v, const QVariant &value);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parse a JSON string
|
||||||
|
*
|
||||||
|
* \param json The JSON data
|
||||||
|
*/
|
||||||
|
QVariant parse(const QString &json);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parse a JSON string
|
||||||
|
*
|
||||||
|
* \param json The JSON data
|
||||||
|
* \param success The success of the parsing
|
||||||
|
*/
|
||||||
|
QVariant parse(const QString &json, bool &success);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This method generates a textual JSON representation
|
||||||
|
*
|
||||||
|
* \param data The JSON data generated by the parser.
|
||||||
|
*
|
||||||
|
* \return QByteArray Textual JSON representation in UTF-8
|
||||||
|
*/
|
||||||
|
QByteArray serialize(const QVariant &data);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This method generates a textual JSON representation
|
||||||
|
*
|
||||||
|
* \param data The JSON data generated by the parser.
|
||||||
|
* \param success The success of the serialization
|
||||||
|
*
|
||||||
|
* \return QByteArray Textual JSON representation in UTF-8
|
||||||
|
*/
|
||||||
|
QByteArray serialize(const QVariant &data, bool &success, int _level = 0);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This method generates a textual JSON representation
|
||||||
|
*
|
||||||
|
* \param data The JSON data generated by the parser.
|
||||||
|
*
|
||||||
|
* \return QString Textual JSON representation
|
||||||
|
*/
|
||||||
|
QString serializeStr(const QVariant &data);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This method generates a textual JSON representation
|
||||||
|
*
|
||||||
|
* \param data The JSON data generated by the parser.
|
||||||
|
* \param success The success of the serialization
|
||||||
|
*
|
||||||
|
* \return QString Textual JSON representation
|
||||||
|
*/
|
||||||
|
QString serializeStr(const QVariant &data, bool &success, int _level = 0);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This method sets date(time) format to be used for QDateTime::toString
|
||||||
|
* If QString is empty, Qt::TextDate is used.
|
||||||
|
*
|
||||||
|
* \param format The JSON data generated by the parser.
|
||||||
|
*/
|
||||||
|
void setDateTimeFormat(const QString& format);
|
||||||
|
void setDateFormat(const QString& format);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This method gets date(time) format to be used for QDateTime::toString
|
||||||
|
* If QString is empty, Qt::TextDate is used.
|
||||||
|
*/
|
||||||
|
QString getDateTimeFormat();
|
||||||
|
QString getDateFormat();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief setPrettySerialize enable/disabled pretty-print when serialize() a json
|
||||||
|
* @param enabled
|
||||||
|
*/
|
||||||
|
void setPrettySerialize(bool enabled);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief isPrettySerialize check if is enabled pretty-print when serialize() a json
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
bool isPrettySerialize();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* QVariant based Json object
|
||||||
|
*/
|
||||||
|
class Object : public QVariant {
|
||||||
|
template<typename T>
|
||||||
|
Object& insertKey(Object* ptr, const QString& key) {
|
||||||
|
T* p = (T*)ptr->data();
|
||||||
|
if (!p->contains(key)) p->insert(key, QVariant());
|
||||||
|
return *reinterpret_cast<Object*>(&p->operator[](key));
|
||||||
|
}
|
||||||
|
template<typename T>
|
||||||
|
void removeKey(Object *ptr, const QString& key) {
|
||||||
|
T* p = (T*)ptr->data();
|
||||||
|
p->remove(key);
|
||||||
|
}
|
||||||
|
public:
|
||||||
|
Object() : QVariant() {}
|
||||||
|
Object(const Object& ref) : QVariant(ref) {}
|
||||||
|
|
||||||
|
Object& operator=(const QVariant& rhs) {
|
||||||
|
/** It maybe more robust when running under Qt versions below 4.7 */
|
||||||
|
QObject * obj = qvariant_cast<QObject *>(rhs);
|
||||||
|
// setValue(rhs);
|
||||||
|
setValue(obj);
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
Object& operator[](const QString& key) {
|
||||||
|
if (type() == QVariant::Map)
|
||||||
|
return insertKey<QVariantMap>(this, key);
|
||||||
|
else if (type() == QVariant::Hash)
|
||||||
|
return insertKey<QVariantHash>(this, key);
|
||||||
|
|
||||||
|
setValue(QVariantMap());
|
||||||
|
|
||||||
|
return insertKey<QVariantMap>(this, key);
|
||||||
|
}
|
||||||
|
const Object& operator[](const QString& key) const {
|
||||||
|
return const_cast<Object*>(this)->operator[](key);
|
||||||
|
}
|
||||||
|
void remove(const QString& key) {
|
||||||
|
if (type() == QVariant::Map)
|
||||||
|
removeKey<QVariantMap>(this, key);
|
||||||
|
else if (type() == QVariant::Hash)
|
||||||
|
removeKey<QVariantHash>(this, key);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
class BuilderJsonArray;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief The BuilderJsonObject class
|
||||||
|
*/
|
||||||
|
class BuilderJsonObject {
|
||||||
|
|
||||||
|
public:
|
||||||
|
BuilderJsonObject();
|
||||||
|
BuilderJsonObject(JsonObject &json);
|
||||||
|
|
||||||
|
BuilderJsonObject *set(const QString &key, const QVariant &value);
|
||||||
|
BuilderJsonObject *set(const QString &key, BuilderJsonObject *builder);
|
||||||
|
BuilderJsonObject *set(const QString &key, BuilderJsonArray *builder);
|
||||||
|
JsonObject create();
|
||||||
|
|
||||||
|
private:
|
||||||
|
static QQueue<BuilderJsonObject *> created_list;
|
||||||
|
|
||||||
|
JsonObject obj;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief The BuilderJsonArray class
|
||||||
|
*/
|
||||||
|
class BuilderJsonArray {
|
||||||
|
|
||||||
|
public:
|
||||||
|
BuilderJsonArray();
|
||||||
|
BuilderJsonArray(JsonArray &json);
|
||||||
|
|
||||||
|
BuilderJsonArray *add(const QVariant &element);
|
||||||
|
BuilderJsonArray *add(BuilderJsonObject *builder);
|
||||||
|
BuilderJsonArray *add(BuilderJsonArray *builder);
|
||||||
|
JsonArray create();
|
||||||
|
|
||||||
|
private:
|
||||||
|
static QQueue<BuilderJsonArray *> created_list;
|
||||||
|
|
||||||
|
JsonArray array;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Create a BuilderJsonObject
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
BuilderJsonObject *objectBuilder();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Create a BuilderJsonObject starting from copy of another json
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
BuilderJsonObject *objectBuilder(JsonObject &json);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Create a BuilderJsonArray
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
BuilderJsonArray *arrayBuilder();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Create a BuilderJsonArray starting from copy of another json
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
BuilderJsonArray *arrayBuilder(JsonArray &json);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#endif // JSON_H
|
109
src/ATBAPP/support/PTUSystem.cpp
Normal file
109
src/ATBAPP/support/PTUSystem.cpp
Normal file
@@ -0,0 +1,109 @@
|
|||||||
|
#include "PTUSystem.h"
|
||||||
|
|
||||||
|
#include <QDebug>
|
||||||
|
#include <QDir>
|
||||||
|
#include <QFileInfo>
|
||||||
|
|
||||||
|
|
||||||
|
PTUSystem::PTUSystem(QObject *parent) : QObject(parent)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
quint16 PTUSystem::readCustomerNumber()
|
||||||
|
{
|
||||||
|
QString resultFilename;
|
||||||
|
QStringList fileNameList;
|
||||||
|
fileNameList << "/mnt/system_data/cust_nr"
|
||||||
|
<< "/etc/cust_nr";
|
||||||
|
for (const auto& filename : fileNameList) {
|
||||||
|
if (QFileInfo(filename).isReadable()) {
|
||||||
|
resultFilename = filename;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QString resultString = PTUSystem::readConfigString(resultFilename);
|
||||||
|
return static_cast<quint16>(resultString.toInt());
|
||||||
|
}
|
||||||
|
|
||||||
|
quint16 PTUSystem::readMachineNumber()
|
||||||
|
{
|
||||||
|
QString resultFilename;
|
||||||
|
QStringList fileNameList;
|
||||||
|
fileNameList << "/mnt/system_data/machine_nr"
|
||||||
|
<< "/etc/machine_nr";
|
||||||
|
for (const auto& filename : fileNameList) {
|
||||||
|
if (QFileInfo(filename).isReadable()) {
|
||||||
|
resultFilename = filename;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QString resultString = PTUSystem::readConfigString(resultFilename);
|
||||||
|
return static_cast<quint16>(resultString.toInt());
|
||||||
|
}
|
||||||
|
|
||||||
|
quint16 PTUSystem::readZoneNumber()
|
||||||
|
{
|
||||||
|
QString resultFilename;
|
||||||
|
QStringList fileNameList;
|
||||||
|
fileNameList << "/mnt/system_data/zone_nr"
|
||||||
|
<< "/etc/zone_nr";
|
||||||
|
for (const auto& filename : fileNameList) {
|
||||||
|
if (QFileInfo(filename).isReadable()) {
|
||||||
|
resultFilename = filename;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QString resultString = PTUSystem::readConfigString(resultFilename);
|
||||||
|
return static_cast<quint16>(resultString.toInt());
|
||||||
|
}
|
||||||
|
|
||||||
|
quint16 PTUSystem::readGroupNumber()
|
||||||
|
{
|
||||||
|
QString resultFilename;
|
||||||
|
QStringList fileNameList;
|
||||||
|
fileNameList << "/mnt/system_data/group_nr"
|
||||||
|
<< "/etc/group_nr";
|
||||||
|
for (const auto& filename : fileNameList) {
|
||||||
|
if (QFileInfo(filename).isReadable()) {
|
||||||
|
resultFilename = filename;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QString resultString = PTUSystem::readConfigString(resultFilename);
|
||||||
|
return static_cast<quint16>(resultString.toInt());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QString PTUSystem::readConfigString(const QString & filename)
|
||||||
|
{
|
||||||
|
QFileInfo fileinfo(filename);
|
||||||
|
|
||||||
|
if (! fileinfo.isReadable() ) {
|
||||||
|
qDebug() << "PTUSystem::readConfigString(): \"" << filename << "\" is not readable";
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
QFile file(filename);
|
||||||
|
|
||||||
|
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
|
||||||
|
qDebug() << "PTUSystem::readConfigString() cannot open file: " << filename;
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
QTextStream in(&file);
|
||||||
|
|
||||||
|
QString stringValue = in.readLine(100);
|
||||||
|
qDebug() << "PTUSystem::readConfigString() stringValue = " << stringValue;
|
||||||
|
|
||||||
|
file.close();
|
||||||
|
|
||||||
|
return stringValue;
|
||||||
|
}
|
24
src/ATBAPP/support/PTUSystem.h
Normal file
24
src/ATBAPP/support/PTUSystem.h
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
#ifndef PTUSYSTEM_H
|
||||||
|
#define PTUSYSTEM_H
|
||||||
|
|
||||||
|
#include <QObject>
|
||||||
|
|
||||||
|
class PTUSystem : public QObject
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
explicit PTUSystem(QObject *parent = nullptr);
|
||||||
|
|
||||||
|
static quint16 readCustomerNumber();
|
||||||
|
static quint16 readMachineNumber();
|
||||||
|
static quint16 readZoneNumber();
|
||||||
|
static quint16 readGroupNumber();
|
||||||
|
|
||||||
|
private:
|
||||||
|
static QString readConfigString(const QString & filename);
|
||||||
|
|
||||||
|
signals:
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // PTUSYSTEM_H
|
140
src/ATBAPP/support/PersistentData.cpp
Normal file
140
src/ATBAPP/support/PersistentData.cpp
Normal file
@@ -0,0 +1,140 @@
|
|||||||
|
#include "PersistentData.h"
|
||||||
|
|
||||||
|
#include <QFile>
|
||||||
|
#include <QFileInfo>
|
||||||
|
#include <QDir>
|
||||||
|
#include <QDateTime>
|
||||||
|
#include <QDataStream>
|
||||||
|
#include <QDebug>
|
||||||
|
|
||||||
|
PersistentData::PersistentData(const QString &datafileName, QObject *parent)
|
||||||
|
: QObject(parent)
|
||||||
|
, isChangedFlag(false)
|
||||||
|
{
|
||||||
|
// load persistant data, if available
|
||||||
|
this->filename = datafileName;
|
||||||
|
|
||||||
|
QFileInfo dataFileInfo(this->filename);
|
||||||
|
QString dataFilePath = dataFileInfo.path();
|
||||||
|
|
||||||
|
QDir dir;
|
||||||
|
if ( ! dir.exists(dataFilePath)) {
|
||||||
|
qCritical() << "Persistent data file does not exist!";
|
||||||
|
qCritical() << " --> create new: " << this->filename;
|
||||||
|
dir.mkpath(dataFilePath);
|
||||||
|
}
|
||||||
|
|
||||||
|
this->read();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void PersistentData::serializeToFile()
|
||||||
|
{
|
||||||
|
this->save();
|
||||||
|
}
|
||||||
|
|
||||||
|
void PersistentData::save()
|
||||||
|
{
|
||||||
|
QFile fileOut(this->filename);
|
||||||
|
if (fileOut.open(QIODevice::WriteOnly))
|
||||||
|
{
|
||||||
|
QDataStream out(&fileOut);
|
||||||
|
out.setVersion(QDataStream::Qt_4_6);
|
||||||
|
|
||||||
|
out << this->hash;
|
||||||
|
fileOut.flush();
|
||||||
|
fileOut.close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void PersistentData::read()
|
||||||
|
{
|
||||||
|
QFile fileIn(this->filename);
|
||||||
|
if (fileIn.open(QIODevice::ReadOnly))
|
||||||
|
{
|
||||||
|
QDataStream in(&fileIn);
|
||||||
|
in.setVersion(QDataStream::Qt_4_6);
|
||||||
|
|
||||||
|
in >> hash;
|
||||||
|
|
||||||
|
fileIn.close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
QVariant PersistentData::getParameter(const QString & key) const {
|
||||||
|
#if defined (ARCH_DesktopLinux)
|
||||||
|
// note: QVariant.toString() returns empty string for custom types
|
||||||
|
qDebug() << "VendingData::getParameter() key = " << key << " value = " << hash.value(key).toString();
|
||||||
|
#endif
|
||||||
|
return hash.value(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
QVariant PersistentData::getParameter(const QString & key)
|
||||||
|
{
|
||||||
|
#if defined (ARCH_DesktopLinux)
|
||||||
|
// note: QVariant.toString() returns empty string for custom types
|
||||||
|
qDebug() << "VendingData::getParameter() key = " << key << " value = " << hash.value(key).toString();
|
||||||
|
#endif
|
||||||
|
|
||||||
|
return hash.value(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
void PersistentData::setParameter(const QString & key, QVariant value)
|
||||||
|
{
|
||||||
|
this->isChangedFlag = true;
|
||||||
|
|
||||||
|
#if defined (ARCH_DesktopLinux)
|
||||||
|
// note: QVariant.toString() returns empty string for custom types
|
||||||
|
qDebug() << "VendingData::setParameter() key = " << key << " value = " << value.toString();
|
||||||
|
#endif
|
||||||
|
|
||||||
|
this->hash.insert(key, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
void PersistentData::clearParameter(const QString & key)
|
||||||
|
{
|
||||||
|
this->isChangedFlag = true;
|
||||||
|
this->hash.remove(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool PersistentData::hasParameter(const QString & key) const
|
||||||
|
{
|
||||||
|
return hash.contains(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
uint PersistentData::getUintParameter(const QString & key) const
|
||||||
|
{
|
||||||
|
qDebug() << "PersistentData::getUintParameter() key = " << key << " value = " << hash.value(key).toString();
|
||||||
|
|
||||||
|
uint returnValue = 0;
|
||||||
|
bool ok;
|
||||||
|
|
||||||
|
returnValue = hash.value(key).toString().toUInt(&ok);
|
||||||
|
if (!ok) returnValue = 0;
|
||||||
|
|
||||||
|
return returnValue;
|
||||||
|
}
|
||||||
|
|
||||||
|
QList<QString> PersistentData::uniqueKeys() const {
|
||||||
|
return hash.uniqueKeys();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void PersistentData::setDCFirmwareVersion(const QString & fw_version)
|
||||||
|
{
|
||||||
|
// there must be a version string!
|
||||||
|
if (fw_version.size() < 1) return;
|
||||||
|
|
||||||
|
if (this->hash["dc_fw_version"].toString() != fw_version) {
|
||||||
|
this->isChangedFlag = true;
|
||||||
|
this->hash.insert("dc_fw_version", fw_version);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QString PersistentData::getDCFirmwareVersion()
|
||||||
|
{
|
||||||
|
return this->hash["dc_fw_version"].toString();
|
||||||
|
}
|
49
src/ATBAPP/support/PersistentData.h
Normal file
49
src/ATBAPP/support/PersistentData.h
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
#ifndef PERSISTENTDATA_H
|
||||||
|
#define PERSISTENTDATA_H
|
||||||
|
|
||||||
|
#include <QObject>
|
||||||
|
#include <QHash>
|
||||||
|
#include <QVariant>
|
||||||
|
#include <QList>
|
||||||
|
#include <QString>
|
||||||
|
|
||||||
|
class PersistentData : public QObject
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
explicit PersistentData(const QString &datafileName, QObject *parent = nullptr);
|
||||||
|
|
||||||
|
void setDCFirmwareVersion(const QString & fw_version);
|
||||||
|
QString getDCFirmwareVersion();
|
||||||
|
|
||||||
|
|
||||||
|
QVariant getParameter(const QString & key);
|
||||||
|
QVariant getParameter(const QString & key) const;
|
||||||
|
void setParameter(const QString & key, QVariant value);
|
||||||
|
void clearParameter(const QString & key);
|
||||||
|
bool hasParameter(const QString & key) const;
|
||||||
|
|
||||||
|
uint getUintParameter(const QString & key) const;
|
||||||
|
QList<QString> uniqueKeys() const;
|
||||||
|
|
||||||
|
|
||||||
|
public slots:
|
||||||
|
void serializeToFile();
|
||||||
|
|
||||||
|
signals:
|
||||||
|
|
||||||
|
|
||||||
|
private:
|
||||||
|
QHash<QString, QVariant> hash;
|
||||||
|
|
||||||
|
QString dc_fw_version;
|
||||||
|
|
||||||
|
QString filename;
|
||||||
|
|
||||||
|
void save();
|
||||||
|
void read();
|
||||||
|
|
||||||
|
bool isChangedFlag;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // PERSISTENTDATA_H
|
Reference in New Issue
Block a user