Compare commits
	
		
			35 Commits
		
	
	
		
			2.0.0
			...
			pu/klaiped
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						
						
							
						
						2d60a7bd5c
	
				 | 
					
					
						|||
| 
						
						
							
						
						6d7d9ade70
	
				 | 
					
					
						|||
| 
						
						
							
						
						72dbc8b858
	
				 | 
					
					
						|||
| 
						
						
							
						
						32d70abf44
	
				 | 
					
					
						|||
| 
						
						
							
						
						c076090e03
	
				 | 
					
					
						|||
| 
						
						
							
						
						6c2717c56b
	
				 | 
					
					
						|||
| 
						
						
							
						
						816182c87b
	
				 | 
					
					
						|||
| 
						
						
							
						
						492d3a107a
	
				 | 
					
					
						|||
| 
						
						
							
						
						962cd01eac
	
				 | 
					
					
						|||
| 
						
						
							
						
						d66363da46
	
				 | 
					
					
						|||
| 
						
						
							
						
						7b25f86d6b
	
				 | 
					
					
						|||
| 
						
						
							
						
						5a999a0494
	
				 | 
					
					
						|||
| 
						
						
							
						
						ec18ac45e4
	
				 | 
					
					
						|||
| 
						
						
							
						
						560b6d3221
	
				 | 
					
					
						|||
| 
						
						
							
						
						b946dc5a92
	
				 | 
					
					
						|||
| 
						
						
							
						
						ea7542a248
	
				 | 
					
					
						|||
| 
						
						
							
						
						4541699ec3
	
				 | 
					
					
						|||
| 
						
						
							
						
						87d50a05dd
	
				 | 
					
					
						|||
| 
						
						
							
						
						379a5d4e3e
	
				 | 
					
					
						|||
| 
						
						
							
						
						6a08cf0b62
	
				 | 
					
					
						|||
| 
						
						
							
						
						849305bc8f
	
				 | 
					
					
						|||
| 
						
						
							
						
						a5c900b9fe
	
				 | 
					
					
						|||
| 
						
						
							
						
						70b488de66
	
				 | 
					
					
						|||
| 
						
						
							
						
						58f50b0ea6
	
				 | 
					
					
						|||
| 
						
						
							
						
						bc5beb4b96
	
				 | 
					
					
						|||
| 
						
						
							
						
						2a0aa2abe2
	
				 | 
					
					
						|||
| 
						
						
							
						
						f94f33862f
	
				 | 
					
					
						|||
| 
						
						
							
						
						b7cedf5444
	
				 | 
					
					
						|||
| 
						
						
							
						
						f81369944c
	
				 | 
					
					
						|||
| 
						
						
							
						
						6072970bf0
	
				 | 
					
					
						|||
| 
						
						
							
						
						8659627171
	
				 | 
					
					
						|||
| 
						
						
							
						
						d5786aa5ab
	
				 | 
					
					
						|||
| 
						
						
							
						
						ba7d801330
	
				 | 
					
					
						|||
| 
						
						
							
						
						19ce57e680
	
				 | 
					
					
						|||
| 
						
						
							
						
						d0ee6d175e
	
				 | 
					
					
						
@@ -87,7 +87,8 @@ HEADERS += \
 | 
				
			|||||||
    src/ATBAPP/support/DBusControllerInterface.h \
 | 
					    src/ATBAPP/support/DBusControllerInterface.h \
 | 
				
			||||||
    src/ATBAPP/support/JSON.h \
 | 
					    src/ATBAPP/support/JSON.h \
 | 
				
			||||||
    src/ATBAPP/support/PTUSystem.h \
 | 
					    src/ATBAPP/support/PTUSystem.h \
 | 
				
			||||||
    src/ATBAPP/support/PersistentData.h
 | 
					    src/ATBAPP/support/PersistentData.h \
 | 
				
			||||||
 | 
					    src/ATBAPP/support/Ticket.h
 | 
				
			||||||
 | 
					
 | 
				
			||||||
SOURCES += \
 | 
					SOURCES += \
 | 
				
			||||||
    src/ATBAPP/ATBHealthEvent.cpp \
 | 
					    src/ATBAPP/ATBHealthEvent.cpp \
 | 
				
			||||||
@@ -99,7 +100,8 @@ SOURCES += \
 | 
				
			|||||||
    src/ATBAPP/support/DBusControllerInterface.cpp \
 | 
					    src/ATBAPP/support/DBusControllerInterface.cpp \
 | 
				
			||||||
    src/ATBAPP/support/JSON.cpp \
 | 
					    src/ATBAPP/support/JSON.cpp \
 | 
				
			||||||
    src/ATBAPP/support/PTUSystem.cpp \
 | 
					    src/ATBAPP/support/PTUSystem.cpp \
 | 
				
			||||||
    src/ATBAPP/support/PersistentData.cpp
 | 
					    src/ATBAPP/support/PersistentData.cpp \
 | 
				
			||||||
 | 
					    src/ATBAPP/support/Ticket.cpp
 | 
				
			||||||
 | 
					
 | 
				
			||||||
