Compare commits
	
		
			17 Commits
		
	
	
		
			2.2.1
			...
			pu/klaiped
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						
						
							
						
						2d60a7bd5c
	
				 | 
					
					
						|||
| 
						
						
							
						
						6d7d9ade70
	
				 | 
					
					
						|||
| 
						
						
							
						
						72dbc8b858
	
				 | 
					
					
						|||
| 
						
						
							
						
						32d70abf44
	
				 | 
					
					
						|||
| 
						
						
							
						
						c076090e03
	
				 | 
					
					
						|||
| 
						
						
							
						
						6c2717c56b
	
				 | 
					
					
						|||
| 
						
						
							
						
						816182c87b
	
				 | 
					
					
						|||
| 
						
						
							
						
						492d3a107a
	
				 | 
					
					
						|||
| 
						
						
							
						
						962cd01eac
	
				 | 
					
					
						|||
| 
						
						
							
						
						d66363da46
	
				 | 
					
					
						|||
| 
						
						
							
						
						7b25f86d6b
	
				 | 
					
					
						|||
| 
						
						
							
						
						5a999a0494
	
				 | 
					
					
						|||
| 
						
						
							
						
						ec18ac45e4
	
				 | 
					
					
						|||
| 
						
						
							
						
						560b6d3221
	
				 | 
					
					
						|||
| 
						
						
							
						
						b946dc5a92
	
				 | 
					
					
						|||
| 
						
						
							
						
						ea7542a248
	
				 | 
					
					
						|||
| 
						
						
							
						
						4541699ec3
	
				 | 
					
					
						
@@ -30,13 +30,31 @@ ATBDeviceControllerPlugin::ATBDeviceControllerPlugin(QObject *parent)
 | 
			
		||||
    this->setParent(parent);
 | 
			
		||||
 | 
			
		||||
    this->pluginInfo = QString::fromUtf8(pluginInfoString.c_str());
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
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->private_loadCashAgentLib("")) {
 | 
			
		||||
        return;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    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_Err()), this, SLOT(onPrintFinishedERR()), Qt::QueuedConnection);
 | 
			
		||||
@@ -61,12 +79,11 @@ ATBDeviceControllerPlugin::ATBDeviceControllerPlugin(QObject *parent)
 | 
			
		||||
    dynamic_cast<QObject*>(hw)->moveToThread(hwThread);
 | 
			
		||||
    hwThread->start();
 | 
			
		||||
 | 
			
		||||
    QString persistentDataFile = "/mnt/system_data/dc_persistentData.dat";
 | 
			
		||||
    this->persistentData = new PersistentData(persistentDataFile);
 | 
			
		||||
 | 
			
		||||
    this->diag = new DeviceControllerDiag(this->persistentData, this);
 | 
			
		||||
    connect(this->diag, &DeviceControllerDiag::newVoltage, this, &ATBDeviceControllerPlugin::onNewVoltage);
 | 
			
		||||
 | 
			
		||||
    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;
 | 
			
		||||