DISTFILES += \
 | 
					DISTFILES += \
 | 
				
			||||||
    generate-version.sh
 | 
					    generate-version.sh
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -30,13 +30,31 @@ ATBDeviceControllerPlugin::ATBDeviceControllerPlugin(QObject *parent)
 | 
				
			|||||||
    this->setParent(parent);
 | 
					    this->setParent(parent);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    this->pluginInfo = QString::fromUtf8(pluginInfoString.c_str());
 | 
					    this->pluginInfo = QString::fromUtf8(pluginInfoString.c_str());
 | 
				
			||||||
 | 
					 | 
				
			||||||
    if (!this->private_loadCashAgentLib("")) {
 | 
					 | 
				
			||||||
        return;
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					ATBDeviceControllerPlugin::~ATBDeviceControllerPlugin() {}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					PLUGIN_STATE ATBDeviceControllerPlugin::initDCPlugin(QObject *eventReceiver, const QSettings & settings)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    this->eventReceiver = eventReceiver;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // read variables from setting
 | 
				
			||||||
 | 
					    this->serialPortName = settings.value("ATBDeviceControllerPlugin/serialPort", "ttymxc2").toString();
 | 
				
			||||||
 | 
					    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);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    this->init_sc_dbus();
 | 
					    this->init_sc_dbus();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString persistentDataFile = "/mnt/system_data/dc_persistentData.dat";
 | 
				
			||||||
 | 
					    this->persistentData = new PersistentData(persistentDataFile);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // setup libCA:
 | 
				
			||||||
 | 
					    if (!this->private_loadCashAgentLib("")) {
 | 
				
			||||||
 | 
					        return PLUGIN_STATE::NOT_INITIALIZED;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    //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);
 | 
				
			||||||
@@ -61,29 +79,20 @@ ATBDeviceControllerPlugin::ATBDeviceControllerPlugin(QObject *parent)
 | 
				
			|||||||
    dynamic_cast<QObject*>(hw)->moveToThread(hwThread);
 | 
					    dynamic_cast<QObject*>(hw)->moveToThread(hwThread);
 | 
				
			||||||
    hwThread->start();
 | 
					    hwThread->start();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    QString persistentDataFile = "/mnt/system_data/dc_persistentData.dat";
 | 
					 | 
				
			||||||
    this->persistentData = new PersistentData(persistentDataFile);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    this->diag = new DeviceControllerDiag(this->persistentData, this);
 | 
					    this->diag = new DeviceControllerDiag(this->persistentData, this);
 | 
				
			||||||
    connect(this->diag, &DeviceControllerDiag::newVoltage, this, &ATBDeviceControllerPlugin::onNewVoltage);
 | 
					    connect(this->diag, &DeviceControllerDiag::newVoltage, this, &ATBDeviceControllerPlugin::onNewVoltage);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    int diagTimeout = settings.value("ATBDeviceControllerPlugin/diagTimeout", "45").toInt();
 | 
				
			||||||
 | 
					    this->diag->setTimeout(diagTimeout);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // currentSelectedTicketType - number of used "Kombiticket" (deprecated) use TICKET_VARIANT in future
 | 
				
			||||||
    this->currentSelectedTicketType = 0;
 | 
					    this->currentSelectedTicketType = 0;
 | 
				
			||||||
 | 
					    this->currentTicket = new Ticket(TICKET_VARIANT::PARKING_TICKET, this);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    this->currentCashState = CASH_STATE::CACHE_EMPTY;
 | 
					    this->currentCashState = CASH_STATE::CACHE_EMPTY;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    this->cashStartAmountInt = 0;
 | 
					    this->cashStartAmountInt = 0;
 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
ATBDeviceControllerPlugin::~ATBDeviceControllerPlugin() {}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
PLUGIN_STATE ATBDeviceControllerPlugin::initDCPlugin(QObject *eventReceiver, const QSettings & settings)
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
    this->eventReceiver = eventReceiver;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    // read variables from setting
 | 
					 | 
				
			||||||
    this->serialPortName = settings.value("ATBDeviceControllerPlugin/serialPort", "ttymxc2").toString();
 | 
					 | 
				
			||||||
    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);
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (this->isMaster) {
 | 
					    if (this->isMaster) {
 | 
				
			||||||
@@ -130,6 +139,37 @@ PLUGIN_STATE ATBDeviceControllerPlugin::initDCPlugin(QObject *eventReceiver, con
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void ATBDeviceControllerPlugin::sendDeviceParameter(const QJsonObject &jsonObject)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    qCritical() << "ATBDeviceControllerPlugin::sendDeviceParameter:";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // extract location info and store location info in persistent data:
 | 
				
			||||||
 | 
					    QJsonValue jsonSubVal;
 | 
				
			||||||
 | 
					    jsonSubVal = jsonObject["Location"];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString locationString = jsonSubVal.toString("");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (locationString == "") {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        qCritical() << "    -->  locationString NULL";
 | 
				
			||||||
 | 
					        return;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    uint16_t customerNr = PTUSystem::readCustomerNumber();
 | 
				
			||||||
 | 
					    uint16_t machineNr  = PTUSystem::readMachineNumber();
 | 
				
			||||||
 | 
					    uint16_t borough    = PTUSystem::readZoneNumber();
 | 
				
			||||||
 | 
					    uint16_t zone       = PTUSystem::readGroupNumber();
 | 
				
			||||||
 | 
					    uint16_t alias      = 0;
 | 
				
			||||||
 | 
					    QByteArray locationBa = locationString.toLocal8Bit();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    this->hw->sendMachineID(customerNr, machineNr, borough, zone, alias, locationBa.data());
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void ATBDeviceControllerPlugin::startPhysicalLayer()
 | 
					void ATBDeviceControllerPlugin::startPhysicalLayer()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    if (!this->isMaster) return;
 | 
					    if (!this->isMaster) return;
 | 
				
			||||||
@@ -502,6 +542,8 @@ void ATBDeviceControllerPlugin::onCBinAndAllDoorsClosed()
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
    qCritical() << "ATBDeviceControllerPlugin::onCBinAndAllDoorsClosed()";
 | 
					    qCritical() << "ATBDeviceControllerPlugin::onCBinAndAllDoorsClosed()";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    this->diag->diagReInit();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    QTimer::singleShot(2000, this, SIGNAL(requestModeIDLE()));
 | 
					    QTimer::singleShot(2000, this, SIGNAL(requestModeIDLE()));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    this->dbus->finishedBackgroundTask("DOOR_OPEN");
 | 
					    this->dbus->finishedBackgroundTask("DOOR_OPEN");
 | 
				
			||||||
@@ -515,10 +557,14 @@ void ATBDeviceControllerPlugin::onAllDoorsClosed()
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
    qCritical() << "ATBDeviceControllerPlugin::onAllDoorsClosed()";
 | 
					    qCritical() << "ATBDeviceControllerPlugin::onAllDoorsClosed()";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (this->diag->isErrorState()) {
 | 
				
			||||||
 | 
					        emit this->requestModeOOO();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    else {
 | 
				
			||||||
        emit this->requestModeIDLE();
 | 
					        emit this->requestModeIDLE();
 | 
				
			||||||
    this->dbus->finishedBackgroundTask("DOOR_OPEN");
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // TODO: check for errors and create a machine event
 | 
					    this->dbus->finishedBackgroundTask("DOOR_OPEN");    
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void ATBDeviceControllerPlugin::onNewVoltage(uint32_t voltage)
 | 
					void ATBDeviceControllerPlugin::onNewVoltage(uint32_t voltage)
 | 
				
			||||||
@@ -554,86 +600,40 @@ void ATBDeviceControllerPlugin::onNewVoltage(uint32_t voltage)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/**
 | 
				
			||||||
 | 
					 * @brief ATBDeviceControllerPlugin::requestPrintTicket
 | 
				
			||||||
 | 
					 * @param ticketVariant
 | 
				
			||||||
 | 
					 * @param printingData
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * Setup (initNew()) Ticket-Object
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
void ATBDeviceControllerPlugin::requestPrintTicket(nsDeviceControllerInterface::TICKET_VARIANT ticketVariant, const QHash<QString, QVariant> & printingData)
 | 
					void ATBDeviceControllerPlugin::requestPrintTicket(nsDeviceControllerInterface::TICKET_VARIANT ticketVariant, const QHash<QString, QVariant> & printingData)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    struct T_dynDat *dynTicketData = new T_dynDat;
 | 
					    QList<quint8> templateList;
 | 
				
			||||||
    memset(dynTicketData, 0, sizeof(*dynTicketData));
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    QDateTime parkingEndDateTime = QDateTime::fromString(printingData["parkingEnd"].toString(),  Qt::ISODate);
 | 
					    // TODO: read template list from .ini
 | 
				
			||||||
    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:
 | 
					 | 
				
			||||||
    QByteArray ba_licenseplate = codec->fromUnicode(printingData["licenseplate"].toString());
 | 
					 | 
				
			||||||
    memcpy((char*)dynTicketData->licensePlate, ba_licenseplate.data(), std::min(ba_licenseplate.size(),8));
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    QByteArray ba_amount = codec->fromUnicode(printingData["amount"].toString());
 | 
					 | 
				
			||||||
    memcpy((char*)dynTicketData->vendingPrice,  ba_amount.data(), std::min(ba_amount.size(),8));  // Szeged
 | 
					 | 
				
			||||||
    memcpy((char*)dynTicketData->dynDat6,       ba_amount.data(), std::min(ba_amount.size(),8));  // Schoenau
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    QByteArray ba_parkingEndTime = codec->fromUnicode(parkingEndDateTime.toString("hh:mm"));
 | 
					 | 
				
			||||||
    memcpy((char*)dynTicketData->parkingEnd,  ba_parkingEndTime.data(), std::min(ba_parkingEndTime.size(),8));
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    QByteArray ba_parkingEndDate = codec->fromUnicode(parkingEndDateString);
 | 
					 | 
				
			||||||
    memcpy((char*)dynTicketData->currentTime,  ba_parkingEndDate.data(), std::min(ba_parkingEndDate.size(),8));
 | 
					 | 
				
			||||||
    // ! and yes... 'ParkingEndDate' is 'currentTime'
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    QByteArray ba_currentDate = codec->fromUnicode(currentDateString);
 | 
					 | 
				
			||||||
    memcpy((char*)dynTicketData->currentDate,  ba_currentDate.data(), std::min(ba_currentDate.size(),8));
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    // STAN for Szeged Start/Stop: must be 9 digits
 | 
					 | 
				
			||||||
    // --------------------------------------------------------------------------------------
 | 
					 | 
				
			||||||
    QString stan = codec->fromUnicode(printingData["STAN"].toString());
 | 
					 | 
				
			||||||
    qCritical() << "   requestPrintTicket() STAN = " << stan;
 | 
					 | 
				
			||||||
    QString stan1;
 | 
					 | 
				
			||||||
    QString stan2;
 | 
					 | 
				
			||||||
    if (stan.length() == 9) {
 | 
					 | 
				
			||||||
        stan1 = "     " + stan.mid(0,3);
 | 
					 | 
				
			||||||
        stan2 = stan.mid(3,3) + " " + stan.mid(6,3);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
    else {
 | 
					 | 
				
			||||||
        qCritical() << "ASSERT: ATBDeviceControllerPlugin::requestPrintTicket() invalid STAN: " << stan;
 | 
					 | 
				
			||||||
        stan1 = "     000";
 | 
					 | 
				
			||||||
        stan2 = "000 000";
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
    QByteArray ba_stan1 = codec->fromUnicode(stan1);
 | 
					 | 
				
			||||||
    QByteArray ba_stan2 = codec->fromUnicode(stan2);
 | 
					 | 
				
			||||||
    // --------------------------------------------------------------------------------------
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    this->templateList.clear();
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    switch (ticketVariant) {
 | 
					 | 
				
			||||||
    case nsDeviceControllerInterface::TICKET_VARIANT::START_RECEIPT:
 | 
					 | 
				
			||||||
        qCritical() << "      -> TICKET_VARIANT::START_RECEIPT";
 | 
					 | 
				
			||||||
        memcpy((char*)dynTicketData->dynDat6, ba_stan1.data(), std::min(ba_stan1.size(),8));
 | 
					 | 
				
			||||||
        memcpy((char*)dynTicketData->dynDat7, ba_stan2.data(), std::min(ba_stan2.size(),8));
 | 
					 | 
				
			||||||
        this->templateList << 21 << 22 << 23;
 | 
					 | 
				
			||||||
        break;
 | 
					 | 
				
			||||||
    case nsDeviceControllerInterface::TICKET_VARIANT::STOP_RECEIPT:
 | 
					 | 
				
			||||||
        qCritical() << "      -> TICKET_VARIANT::STOP_RECEIPT";
 | 
					 | 
				
			||||||
        memcpy((char*)dynTicketData->dynDat6, ba_stan1.data(), std::min(ba_stan1.size(),8));
 | 
					 | 
				
			||||||
        memcpy((char*)dynTicketData->dynDat7, ba_stan2.data(), std::min(ba_stan2.size(),8));
 | 
					 | 
				
			||||||
        this->templateList << 24 << 25 << 26;
 | 
					 | 
				
			||||||
        break;
 | 
					 | 
				
			||||||
    case nsDeviceControllerInterface::TICKET_VARIANT::RECEIPT:
 | 
					 | 
				
			||||||
        break;
 | 
					 | 
				
			||||||
    case nsDeviceControllerInterface::TICKET_VARIANT::ERROR_RECEIPT:
 | 
					 | 
				
			||||||
        break;
 | 
					 | 
				
			||||||
    case nsDeviceControllerInterface::TICKET_VARIANT::PARKING_TICKET:
 | 
					 | 
				
			||||||
        break;
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // DEBUG
 | 
					    // DEBUG
 | 
				
			||||||
 | 
					    qCritical() << "------------------------------------------------------------------------";
 | 
				
			||||||
    qCritical() << "ATBDeviceControllerPlugin::requestPrintTicket()";
 | 
					    qCritical() << "ATBDeviceControllerPlugin::requestPrintTicket()";
 | 
				
			||||||
    for (int i =0; i < this->templateList.size(); ++i) {
 | 
					    qCritical() << "     TICKET_VARIANT: " << ticketVariant;
 | 
				
			||||||
        qCritical() << "     template: " << this->templateList.at(i);
 | 
					    qCritical() << "          dyn1_list: " << printingData["dyn1_list"].toStringList();
 | 
				
			||||||
    }
 | 
					    qCritical() << "          dyn2_list: " << printingData["dyn2_list"].toStringList();
 | 
				
			||||||
 | 
					    qCritical() << "------------------------------------------------------------------------";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (!this->currentTicket->initNew(ticketVariant, templateList, printingData)) {
 | 
				
			||||||
 | 
					        this->errorCode = this->currentTicket->getErrorCode();
 | 
				
			||||||
 | 
					        this->errorDescription = this->currentTicket->getErrorCode();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        qCritical() << "ERROR: ticket->initNew: " << ticketVariant;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        this->onPrintFinishedERR();
 | 
				
			||||||
 | 
					        return;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /*
 | 
					    /*
 | 
				
			||||||
    if (!this->hw->dc_isPortOpen()) {
 | 
					    if (!this->hw->dc_isPortOpen()) {
 | 
				
			||||||
        qCritical() << "    ... serial port is not open!";
 | 
					        qCritical() << "    ... serial port is not open!";
 | 
				
			||||||
@@ -642,26 +642,7 @@ void ATBDeviceControllerPlugin::requestPrintTicket(nsDeviceControllerInterface::
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
    */
 | 
					    */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // TODO: wird hier nur 'licensePlate' gedruckt?
 | 
					    this->prepareDynTemplateData();
 | 
				
			||||||
    if (!this->hw->prn_sendDynamicPrnValues(dynTicketData->licensePlate)) {
 | 
					 | 
				
			||||||
        this->errorCode = "hwapi::prn_sendDynamicPrnValues";
 | 
					 | 
				
			||||||
        this->errorDescription = "hwapi method 'hwapi::prn_sendDynamicPrnValues' result is false";
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        qCritical() << "ERROR:";
 | 
					 | 
				
			||||||
        qCritical() << "ATBDeviceControllerPlugin::requestPrintTicket( "        << endl
 | 
					 | 
				
			||||||
                    << "     licenseplate = " << printingData["licenseplate"]   << endl
 | 
					 | 
				
			||||||
                    << "           amount = " << printingData["amount"]         << endl
 | 
					 | 
				
			||||||
                    << "       parkingEnd = " << printingData["parkingEnd"]     << endl
 | 
					 | 
				
			||||||
                    << "      currentTime = " << printingData["currentTime"]    << endl
 | 
					 | 
				
			||||||
                    << "      currentDate = " << printingData["currentDate"]    << endl
 | 
					 | 
				
			||||||
                    << "             stan = " << printingData["STAN"]           << endl;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        this->onPrintFinishedERR();
 | 
					 | 
				
			||||||
        return;
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    QTimer::singleShot(1000, this, SLOT(onPrinterDataPreparedForTemplates()));
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void ATBDeviceControllerPlugin::requestPrintReceipt(const QHash<QString, QVariant> & printingData)
 | 
					void ATBDeviceControllerPlugin::requestPrintReceipt(const QHash<QString, QVariant> & printingData)
 | 
				
			||||||
@@ -673,10 +654,22 @@ void ATBDeviceControllerPlugin::requestPrintReceipt(const QHash<QString, QVarian
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
void ATBDeviceControllerPlugin::requestPrintReceipt(const QString & printingString)
 | 
					void ATBDeviceControllerPlugin::requestPrintReceipt(const QString & printingString)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    QByteArray ba = printingString.toUtf8();
 | 
					    QByteArray ba_receipt = this->codec->fromUnicode(printingString);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    //QByteArray ba = printingString.toUtf8();
 | 
				
			||||||
    hw->prn_switchPower(true);
 | 
					    hw->prn_switchPower(true);
 | 
				
			||||||
    hw->prn_setFonts(8,12,0,0);
 | 
					    hw->prn_setFonts(8,12,0,0);
 | 
				
			||||||
    hw->prn_sendText(&ba);
 | 
					    hw->prn_sendText(&ba_receipt);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // DEBUG
 | 
				
			||||||
 | 
					    //qCritical() << "---------------------------------------------------------------";
 | 
				
			||||||
 | 
					    //qCritical() << "ATBDeviceControllerPlugin::requestPrintReceipt()";
 | 
				
			||||||
 | 
					    //qCritical() << "    receipt data:";
 | 
				
			||||||
 | 
					    //qCritical() << QString(ba_receipt);
 | 
				
			||||||
 | 
					    //qCritical() << "---------------------------------------------------------------";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    this->printResultCheckCounter = 0;
 | 
				
			||||||
    QTimer::singleShot(4000, this, SLOT(onPrinterWaitForPrintingReceipt()));
 | 
					    QTimer::singleShot(4000, this, SLOT(onPrinterWaitForPrintingReceipt()));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    //QTimer::singleShot(2000, this, [this](){ hw->prn_cut(3);  } );
 | 
					    //QTimer::singleShot(2000, this, [this](){ hw->prn_cut(3);  } );
 | 
				
			||||||
@@ -725,7 +718,8 @@ void ATBDeviceControllerPlugin::onPrinterWaitForPrintingReceipt()
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
void ATBDeviceControllerPlugin::requestPrintTicket(const QHash<QString, QVariant> & printingData)
 | 
					void ATBDeviceControllerPlugin::requestPrintTicket(const QHash<QString, QVariant> & printingData)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    struct T_dynDat *dynTicketData = new T_dynDat;
 | 
					    struct T_dynDat dynamicTicketData;
 | 
				
			||||||
 | 
					    struct T_dynDat *dynTicketData = &dynamicTicketData;
 | 
				
			||||||
    memset(dynTicketData, 0, sizeof(*dynTicketData));
 | 
					    memset(dynTicketData, 0, sizeof(*dynTicketData));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    qCritical() << "ATBDeviceControllerPlugin::requestPrintTicket( "         << endl
 | 
					    qCritical() << "ATBDeviceControllerPlugin::requestPrintTicket( "         << endl
 | 
				
			||||||
@@ -810,23 +804,36 @@ void ATBDeviceControllerPlugin::requestPrintTicket(const QHash<QString, QVariant
 | 
				
			|||||||
    //          2 - Card / ShortTimeParking
 | 
					    //          2 - Card / ShortTimeParking
 | 
				
			||||||
    //          3 - Cash / DayTicket
 | 
					    //          3 - Cash / DayTicket
 | 
				
			||||||
    //          4 - Card / DayTicket
 | 
					    //          4 - Card / DayTicket
 | 
				
			||||||
 | 
					    //      00744 - NeuhauserVT/NAZ:
 | 
				
			||||||
 | 
					    //          1 - Erwachsene
 | 
				
			||||||
 | 
					    //          2 - Jugendliche
 | 
				
			||||||
 | 
					    //      00741 - NeuhauserVT/Linsinger Maschinenbau
 | 
				
			||||||
 | 
					    //          t.b.d.
 | 
				
			||||||
    QString paymentType = printingData["paymentType"].toString(); // must be "CASH" | "CARD"
 | 
					    QString paymentType = printingData["paymentType"].toString(); // must be "CASH" | "CARD"
 | 
				
			||||||
    QString productName = printingData["product"].toString();     // must be "ShortTimeParking" | "DayTicket"
 | 
					    QString productName = printingData["product"].toString();     // must be "ShortTimeParking" | "DayTicket"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if ( (paymentType == "CASH") && (productName == "SHORT_TERM_PARKING") ) {
 | 
					    if ( (paymentType == "CASH") && (productName == "SHORT_TERM_PARKING") ) {
 | 
				
			||||||
        this->currentSelectedTicketType = 1;
 | 
					        this->currentSelectedTicketType = 1; // "Kombiticket #1"
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    else
 | 
					    else
 | 
				
			||||||
    if ( (paymentType == "CARD") && (productName == "SHORT_TERM_PARKING") ) {
 | 
					    if ( (paymentType == "CARD") && (productName == "SHORT_TERM_PARKING") ) {
 | 
				
			||||||
        this->currentSelectedTicketType = 2;
 | 
					        this->currentSelectedTicketType = 2; // "Kombiticket #2"
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    else
 | 
					    else
 | 
				
			||||||
    if ( (paymentType == "CASH") && (productName == "DAY_TICKET") ) {
 | 
					    if ( (paymentType == "CASH") && (productName == "DAY_TICKET") ) {
 | 
				
			||||||
        this->currentSelectedTicketType = 3;
 | 
					        this->currentSelectedTicketType = 3; // "Kombiticket #3"
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    else
 | 
					    else
 | 
				
			||||||
    if ( (paymentType == "CARD") && (productName == "DAY_TICKET") ) {
 | 
					    if ( (paymentType == "CARD") && (productName == "DAY_TICKET") ) {
 | 
				
			||||||
        this->currentSelectedTicketType = 4;
 | 
					        this->currentSelectedTicketType = 4; // "Kombiticket #4"
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    else
 | 
				
			||||||
 | 
					    if ( productName == "DAY_TICKET_ADULT") {
 | 
				
			||||||
 | 
					        this->currentSelectedTicketType = 1;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    else
 | 
				
			||||||
 | 
					    if ( productName == "DAY_TICKET_TEEN") {
 | 
				
			||||||
 | 
					        this->currentSelectedTicketType = 2;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    else {
 | 
					    else {
 | 
				
			||||||
        qCritical() << "ERROR: requestPrintTicket(): invalid payment data:";
 | 
					        qCritical() << "ERROR: requestPrintTicket(): invalid payment data:";
 | 
				
			||||||
@@ -842,7 +849,7 @@ void ATBDeviceControllerPlugin::requestPrintTicket(const QHash<QString, QVariant
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
void ATBDeviceControllerPlugin::onPrinterDataPreparedForTemplates()
 | 
					void ATBDeviceControllerPlugin::onPrinterDataPreparedForTemplates()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    if (this->templateList.isEmpty()) return;
 | 
					    if (this->currentTicket->templateList()->isEmpty()) return;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    this->onPrinterPrintNextTemplate();
 | 
					    this->onPrinterPrintNextTemplate();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
@@ -853,6 +860,7 @@ 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!
 | 
				
			||||||
 | 
					    this->printResultCheckCounter = 0;
 | 
				
			||||||
    QTimer::singleShot(4000, this, SLOT(onPrinterWaitForPrintingTicket()));
 | 
					    QTimer::singleShot(4000, this, SLOT(onPrinterWaitForPrintingTicket()));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // old: use printer templates:
 | 
					    // old: use printer templates:
 | 
				
			||||||
@@ -876,8 +884,17 @@ void ATBDeviceControllerPlugin::onPrinterWaitForPrintingTicket()
 | 
				
			|||||||
        this->onPrintFinishedERR();
 | 
					        this->onPrintFinishedERR();
 | 
				
			||||||
        break;
 | 
					        break;
 | 
				
			||||||
    default:
 | 
					    default:
 | 
				
			||||||
 | 
					        // result value is not defined (-> workaround for DC misbehaviour)
 | 
				
			||||||
 | 
					        if (this->printResultCheckCounter < 10) {
 | 
				
			||||||
 | 
					            this->printResultCheckCounter++;
 | 
				
			||||||
 | 
					            qCritical() << "DC print result undefined: " << printerResult;
 | 
				
			||||||
 | 
					            QTimer::singleShot(1000, this, SLOT(onPrinterWaitForPrintingTicket()));
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        else {
 | 
				
			||||||
            qCritical() << "DC Error: wait for printing";
 | 
					            qCritical() << "DC Error: wait for printing";
 | 
				
			||||||
            this->onPrintFinishedERR();
 | 
					            this->onPrintFinishedERR();
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        break;
 | 
					        break;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -887,30 +904,38 @@ void ATBDeviceControllerPlugin::onPrinterWaitForPrintingTicket()
 | 
				
			|||||||
void ATBDeviceControllerPlugin::onPrinterPrintNextTemplate()
 | 
					void ATBDeviceControllerPlugin::onPrinterPrintNextTemplate()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    // template list must not be empty
 | 
					    // template list must not be empty
 | 
				
			||||||
    if (this->templateList.isEmpty()) {
 | 
					    if (this->currentTicket->templateList()->isEmpty()) {
 | 
				
			||||||
        this->onPrintFinishedERR();
 | 
					        this->onPrintFinishedERR();
 | 
				
			||||||
        return;
 | 
					        return;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    qCritical() << "     ... print template " << this->templateList.first();
 | 
					    qCritical() << "     ... print template " << this->currentTicket->templateList()->first();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (!this->hw->prn_printTemplate(this->templateList.first())) {
 | 
					    if (!this->hw->prn_printTemplate(this->currentTicket->templateList()->first())) {
 | 
				
			||||||
        this->errorCode = "hwapi::prn_printTemplate";
 | 
					        this->errorCode = "hwapi::prn_printTemplate";
 | 
				
			||||||
        this->errorDescription = QString("hwapi method 'hwapi::onPrinterPrintNextTemplate(%1)' result is false").arg(this->templateList.first());
 | 
					        this->errorDescription = QString("hwapi method 'hwapi::onPrinterPrintNextTemplate(%1)' result is false").arg(this->currentTicket->templateList()->first());
 | 
				
			||||||
        this->onPrintFinishedERR();
 | 
					        this->onPrintFinishedERR();
 | 
				
			||||||
        return;
 | 
					        return;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    this->templateList.removeFirst();
 | 
					    this->currentTicket->templateList()->removeFirst();
 | 
				
			||||||
 | 
					    this->currentTicket->setCurrentTemplateProcessed();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (templateList.isEmpty()) {
 | 
					    if (this->currentTicket->templateList()->isEmpty()) {
 | 
				
			||||||
        // all templates are printed
 | 
					        // all templates are printed
 | 
				
			||||||
 | 
					        this->printResultCheckCounter = 0;
 | 
				
			||||||
        QTimer::singleShot(2000, this, SLOT(onPrinterWaitForPrintingTicket()));
 | 
					        QTimer::singleShot(2000, this, SLOT(onPrinterWaitForPrintingTicket()));
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					    else {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (this->currentTicket->hasTemplateDynData()) {
 | 
				
			||||||
 | 
					            // set new dyn data:
 | 
				
			||||||
 | 
					            QTimer::singleShot(2000, this, SLOT(onPrinterPrepareDynTemplateData()));
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
        else {
 | 
					        else {
 | 
				
			||||||
            // print next template
 | 
					            // print next template
 | 
				
			||||||
            QTimer::singleShot(2000, this, SLOT(onPrinterPrintNextTemplate()));
 | 
					            QTimer::singleShot(2000, this, SLOT(onPrinterPrintNextTemplate()));
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/************************************************************************************************
 | 
					/************************************************************************************************
 | 
				
			||||||
@@ -943,6 +968,166 @@ void ATBDeviceControllerPlugin::onPrintFinishedERR()
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void ATBDeviceControllerPlugin::onPrinterPrepareDynTemplateData()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    this->prepareDynTemplateData();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					void ATBDeviceControllerPlugin::prepareDynTemplateData()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    struct T_dynDat dynamicTicketData;
 | 
				
			||||||
 | 
					    struct T_dynDat *dynTicketData = &dynamicTicketData;
 | 
				
			||||||
 | 
					    memset(dynTicketData, 0, sizeof(*dynTicketData));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // setup dynTicketData dependent on currentTicket
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // DEBUG:
 | 
				
			||||||
 | 
					    qCritical() << "---------------------------------------------------";
 | 
				
			||||||
 | 
					    qCritical() << "ATBDeviceControllerPlugin::prepareDynTemplateData():";
 | 
				
			||||||
 | 
					    qCritical() << "    -> currentProcessedTemplateNumber: " << this->currentTicket->getCurrentProcessedTemplateNumber();
 | 
				
			||||||
 | 
					    qCritical() << "    -> this->currentTicket->variant(): " << this->currentTicket->variant();
 | 
				
			||||||
 | 
					    qCritical() << "---------------------------------------------------";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    switch (this->currentTicket->variant()) {
 | 
				
			||||||
 | 
					    case nsDeviceControllerInterface::TICKET_VARIANT::START_RECEIPT:
 | 
				
			||||||
 | 
					        private_setupDynTemplateData_START_RECEIPT(dynTicketData, this->currentTicket);
 | 
				
			||||||
 | 
					        break;
 | 
				
			||||||
 | 
					    case nsDeviceControllerInterface::TICKET_VARIANT::STOP_RECEIPT:
 | 
				
			||||||
 | 
					        private_setupDynTemplatData_STOP_RECEIPT(dynTicketData, this->currentTicket);
 | 
				
			||||||
 | 
					        break;
 | 
				
			||||||
 | 
					    case nsDeviceControllerInterface::TICKET_VARIANT::FINE_PAYMENT:
 | 
				
			||||||
 | 
					        private_setupDynTemplatData_FINE_PAYMENT(dynTicketData, this->currentTicket);
 | 
				
			||||||
 | 
					        break;
 | 
				
			||||||
 | 
					    case nsDeviceControllerInterface::TICKET_VARIANT::RECEIPT:
 | 
				
			||||||
 | 
					        break;
 | 
				
			||||||
 | 
					    case nsDeviceControllerInterface::TICKET_VARIANT::ERROR_RECEIPT:
 | 
				
			||||||
 | 
					        break;
 | 
				
			||||||
 | 
					    case nsDeviceControllerInterface::TICKET_VARIANT::PARKING_TICKET:
 | 
				
			||||||
 | 
					        break;
 | 
				
			||||||
 | 
					    case nsDeviceControllerInterface::TICKET_VARIANT::FOOD_STAMP:
 | 
				
			||||||
 | 
					        private_setupDynTemplatData_FOOD_STAMP(dynTicketData, this->currentTicket);
 | 
				
			||||||
 | 
					        break;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // C-Programmierung: wird hier nur 'licensePlate' gedruckt?
 | 
				
			||||||
 | 
					    if (!this->hw->prn_sendDynamicPrnValues(dynTicketData->licensePlate)) {
 | 
				
			||||||
 | 
					        this->errorCode = "hwapi::prn_sendDynamicPrnValues";
 | 
				
			||||||
 | 
					        this->errorDescription = "hwapi method 'hwapi::prn_sendDynamicPrnValues' result is false";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        qCritical() << "ERROR: hw->prn_sendDynamicPrnValues";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        this->onPrintFinishedERR();
 | 
				
			||||||
 | 
					        return;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QTimer::singleShot(1000, this, SLOT(onPrinterDataPreparedForTemplates()));
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void ATBDeviceControllerPlugin::private_setupDynTemplateData_START_RECEIPT(struct T_dynDat *dynTicketData, Ticket *ticket)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    QDateTime parkingEndDateTime = QDateTime::fromString(ticket->getPrintingData()["parkingEnd"].toString(),  Qt::ISODate);
 | 
				
			||||||
 | 
					    QDateTime currentDateTime    = QDateTime::fromString(ticket->getPrintingData()["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:
 | 
				
			||||||
 | 
					    QByteArray ba_licenseplate = codec->fromUnicode(ticket->getPrintingData()["licenseplate"].toString());
 | 
				
			||||||
 | 
					    memcpy((char*)dynTicketData->licensePlate, ba_licenseplate.data(), std::min(ba_licenseplate.size(),8));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QByteArray ba_amount = codec->fromUnicode(ticket->getPrintingData()["amount"].toString());
 | 
				
			||||||
 | 
					    memcpy((char*)dynTicketData->vendingPrice,  ba_amount.data(), std::min(ba_amount.size(),8));  // Szeged
 | 
				
			||||||
 | 
					    memcpy((char*)dynTicketData->dynDat6,       ba_amount.data(), std::min(ba_amount.size(),8));  // Schoenau
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QByteArray ba_parkingEndTime = codec->fromUnicode(parkingEndDateTime.toString("hh:mm"));
 | 
				
			||||||
 | 
					    memcpy((char*)dynTicketData->parkingEnd,  ba_parkingEndTime.data(), std::min(ba_parkingEndTime.size(),8));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QByteArray ba_parkingEndDate = codec->fromUnicode(parkingEndDateString);
 | 
				
			||||||
 | 
					    memcpy((char*)dynTicketData->currentTime,  ba_parkingEndDate.data(), std::min(ba_parkingEndDate.size(),8));
 | 
				
			||||||
 | 
					    // ! and yes... 'ParkingEndDate' is 'currentTime'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QByteArray ba_currentDate = codec->fromUnicode(currentDateString);
 | 
				
			||||||
 | 
					    memcpy((char*)dynTicketData->currentDate,  ba_currentDate.data(), std::min(ba_currentDate.size(),8));
 | 
				
			||||||
 | 
					    // STAN for Szeged Start/Stop: must be 9 digits
 | 
				
			||||||
 | 
					    // --------------------------------------------------------------------------------------
 | 
				
			||||||
 | 
					    QString stan = codec->fromUnicode(ticket->getPrintingData()["STAN"].toString());
 | 
				
			||||||
 | 
					    qCritical() << "   requestPrintTicket() STAN = " << stan;
 | 
				
			||||||
 | 
					    QString stan1;
 | 
				
			||||||
 | 
					    QString stan2;
 | 
				
			||||||
 | 
					    if (stan.length() == 9) {
 | 
				
			||||||
 | 
					        stan1 = "     " + stan.mid(0,3);
 | 
				
			||||||
 | 
					        stan2 = stan.mid(3,3) + " " + stan.mid(6,3);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    else {
 | 
				
			||||||
 | 
					        qCritical() << "ASSERT: ATBDeviceControllerPlugin::requestPrintTicket() invalid STAN: " << stan;
 | 
				
			||||||
 | 
					        stan1 = "     000";
 | 
				
			||||||
 | 
					        stan2 = "000 000";
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    QByteArray ba_stan1 = codec->fromUnicode(stan1);
 | 
				
			||||||
 | 
					    QByteArray ba_stan2 = codec->fromUnicode(stan2);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // --------------------------------------------------------------------------------------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    memcpy((char*)dynTicketData->dynDat6, ba_stan1.data(), std::min(ba_stan1.size(),8));
 | 
				
			||||||
 | 
					    memcpy((char*)dynTicketData->dynDat7, ba_stan2.data(), std::min(ba_stan2.size(),8));
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void ATBDeviceControllerPlugin::private_setupDynTemplatData_STOP_RECEIPT(struct T_dynDat *dynTicketData,  Ticket *ticket)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    // same as START_RECEIPT
 | 
				
			||||||
 | 
					    this->private_setupDynTemplateData_START_RECEIPT(dynTicketData, ticket);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void ATBDeviceControllerPlugin::private_setupDynTemplatData_FOOD_STAMP(struct T_dynDat *dynTicketData, Ticket *ticket)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    quint8 currentProcessedTemplateNumber = ticket->getCurrentProcessedTemplateNumber();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // TODO: check DynXList size / or ensure that DynXList has value
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // "Mitarbeiter-Nummer": dynPr1 -> licenceplate
 | 
				
			||||||
 | 
					    QString currentEMP_Nr = ticket->getDyn1List().at(currentProcessedTemplateNumber);
 | 
				
			||||||
 | 
					    QByteArray ba_licenseplate = codec->fromUnicode(currentEMP_Nr);
 | 
				
			||||||
 | 
					    memcpy((char*)dynTicketData->licensePlate, ba_licenseplate.data(), std::min(ba_licenseplate.size(),8));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // "Lauf.Nr": dynPr2 -> vendingPrice
 | 
				
			||||||
 | 
					    QString currentStampNumber = ticket->getDyn2List().at(currentProcessedTemplateNumber);
 | 
				
			||||||
 | 
					    QByteArray ba_amount = codec->fromUnicode(currentStampNumber);
 | 
				
			||||||
 | 
					    memcpy((char*)dynTicketData->vendingPrice, ba_amount.data(), std::min(ba_amount.size(),8));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // DEBUG
 | 
				
			||||||
 | 
					    qCritical() << "-------------------------------------------------------";
 | 
				
			||||||
 | 
					    qCritical() << "private_setupDynTemplatData_FOOD_STAMP()";
 | 
				
			||||||
 | 
					    qCritical() << "       currentProcessedTemplateNumber: " << currentProcessedTemplateNumber;
 | 
				
			||||||
 | 
					    qCritical() << "                        currentEMP_Nr: " << currentEMP_Nr;
 | 
				
			||||||
 | 
					    qCritical() << "                   currentStampNumber: " << currentStampNumber;
 | 
				
			||||||
 | 
					    qCritical() << "-------------------------------------------------------";
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void ATBDeviceControllerPlugin::private_setupDynTemplatData_FINE_PAYMENT(struct T_dynDat *dynTicketData,   Ticket *ticket)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    QDateTime currentDateTime    = QDateTime::fromString(ticket->getPrintingData()["currentDateTime"].toString(), Qt::ISODate);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString currentDateString    = this->printerLocale.toString(currentDateTime.date(),    QLocale::ShortFormat);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // set dynamic printer data:
 | 
				
			||||||
 | 
					    QByteArray ba_licenseplate = codec->fromUnicode(ticket->getPrintingData()["licenseplate"].toString());
 | 
				
			||||||
 | 
					    memcpy((char*)dynTicketData->licensePlate, ba_licenseplate.data(), std::min(ba_licenseplate.size(),8));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QByteArray ba_amount = codec->fromUnicode(ticket->getPrintingData()["amount"].toString());
 | 
				
			||||||
 | 
					    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_currentDate = codec->fromUnicode(currentDateString);
 | 
				
			||||||
 | 
					    memcpy((char*)dynTicketData->currentDate,   ba_currentDate.data(), std::min(ba_currentDate.size(),8));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QByteArray ba_ticketId = codec->fromUnicode(ticket->getPrintingData()["ticketId"].toString());
 | 
				
			||||||
 | 
					    memcpy((char*)dynTicketData->dynDat7,       ba_amount.data(), std::min(ba_ticketId.size(),8));
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/************************************************************************************************
 | 
					/************************************************************************************************
 | 
				
			||||||
 * cash payment
 | 
					 * cash payment
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
@@ -1372,7 +1557,7 @@ int ATBDeviceControllerPlugin::init_sc_dbus()
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
void ATBDeviceControllerPlugin::onWokeUp(uchar source)
 | 
					void ATBDeviceControllerPlugin::onWokeUp(uchar source)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    if (source == 0x01) {
 | 
					    if (source == 0x01 || source == 0xFE) {
 | 
				
			||||||
        // woke up from device controller
 | 
					        // woke up from device controller
 | 
				
			||||||
        this->diag->diagRequest();
 | 
					        this->diag->diagRequest();
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,6 +7,7 @@
 | 
				
			|||||||
#include "src/ATBAPP/DeviceControllerInterface.h"
 | 
					#include "src/ATBAPP/DeviceControllerInterface.h"
 | 
				
			||||||
#include "src/ATBAPP/ATBAPPplugin.h"
 | 
					#include "src/ATBAPP/ATBAPPplugin.h"
 | 
				
			||||||
#include "src/ATBAPP/DeviceControllerDiag.h"
 | 
					#include "src/ATBAPP/DeviceControllerDiag.h"
 | 
				
			||||||
 | 
					#include "src/ATBAPP/support/Ticket.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "version.h"
 | 
					#include "version.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -20,11 +21,11 @@
 | 
				
			|||||||
class DBusControllerInterface;
 | 
					class DBusControllerInterface;
 | 
				
			||||||
class QTextCodec;
 | 
					class QTextCodec;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
using namespace nsDeviceControllerInterface;
 | 
					using namespace nsDeviceControllerInterface;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class QSettings;
 | 
					class QSettings;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class ATBDeviceControllerPlugin :
 | 
					class ATBDeviceControllerPlugin :
 | 
				
			||||||
        public DeviceControllerInterface
 | 
					        public DeviceControllerInterface
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
@@ -43,6 +44,8 @@ public:
 | 
				
			|||||||
    // interface:
 | 
					    // interface:
 | 
				
			||||||
    PLUGIN_STATE initDCPlugin(QObject *eventReceiver, const QSettings & settings);
 | 
					    PLUGIN_STATE initDCPlugin(QObject *eventReceiver, const QSettings & settings);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    void sendDeviceParameter(const QJsonObject & jsonObject);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // TASKS: Cash handling -------------------------------------------------------
 | 
					    // TASKS: Cash handling -------------------------------------------------------
 | 
				
			||||||
    void requestStartCashInput(const QString & amount);
 | 
					    void requestStartCashInput(const QString & amount);
 | 
				
			||||||
    void requestStopCashInput();
 | 
					    void requestStopCashInput();
 | 
				
			||||||
@@ -94,8 +97,6 @@ private:
 | 
				
			|||||||
   QString errorDescription;
 | 
					   QString errorDescription;
 | 
				
			||||||
   QString pluginInfo;
 | 
					   QString pluginInfo;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
   QList<int> templateList;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
   QString serialPortName;
 | 
					   QString serialPortName;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
   bool useDebug;
 | 
					   bool useDebug;
 | 
				
			||||||
@@ -128,11 +129,24 @@ private:
 | 
				
			|||||||
   // counts failed hw->log_chkIfVaultRecordAvailable()
 | 
					   // counts failed hw->log_chkIfVaultRecordAvailable()
 | 
				
			||||||
   int accountCheckCounter;
 | 
					   int accountCheckCounter;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					   // counts faild hw->prn-getPrintResult()
 | 
				
			||||||
 | 
					   int printResultCheckCounter;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
   // dbus
 | 
					   // dbus
 | 
				
			||||||
   int init_sc_dbus();
 | 
					   int init_sc_dbus();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					   // printer privates ----------------------------------------------------------------------------
 | 
				
			||||||
 | 
					   Ticket * currentTicket;
 | 
				
			||||||
   QLocale printerLocale;
 | 
					   QLocale printerLocale;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					   void prepareDynTemplateData();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					   void private_setupDynTemplateData_START_RECEIPT(struct T_dynDat *dynTicketData, Ticket *ticket);
 | 
				
			||||||
 | 
					   void private_setupDynTemplatData_STOP_RECEIPT(struct T_dynDat *dynTicketData,   Ticket *ticket);
 | 
				
			||||||
 | 
					   void private_setupDynTemplatData_FOOD_STAMP(struct T_dynDat *dynTicketData,     Ticket *ticket);
 | 
				
			||||||
 | 
					   void private_setupDynTemplatData_FINE_PAYMENT(struct T_dynDat *dynTicketData,   Ticket *ticket);
 | 
				
			||||||
 | 
					   // ---------------------------------------------------------------------------------------------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
private slots:
 | 
					private slots:
 | 
				
			||||||
   // printer
 | 
					   // printer
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -142,6 +156,8 @@ private slots:
 | 
				
			|||||||
   void onPrinterWaitForPrintingTicket();
 | 
					   void onPrinterWaitForPrintingTicket();
 | 
				
			||||||
   void onPrinterWaitForPrintingReceipt();
 | 
					   void onPrinterWaitForPrintingReceipt();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					   void onPrinterPrepareDynTemplateData();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
   void onPrintFinishedOK();
 | 
					   void onPrintFinishedOK();
 | 
				
			||||||
   void onPrintFinishedERR();
 | 
					   void onPrintFinishedERR();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -5,6 +5,11 @@
 | 
				
			|||||||
#include <QUuid>
 | 
					#include <QUuid>
 | 
				
			||||||
#include <QDebug>
 | 
					#include <QDebug>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QProcess>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "support/JSON.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
DeviceControllerDiag::DeviceControllerDiag(PersistentData *pData, QObject *parent)
 | 
					DeviceControllerDiag::DeviceControllerDiag(PersistentData *pData, QObject *parent)
 | 
				
			||||||
    : QObject(parent)
 | 
					    : QObject(parent)
 | 
				
			||||||
    , coinProcessorType(nsDeviceControllerInterface::COIN_PROCESSOR::ESCROW)
 | 
					    , coinProcessorType(nsDeviceControllerInterface::COIN_PROCESSOR::ESCROW)
 | 
				
			||||||
@@ -12,10 +17,13 @@ DeviceControllerDiag::DeviceControllerDiag(PersistentData *pData, QObject *paren
 | 
				
			|||||||
    , eventReceiver(nullptr)
 | 
					    , eventReceiver(nullptr)
 | 
				
			||||||
    , isRequestRunning(false)
 | 
					    , isRequestRunning(false)
 | 
				
			||||||
    , flagInterruptDiag(false)
 | 
					    , flagInterruptDiag(false)
 | 
				
			||||||
 | 
					    , lastState(DeviceController::State::INITIAL_STATE)
 | 
				
			||||||
 | 
					    , _isErrorState(false)
 | 
				
			||||||
    , pData(pData)
 | 
					    , pData(pData)
 | 
				
			||||||
 | 
					    , E255counter(0)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    diagRequestTimeoutTimer = new QTimer(this);
 | 
					    diagRequestTimeoutTimer = new QTimer(this);
 | 
				
			||||||
    diagRequestTimeoutTimer->setInterval(1000*20);  // 20s
 | 
					    diagRequestTimeoutTimer->setInterval(1000*45);
 | 
				
			||||||
    diagRequestTimeoutTimer->setSingleShot(true);
 | 
					    diagRequestTimeoutTimer->setSingleShot(true);
 | 
				
			||||||
    connect(diagRequestTimeoutTimer, &QTimer::timeout, this, &DeviceControllerDiag::onDiagRequestTimeoutTimerTimeout);
 | 
					    connect(diagRequestTimeoutTimer, &QTimer::timeout, this, &DeviceControllerDiag::onDiagRequestTimeoutTimerTimeout);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
@@ -31,6 +39,17 @@ void DeviceControllerDiag::init(hwinf *hw, QObject* eventReceiver)
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void DeviceControllerDiag::diagReInit()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    this->machineEventSet.clear();
 | 
				
			||||||
 | 
					    this->_isErrorState = false;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void DeviceControllerDiag::setTimeout(int timeout)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    this->diagRequestTimeoutTimer->setInterval(1000 * timeout);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void DeviceControllerDiag::diagRequest()
 | 
					void DeviceControllerDiag::diagRequest()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    qCritical() << "DeviceControllerDiag::diagRequest()";
 | 
					    qCritical() << "DeviceControllerDiag::diagRequest()";
 | 
				
			||||||
@@ -62,6 +81,24 @@ void DeviceControllerDiag::onDiagRequestTimeoutTimerTimeout()
 | 
				
			|||||||
    this->flagInterruptDiag = true;
 | 
					    this->flagInterruptDiag = true;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool DeviceControllerDiag::isErrorState()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    return this->_isErrorState;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool DeviceControllerDiag::isOperatingState()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    return !this->_isErrorState;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QSet<DeviceController::State> DeviceControllerDiag::getCurrentMachineState()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    return this->machineEventSet;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void DeviceControllerDiag::private_startDiag()
 | 
					void DeviceControllerDiag::private_startDiag()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    // check for DiagRequestTimeoutTimerTimeout:
 | 
					    // check for DiagRequestTimeoutTimerTimeout:
 | 
				
			||||||
@@ -70,6 +107,20 @@ void DeviceControllerDiag::private_startDiag()
 | 
				
			|||||||
        this->private_sendDiagEvent(DeviceController::State::E255);
 | 
					        this->private_sendDiagEvent(DeviceController::State::E255);
 | 
				
			||||||
        this->isRequestRunning  = false;
 | 
					        this->isRequestRunning  = false;
 | 
				
			||||||
        this->flagInterruptDiag = false;
 | 
					        this->flagInterruptDiag = false;
 | 
				
			||||||
 | 
					        if (this->E255counter > 5) {
 | 
				
			||||||
 | 
					            this->restartCArun();
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        else {
 | 
				
			||||||
 | 
					            this->E255counter++;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            // try it again, until success:
 | 
				
			||||||
 | 
					            QTimer::singleShot(400, this, &DeviceControllerDiag::diagRequest);
 | 
				
			||||||
 | 
					            /**
 | 
				
			||||||
 | 
					             * But please note:
 | 
				
			||||||
 | 
					             * - diag does currently not stop suspend (start a background task)
 | 
				
			||||||
 | 
					             * - diag is called again in ModeOOO wokeup()
 | 
				
			||||||
 | 
					             */
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
        return;
 | 
					        return;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -104,6 +155,8 @@ void DeviceControllerDiag::sys_superviseSystem()
 | 
				
			|||||||
        this->private_sendDiagEvent(DeviceController::State::E255);
 | 
					        this->private_sendDiagEvent(DeviceController::State::E255);
 | 
				
			||||||
        this->flagInterruptDiag = false;
 | 
					        this->flagInterruptDiag = false;
 | 
				
			||||||
        this->isRequestRunning  = false;
 | 
					        this->isRequestRunning  = false;
 | 
				
			||||||
 | 
					        if (this->E255counter > 5) { this->restartCArun(); }
 | 
				
			||||||
 | 
					                              else { this->E255counter++; }
 | 
				
			||||||
        return;
 | 
					        return;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -114,6 +167,8 @@ void DeviceControllerDiag::sys_superviseSystem()
 | 
				
			|||||||
        this->private_sendDiagEvent(DeviceController::State::E254);
 | 
					        this->private_sendDiagEvent(DeviceController::State::E254);
 | 
				
			||||||
        this->diagRequestTimeoutTimer->stop();
 | 
					        this->diagRequestTimeoutTimer->stop();
 | 
				
			||||||
        this->isRequestRunning  = false;
 | 
					        this->isRequestRunning  = false;
 | 
				
			||||||
 | 
					        if (this->E255counter > 5) { this->restartCArun(); }
 | 
				
			||||||
 | 
					                              else { this->E255counter++; }
 | 
				
			||||||
        return;
 | 
					        return;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -126,7 +181,7 @@ void DeviceControllerDiag::sys_superviseSystem()
 | 
				
			|||||||
    {
 | 
					    {
 | 
				
			||||||
        // noch keine Testergebnisse
 | 
					        // noch keine Testergebnisse
 | 
				
			||||||
        if (dynMaCond.startupTestIsRunning) {
 | 
					        if (dynMaCond.startupTestIsRunning) {
 | 
				
			||||||
            // TODO?
 | 
					            qCritical() << "            startupTestIsRunning --> call again";
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -136,18 +191,6 @@ void DeviceControllerDiag::sys_superviseSystem()
 | 
				
			|||||||
        return;
 | 
					        return;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // all doors: 99: undefined  0:closed  1:open
 | 
					 | 
				
			||||||
    if (dynMaCond.lowerDoor || dynMaCond.upperDoor) {
 | 
					 | 
				
			||||||
        // Service or battery door is open, goto INTRUSION MODE
 | 
					 | 
				
			||||||
        qCritical() << "DeviceControllerDiag::sys_superviseSystem() Service or battery door is open, goto INTRUSION MODE";
 | 
					 | 
				
			||||||
        this->private_sendDiagEvent(DeviceController::State::E253);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
    if (dynMaCond.middleDoor) {
 | 
					 | 
				
			||||||
        // vault door is open, goto INTRUSION MODE
 | 
					 | 
				
			||||||
        qCritical() << "DeviceControllerDiag::sys_superviseSystem() vault door is open, goto INTRUSION MODE";
 | 
					 | 
				
			||||||
        this->private_sendDiagEvent(DeviceController::State::E252);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    qCritical() << "      --> call  sub_componentAssessment()";
 | 
					    qCritical() << "      --> call  sub_componentAssessment()";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    sub_componentAssessment();
 | 
					    sub_componentAssessment();
 | 
				
			||||||
@@ -181,6 +224,21 @@ void DeviceControllerDiag::sub_componentAssessment()
 | 
				
			|||||||
        this->private_sendDiagEvent(DeviceController::State::A000);
 | 
					        this->private_sendDiagEvent(DeviceController::State::A000);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // check for open doors
 | 
				
			||||||
 | 
					    // all doors: 99: undefined  0:closed  1:open
 | 
				
			||||||
 | 
					    if (dynMaCond.lowerDoor || dynMaCond.upperDoor) {
 | 
				
			||||||
 | 
					        // Service or battery door is open
 | 
				
			||||||
 | 
					        flag_sendOperate = false;
 | 
				
			||||||
 | 
					        qCritical() << "DeviceControllerDiag::sys_superviseSystem() Service or battery door is open, goto INTRUSION MODE";
 | 
				
			||||||
 | 
					        this->private_sendDiagEvent(DeviceController::State::E253);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    if (dynMaCond.middleDoor) {
 | 
				
			||||||
 | 
					        // vault door is open
 | 
				
			||||||
 | 
					        flag_sendOperate = false;
 | 
				
			||||||
 | 
					        qCritical() << "DeviceControllerDiag::sys_superviseSystem() vault door is open, goto INTRUSION MODE";
 | 
				
			||||||
 | 
					        this->private_sendDiagEvent(DeviceController::State::E252);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // check for invalid states:
 | 
					    // check for invalid states:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (modCond.rtc>=200) {
 | 
					    if (modCond.rtc>=200) {
 | 
				
			||||||
@@ -224,12 +282,16 @@ void DeviceControllerDiag::sub_componentAssessment()
 | 
				
			|||||||
        }
 | 
					        }
 | 
				
			||||||
        if (modCond.coinEscrow>=200) {
 | 
					        if (modCond.coinEscrow>=200) {
 | 
				
			||||||
            flag_sendOperate = false;
 | 
					            flag_sendOperate = false;
 | 
				
			||||||
            this->private_sendDiagEvent(DeviceController::State::E010);
 | 
					            // coinEscrow>200 is considered a warning:
 | 
				
			||||||
 | 
					            this->private_sendDiagEvent(DeviceController::State::W010);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    // -----------------------------------------------------------------------------------------------
 | 
					    // -----------------------------------------------------------------------------------------------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    switch (devPara.kindOfCoinChecker) {
 | 
					    switch (devPara.kindOfCoinChecker) {
 | 
				
			||||||
 | 
					        case 0:
 | 
				
			||||||
 | 
					            this->coinProcessorType = nsDeviceControllerInterface::COIN_PROCESSOR::NONE;
 | 
				
			||||||
 | 
					            break;
 | 
				
			||||||
        case 1:
 | 
					        case 1:
 | 
				
			||||||
        case 2:
 | 
					        case 2:
 | 
				
			||||||
            this->coinProcessorType = nsDeviceControllerInterface::COIN_PROCESSOR::ESCROW;
 | 
					            this->coinProcessorType = nsDeviceControllerInterface::COIN_PROCESSOR::ESCROW;
 | 
				
			||||||
@@ -243,7 +305,8 @@ void DeviceControllerDiag::sub_componentAssessment()
 | 
				
			|||||||
    {
 | 
					    {
 | 
				
			||||||
        if (modCond.coinEscrow>=200) {
 | 
					        if (modCond.coinEscrow>=200) {
 | 
				
			||||||
            flag_sendOperate = false;
 | 
					            flag_sendOperate = false;
 | 
				
			||||||
            this->private_sendDiagEvent(DeviceController::State::E010);
 | 
					            // coinEscrow>200 is considered a warning:
 | 
				
			||||||
 | 
					            this->private_sendDiagEvent(DeviceController::State::W010);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        if (modCond.coinSafe==201)  { // full
 | 
					        if (modCond.coinSafe==201)  { // full
 | 
				
			||||||
            flag_sendOperate = false;
 | 
					            flag_sendOperate = false;
 | 
				
			||||||
@@ -315,7 +378,7 @@ void DeviceControllerDiag::sub_componentAssessment()
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
    if (modCond.temper>=200) {
 | 
					    if (modCond.temper>=200) {
 | 
				
			||||||
        flag_sendOperate = false;
 | 
					        flag_sendOperate = false;
 | 
				
			||||||
        this->private_sendDiagEvent(DeviceController::State::E004);
 | 
					        this->private_sendDiagEvent(DeviceController::State::W004);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // check for warnings
 | 
					    // check for warnings
 | 
				
			||||||
@@ -362,7 +425,6 @@ void DeviceControllerDiag::private_sendDiagEvent(DeviceController::State result)
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
    qCritical() << "DeviceControllerDiag::private_sendDiagEvent() result: " << result;
 | 
					    qCritical() << "DeviceControllerDiag::private_sendDiagEvent() result: " << result;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
    if (this->eventReceiver == nullptr) {
 | 
					    if (this->eventReceiver == nullptr) {
 | 
				
			||||||
        qCritical() << "DeviceControllerDiag: no eventReceiver";
 | 
					        qCritical() << "DeviceControllerDiag: no eventReceiver";
 | 
				
			||||||
        return;
 | 
					        return;
 | 
				
			||||||
@@ -385,61 +447,81 @@ void DeviceControllerDiag::private_sendDiagEvent(DeviceController::State result)
 | 
				
			|||||||
    QString parameter;
 | 
					    QString parameter;
 | 
				
			||||||
    switch (result) {
 | 
					    switch (result) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    case DeviceController::State::INITIAL_STATE:
 | 
				
			||||||
 | 
					        break;
 | 
				
			||||||
    case DeviceController::State::A000:   // alarm / intrusion
 | 
					    case DeviceController::State::A000:   // alarm / intrusion
 | 
				
			||||||
        eventClass = EVENT_CLASS::ALARM;
 | 
					        eventClass = EVENT_CLASS::ALARM;
 | 
				
			||||||
        parameter  = "alarm / intrusion";
 | 
					        parameter  = "alarm / intrusion";
 | 
				
			||||||
 | 
					        this->_isErrorState = true;
 | 
				
			||||||
        break;
 | 
					        break;
 | 
				
			||||||
    case DeviceController::State::E002:    // real time clock error
 | 
					    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";
 | 
				
			||||||
 | 
					        this->_isErrorState = true;
 | 
				
			||||||
        break;
 | 
					        break;
 | 
				
			||||||
    case DeviceController::State::E003:   // voltage error
 | 
					    case DeviceController::State::E003:   // voltage error
 | 
				
			||||||
        eventClass = EVENT_CLASS::ERROR;
 | 
					        eventClass = EVENT_CLASS::ERROR;
 | 
				
			||||||
        parameter  = "voltage error";
 | 
					        parameter  = "voltage error";
 | 
				
			||||||
 | 
					        this->_isErrorState = true;
 | 
				
			||||||
        break;
 | 
					        break;
 | 
				
			||||||
    case DeviceController::State::E004:   // temperature error
 | 
					    case DeviceController::State::E004:   // temperature error
 | 
				
			||||||
        eventClass = EVENT_CLASS::ERROR;
 | 
					        eventClass = EVENT_CLASS::ERROR;
 | 
				
			||||||
        parameter  = "temperature error";
 | 
					        parameter  = "temperature error";
 | 
				
			||||||
 | 
					        this->_isErrorState = true;
 | 
				
			||||||
        break;
 | 
					        break;
 | 
				
			||||||
    case DeviceController::State::E007:    // coin safe full
 | 
					    case DeviceController::State::E007:    // coin safe full
 | 
				
			||||||
        eventClass = EVENT_CLASS::ERROR;
 | 
					        eventClass = EVENT_CLASS::ERROR;
 | 
				
			||||||
        parameter  = "coin safe full";
 | 
					        parameter  = "coin safe full";
 | 
				
			||||||
 | 
					        this->_isErrorState = true;
 | 
				
			||||||
        break;
 | 
					        break;
 | 
				
			||||||
    case DeviceController::State::E008:    // bill acceptor full
 | 
					    case DeviceController::State::E008:    // bill acceptor full
 | 
				
			||||||
        eventClass = EVENT_CLASS::ERROR;
 | 
					        eventClass = EVENT_CLASS::ERROR;
 | 
				
			||||||
        parameter  = "bill acceptor full";
 | 
					        parameter  = "bill acceptor full";
 | 
				
			||||||
 | 
					        this->_isErrorState = true;
 | 
				
			||||||
        break;
 | 
					        break;
 | 
				
			||||||
    case DeviceController::State::E009:    // no cash box
 | 
					    case DeviceController::State::E009:    // no cash box
 | 
				
			||||||
        eventClass = EVENT_CLASS::ERROR;
 | 
					        eventClass = EVENT_CLASS::ERROR;
 | 
				
			||||||
        parameter  = "no cash box";
 | 
					        parameter  = "no cash box";
 | 
				
			||||||
 | 
					        this->_isErrorState = true;
 | 
				
			||||||
        break;
 | 
					        break;
 | 
				
			||||||
    case DeviceController::State::E010:    // coin escrow
 | 
					    case DeviceController::State::E010:    // coin escrow
 | 
				
			||||||
        eventClass = EVENT_CLASS::ERROR;
 | 
					        eventClass = EVENT_CLASS::ERROR;
 | 
				
			||||||
        parameter  = "coin escrow";
 | 
					        parameter  = "coin escrow";
 | 
				
			||||||
 | 
					        this->_isErrorState = true;
 | 
				
			||||||
 | 
					        break;
 | 
				
			||||||
 | 
					    case DeviceController::State::W010:    // coin escrow
 | 
				
			||||||
 | 
					        eventClass = EVENT_CLASS::WARNING;
 | 
				
			||||||
 | 
					        parameter  = "coin escrow";
 | 
				
			||||||
        break;
 | 
					        break;
 | 
				
			||||||
    case DeviceController::State::E011:    // mem error int.ee.
 | 
					    case DeviceController::State::E011:    // mem error int.ee.
 | 
				
			||||||
        eventClass = EVENT_CLASS::ERROR;
 | 
					        eventClass = EVENT_CLASS::ERROR;
 | 
				
			||||||
        parameter  = "mem error int.ee.";
 | 
					        parameter  = "mem error int.ee.";
 | 
				
			||||||
 | 
					        this->_isErrorState = true;
 | 
				
			||||||
        break;
 | 
					        break;
 | 
				
			||||||
    case DeviceController::State::E018:    // no paper
 | 
					    case DeviceController::State::E018:    // no paper
 | 
				
			||||||
        eventClass = EVENT_CLASS::ERROR;
 | 
					        eventClass = EVENT_CLASS::ERROR;
 | 
				
			||||||
        parameter  = "no paper";
 | 
					        parameter  = "no paper";
 | 
				
			||||||
 | 
					        this->_isErrorState = true;
 | 
				
			||||||
        break;
 | 
					        break;
 | 
				
			||||||
    case DeviceController::State::E020:    // printer error
 | 
					    case DeviceController::State::E020:    // printer error
 | 
				
			||||||
        eventClass = EVENT_CLASS::ERROR;
 | 
					        eventClass = EVENT_CLASS::ERROR;
 | 
				
			||||||
        parameter  = "printer error";
 | 
					        parameter  = "printer error";
 | 
				
			||||||
 | 
					        this->_isErrorState = true;
 | 
				
			||||||
        break;
 | 
					        break;
 | 
				
			||||||
    case DeviceController::State::E025:    // coin blocker
 | 
					    case DeviceController::State::E025:    // coin blocker
 | 
				
			||||||
        eventClass = EVENT_CLASS::ERROR;
 | 
					        eventClass = EVENT_CLASS::ERROR;
 | 
				
			||||||
        parameter  = "coin blocker";
 | 
					        parameter  = "coin blocker";
 | 
				
			||||||
 | 
					        this->_isErrorState = true;
 | 
				
			||||||
        break;
 | 
					        break;
 | 
				
			||||||
    case DeviceController::State::E026:    // error coin validator
 | 
					    case DeviceController::State::E026:    // error coin validator
 | 
				
			||||||
        eventClass = EVENT_CLASS::ERROR;
 | 
					        eventClass = EVENT_CLASS::ERROR;
 | 
				
			||||||
        parameter  = "error coin validator";
 | 
					        parameter  = "error coin validator";
 | 
				
			||||||
 | 
					        this->_isErrorState = true;
 | 
				
			||||||
        break;
 | 
					        break;
 | 
				
			||||||
    case DeviceController::State::E034:    // mdb error
 | 
					    case DeviceController::State::E034:    // mdb error
 | 
				
			||||||
        eventClass = EVENT_CLASS::ERROR;
 | 
					        eventClass = EVENT_CLASS::ERROR;
 | 
				
			||||||
        parameter  = "mdb error";
 | 
					        parameter  = "mdb error";
 | 
				
			||||||
 | 
					        this->_isErrorState = true;
 | 
				
			||||||
        break;
 | 
					        break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    case DeviceController::State::E071:   // cash box change is ongoing
 | 
					    case DeviceController::State::E071:   // cash box change is ongoing
 | 
				
			||||||
@@ -468,16 +550,21 @@ void DeviceControllerDiag::private_sendDiagEvent(DeviceController::State result)
 | 
				
			|||||||
        parameter  = "no valid data from DeviceController";
 | 
					        parameter  = "no valid data from DeviceController";
 | 
				
			||||||
        break;
 | 
					        break;
 | 
				
			||||||
    case DeviceController::State::E255:   // no valid data from DeviceController
 | 
					    case DeviceController::State::E255:   // no valid data from DeviceController
 | 
				
			||||||
        eventClass = EVENT_CLASS::STATE;
 | 
					        eventClass = EVENT_CLASS::ERROR;
 | 
				
			||||||
        parameter  = "";
 | 
					        parameter  = "no valid data from DeviceController";
 | 
				
			||||||
        qCritical() << "                ... ignore " << QMetaEnum::fromType<DeviceController::State>().valueToKey(result);
 | 
					 | 
				
			||||||
        return;
 | 
					 | 
				
			||||||
        break;
 | 
					        break;
 | 
				
			||||||
    case DeviceController::State::O000:   // everything is fine
 | 
					    case DeviceController::State::O000:   // everything is fine
 | 
				
			||||||
        this->machineEventSet.clear();
 | 
					        this->machineEventSet.clear();
 | 
				
			||||||
 | 
					        this->_isErrorState = false;
 | 
				
			||||||
        eventClass = EVENT_CLASS::OPERATE;
 | 
					        eventClass = EVENT_CLASS::OPERATE;
 | 
				
			||||||
        parameter  = "";
 | 
					        parameter  = "";
 | 
				
			||||||
 | 
					        if (this->lastState == DeviceController::State::O000) {
 | 
				
			||||||
 | 
					            qCritical() << "   ... everything fine, no state change -> skip sending";
 | 
				
			||||||
 | 
					            return;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        else {
 | 
				
			||||||
            qCritical() << "   ... everything fine";
 | 
					            qCritical() << "   ... everything fine";
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
        break;
 | 
					        break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    case DeviceController::State::W001:   // paper low
 | 
					    case DeviceController::State::W001:   // paper low
 | 
				
			||||||
@@ -496,8 +583,23 @@ void DeviceControllerDiag::private_sendDiagEvent(DeviceController::State result)
 | 
				
			|||||||
        eventClass = EVENT_CLASS::WARNING;
 | 
					        eventClass = EVENT_CLASS::WARNING;
 | 
				
			||||||
        parameter  = "temperatur warning";
 | 
					        parameter  = "temperatur warning";
 | 
				
			||||||
        break;
 | 
					        break;
 | 
				
			||||||
 | 
					    case DeviceController::State::W255:   // restart carun
 | 
				
			||||||
 | 
					        eventClass = EVENT_CLASS::WARNING;
 | 
				
			||||||
 | 
					        parameter  = "restart carun";
 | 
				
			||||||
 | 
					        break;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    this->lastState = result;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * Variant: send 'parameter' as JSON:
 | 
				
			||||||
 | 
					     *
 | 
				
			||||||
 | 
					        JSON::setPrettySerialize(false);
 | 
				
			||||||
 | 
					        JSON::JsonObject json = JSON::objectBuilder()
 | 
				
			||||||
 | 
					                  ->set("description", parameter)
 | 
				
			||||||
 | 
					            ->create();
 | 
				
			||||||
 | 
					        QString parameterJsonString = JSON::serialize(json);
 | 
				
			||||||
 | 
					    */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    ATBMachineEvent *machineEvent = new ATBMachineEvent(
 | 
					    ATBMachineEvent *machineEvent = new ATBMachineEvent(
 | 
				
			||||||
                eventId,
 | 
					                eventId,
 | 
				
			||||||
@@ -509,10 +611,18 @@ void DeviceControllerDiag::private_sendDiagEvent(DeviceController::State result)
 | 
				
			|||||||
                ""         // second level info
 | 
					                ""         // second level info
 | 
				
			||||||
                );
 | 
					                );
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    //emit diagResponse(machineEvent);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    QCoreApplication::postEvent(eventReceiver, machineEvent);
 | 
					    QCoreApplication::postEvent(eventReceiver, machineEvent);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/**
 | 
				
			||||||
 | 
					 * reset / restart / reinit deviceController
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					void DeviceControllerDiag::restartCArun()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    this->E255counter = 0;
 | 
				
			||||||
 | 
					    this->private_sendDiagEvent(DeviceController::State::W255);
 | 
				
			||||||
 | 
					    QProcess::startDetached("/bin/systemctl", {"restart", "carun"});
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -29,6 +29,7 @@ namespace DeviceController {
 | 
				
			|||||||
        E008,
 | 
					        E008,
 | 
				
			||||||
        E009,
 | 
					        E009,
 | 
				
			||||||
        E010,
 | 
					        E010,
 | 
				
			||||||
 | 
					        W010,   // Coin Escrow
 | 
				
			||||||
        E011,
 | 
					        E011,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        E018,
 | 
					        E018,
 | 
				
			||||||
@@ -52,7 +53,11 @@ namespace DeviceController {
 | 
				
			|||||||
        W001,
 | 
					        W001,
 | 
				
			||||||
        W002,
 | 
					        W002,
 | 
				
			||||||
        W003,
 | 
					        W003,
 | 
				
			||||||
        W004
 | 
					        W004,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        W255,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        INITIAL_STATE
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
    Q_ENUM_NS(State)
 | 
					    Q_ENUM_NS(State)
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
@@ -70,9 +75,32 @@ public:
 | 
				
			|||||||
    nsDeviceControllerInterface::COIN_PROCESSOR coinProcessorType;
 | 
					    nsDeviceControllerInterface::COIN_PROCESSOR coinProcessorType;
 | 
				
			||||||
    nsDeviceControllerInterface::BILL_ACCEPTOR  billAcceptor;
 | 
					    nsDeviceControllerInterface::BILL_ACCEPTOR  billAcceptor;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * return true, if machineEventSet contains an error
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    bool isErrorState();
 | 
				
			||||||
 | 
					    bool isOperatingState();
 | 
				
			||||||
 | 
					    QSet<DeviceController::State> getCurrentMachineState();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    void setTimeout(int timeout);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
public slots:
 | 
					public slots:
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * start diag request
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
    void diagRequest();
 | 
					    void diagRequest();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * reset / re-init diag request.
 | 
				
			||||||
 | 
					     * Called e.g. when doors are closed.
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    void diagReInit();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * reset / restart / reinit deviceController
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    void restartCArun();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
signals:
 | 
					signals:
 | 
				
			||||||
    void diagResponse(ATBMachineEvent* machineEvent);
 | 
					    void diagResponse(ATBMachineEvent* machineEvent);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -91,10 +119,14 @@ private:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    int lastVoltage;
 | 
					    int lastVoltage;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    DeviceController::State lastState;
 | 
				
			||||||
    QSet<DeviceController::State> machineEventSet;
 | 
					    QSet<DeviceController::State> machineEventSet;
 | 
				
			||||||
 | 
					    bool _isErrorState;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    PersistentData* pData;
 | 
					    PersistentData* pData;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    int E255counter;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
private slots:
 | 
					private slots:
 | 
				
			||||||
    void onDiagRequestTimeoutTimerTimeout();
 | 
					    void onDiagRequestTimeoutTimerTimeout();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -103,7 +135,6 @@ private slots:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    void sys_superviseSystem();
 | 
					    void sys_superviseSystem();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#endif // DEVICECONTROLLERDIAG_H
 | 
					#endif // DEVICECONTROLLERDIAG_H
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -5,6 +5,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#include <QSettings>
 | 
					#include <QSettings>
 | 
				
			||||||
#include <QString>
 | 
					#include <QString>
 | 
				
			||||||
 | 
					#include <QJsonObject>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "ATBAPPplugin.h"
 | 
					#include "ATBAPPplugin.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -39,6 +40,12 @@ public:
 | 
				
			|||||||
    virtual nsDeviceControllerInterface::PLUGIN_STATE initDCPlugin(QObject *eventReceiver,
 | 
					    virtual nsDeviceControllerInterface::PLUGIN_STATE initDCPlugin(QObject *eventReceiver,
 | 
				
			||||||
                                                                   const QSettings & settings) = 0;
 | 
					                                                                   const QSettings & settings) = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * e.g. send location
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    virtual void sendDeviceParameter(const QJsonObject & jsonObject) = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // TASKS: Cash handling -------------------------------------------------------
 | 
					    // TASKS: Cash handling -------------------------------------------------------
 | 
				
			||||||
    /**
 | 
					    /**
 | 
				
			||||||
     * enables coin input
 | 
					     * enables coin input
 | 
				
			||||||
@@ -196,7 +203,7 @@ signals:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Q_DECLARE_INTERFACE(DeviceControllerInterface,
 | 
					Q_DECLARE_INTERFACE(DeviceControllerInterface,
 | 
				
			||||||
                    "eu.atb.ptu.plugin.DeviceControllerInterface/1.1.2")
 | 
					                    "eu.atb.ptu.plugin.DeviceControllerInterface/1.1.5")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
namespace nsDeviceControllerInterface {
 | 
					namespace nsDeviceControllerInterface {
 | 
				
			||||||
@@ -229,11 +236,14 @@ namespace nsDeviceControllerInterface {
 | 
				
			|||||||
        ERROR_RECEIPT,
 | 
					        ERROR_RECEIPT,
 | 
				
			||||||
        START_RECEIPT,   // e.g. Szeged Start
 | 
					        START_RECEIPT,   // e.g. Szeged Start
 | 
				
			||||||
        STOP_RECEIPT,    // e.g. Szeged Stop
 | 
					        STOP_RECEIPT,    // e.g. Szeged Stop
 | 
				
			||||||
 | 
					        FINE_PAYMENT,    // e.g. Klaipeda
 | 
				
			||||||
 | 
					        FOOD_STAMP
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    enum class COIN_PROCESSOR : quint8 {
 | 
					    enum class COIN_PROCESSOR : quint8 {
 | 
				
			||||||
        CHANGER,
 | 
					        CHANGER,
 | 
				
			||||||
        ESCROW
 | 
					        ESCROW,
 | 
				
			||||||
 | 
					        NONE
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    enum class BILL_ACCEPTOR  : quint8 {
 | 
					    enum class BILL_ACCEPTOR  : quint8 {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -30,8 +30,11 @@ PersistentData::PersistentData(const QString &datafileName, QObject *parent)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
void PersistentData::serializeToFile()
 | 
					void PersistentData::serializeToFile()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					    if (this->isChangedFlag) {
 | 
				
			||||||
 | 
					        qCritical() << "PersistentData::isChanged -> save";
 | 
				
			||||||
        this->save();
 | 
					        this->save();
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void PersistentData::save()
 | 
					void PersistentData::save()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
@@ -44,6 +47,8 @@ void PersistentData::save()
 | 
				
			|||||||
        out << this->hash;
 | 
					        out << this->hash;
 | 
				
			||||||
        fileOut.flush();
 | 
					        fileOut.flush();
 | 
				
			||||||
        fileOut.close();
 | 
					        fileOut.close();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        this->isChangedFlag = false;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										175
									
								
								src/ATBAPP/support/Ticket.cpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										175
									
								
								src/ATBAPP/support/Ticket.cpp
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,175 @@
 | 
				
			|||||||
 | 
					#include "Ticket.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QDebug>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Ticket::Ticket(TICKET_VARIANT ticketVariant, QObject *parent )
 | 
				
			||||||
 | 
					    : QObject(parent)
 | 
				
			||||||
 | 
					    , ticketVariant(ticketVariant)
 | 
				
			||||||
 | 
					    , _hasTemplateDynData(false)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					TICKET_VARIANT Ticket::variant()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    return this->ticketVariant;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QList<quint8> * Ticket::templateList()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    return &(this->_templateList);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool Ticket::hasTemplateDynData()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    return this->_hasTemplateDynData;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					quint8 Ticket::getCurrentProcessedTemplateNumber()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    return this->currentProcessedTemplateNumber;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void Ticket::setCurrentTemplateProcessed()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    this->currentProcessedTemplateNumber++;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool Ticket::initNew(TICKET_VARIANT ticketVariant, const QList<quint8> & templateList, const QHash<QString, QVariant> & printingData)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    this->clear();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    this->ticketVariant = ticketVariant;
 | 
				
			||||||
 | 
					    this->printingData = printingData;
 | 
				
			||||||
 | 
					    this->_templateList = templateList;
 | 
				
			||||||
 | 
					    this->currentProcessedTemplateNumber = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // DEBUG
 | 
				
			||||||
 | 
					    qCritical() << "Ticket::initNew():";
 | 
				
			||||||
 | 
					    qCritical() << "      -> " << ticketVariant;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    int multiplicatorInt = 1;  // default
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    switch (this->ticketVariant) {
 | 
				
			||||||
 | 
					    case TICKET_VARIANT::PARKING_TICKET:
 | 
				
			||||||
 | 
					        break;
 | 
				
			||||||
 | 
					    case TICKET_VARIANT::RECEIPT:
 | 
				
			||||||
 | 
					        break;
 | 
				
			||||||
 | 
					    case TICKET_VARIANT::ERROR_RECEIPT:
 | 
				
			||||||
 | 
					        break;
 | 
				
			||||||
 | 
					    case TICKET_VARIANT::START_RECEIPT:
 | 
				
			||||||
 | 
					        this->_templateList << 21 << 22 << 23;
 | 
				
			||||||
 | 
					        break;
 | 
				
			||||||
 | 
					    case TICKET_VARIANT::STOP_RECEIPT:
 | 
				
			||||||
 | 
					        this->_templateList << 24 << 25 << 26;
 | 
				
			||||||
 | 
					        break;
 | 
				
			||||||
 | 
					    case TICKET_VARIANT::FINE_PAYMENT:
 | 
				
			||||||
 | 
					        this->_templateList << 24 << 25 << 26;
 | 
				
			||||||
 | 
					        break;
 | 
				
			||||||
 | 
					    case TICKET_VARIANT::FOOD_STAMP:
 | 
				
			||||||
 | 
					         if (printingData.contains("dyn1_list")) {
 | 
				
			||||||
 | 
					            this->_hasTemplateDynData = true;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            this->dyn1List = printingData["dyn1_list"].toStringList();
 | 
				
			||||||
 | 
					            this->dyn2List = printingData["dyn2_list"].toStringList();
 | 
				
			||||||
 | 
					         }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					         if (printingData.contains("multiplicator")) {
 | 
				
			||||||
 | 
					             multiplicatorInt = printingData["multiplicator"].toInt();
 | 
				
			||||||
 | 
					             for (int i = 1; i < multiplicatorInt; i++) {
 | 
				
			||||||
 | 
					                 this->_templateList << 1;
 | 
				
			||||||
 | 
					             }
 | 
				
			||||||
 | 
					             // last template:
 | 
				
			||||||
 | 
					             this->_templateList << 2;
 | 
				
			||||||
 | 
					         }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					         // DEBUG FOOD_STAMP:
 | 
				
			||||||
 | 
					         qCritical() << "     --> printingData[\"multiplicator\"]" << multiplicatorInt;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        break;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // DEBUG
 | 
				
			||||||
 | 
					    QString templateListString;
 | 
				
			||||||
 | 
					    for (int i =0; i < this->_templateList.size(); ++i) {
 | 
				
			||||||
 | 
					        templateListString.append(QString(" %1").arg(this->_templateList.at(i)));
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    qCritical() << "     -> templates: " << templateListString;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return true;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void Ticket::clear()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    this->ticketVariant = TICKET_VARIANT::PARKING_TICKET;
 | 
				
			||||||
 | 
					    this->printingData.clear();
 | 
				
			||||||
 | 
					    this->_templateList.clear();
 | 
				
			||||||
 | 
					    this->errorCode.clear();
 | 
				
			||||||
 | 
					    this->errorDescription.clear();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    this->_hasTemplateDynData = false;
 | 
				
			||||||
 | 
					    this->dyn1List.clear();
 | 
				
			||||||
 | 
					    this->dyn1List.clear();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QString Ticket::getErrorCode()         {  return this->errorCode;        }
 | 
				
			||||||
 | 
					QString Ticket::getErrorDescription()  {  return this->errorDescription; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/**
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					QStringList Ticket::getDyn1List()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    return this->dyn1List;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QStringList Ticket::getDyn2List()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    return this->dyn2List;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QHash<QString, QVariant> & Ticket::getPrintingData()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    return this->printingData;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/************************************************************************************************
 | 
				
			||||||
 | 
					 * operator
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					QDebug operator<<(QDebug debug, TICKET_VARIANT ticketVariant)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    switch (ticketVariant) {
 | 
				
			||||||
 | 
					        case TICKET_VARIANT::PARKING_TICKET:
 | 
				
			||||||
 | 
					            debug << "TICKET_VARIANT::PARKING_TICKET";
 | 
				
			||||||
 | 
					            break;
 | 
				
			||||||
 | 
					        case TICKET_VARIANT::RECEIPT:
 | 
				
			||||||
 | 
					            debug << "TICKET_VARIANT::RECEIPT";
 | 
				
			||||||
 | 
					            break;
 | 
				
			||||||
 | 
					        case TICKET_VARIANT::ERROR_RECEIPT:
 | 
				
			||||||
 | 
					            debug << "TICKET_VARIANT::ERROR_RECEIPT";
 | 
				
			||||||
 | 
					            break;
 | 
				
			||||||
 | 
					        case TICKET_VARIANT::START_RECEIPT:
 | 
				
			||||||
 | 
					            debug << "TICKET_VARIANT::START_RECEIPT";
 | 
				
			||||||
 | 
					            break;
 | 
				
			||||||
 | 
					        case TICKET_VARIANT::STOP_RECEIPT:
 | 
				
			||||||
 | 
					            debug << "TICKET_VARIANT::STOP_RECEIPT";
 | 
				
			||||||
 | 
					            break;
 | 
				
			||||||
 | 
					        case TICKET_VARIANT::FINE_PAYMENT:
 | 
				
			||||||
 | 
					            debug << "TICKET_VARIANT::FINE_PAYMENT";
 | 
				
			||||||
 | 
					            break;
 | 
				
			||||||
 | 
					        case TICKET_VARIANT::FOOD_STAMP:
 | 
				
			||||||
 | 
					            debug << "TICKET_VARIANT::FOOD_STAMP";
 | 
				
			||||||
 | 
					            break;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return debug;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										88
									
								
								src/ATBAPP/support/Ticket.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										88
									
								
								src/ATBAPP/support/Ticket.h
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,88 @@
 | 
				
			|||||||
 | 
					#ifndef TICKET_H
 | 
				
			||||||
 | 
					#define TICKET_H
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QObject>
 | 
				
			||||||
 | 
					#include <QHash>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "../DeviceControllerInterface.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					using namespace nsDeviceControllerInterface;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QDebug operator<<(QDebug debug, TICKET_VARIANT ticketVariant);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class Ticket : public QObject
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    Q_OBJECT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					public:
 | 
				
			||||||
 | 
					    Ticket(TICKET_VARIANT ticketVariant, QObject *parent = nullptr);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    bool initNew(TICKET_VARIANT ticketVariant, const QList<quint8> & templateList, const QHash<QString, QVariant> & printingData);
 | 
				
			||||||
 | 
					    void clear();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    TICKET_VARIANT variant();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QList<quint8> * templateList();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * @brief getPrintingData - generic getter for printingData
 | 
				
			||||||
 | 
					     * Used mainly for simple tickets (single tickets e.g. ParkingTicket)
 | 
				
			||||||
 | 
					     * @return
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    QHash<QString, QVariant> & getPrintingData();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * @brief hasTemplateDynData
 | 
				
			||||||
 | 
					     * @return true, if ticket has dynamic data for each template.
 | 
				
			||||||
 | 
					     *
 | 
				
			||||||
 | 
					     * This depends on TICKET_VARIANT and printingData
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    bool hasTemplateDynData();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * @brief getDyn1List
 | 
				
			||||||
 | 
					     * contains dynamic template data
 | 
				
			||||||
 | 
					     * The size of the lists must be exactly the same as the number of templates.
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    QStringList getDyn1List();
 | 
				
			||||||
 | 
					    QStringList getDyn2List();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    quint8 getCurrentProcessedTemplateNumber();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * Mark current template as processed
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    void setCurrentTemplateProcessed();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // error handling
 | 
				
			||||||
 | 
					    QString getErrorCode();
 | 
				
			||||||
 | 
					    QString getErrorDescription();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					private:
 | 
				
			||||||
 | 
					    TICKET_VARIANT ticketVariant;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // printingData from application
 | 
				
			||||||
 | 
					    QHash<QString, QVariant> printingData;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // templateList, from .ini or created by ticketVariant...
 | 
				
			||||||
 | 
					    QList<quint8> _templateList;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    bool _hasTemplateDynData;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    quint8 currentProcessedTemplateNumber;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QStringList dyn1List;
 | 
				
			||||||
 | 
					    QStringList dyn2List;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // error handling
 | 
				
			||||||
 | 
					    QString errorCode;
 | 
				
			||||||
 | 
					    QString errorDescription;
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#endif // TICKET_H
 | 
				
			||||||
		Reference in New Issue
	
	Block a user