@@ -75,19 +92,7 @@ ATBDeviceControllerPlugin::ATBDeviceControllerPlugin(QObject *parent)
 | 
			
		||||
    this->currentCashState = CASH_STATE::CACHE_EMPTY;
 | 
			
		||||
 | 
			
		||||
    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) {
 | 
			
		||||
@@ -227,20 +232,20 @@ void ATBDeviceControllerPlugin::reset()
 | 
			
		||||
// Handle Mode-Changes --------------------------------------------------------
 | 
			
		||||
 | 
			
		||||
void ATBDeviceControllerPlugin::onChangedProgramModeToSELL()
 | 
			
		||||
{
 | 
			
		||||
{    
 | 
			
		||||
    hw->dc_autoRequest(true);
 | 
			
		||||
    hw->rtc_setDateTime();
 | 
			
		||||
    hw->mdb_switchWake(0);   // wakeup MDB components
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void ATBDeviceControllerPlugin::onChangedProgramModeToSERVICE()
 | 
			
		||||
{
 | 
			
		||||
{    
 | 
			
		||||
    hw->dc_autoRequest(true);
 | 
			
		||||
    hw->mdb_switchWake(0);   // wakeup MDB components
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void ATBDeviceControllerPlugin::onChangedProgramModeToIDLE()
 | 
			
		||||
{
 | 
			
		||||
{    
 | 
			
		||||
    hw->dc_autoRequest(true);
 | 
			
		||||
    this->diag->diagRequest();
 | 
			
		||||
    hw->mdb_switchWake(1);
 | 
			
		||||
@@ -537,6 +542,8 @@ void ATBDeviceControllerPlugin::onCBinAndAllDoorsClosed()
 | 
			
		||||
{
 | 
			
		||||
    qCritical() << "ATBDeviceControllerPlugin::onCBinAndAllDoorsClosed()";
 | 
			
		||||
 | 
			
		||||
    this->diag->diagReInit();
 | 
			
		||||
 | 
			
		||||
    QTimer::singleShot(2000, this, SIGNAL(requestModeIDLE()));
 | 
			
		||||
 | 
			
		||||
    this->dbus->finishedBackgroundTask("DOOR_OPEN");
 | 
			
		||||
@@ -647,10 +654,22 @@ void ATBDeviceControllerPlugin::requestPrintReceipt(const QHash<QString, QVarian
 | 
			
		||||
 | 
			
		||||
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_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(2000, this, [this](){ hw->prn_cut(3);  } );
 | 
			
		||||
@@ -699,7 +718,8 @@ void ATBDeviceControllerPlugin::onPrinterWaitForPrintingReceipt()
 | 
			
		||||
 | 
			
		||||
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));
 | 
			
		||||
 | 
			
		||||
    qCritical() << "ATBDeviceControllerPlugin::requestPrintTicket( "         << endl
 | 
			
		||||
@@ -840,6 +860,7 @@ void ATBDeviceControllerPlugin::onPrinterDataPrepared()
 | 
			
		||||
 | 
			
		||||
    // note: calling prn_getPrintResult() immediately may result in wrong answer!
 | 
			
		||||
    // We have to wait "about some seconds" until calling this function!
 | 
			
		||||
    this->printResultCheckCounter = 0;
 | 
			
		||||
    QTimer::singleShot(4000, this, SLOT(onPrinterWaitForPrintingTicket()));
 | 
			
		||||
 | 
			
		||||
    // old: use printer templates:
 | 
			
		||||
@@ -863,8 +884,17 @@ void ATBDeviceControllerPlugin::onPrinterWaitForPrintingTicket()
 | 
			
		||||
        this->onPrintFinishedERR();
 | 
			
		||||
        break;
 | 
			
		||||
    default:
 | 
			
		||||
        qCritical() << "DC Error: wait for printing";
 | 
			
		||||
        this->onPrintFinishedERR();
 | 
			
		||||
        // 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";
 | 
			
		||||
            this->onPrintFinishedERR();
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        break;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
@@ -892,6 +922,7 @@ void ATBDeviceControllerPlugin::onPrinterPrintNextTemplate()
 | 
			
		||||
 | 
			
		||||
    if (this->currentTicket->templateList()->isEmpty()) {
 | 
			
		||||
        // all templates are printed
 | 
			
		||||
        this->printResultCheckCounter = 0;
 | 
			
		||||
        QTimer::singleShot(2000, this, SLOT(onPrinterWaitForPrintingTicket()));
 | 
			
		||||
    }
 | 
			
		||||
    else {
 | 
			
		||||
@@ -943,7 +974,8 @@ void ATBDeviceControllerPlugin::onPrinterPrepareDynTemplateData()
 | 
			
		||||
}
 | 
			
		||||
void ATBDeviceControllerPlugin::prepareDynTemplateData()
 | 
			
		||||
{
 | 
			
		||||
    struct T_dynDat *dynTicketData = new T_dynDat;
 | 
			
		||||
    struct T_dynDat dynamicTicketData;
 | 
			
		||||
    struct T_dynDat *dynTicketData = &dynamicTicketData;
 | 
			
		||||
    memset(dynTicketData, 0, sizeof(*dynTicketData));
 | 
			
		||||
 | 
			
		||||
    // setup dynTicketData dependent on currentTicket
 | 
			
		||||
@@ -962,6 +994,9 @@ void ATBDeviceControllerPlugin::prepareDynTemplateData()
 | 
			
		||||
    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:
 | 
			
		||||
@@ -1070,6 +1105,27 @@ void ATBDeviceControllerPlugin::private_setupDynTemplatData_FOOD_STAMP(struct T_
 | 
			
		||||
    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));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/************************************************************************************************
 | 
			
		||||
@@ -1501,7 +1557,7 @@ int ATBDeviceControllerPlugin::init_sc_dbus()
 | 
			
		||||
 | 
			
		||||
void ATBDeviceControllerPlugin::onWokeUp(uchar source)
 | 
			
		||||
{
 | 
			
		||||
    if (source == 0x01) {
 | 
			
		||||
    if (source == 0x01 || source == 0xFE) {
 | 
			
		||||
        // woke up from device controller
 | 
			
		||||
        this->diag->diagRequest();
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
@@ -129,6 +129,9 @@ private:
 | 
			
		||||
   // counts failed hw->log_chkIfVaultRecordAvailable()
 | 
			
		||||
   int accountCheckCounter;
 | 
			
		||||
 | 
			
		||||
   // counts faild hw->prn-getPrintResult()
 | 
			
		||||
   int printResultCheckCounter;
 | 
			
		||||
 | 
			
		||||
   // dbus
 | 
			
		||||
   int init_sc_dbus();
 | 
			
		||||
 | 
			
		||||
@@ -141,6 +144,7 @@ private:
 | 
			
		||||
   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:
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ class ATBMachineEvent : public QEvent
 | 
			
		||||
public:
 | 
			
		||||
    explicit ATBMachineEvent(const QString & id,
 | 
			
		||||
                const QString & deviceName,              // PTU/PRINTER/DC/...
 | 
			
		||||
                EVENT_CLASS eventClass,          // reason of event: Error/Warning/Alarm
 | 
			
		||||
                EVENT_CLASS eventClass,                  // reason of event: Error/Warning/Alarm
 | 
			
		||||
                const QString & name,                    // 'Event': "E001", "W003"
 | 
			
		||||
                const int state,
 | 
			
		||||
                const QString & parameter,
 | 
			
		||||
 
 | 
			
		||||
@@ -5,6 +5,11 @@
 | 
			
		||||
#include <QUuid>
 | 
			
		||||
#include <QDebug>
 | 
			
		||||
 | 
			
		||||
#include <QProcess>
 | 
			
		||||
 | 
			
		||||
#include "support/JSON.h"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
DeviceControllerDiag::DeviceControllerDiag(PersistentData *pData, QObject *parent)
 | 
			
		||||
    : QObject(parent)
 | 
			
		||||
    , coinProcessorType(nsDeviceControllerInterface::COIN_PROCESSOR::ESCROW)
 | 
			
		||||
@@ -15,9 +20,10 @@ DeviceControllerDiag::DeviceControllerDiag(PersistentData *pData, QObject *paren
 | 
			
		||||
    , lastState(DeviceController::State::INITIAL_STATE)
 | 
			
		||||
    , _isErrorState(false)
 | 
			
		||||
    , pData(pData)
 | 
			
		||||
    , E255counter(0)
 | 
			
		||||
{
 | 
			
		||||
    diagRequestTimeoutTimer = new QTimer(this);
 | 
			
		||||
    diagRequestTimeoutTimer->setInterval(1000*20);  // 20s
 | 
			
		||||
    diagRequestTimeoutTimer->setInterval(1000*45);
 | 
			
		||||
    diagRequestTimeoutTimer->setSingleShot(true);
 | 
			
		||||
    connect(diagRequestTimeoutTimer, &QTimer::timeout, this, &DeviceControllerDiag::onDiagRequestTimeoutTimerTimeout);
 | 
			
		||||
}
 | 
			
		||||
@@ -33,6 +39,17 @@ void DeviceControllerDiag::init(hwinf *hw, QObject* eventReceiver)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
void DeviceControllerDiag::diagReInit()
 | 
			
		||||
{
 | 
			
		||||
    this->machineEventSet.clear();
 | 
			
		||||
    this->_isErrorState = false;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void DeviceControllerDiag::setTimeout(int timeout)
 | 
			
		||||
{
 | 
			
		||||
    this->diagRequestTimeoutTimer->setInterval(1000 * timeout);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void DeviceControllerDiag::diagRequest()
 | 
			
		||||
{
 | 
			
		||||
    qCritical() << "DeviceControllerDiag::diagRequest()";
 | 
			
		||||
@@ -90,6 +107,20 @@ void DeviceControllerDiag::private_startDiag()
 | 
			
		||||
        this->private_sendDiagEvent(DeviceController::State::E255);
 | 
			
		||||
        this->isRequestRunning  = false;
 | 
			
		||||
        this->flagInterruptDiag = false;
 | 
			
		||||
        if (this->E255counter > 5) {
 | 
			
		||||
            this->restartCArun();
 | 
			
		||||
        }
 | 
			
		||||
        else {
 | 
			
		||||
            this->E255counter++;
 | 
			
		||||
 | 
			
		||||
            // try it again, until success:
 | 
			
		||||
            QTimer::singleShot(400, this, &DeviceControllerDiag::diagRequest);
 | 
			
		||||
            /**
 | 
			
		||||
             * But please note:
 | 
			
		||||
             * - diag does currently not stop suspend (start a background task)
 | 
			
		||||
             * - diag is called again in ModeOOO wokeup()
 | 
			
		||||
             */
 | 
			
		||||
        }
 | 
			
		||||
        return;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
@@ -124,6 +155,8 @@ void DeviceControllerDiag::sys_superviseSystem()
 | 
			
		||||
        this->private_sendDiagEvent(DeviceController::State::E255);
 | 
			
		||||
        this->flagInterruptDiag = false;
 | 
			
		||||
        this->isRequestRunning  = false;
 | 
			
		||||
        if (this->E255counter > 5) { this->restartCArun(); }
 | 
			
		||||
                              else { this->E255counter++; }
 | 
			
		||||
        return;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
@@ -134,6 +167,8 @@ void DeviceControllerDiag::sys_superviseSystem()
 | 
			
		||||
        this->private_sendDiagEvent(DeviceController::State::E254);
 | 
			
		||||
        this->diagRequestTimeoutTimer->stop();
 | 
			
		||||
        this->isRequestRunning  = false;
 | 
			
		||||
        if (this->E255counter > 5) { this->restartCArun(); }
 | 
			
		||||
                              else { this->E255counter++; }
 | 
			
		||||
        return;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
@@ -146,7 +181,7 @@ void DeviceControllerDiag::sys_superviseSystem()
 | 
			
		||||
    {
 | 
			
		||||
        // noch keine Testergebnisse
 | 
			
		||||
        if (dynMaCond.startupTestIsRunning) {
 | 
			
		||||
            // TODO?
 | 
			
		||||
            qCritical() << "            startupTestIsRunning --> call again";
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@@ -156,18 +191,6 @@ void DeviceControllerDiag::sys_superviseSystem()
 | 
			
		||||
        return;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    // all doors: 99: undefined  0:closed  1:open
 | 
			
		||||
    if (dynMaCond.lowerDoor || dynMaCond.upperDoor) {
 | 
			
		||||
        // Service or battery door is open, goto INTRUSION MODE
 | 
			
		||||
        qCritical() << "DeviceControllerDiag::sys_superviseSystem() Service or battery door is open, goto INTRUSION MODE";
 | 
			
		||||
        this->private_sendDiagEvent(DeviceController::State::E253);
 | 
			
		||||
    }
 | 
			
		||||
    if (dynMaCond.middleDoor) {
 | 
			
		||||
        // vault door is open, goto INTRUSION MODE
 | 
			
		||||
        qCritical() << "DeviceControllerDiag::sys_superviseSystem() vault door is open, goto INTRUSION MODE";
 | 
			
		||||
        this->private_sendDiagEvent(DeviceController::State::E252);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    qCritical() << "      --> call  sub_componentAssessment()";
 | 
			
		||||
 | 
			
		||||
    sub_componentAssessment();
 | 
			
		||||
@@ -201,6 +224,21 @@ void DeviceControllerDiag::sub_componentAssessment()
 | 
			
		||||
        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:
 | 
			
		||||
 | 
			
		||||
    if (modCond.rtc>=200) {
 | 
			
		||||
@@ -244,7 +282,8 @@ void DeviceControllerDiag::sub_componentAssessment()
 | 
			
		||||
        }
 | 
			
		||||
        if (modCond.coinEscrow>=200) {
 | 
			
		||||
            flag_sendOperate = false;
 | 
			
		||||
            this->private_sendDiagEvent(DeviceController::State::E010);
 | 
			
		||||
            // coinEscrow>200 is considered a warning:
 | 
			
		||||
            this->private_sendDiagEvent(DeviceController::State::W010);
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
    // -----------------------------------------------------------------------------------------------
 | 
			
		||||
@@ -266,7 +305,8 @@ void DeviceControllerDiag::sub_componentAssessment()
 | 
			
		||||
    {
 | 
			
		||||
        if (modCond.coinEscrow>=200) {
 | 
			
		||||
            flag_sendOperate = false;
 | 
			
		||||
            this->private_sendDiagEvent(DeviceController::State::E010);
 | 
			
		||||
            // coinEscrow>200 is considered a warning:
 | 
			
		||||
            this->private_sendDiagEvent(DeviceController::State::W010);
 | 
			
		||||
        }
 | 
			
		||||
        if (modCond.coinSafe==201)  { // full
 | 
			
		||||
            flag_sendOperate = false;
 | 
			
		||||
@@ -338,7 +378,7 @@ void DeviceControllerDiag::sub_componentAssessment()
 | 
			
		||||
    }
 | 
			
		||||
    if (modCond.temper>=200) {
 | 
			
		||||
        flag_sendOperate = false;
 | 
			
		||||
        this->private_sendDiagEvent(DeviceController::State::E004);
 | 
			
		||||
        this->private_sendDiagEvent(DeviceController::State::W004);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    // check for warnings
 | 
			
		||||
@@ -449,6 +489,10 @@ void DeviceControllerDiag::private_sendDiagEvent(DeviceController::State result)
 | 
			
		||||
        parameter  = "coin escrow";
 | 
			
		||||
        this->_isErrorState = true;
 | 
			
		||||
        break;
 | 
			
		||||
    case DeviceController::State::W010:    // coin escrow
 | 
			
		||||
        eventClass = EVENT_CLASS::WARNING;
 | 
			
		||||
        parameter  = "coin escrow";
 | 
			
		||||
        break;
 | 
			
		||||
    case DeviceController::State::E011:    // mem error int.ee.
 | 
			
		||||
        eventClass = EVENT_CLASS::ERROR;
 | 
			
		||||
        parameter  = "mem error int.ee.";
 | 
			
		||||
@@ -506,10 +550,8 @@ void DeviceControllerDiag::private_sendDiagEvent(DeviceController::State result)
 | 
			
		||||
        parameter  = "no valid data from DeviceController";
 | 
			
		||||
        break;
 | 
			
		||||
    case DeviceController::State::E255:   // no valid data from DeviceController
 | 
			
		||||
        eventClass = EVENT_CLASS::STATE;
 | 
			
		||||
        parameter  = "";
 | 
			
		||||
        qCritical() << "       ... ignore " << QMetaEnum::fromType<DeviceController::State>().valueToKey(result);
 | 
			
		||||
        return;
 | 
			
		||||
        eventClass = EVENT_CLASS::ERROR;
 | 
			
		||||
        parameter  = "no valid data from DeviceController";
 | 
			
		||||
        break;
 | 
			
		||||
    case DeviceController::State::O000:   // everything is fine
 | 
			
		||||
        this->machineEventSet.clear();
 | 
			
		||||
@@ -541,10 +583,24 @@ void DeviceControllerDiag::private_sendDiagEvent(DeviceController::State result)
 | 
			
		||||
        eventClass = EVENT_CLASS::WARNING;
 | 
			
		||||
        parameter  = "temperatur warning";
 | 
			
		||||
        break;
 | 
			
		||||
    case DeviceController::State::W255:   // restart carun
 | 
			
		||||
        eventClass = EVENT_CLASS::WARNING;
 | 
			
		||||
        parameter  = "restart carun";
 | 
			
		||||
        break;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    this->lastState = result;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * Variant: send 'parameter' as JSON:
 | 
			
		||||
     *
 | 
			
		||||
        JSON::setPrettySerialize(false);
 | 
			
		||||
        JSON::JsonObject json = JSON::objectBuilder()
 | 
			
		||||
                  ->set("description", parameter)
 | 
			
		||||
            ->create();
 | 
			
		||||
        QString parameterJsonString = JSON::serialize(json);
 | 
			
		||||
    */
 | 
			
		||||
 | 
			
		||||
    ATBMachineEvent *machineEvent = new ATBMachineEvent(
 | 
			
		||||
                eventId,
 | 
			
		||||
                "DC",
 | 
			
		||||
@@ -555,10 +611,18 @@ void DeviceControllerDiag::private_sendDiagEvent(DeviceController::State result)
 | 
			
		||||
                ""         // second level info
 | 
			
		||||
                );
 | 
			
		||||
 | 
			
		||||
    //emit diagResponse(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,
 | 
			
		||||
        E009,
 | 
			
		||||
        E010,
 | 
			
		||||
        W010,   // Coin Escrow
 | 
			
		||||
        E011,
 | 
			
		||||
 | 
			
		||||
        E018,
 | 
			
		||||
@@ -54,6 +55,8 @@ namespace DeviceController {
 | 
			
		||||
        W003,
 | 
			
		||||
        W004,
 | 
			
		||||
 | 
			
		||||
        W255,
 | 
			
		||||
 | 
			
		||||
        INITIAL_STATE
 | 
			
		||||
    };
 | 
			
		||||
    Q_ENUM_NS(State)
 | 
			
		||||
@@ -79,9 +82,25 @@ public:
 | 
			
		||||
    bool isOperatingState();
 | 
			
		||||
    QSet<DeviceController::State> getCurrentMachineState();
 | 
			
		||||
 | 
			
		||||
    void setTimeout(int timeout);
 | 
			
		||||
 | 
			
		||||
public slots:
 | 
			
		||||
    /**
 | 
			
		||||
     * start diag request
 | 
			
		||||
     */
 | 
			
		||||
    void diagRequest();
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * reset / re-init diag request.
 | 
			
		||||
     * Called e.g. when doors are closed.
 | 
			
		||||
     */
 | 
			
		||||
    void diagReInit();
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * reset / restart / reinit deviceController
 | 
			
		||||
     */
 | 
			
		||||
    void restartCArun();
 | 
			
		||||
 | 
			
		||||
signals:
 | 
			
		||||
    void diagResponse(ATBMachineEvent* machineEvent);
 | 
			
		||||
 | 
			
		||||
@@ -106,6 +125,8 @@ private:
 | 
			
		||||
 | 
			
		||||
    PersistentData* pData;
 | 
			
		||||
 | 
			
		||||
    int E255counter;
 | 
			
		||||
 | 
			
		||||
private slots:
 | 
			
		||||
    void onDiagRequestTimeoutTimerTimeout();
 | 
			
		||||
 | 
			
		||||
@@ -114,7 +135,6 @@ private slots:
 | 
			
		||||
 | 
			
		||||
    void sys_superviseSystem();
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
#endif // DEVICECONTROLLERDIAG_H
 | 
			
		||||
 
 | 
			
		||||
@@ -203,7 +203,7 @@ signals:
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
Q_DECLARE_INTERFACE(DeviceControllerInterface,
 | 
			
		||||
                    "eu.atb.ptu.plugin.DeviceControllerInterface/1.1.4")
 | 
			
		||||
                    "eu.atb.ptu.plugin.DeviceControllerInterface/1.1.5")
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
namespace nsDeviceControllerInterface {
 | 
			
		||||
@@ -236,6 +236,7 @@ namespace nsDeviceControllerInterface {
 | 
			
		||||
        ERROR_RECEIPT,
 | 
			
		||||
        START_RECEIPT,   // e.g. Szeged Start
 | 
			
		||||
        STOP_RECEIPT,    // e.g. Szeged Stop
 | 
			
		||||
        FINE_PAYMENT,    // e.g. Klaipeda
 | 
			
		||||
        FOOD_STAMP
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -64,6 +64,9 @@ bool Ticket::initNew(TICKET_VARIANT ticketVariant, const QList<quint8> & templat
 | 
			
		||||
    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;
 | 
			
		||||
@@ -160,6 +163,9 @@ QDebug operator<<(QDebug debug, TICKET_VARIANT ticketVariant)
 | 
			
		||||
        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;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user