Compare commits
	
		
			76 Commits
		
	
	
		
			1.2.1
			...
			improveTIC
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						
						
							
						
						10b0e494b2
	
				 | 
					
					
						|||
| 
						
						
							
						
						24a1390a11
	
				 | 
					
					
						|||
| 
						
						
							
						
						c8508a0c62
	
				 | 
					
					
						|||
| 
						
						
							
						
						fbfbe3d243
	
				 | 
					
					
						|||
| 
						
						
							
						
						cbc0dd0ad6
	
				 | 
					
					
						|||
| 
						
						
							
						
						1abd6bfa90
	
				 | 
					
					
						|||
| 
						
						
							
						
						a03dfe87a5
	
				 | 
					
					
						|||
| 
						
						
							
						
						03b192fb60
	
				 | 
					
					
						|||
| 
						
						
							
						
						e8b3bb1aa0
	
				 | 
					
					
						|||
| 
						
						
							
						
						8fe705f49b
	
				 | 
					
					
						|||
| 
						
						
							
						
						bf1bdc34bb
	
				 | 
					
					
						|||
| 
						
						
							
						
						73ae01573d
	
				 | 
					
					
						|||
| 
						
						
							
						
						bc595e1c7e
	
				 | 
					
					
						|||
| 
						
						
							
						
						18104b7271
	
				 | 
					
					
						|||
| 
						
						
							
						
						d720c7190f
	
				 | 
					
					
						|||
| 
						
						
							
						
						3fff6a0ebe
	
				 | 
					
					
						|||
| 
						
						
							
						
						bacee366b8
	
				 | 
					
					
						|||
| 
						
						
							
						
						acf3e143c1
	
				 | 
					
					
						|||
| 
						
						
							
						
						c84050091b
	
				 | 
					
					
						|||
| 
						
						
							
						
						9be2841187
	
				 | 
					
					
						|||
| 
						
						
							
						
						3e4db6cfcc
	
				 | 
					
					
						|||
| 
						
						
							
						
						5898be8807
	
				 | 
					
					
						|||
| 
						
						
							
						
						f20957c14a
	
				 | 
					
					
						|||
| 
						
						
							
						
						1bcdb5ba21
	
				 | 
					
					
						|||
| 
						
						
							
						
						a43af8ab86
	
				 | 
					
					
						|||
| 
						
						
							
						
						d7443974e2
	
				 | 
					
					
						|||
| 
						
						
							
						
						346c953175
	
				 | 
					
					
						|||
| 
						
						
							
						
						8cf6897a21
	
				 | 
					
					
						|||
| 
						
						
							
						
						69eb87e358
	
				 | 
					
					
						|||
| 
						
						
							
						
						8eab11479c
	
				 | 
					
					
						|||
| 
						
						
							
						
						ac93e9e631
	
				 | 
					
					
						|||
| 
						
						
							
						
						c1dd20ec4f
	
				 | 
					
					
						|||
| 
						
						
							
						
						2d60a7bd5c
	
				 | 
					
					
						|||
| 
						
						
							
						
						6d7d9ade70
	
				 | 
					
					
						|||
| 
						
						
							
						
						72dbc8b858
	
				 | 
					
					
						|||
| 
						
						
							
						
						32d70abf44
	
				 | 
					
					
						|||
| 
						
						
							
						
						c076090e03
	
				 | 
					
					
						|||
| 
						
						
							
						
						6c2717c56b
	
				 | 
					
					
						|||
| 
						
						
							
						
						816182c87b
	
				 | 
					
					
						|||
| 
						
						
							
						
						492d3a107a
	
				 | 
					
					
						|||
| 
						
						
							
						
						962cd01eac
	
				 | 
					
					
						|||
| 
						
						
							
						
						d66363da46
	
				 | 
					
					
						|||
| 
						
						
							
						
						7b25f86d6b
	
				 | 
					
					
						|||
| 
						
						
							
						
						5a999a0494
	
				 | 
					
					
						|||
| 
						
						
							
						
						ec18ac45e4
	
				 | 
					
					
						|||
| 
						
						
							
						
						560b6d3221
	
				 | 
					
					
						|||
| 
						
						
							
						
						b946dc5a92
	
				 | 
					
					
						|||
| 
						
						
							
						
						ea7542a248
	
				 | 
					
					
						|||
| 
						
						
							
						
						4541699ec3
	
				 | 
					
					
						|||
| 
						
						
							
						
						87d50a05dd
	
				 | 
					
					
						|||
| 
						
						
							
						
						379a5d4e3e
	
				 | 
					
					
						|||
| 
						
						
							
						
						6a08cf0b62
	
				 | 
					
					
						|||
| 
						
						
							
						
						849305bc8f
	
				 | 
					
					
						|||
| 
						
						
							
						
						a5c900b9fe
	
				 | 
					
					
						|||
| 
						
						
							
						
						70b488de66
	
				 | 
					
					
						|||
| 
						
						
							
						
						58f50b0ea6
	
				 | 
					
					
						|||
| 
						
						
							
						
						bc5beb4b96
	
				 | 
					
					
						|||
| 
						
						
							
						
						2a0aa2abe2
	
				 | 
					
					
						|||
| 
						
						
							
						
						f94f33862f
	
				 | 
					
					
						|||
| 
						
						
							
						
						b7cedf5444
	
				 | 
					
					
						|||
| 
						
						
							
						
						f81369944c
	
				 | 
					
					
						|||
| 
						
						
							
						
						6072970bf0
	
				 | 
					
					
						|||
| 
						
						
							
						
						8659627171
	
				 | 
					
					
						|||
| 
						
						
							
						
						d5786aa5ab
	
				 | 
					
					
						|||
| 
						
						
							
						
						ba7d801330
	
				 | 
					
					
						|||
| 
						
						
							
						
						19ce57e680
	
				 | 
					
					
						|||
| 
						
						
							
						
						d0ee6d175e
	
				 | 
					
					
						|||
| 
						
						
							
						
						3eaf98fb09
	
				 | 
					
					
						|||
| 
						
						
							
						
						bab7423965
	
				 | 
					
					
						|||
| 
						
						
							
						
						a76e3cd10e
	
				 | 
					
					
						|||
| 
						
						
							
						
						eb1eab690b
	
				 | 
					
					
						|||
| 
						
						
							
						
						7ae4ddd851
	
				 | 
					
					
						|||
| 
						
						
							
						
						0cc89cefab
	
				 | 
					
					
						|||
| 
						
						
							
						
						14755cd5b4
	
				 | 
					
					
						|||
| 
						
						
							
						
						d2efe566c5
	
				 | 
					
					
						|||
| 
						
						
							
						
						b058b6aee0
	
				 | 
					
					
						
							
								
								
									
										22
									
								
								DCPlugin.pro
									
									
									
									
									
								
							
							
						
						
									
										22
									
								
								DCPlugin.pro
									
									
									
									
									
								
							@@ -30,7 +30,14 @@ contains( CONFIG, PTU5 ) {
 | 
				
			|||||||
    QMAKE_CXXFLAGS += -std=c++11
 | 
					    QMAKE_CXXFLAGS += -std=c++11
 | 
				
			||||||
    linux-clang {  QMAKE_CXXFLAGS += -Qunused-arguments   }
 | 
					    linux-clang {  QMAKE_CXXFLAGS += -Qunused-arguments   }
 | 
				
			||||||
    CONFIG += link_pkgconfig
 | 
					    CONFIG += link_pkgconfig
 | 
				
			||||||
 | 
					    PTU5BASEPATH = /opt/devel/ptu5
 | 
				
			||||||
    ARCH = PTU5
 | 
					    ARCH = PTU5
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    INCLUDEPATH += $$PTU5BASEPATH/qt/libs/deviceController/include/
 | 
				
			||||||
 | 
					    LIBS += -L$$PTU5BASEPATH/qt/libs/deviceController/library
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    LIBS += -lCAslave
 | 
				
			||||||
 | 
					    LIBS += -lCAmaster
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
contains( CONFIG, PTU5_YOCTO ) {
 | 
					contains( CONFIG, PTU5_YOCTO ) {
 | 
				
			||||||
@@ -38,8 +45,8 @@ contains( CONFIG, PTU5_YOCTO ) {
 | 
				
			|||||||
    PTU5BASEPATH = /opt/devel/ptu5
 | 
					    PTU5BASEPATH = /opt/devel/ptu5
 | 
				
			||||||
    ARCH = PTU5
 | 
					    ARCH = PTU5
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # add qmqtt lib
 | 
					    LIBS += -lCAslave
 | 
				
			||||||
    #LIBS += -lQt5Qmqtt
 | 
					    LIBS += -lCAmaster
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
TARGET   = ATBDeviceControllerPlugin
 | 
					TARGET   = ATBDeviceControllerPlugin
 | 
				
			||||||
@@ -69,7 +76,6 @@ DEFINES += QT_DEPRECATED_WARNINGS
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
# ATBAPP interface
 | 
					# ATBAPP interface
 | 
				
			||||||
HEADERS += \
 | 
					HEADERS += \
 | 
				
			||||||
    include/interfaces.h \
 | 
					 | 
				
			||||||
    src/ATBAPP/ATBAPPplugin.h \
 | 
					    src/ATBAPP/ATBAPPplugin.h \
 | 
				
			||||||
    src/ATBAPP/DeviceControllerDiag.h \
 | 
					    src/ATBAPP/DeviceControllerDiag.h \
 | 
				
			||||||
    src/ATBAPP/DeviceControllerInterface.h \
 | 
					    src/ATBAPP/DeviceControllerInterface.h \
 | 
				
			||||||
@@ -80,7 +86,10 @@ HEADERS += \
 | 
				
			|||||||
    src/ATBAPP/support/CashUtils.h \
 | 
					    src/ATBAPP/support/CashUtils.h \
 | 
				
			||||||
    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/Ticket.h \
 | 
				
			||||||
 | 
					    src/ATBAPP/support/TicketUtils.h
 | 
				
			||||||
 | 
					
 | 
				
			||||||
SOURCES += \
 | 
					SOURCES += \
 | 
				
			||||||
    src/ATBAPP/ATBHealthEvent.cpp \
 | 
					    src/ATBAPP/ATBHealthEvent.cpp \
 | 
				
			||||||
@@ -91,7 +100,10 @@ SOURCES += \
 | 
				
			|||||||
    src/ATBAPP/support/CashUtils.cpp \
 | 
					    src/ATBAPP/support/CashUtils.cpp \
 | 
				
			||||||
    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/Ticket.cpp \
 | 
				
			||||||
 | 
					    src/ATBAPP/support/TicketUtils.cpp
 | 
				
			||||||
 | 
					
 | 
				
			||||||
DISTFILES += \
 | 
					DISTFILES += \
 | 
				
			||||||
    generate-version.sh
 | 
					    generate-version.sh
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -24,6 +24,7 @@ struct T_emp
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
   // dynamic:
 | 
					   // dynamic:
 | 
				
			||||||
   uint8_t state;      // step counter of EMP (electronic coin checker) FSM (finite state machine):
 | 
					   uint8_t state;      // step counter of EMP (electronic coin checker) FSM (finite state machine):
 | 
				
			||||||
 | 
					   /*
 | 
				
			||||||
   // 0=start command
 | 
					   // 0=start command
 | 
				
			||||||
       // 1=powered, do emp ini, send reset
 | 
					       // 1=powered, do emp ini, send reset
 | 
				
			||||||
       // 2=delay
 | 
					       // 2=delay
 | 
				
			||||||
@@ -39,7 +40,7 @@ struct T_emp
 | 
				
			|||||||
       // 90: stop all, 1s delay
 | 
					       // 90: stop all, 1s delay
 | 
				
			||||||
       // 99: off, all stopped
 | 
					       // 99: off, all stopped
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					*/
 | 
				
			||||||
   uint8_t pollingRunning;
 | 
					   uint8_t pollingRunning;
 | 
				
			||||||
   uint8_t paymentRunning;
 | 
					   uint8_t paymentRunning;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -238,6 +239,7 @@ struct T_dynamicCondition
 | 
				
			|||||||
        uint8_t lastVDoorState;
 | 
					        uint8_t lastVDoorState;
 | 
				
			||||||
        uint8_t lastCBstate;
 | 
					        uint8_t lastCBstate;
 | 
				
			||||||
        char        paymentInProgress;
 | 
					        char        paymentInProgress;
 | 
				
			||||||
 | 
					        // Version Szeged:  aug2023
 | 
				
			||||||
        //	0: stopped by timeout
 | 
					        //	0: stopped by timeout
 | 
				
			||||||
        //  1: running  2: wait4lastCoin
 | 
					        //  1: running  2: wait4lastCoin
 | 
				
			||||||
        //				3: payment stopped manually, coins in Escrow
 | 
					        //				3: payment stopped manually, coins in Escrow
 | 
				
			||||||
@@ -246,6 +248,21 @@ struct T_dynamicCondition
 | 
				
			|||||||
        //			    6: coins encashed   7:coins returned
 | 
					        //			    6: coins encashed   7:coins returned
 | 
				
			||||||
        //				8: CoinChecker or MDB on Error
 | 
					        //				8: CoinChecker or MDB on Error
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        // since Schoenau with bill and changer, nov2023
 | 
				
			||||||
 | 
					        //0 = no payment
 | 
				
			||||||
 | 
					        //will be set to 1 by cash_startCollection()
 | 
				
			||||||
 | 
					        //neu 1: wait for devices getting ready for payment
 | 
				
			||||||
 | 
					        //2 = payment,
 | 
				
			||||||
 | 
					        //3 = wait for last coin/bill
 | 
				
			||||||
 | 
					        //4 = Bezahlvorgang manuell beendet
 | 
				
			||||||
 | 
					        //5 = payment stopped autom, amount collected, coins in Escrow
 | 
				
			||||||
 | 
					        //6 = Bezahlvorgang beendet weil ZK voll
 | 
				
			||||||
 | 
					        //4,5,6: payment done, keep on polling, wait for cash or return command
 | 
				
			||||||
 | 
					        //7 = encash collected money from coin escrow into cash box
 | 
				
			||||||
 | 
					        //8 = return "amountToReturn", can be complete inserted amount or only overpayment
 | 
				
			||||||
 | 
					        //9 = wait for changer result
 | 
				
			||||||
 | 
					        //10= print refund receipt with "amountToReturn"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        char        res1;
 | 
					        char        res1;
 | 
				
			||||||
        uint16_t    U_Batt;
 | 
					        uint16_t    U_Batt;
 | 
				
			||||||
@@ -397,6 +414,7 @@ struct T_bna
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class DownloadThread;
 | 
				
			||||||
class hwinf
 | 
					class hwinf
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -2252,14 +2270,23 @@ public:
 | 
				
			|||||||
    virtual void bna_requestCurrentNotes() const {}
 | 
					    virtual void bna_requestCurrentNotes() const {}
 | 
				
			||||||
    // send command to DC in order to get transaction data
 | 
					    // send command to DC in order to get transaction data
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    virtual uint8_t bna_getCurrentNotes(uint16_t latestBill, uint16_t *currentNotes) const {
 | 
					    virtual uint8_t bna_getCurrentNotes(uint16_t latestBill, uint16_t *currentNotes) const
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
        Q_UNUSED(latestBill);
 | 
					        Q_UNUSED(latestBill);
 | 
				
			||||||
        Q_UNUSED(currentNotes);
 | 
					        Q_UNUSED(currentNotes);
 | 
				
			||||||
        return 0;
 | 
					        return 0;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    // returns number of collected bank notes since start-command (current transaction)
 | 
					    // returns number of collected bank notes since start-command (current transaction)
 | 
				
			||||||
    //  latestBill: last accepted bank note, value in cent
 | 
					    // return value: numbers of bills or 99 in case of error
 | 
				
			||||||
    //  currentNotes an array with up to 16 (further) notes collected
 | 
					    //  latestBill: not used
 | 
				
			||||||
 | 
					    // in case of error: currentNotes[0,1,2,3] = 1..4 error number(s)
 | 
				
			||||||
 | 
					    // in normal case:
 | 
				
			||||||
 | 
					    //  currentNotes[0]: last bill in cent (e.g. 1000 = 10€)
 | 
				
			||||||
 | 
					    //  currentNotes[1]: bin 1 = bill is still in escrow   else bill is stacked
 | 
				
			||||||
 | 
					    //       note: by now (dec2023) escrow is not used, bills always go to stacker (box)
 | 
				
			||||||
 | 
					    //  currentNotes[2]: total sum of bills in cent, low word (16bit)
 | 
				
			||||||
 | 
					    //  currentNotes[3]: total sum of bills in cent, high word (16bit)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    virtual void bna_requestStackerLevel() const {}
 | 
					    virtual void bna_requestStackerLevel() const {}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -2273,9 +2300,73 @@ public:
 | 
				
			|||||||
    //                                          countOfBills[1] for 10€   and so on
 | 
					    //                                          countOfBills[1] for 10€   and so on
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // download device controller
 | 
				
			||||||
 | 
					    virtual bool dcDownloadRequest(QString const &fileToDownload) const {
 | 
				
			||||||
 | 
					        Q_UNUSED(fileToDownload);
 | 
				
			||||||
 | 
					        return false;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    virtual bool dcDownloadRequested() const { return false; }
 | 
				
			||||||
 | 
					    virtual bool dcDownloadResetRequest() const { return false; }
 | 
				
			||||||
 | 
					    virtual bool dcDownloadRequestAck() const { return false; }
 | 
				
			||||||
 | 
					    virtual bool dcDownloadRunning() const { return false; }
 | 
				
			||||||
 | 
					    virtual bool dcDownloadFinished() { return false; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    virtual bool dcDownloadReportStart() const { return false; }
 | 
				
			||||||
 | 
					    virtual bool dcDownloadReportRunning() const { return true; }
 | 
				
			||||||
 | 
					    virtual bool dcDownloadReportFinished() { return true; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    virtual bool dcDownloadThreadStart() { return false; }
 | 
				
			||||||
 | 
					    virtual bool dcDownloadThreadRunning() const { return true; }
 | 
				
			||||||
 | 
					    virtual void dcDownloadThreadFinalize(DownloadThread *) {}
 | 
				
			||||||
 | 
					    virtual bool dcDownloadThreadFinished() const { return true; }
 | 
				
			||||||
 | 
					    virtual bool dcDownloadReportThreadStart() { return false; }
 | 
				
			||||||
 | 
					    virtual bool dcDownloadReportThreadRunning() const { return true; }
 | 
				
			||||||
 | 
					    virtual void dcDownloadReportThreadFinalize() {}
 | 
				
			||||||
 | 
					    virtual void dcDownloadReportThreadQuit() {}
 | 
				
			||||||
 | 
					    virtual bool dcDownloadReportThreadFinished() const { return true; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    virtual QString dcDownloadFileName() const { return ""; }
 | 
				
			||||||
 | 
					    virtual bool dcDownloadSetRequested(bool requested) {
 | 
				
			||||||
 | 
					       Q_UNUSED(requested); return false;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    virtual bool dcDownloadSetRunning(bool running) {
 | 
				
			||||||
 | 
					       Q_UNUSED(running); return false;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    virtual bool dcDownloadSetFinished(bool finished) {
 | 
				
			||||||
 | 
					       Q_UNUSED(finished); return false;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    virtual void dcDownloadSetTotalBlockNumber(uint16_t totalBlockNumber) {
 | 
				
			||||||
 | 
					       Q_UNUSED(totalBlockNumber);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    virtual void dcDownloadSetCurrentBlockNumber(uint16_t currentBlockNumber) {
 | 
				
			||||||
 | 
					       Q_UNUSED(currentBlockNumber);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    virtual bool dcDownloadGetRequested() const { return false; }
 | 
				
			||||||
 | 
					    virtual bool dcDownloadGetRunning() const { return false; }
 | 
				
			||||||
 | 
					    virtual bool dcDownloadGetFinished() const { return false; }
 | 
				
			||||||
 | 
					    virtual uint16_t dcDownloadGetTotalBlockNumber() const { return 0; }
 | 
				
			||||||
 | 
					    virtual uint16_t dcDownloadGetCurrentBlockNumber() const { return 0; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    virtual QObject const *getAPI() { return nullptr; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
signals:
 | 
					signals:
 | 
				
			||||||
 | 
					    /*
 | 
				
			||||||
 | 
					        NOTE: the difference between a virtual Qt signal and a normal Qt signal:
 | 
				
			||||||
 | 
					        A Qt virtual signal is a connection that is established using a pointer
 | 
				
			||||||
 | 
					        or reference and is not connected to an object or data. It is therefore
 | 
				
			||||||
 | 
					        not bound to a particular object, but to a specific class (object type).
 | 
				
			||||||
 | 
					        Qt virtual signals are useful because they allow you to create
 | 
				
			||||||
 | 
					        connections without worrying about whether an object or a specific data
 | 
				
			||||||
 | 
					        element has been destroyed.
 | 
				
			||||||
 | 
					        https://www.youtube.com/watch?v=HTH3VFfqsXw
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    virtual void hwapi_reportDCDownloadStatus(QString const&) const {}
 | 
				
			||||||
 | 
					    virtual void hwapi_reportDCDownloadSuccess(QString const&) const {}
 | 
				
			||||||
 | 
					    virtual void hwapi_reportDCDownloadFailure(QString const&) const {}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    virtual void hwapi_templatePrintFinished_OK(void) const=0;
 | 
					    virtual void hwapi_templatePrintFinished_OK(void) const=0;
 | 
				
			||||||
    virtual void hwapi_templatePrintFinished_Err(void) const=0;
 | 
					    virtual void hwapi_templatePrintFinished_Err(void) const=0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -2299,6 +2390,7 @@ signals:
 | 
				
			|||||||
    virtual void hwapi_doorCBinAndAllDoorsClosed(void) const=0;
 | 
					    virtual void hwapi_doorCBinAndAllDoorsClosed(void) const=0;
 | 
				
			||||||
    virtual void hwapi_doorAllDoorsClosed(void) const=0;
 | 
					    virtual void hwapi_doorAllDoorsClosed(void) const=0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    virtual void hwapi_coinAttached() const = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // NOTE: declaring a "pure virtual" "signal" should be an error and thus not valid.
 | 
					    // NOTE: declaring a "pure virtual" "signal" should be an error and thus not valid.
 | 
				
			||||||
    /* GH Version, bringt Fehler
 | 
					    /* GH Version, bringt Fehler
 | 
				
			||||||
 
 | 
				
			|||||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							@@ -7,12 +7,13 @@
 | 
				
			|||||||
#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"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "support/PersistentData.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <DeviceController/interfaces.h>
 | 
				
			||||||
#include "interfaces.h"
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <unistd.h>
 | 
					#include <unistd.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,10 +44,13 @@ 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();
 | 
				
			||||||
    void cashCollect();
 | 
					    void cashCollect();
 | 
				
			||||||
 | 
					    void cashCollect(const QString & amount);
 | 
				
			||||||
    void cashAbort();
 | 
					    void cashAbort();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // read coin/cash processing variants -----------------------------------------
 | 
					    // read coin/cash processing variants -----------------------------------------
 | 
				
			||||||
@@ -94,8 +98,6 @@ private:
 | 
				
			|||||||
   QString errorDescription;
 | 
					   QString errorDescription;
 | 
				
			||||||
   QString pluginInfo;
 | 
					   QString pluginInfo;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
   QList<int> templateList;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
   QString serialPortName;
 | 
					   QString serialPortName;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
   bool useDebug;
 | 
					   bool useDebug;
 | 
				
			||||||
@@ -112,6 +114,8 @@ private:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
   DeviceControllerDiag* diag;
 | 
					   DeviceControllerDiag* diag;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					   PersistentData *persistentData;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
   uint32_t cashStartAmountInt;
 | 
					   uint32_t cashStartAmountInt;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -126,11 +130,29 @@ 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;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					   QHash<TICKET_VARIANT, QList<quint8>> ticketTemplateList;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					   void initTicketTemplateList(const QSettings * settings);
 | 
				
			||||||
 | 
					   void prepareDynTemplateData();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					   void private_setupDynTemplateData_DEFAULT(struct T_dynDat *dynTicketData, Ticket *ticket);
 | 
				
			||||||
 | 
					   void private_setupDynTemplateData_START_RECEIPT(struct T_dynDat *dynTicketData, Ticket *ticket);
 | 
				
			||||||
 | 
					   void private_setupDynTemplatData_STOP_RECEIPT(struct T_dynDat *dynTicketData,   Ticket *ticket);
 | 
				
			||||||
 | 
					   void private_setupDynTemplatData_FOOD_STAMP(struct T_dynDat *dynTicketData,     Ticket *ticket);
 | 
				
			||||||
 | 
					   void private_setupDynTemplatData_FINE_PAYMENT(struct T_dynDat *dynTicketData,   Ticket *ticket);
 | 
				
			||||||
 | 
					   void private_setupDynTemplatData_FREE_TICKET(struct T_dynDat *dynTicketData,   Ticket *ticket);
 | 
				
			||||||
 | 
					   // ---------------------------------------------------------------------------------------------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
private slots:
 | 
					private slots:
 | 
				
			||||||
   // printer
 | 
					   // printer
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -140,6 +162,8 @@ private slots:
 | 
				
			|||||||
   void onPrinterWaitForPrintingTicket();
 | 
					   void onPrinterWaitForPrintingTicket();
 | 
				
			||||||
   void onPrinterWaitForPrintingReceipt();
 | 
					   void onPrinterWaitForPrintingReceipt();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					   void onPrinterPrepareDynTemplateData();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
   void onPrintFinishedOK();
 | 
					   void onPrintFinishedOK();
 | 
				
			||||||
   void onPrintFinishedERR();
 | 
					   void onPrintFinishedERR();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -5,16 +5,25 @@
 | 
				
			|||||||
#include <QUuid>
 | 
					#include <QUuid>
 | 
				
			||||||
#include <QDebug>
 | 
					#include <QDebug>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
DeviceControllerDiag::DeviceControllerDiag(QObject *parent)
 | 
					#include <QProcess>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "support/JSON.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					DeviceControllerDiag::DeviceControllerDiag(PersistentData *pData, QObject *parent)
 | 
				
			||||||
    : QObject(parent)
 | 
					    : QObject(parent)
 | 
				
			||||||
    , coinProcessorType(nsDeviceControllerInterface::COIN_PROCESSOR::ESCROW)
 | 
					    , coinProcessorType(nsDeviceControllerInterface::COIN_PROCESSOR::ESCROW)
 | 
				
			||||||
    , billAcceptor(nsDeviceControllerInterface::BILL_ACCEPTOR::NO)
 | 
					    , billAcceptor(nsDeviceControllerInterface::BILL_ACCEPTOR::NO)
 | 
				
			||||||
    , eventReceiver(nullptr)
 | 
					    , eventReceiver(nullptr)
 | 
				
			||||||
    , isRequestRunning(false)
 | 
					    , isRequestRunning(false)
 | 
				
			||||||
    , flagInterruptDiag(false)
 | 
					    , flagInterruptDiag(false)
 | 
				
			||||||
 | 
					    , lastState(DeviceController::State::INITIAL_STATE)
 | 
				
			||||||
 | 
					    , _isErrorState(false)
 | 
				
			||||||
 | 
					    , 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);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
@@ -30,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()";
 | 
				
			||||||
@@ -42,6 +62,16 @@ void DeviceControllerDiag::diagRequest()
 | 
				
			|||||||
    this->diagRequestTimeoutTimer->start();
 | 
					    this->diagRequestTimeoutTimer->start();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    this->private_startDiag();
 | 
					    this->private_startDiag();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // read dc-fw-version:
 | 
				
			||||||
 | 
					    /* note: dc_getSWVersion() returns always 32 characters (QString)...
 | 
				
			||||||
 | 
					     * if no version string could be read it will contain 32 null-characters:
 | 
				
			||||||
 | 
					     * "\u0000\u0000..."
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    QString dc_fw_version = hw->dc_getSWversion().remove(QChar('\0'));
 | 
				
			||||||
 | 
					    qCritical() << "ATBDeviceControllerPlugin: DC firmware version: " << dc_fw_version;
 | 
				
			||||||
 | 
					    this->pData->setDCFirmwareVersion(dc_fw_version);
 | 
				
			||||||
 | 
					    this->pData->serializeToFile();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -51,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:
 | 
				
			||||||
@@ -59,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;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -73,6 +135,7 @@ void DeviceControllerDiag::private_startDiag()
 | 
				
			|||||||
        qCritical() << "DeviceControllerDiag::private_startDiag() DCdata is +++not+++ valid";
 | 
					        qCritical() << "DeviceControllerDiag::private_startDiag() DCdata is +++not+++ valid";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        // try it again
 | 
					        // try it again
 | 
				
			||||||
 | 
					        hw->dc_autoRequest(true);
 | 
				
			||||||
        QTimer::singleShot(200, this, &DeviceControllerDiag::private_startDiag);
 | 
					        QTimer::singleShot(200, this, &DeviceControllerDiag::private_startDiag);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
@@ -80,8 +143,8 @@ void DeviceControllerDiag::private_startDiag()
 | 
				
			|||||||
void DeviceControllerDiag::sys_superviseSystem()
 | 
					void DeviceControllerDiag::sys_superviseSystem()
 | 
				
			||||||
{    // this function proofs if vending is possible depending of doors state
 | 
					{    // this function proofs if vending is possible depending of doors state
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    struct T_dynamicCondition dynMaCond;
 | 
					    struct T_dynamicCondition dynMaCond = {};
 | 
				
			||||||
    struct T_moduleCondition  modCond;
 | 
					    struct T_moduleCondition  modCond = {};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    qCritical() << "      sys_superviseSystem()";
 | 
					    qCritical() << "      sys_superviseSystem()";
 | 
				
			||||||
@@ -93,6 +156,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;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -100,9 +165,12 @@ void DeviceControllerDiag::sys_superviseSystem()
 | 
				
			|||||||
    {
 | 
					    {
 | 
				
			||||||
        // es gibt keinerlei gültige Daten vom DC
 | 
					        // es gibt keinerlei gültige Daten vom DC
 | 
				
			||||||
        qCritical() << "DeviceControllerDiag::sys_superviseSystem() no valid data!";
 | 
					        qCritical() << "DeviceControllerDiag::sys_superviseSystem() no valid data!";
 | 
				
			||||||
        this->private_sendDiagEvent(DeviceController::State::E254);
 | 
					        hw->dc_autoRequest(true);
 | 
				
			||||||
 | 
					        this->private_sendDiagEvent(DeviceController::State::M0254);
 | 
				
			||||||
        this->diagRequestTimeoutTimer->stop();
 | 
					        this->diagRequestTimeoutTimer->stop();
 | 
				
			||||||
        this->isRequestRunning  = false;
 | 
					        this->isRequestRunning  = false;
 | 
				
			||||||
 | 
					        if (this->E255counter > 5) { this->restartCArun(); }
 | 
				
			||||||
 | 
					                              else { this->E255counter++; }
 | 
				
			||||||
        return;
 | 
					        return;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -115,7 +183,7 @@ void DeviceControllerDiag::sys_superviseSystem()
 | 
				
			|||||||
    {
 | 
					    {
 | 
				
			||||||
        // noch keine Testergebnisse
 | 
					        // noch keine Testergebnisse
 | 
				
			||||||
        if (dynMaCond.startupTestIsRunning) {
 | 
					        if (dynMaCond.startupTestIsRunning) {
 | 
				
			||||||
            // TODO?
 | 
					            qCritical() << "            startupTestIsRunning --> call again";
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -125,18 +193,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();
 | 
				
			||||||
@@ -148,13 +204,13 @@ void DeviceControllerDiag::sub_componentAssessment()
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
    bool flag_sendOperate = true;
 | 
					    bool flag_sendOperate = true;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    struct T_moduleCondition modCond;
 | 
					    struct T_moduleCondition modCond = {};
 | 
				
			||||||
    hw->sys_getDeviceConditions(&modCond);
 | 
					    hw->sys_getDeviceConditions(&modCond);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    struct T_dynamicCondition dynMaCond;
 | 
					    struct T_dynamicCondition dynMaCond = {};
 | 
				
			||||||
    hw->sys_getDynMachineConditions(&dynMaCond);
 | 
					    hw->sys_getDynMachineConditions(&dynMaCond);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    struct T_devices devPara;
 | 
					    struct T_devices devPara = {};
 | 
				
			||||||
    hw->sys_restoreDeviceParameter(&devPara);
 | 
					    hw->sys_restoreDeviceParameter(&devPara);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // store some interesting results:
 | 
					    // store some interesting results:
 | 
				
			||||||
@@ -170,6 +226,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::M0253);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    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::M0252);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // check for invalid states:
 | 
					    // check for invalid states:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (modCond.rtc>=200) {
 | 
					    if (modCond.rtc>=200) {
 | 
				
			||||||
@@ -213,12 +284,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;
 | 
				
			||||||
@@ -232,7 +307,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;
 | 
				
			||||||
@@ -290,12 +366,12 @@ void DeviceControllerDiag::sub_componentAssessment()
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    if (dynMaCond.nowCardTest>0) {
 | 
					    if (dynMaCond.nowCardTest>0) {
 | 
				
			||||||
        flag_sendOperate = false;
 | 
					        flag_sendOperate = false;
 | 
				
			||||||
        this->private_sendDiagEvent(DeviceController::State::E072);
 | 
					        this->private_sendDiagEvent(DeviceController::State::M0072);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (dynMaCond.startupTestIsRunning>0) {
 | 
					    if (dynMaCond.startupTestIsRunning>0) {
 | 
				
			||||||
        flag_sendOperate = false;
 | 
					        flag_sendOperate = false;
 | 
				
			||||||
        this->private_sendDiagEvent(DeviceController::State::E073);
 | 
					        this->private_sendDiagEvent(DeviceController::State::M0073);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (modCond.voltage>=200) {
 | 
					    if (modCond.voltage>=200) {
 | 
				
			||||||
@@ -304,7 +380,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
 | 
				
			||||||
@@ -351,7 +427,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;
 | 
				
			||||||
@@ -374,99 +449,124 @@ 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::M0071:   // cash box change is ongoing
 | 
				
			||||||
        eventClass = EVENT_CLASS::STATE;
 | 
					        eventClass = EVENT_CLASS::STATE;
 | 
				
			||||||
        parameter  = "cash box change is ongoing";
 | 
					        parameter  = "cash box change is ongoing";
 | 
				
			||||||
        break;
 | 
					        break;
 | 
				
			||||||
    case DeviceController::State::E072:   // card test running
 | 
					    case DeviceController::State::M0072:   // card test running
 | 
				
			||||||
        eventClass = EVENT_CLASS::STATE;
 | 
					        eventClass = EVENT_CLASS::STATE;
 | 
				
			||||||
        parameter  = "card test running";
 | 
					        parameter  = "card test running";
 | 
				
			||||||
        break;
 | 
					        break;
 | 
				
			||||||
    case DeviceController::State::E073:   // startup-test is running
 | 
					    case DeviceController::State::M0073:   // startup-test is running
 | 
				
			||||||
        eventClass = EVENT_CLASS::STATE;
 | 
					        eventClass = EVENT_CLASS::STATE;
 | 
				
			||||||
        parameter  = "startup-test is running";
 | 
					        parameter  = "startup-test is running";
 | 
				
			||||||
        break;
 | 
					        break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    case DeviceController::State::E252:   // cash box door open
 | 
					    case DeviceController::State::M0252:   // cash box door open
 | 
				
			||||||
        eventClass = EVENT_CLASS::STATE;
 | 
					        eventClass = EVENT_CLASS::STATE;
 | 
				
			||||||
        parameter  = "cash box door open";
 | 
					        parameter  = "cash box door open";
 | 
				
			||||||
        break;
 | 
					        break;
 | 
				
			||||||
    case DeviceController::State::E253:   // service or battery door open
 | 
					    case DeviceController::State::M0253:   // service or battery door open
 | 
				
			||||||
        eventClass = EVENT_CLASS::STATE;
 | 
					        eventClass = EVENT_CLASS::STATE;
 | 
				
			||||||
        parameter  = "service or battery door open";
 | 
					        parameter  = "service or battery door open";
 | 
				
			||||||
        break;
 | 
					        break;
 | 
				
			||||||
    case DeviceController::State::E254:   // no valid data from DeviceController
 | 
					    case DeviceController::State::M0254:   // no valid data from DeviceController
 | 
				
			||||||
        eventClass = EVENT_CLASS::STATE;
 | 
					        eventClass = EVENT_CLASS::STATE;
 | 
				
			||||||
        parameter  = "no valid data from DeviceController";
 | 
					        parameter  = "no valid data from DeviceController";
 | 
				
			||||||
        break;
 | 
					        break;
 | 
				
			||||||
    case DeviceController::State::E255:   // no valid data from DeviceController
 | 
					    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
 | 
				
			||||||
@@ -485,23 +585,46 @@ 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,
 | 
				
			||||||
                "DC",
 | 
					                "DC",
 | 
				
			||||||
                eventClass,
 | 
					                eventClass,
 | 
				
			||||||
                eventName,
 | 
					                eventName,
 | 
				
			||||||
                1,
 | 
					                1,         // eventState
 | 
				
			||||||
                parameter,
 | 
					                parameter,
 | 
				
			||||||
                ""         // 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"});
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -5,9 +5,12 @@
 | 
				
			|||||||
#include <QSet>
 | 
					#include <QSet>
 | 
				
			||||||
#include <QTimer>
 | 
					#include <QTimer>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "ATBMachineEvent.h"
 | 
					#include <DeviceController/interfaces.h>
 | 
				
			||||||
#include "interfaces.h"
 | 
					
 | 
				
			||||||
#include "DeviceControllerInterface.h"
 | 
					#include "DeviceControllerInterface.h"
 | 
				
			||||||
 | 
					#include "ATBMachineEvent.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "support/PersistentData.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
namespace DeviceController {
 | 
					namespace DeviceController {
 | 
				
			||||||
@@ -26,6 +29,7 @@ namespace DeviceController {
 | 
				
			|||||||
        E008,
 | 
					        E008,
 | 
				
			||||||
        E009,
 | 
					        E009,
 | 
				
			||||||
        E010,
 | 
					        E010,
 | 
				
			||||||
 | 
					        W010,   // Coin Escrow
 | 
				
			||||||
        E011,
 | 
					        E011,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        E018,
 | 
					        E018,
 | 
				
			||||||
@@ -37,19 +41,24 @@ namespace DeviceController {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        E034,
 | 
					        E034,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        E071,
 | 
					        M0071, // cashbox change is ongoing
 | 
				
			||||||
        E072,
 | 
					        M0072, // cardtest is running
 | 
				
			||||||
        E073,
 | 
					        M0073, // startup-test is running
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        M0252, // cashbox door open
 | 
				
			||||||
 | 
					        M0253, // service or battery door is open
 | 
				
			||||||
 | 
					        M0254, // no valid data from DC
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        E252,
 | 
					 | 
				
			||||||
        E253,
 | 
					 | 
				
			||||||
        E254,
 | 
					 | 
				
			||||||
        E255,
 | 
					        E255,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        W001,
 | 
					        W001,
 | 
				
			||||||
        W002,
 | 
					        W002,
 | 
				
			||||||
        W003,
 | 
					        W003,
 | 
				
			||||||
        W004
 | 
					        W004,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        W255,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        INITIAL_STATE
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
    Q_ENUM_NS(State)
 | 
					    Q_ENUM_NS(State)
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
@@ -60,16 +69,39 @@ class DeviceControllerDiag : public QObject
 | 
				
			|||||||
    Q_OBJECT
 | 
					    Q_OBJECT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
    DeviceControllerDiag(QObject *parent = nullptr);
 | 
					    DeviceControllerDiag(PersistentData *pData, QObject *parent = nullptr);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    void init(hwinf* hw, QObject* eventReceiver);
 | 
					    void init(hwinf* hw, QObject* eventReceiver);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    nsDeviceControllerInterface::COIN_PROCESSOR coinProcessorType;
 | 
					    nsDeviceControllerInterface::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);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -88,9 +120,13 @@ private:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    int lastVoltage;
 | 
					    int lastVoltage;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    DeviceController::State lastState;
 | 
				
			||||||
    QSet<DeviceController::State> machineEventSet;
 | 
					    QSet<DeviceController::State> machineEventSet;
 | 
				
			||||||
 | 
					    bool _isErrorState;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    PersistentData* pData;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    int E255counter;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
private slots:
 | 
					private slots:
 | 
				
			||||||
    void onDiagRequestTimeoutTimerTimeout();
 | 
					    void onDiagRequestTimeoutTimerTimeout();
 | 
				
			||||||
@@ -100,7 +136,6 @@ private slots:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    void sys_superviseSystem();
 | 
					    void sys_superviseSystem();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#endif // DEVICECONTROLLERDIAG_H
 | 
					#endif // DEVICECONTROLLERDIAG_H
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -5,6 +5,8 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#include <QSettings>
 | 
					#include <QSettings>
 | 
				
			||||||
#include <QString>
 | 
					#include <QString>
 | 
				
			||||||
 | 
					#include <QJsonObject>
 | 
				
			||||||
 | 
					#include <QtCore/QHash>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "ATBAPPplugin.h"
 | 
					#include "ATBAPPplugin.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -39,6 +41,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
 | 
				
			||||||
@@ -53,9 +61,10 @@ public:
 | 
				
			|||||||
    virtual void requestStopCashInput() = 0;
 | 
					    virtual void requestStopCashInput() = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /**
 | 
					    /**
 | 
				
			||||||
     * called e.g. on Button "NEXT" in pay-up (direct coin input)
 | 
					     * called e.g. after printing
 | 
				
			||||||
     */
 | 
					     */
 | 
				
			||||||
    virtual void cashCollect() = 0;
 | 
					    virtual void cashCollect() = 0;
 | 
				
			||||||
 | 
					    virtual void cashCollect(const QString & amount) = 0;
 | 
				
			||||||
    virtual void cashAbort() = 0;
 | 
					    virtual void cashAbort() = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // TASKS: Account -------------------------------------------------------------
 | 
					    // TASKS: Account -------------------------------------------------------------
 | 
				
			||||||
@@ -104,6 +113,9 @@ signals:
 | 
				
			|||||||
                                     const QString & errorCode,
 | 
					                                     const QString & errorCode,
 | 
				
			||||||
                                     const QString & errorDescription);
 | 
					                                     const QString & errorDescription);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    void coinAttached();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /**
 | 
					    /**
 | 
				
			||||||
     * emitted on e.g. a coin input
 | 
					     * emitted on e.g. a coin input
 | 
				
			||||||
     */
 | 
					     */
 | 
				
			||||||
@@ -128,6 +140,14 @@ signals:
 | 
				
			|||||||
                                     const QString & errorCode,
 | 
					                                     const QString & errorCode,
 | 
				
			||||||
                                     const QString & errorDescription);
 | 
					                                     const QString & errorDescription);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * emitted if cashPayment has been finished, e.g. in result to task cashCollect():
 | 
				
			||||||
 | 
					     * if coins in changer must be given back to user.
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    void cashPaymentChanging(nsDeviceControllerInterface::RESULT_STATE resultState,
 | 
				
			||||||
 | 
					                                     const QString & changeValue,        // amount changed by changer/escrow
 | 
				
			||||||
 | 
					                                     const QString & errorCode,
 | 
				
			||||||
 | 
					                                     const QString & errorDescription);
 | 
				
			||||||
    /**
 | 
					    /**
 | 
				
			||||||
     * emitted if cashPayment has been finished, e.g. in result to task cashCollect():
 | 
					     * emitted if cashPayment has been finished, e.g. in result to task cashCollect():
 | 
				
			||||||
     *  -> ticket should be printed sucessfully
 | 
					     *  -> ticket should be printed sucessfully
 | 
				
			||||||
@@ -135,7 +155,7 @@ signals:
 | 
				
			|||||||
     * Provides data for logging, especially changed value
 | 
					     * Provides data for logging, especially changed value
 | 
				
			||||||
     */
 | 
					     */
 | 
				
			||||||
    void cashPaymentFinished(nsDeviceControllerInterface::RESULT_STATE resultState,
 | 
					    void cashPaymentFinished(nsDeviceControllerInterface::RESULT_STATE resultState,
 | 
				
			||||||
                                     const QString & newCashValue,  // total inserted amount amount
 | 
					                                     const QString & newCashValue,  // total inserted amount
 | 
				
			||||||
                                     const QString & coinValue,     // inserted amount, paid with coins
 | 
					                                     const QString & coinValue,     // inserted amount, paid with coins
 | 
				
			||||||
                                     const QString & noteValue,     // inserted amount, paid with notes
 | 
					                                     const QString & noteValue,     // inserted amount, paid with notes
 | 
				
			||||||
                                     const QString & changeValue,   // amount changed by changer/escrow
 | 
					                                     const QString & changeValue,   // amount changed by changer/escrow
 | 
				
			||||||
@@ -193,10 +213,11 @@ signals:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Q_DECLARE_INTERFACE(DeviceControllerInterface,
 | 
					Q_DECLARE_INTERFACE(DeviceControllerInterface,
 | 
				
			||||||
                    "eu.atb.ptu.plugin.DeviceControllerInterface/1.1.1")
 | 
					                    "eu.atb.ptu.plugin.DeviceControllerInterface/1.2.1")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
namespace nsDeviceControllerInterface {
 | 
					namespace nsDeviceControllerInterface {
 | 
				
			||||||
 | 
					    Q_NAMESPACE
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    enum class PLUGIN_STATE : quint8 {
 | 
					    enum class PLUGIN_STATE : quint8 {
 | 
				
			||||||
        NOT_INITIALIZED = 0,
 | 
					        NOT_INITIALIZED = 0,
 | 
				
			||||||
@@ -221,16 +242,48 @@ namespace nsDeviceControllerInterface {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    enum class TICKET_VARIANT : quint8 {
 | 
					    enum class TICKET_VARIANT : quint8 {
 | 
				
			||||||
 | 
					        INVALID,
 | 
				
			||||||
 | 
					        NO_TICKET,
 | 
				
			||||||
        PARKING_TICKET,
 | 
					        PARKING_TICKET,
 | 
				
			||||||
 | 
					        PARKING_TICKET_CAR,
 | 
				
			||||||
 | 
					        PARKING_TICKET_VAN,
 | 
				
			||||||
 | 
					        PARKING_TICKET_CAMPER,
 | 
				
			||||||
 | 
					        DAY_TICKET,
 | 
				
			||||||
 | 
					        DAY_TICKET_ADULT,
 | 
				
			||||||
 | 
					        DAY_TICKET_TEEN,
 | 
				
			||||||
 | 
					        DAY_TICKET_CHILD,
 | 
				
			||||||
 | 
					        DAY_TICKET_CAR,
 | 
				
			||||||
 | 
					        DAY_TICKET_VAN,
 | 
				
			||||||
 | 
					        DAY_TICKET_CAMPER,
 | 
				
			||||||
        RECEIPT,
 | 
					        RECEIPT,
 | 
				
			||||||
        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,
 | 
				
			||||||
 | 
					        FIXED_PRICE_1,
 | 
				
			||||||
 | 
					        FIXED_PRICE_2,
 | 
				
			||||||
 | 
					        FIXED_PRICE_3,
 | 
				
			||||||
 | 
					        FIXED_PRICE_4,
 | 
				
			||||||
 | 
					        FIXED_PRICE_5,
 | 
				
			||||||
 | 
					        FIXED_PRICE_6,
 | 
				
			||||||
 | 
					        FIXED_PRICE_7,
 | 
				
			||||||
 | 
					        FIXED_PRICE_8,
 | 
				
			||||||
 | 
					        FIXED_PRICE_9,
 | 
				
			||||||
 | 
					        FIXED_PRICE_10,
 | 
				
			||||||
 | 
					        FREE_TICKET
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
 | 
					    Q_ENUM_NS(TICKET_VARIANT)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    inline uint qHash(const nsDeviceControllerInterface::TICKET_VARIANT &key, uint seed = 0)
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					        return ::qHash(static_cast<quint8>(key), seed);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    enum class COIN_PROCESSOR : quint8 {
 | 
					    enum class COIN_PROCESSOR : quint8 {
 | 
				
			||||||
        CHANGER,
 | 
					        CHANGER,
 | 
				
			||||||
        ESCROW
 | 
					        ESCROW,
 | 
				
			||||||
 | 
					        NONE
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    enum class BILL_ACCEPTOR  : quint8 {
 | 
					    enum class BILL_ACCEPTOR  : quint8 {
 | 
				
			||||||
@@ -247,4 +300,6 @@ namespace nsDeviceControllerInterface {
 | 
				
			|||||||
    };
 | 
					    };
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#endif // DEVICECONTROLLERINTERFACE_H
 | 
					#endif // DEVICECONTROLLERINTERFACE_H
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,7 +2,7 @@
 | 
				
			|||||||
#define CASHUTILS_H
 | 
					#define CASHUTILS_H
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <QObject>
 | 
					#include <QObject>
 | 
				
			||||||
#include "interfaces.h"
 | 
					#include <DeviceController/interfaces.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
namespace CashUtils {
 | 
					namespace CashUtils {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										145
									
								
								src/ATBAPP/support/PersistentData.cpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										145
									
								
								src/ATBAPP/support/PersistentData.cpp
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,145 @@
 | 
				
			|||||||
 | 
					#include "PersistentData.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QFile>
 | 
				
			||||||
 | 
					#include <QFileInfo>
 | 
				
			||||||
 | 
					#include <QDir>
 | 
				
			||||||
 | 
					#include <QDateTime>
 | 
				
			||||||
 | 
					#include <QDataStream>
 | 
				
			||||||
 | 
					#include <QDebug>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					PersistentData::PersistentData(const QString &datafileName, QObject *parent)
 | 
				
			||||||
 | 
					    : QObject(parent)
 | 
				
			||||||
 | 
					    , isChangedFlag(false)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    // load persistant data, if available
 | 
				
			||||||
 | 
					    this->filename = datafileName;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QFileInfo dataFileInfo(this->filename);
 | 
				
			||||||
 | 
					    QString dataFilePath = dataFileInfo.path();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QDir dir;
 | 
				
			||||||
 | 
					    if ( ! dir.exists(dataFilePath)) {
 | 
				
			||||||
 | 
					        qCritical() << "Persistent data file does not exist!";
 | 
				
			||||||
 | 
					        qCritical() << "          --> create new: " << this->filename;
 | 
				
			||||||
 | 
					        dir.mkpath(dataFilePath);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    this->read();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void PersistentData::serializeToFile()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    if (this->isChangedFlag) {
 | 
				
			||||||
 | 
					        qCritical() << "PersistentData::isChanged -> save";
 | 
				
			||||||
 | 
					        this->save();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void PersistentData::save()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    QFile fileOut(this->filename);
 | 
				
			||||||
 | 
					    if (fileOut.open(QIODevice::WriteOnly))
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					        QDataStream out(&fileOut);
 | 
				
			||||||
 | 
					        out.setVersion(QDataStream::Qt_4_6);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        out << this->hash;
 | 
				
			||||||
 | 
					        fileOut.flush();
 | 
				
			||||||
 | 
					        fileOut.close();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        this->isChangedFlag = false;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void PersistentData::read()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    QFile fileIn(this->filename);
 | 
				
			||||||
 | 
					    if (fileIn.open(QIODevice::ReadOnly))
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					        QDataStream in(&fileIn);
 | 
				
			||||||
 | 
					        in.setVersion(QDataStream::Qt_4_6);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        in >> hash;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        fileIn.close();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QVariant PersistentData::getParameter(const QString & key) const {
 | 
				
			||||||
 | 
					#if defined (ARCH_DesktopLinux)
 | 
				
			||||||
 | 
					    // note: QVariant.toString() returns empty string for custom types
 | 
				
			||||||
 | 
					    qDebug() << "VendingData::getParameter() key = " << key << " value = " << hash.value(key).toString();
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					    return hash.value(key);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QVariant PersistentData::getParameter(const QString & key)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    #if defined (ARCH_DesktopLinux)
 | 
				
			||||||
 | 
					    // note: QVariant.toString() returns empty string for custom types
 | 
				
			||||||
 | 
					    qDebug() << "VendingData::getParameter() key = " << key << " value = " << hash.value(key).toString();
 | 
				
			||||||
 | 
					    #endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return hash.value(key);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void PersistentData::setParameter(const QString & key, QVariant value)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    this->isChangedFlag = true;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    #if defined (ARCH_DesktopLinux)
 | 
				
			||||||
 | 
					    // note: QVariant.toString() returns empty string for custom types
 | 
				
			||||||
 | 
					    qDebug() << "VendingData::setParameter() key = " << key << " value = " << value.toString();
 | 
				
			||||||
 | 
					    #endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    this->hash.insert(key, value);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void PersistentData::clearParameter(const QString & key)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    this->isChangedFlag = true;
 | 
				
			||||||
 | 
					    this->hash.remove(key);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool PersistentData::hasParameter(const QString & key) const
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    return hash.contains(key);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					uint PersistentData::getUintParameter(const QString & key) const
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    qDebug() << "PersistentData::getUintParameter() key = " << key << " value = " << hash.value(key).toString();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    uint returnValue = 0;
 | 
				
			||||||
 | 
					    bool ok;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    returnValue = hash.value(key).toString().toUInt(&ok);
 | 
				
			||||||
 | 
					    if (!ok) returnValue = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return returnValue;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QList<QString> PersistentData::uniqueKeys() const {
 | 
				
			||||||
 | 
					    return hash.uniqueKeys();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void PersistentData::setDCFirmwareVersion(const QString & fw_version)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    // there must be a version string!
 | 
				
			||||||
 | 
					    if (fw_version.size() < 1) return;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (this->hash["dc_fw_version"].toString() != fw_version) {
 | 
				
			||||||
 | 
					        this->isChangedFlag = true;
 | 
				
			||||||
 | 
					        this->hash.insert("dc_fw_version", fw_version);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QString PersistentData::getDCFirmwareVersion()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    return this->hash["dc_fw_version"].toString();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										49
									
								
								src/ATBAPP/support/PersistentData.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										49
									
								
								src/ATBAPP/support/PersistentData.h
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,49 @@
 | 
				
			|||||||
 | 
					#ifndef PERSISTENTDATA_H
 | 
				
			||||||
 | 
					#define PERSISTENTDATA_H
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QObject>
 | 
				
			||||||
 | 
					#include <QHash>
 | 
				
			||||||
 | 
					#include <QVariant>
 | 
				
			||||||
 | 
					#include <QList>
 | 
				
			||||||
 | 
					#include <QString>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class PersistentData : public QObject
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    Q_OBJECT
 | 
				
			||||||
 | 
					public:
 | 
				
			||||||
 | 
					    explicit PersistentData(const QString &datafileName, QObject *parent = nullptr);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    void setDCFirmwareVersion(const QString & fw_version);
 | 
				
			||||||
 | 
					    QString getDCFirmwareVersion();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QVariant getParameter(const QString & key);
 | 
				
			||||||
 | 
					    QVariant getParameter(const QString & key) const;
 | 
				
			||||||
 | 
					    void setParameter(const QString & key, QVariant value);
 | 
				
			||||||
 | 
					    void clearParameter(const QString & key);
 | 
				
			||||||
 | 
					    bool hasParameter(const QString & key) const;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    uint getUintParameter(const QString & key) const;
 | 
				
			||||||
 | 
					    QList<QString> uniqueKeys() const;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					public slots:
 | 
				
			||||||
 | 
					    void serializeToFile();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					signals:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					private:
 | 
				
			||||||
 | 
					    QHash<QString, QVariant> hash;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString dc_fw_version;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QString filename;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    void save();
 | 
				
			||||||
 | 
					    void read();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    bool isChangedFlag;
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#endif // PERSISTENTDATA_H
 | 
				
			||||||
							
								
								
									
										231
									
								
								src/ATBAPP/support/Ticket.cpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										231
									
								
								src/ATBAPP/support/Ticket.cpp
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,231 @@
 | 
				
			|||||||
 | 
					#include "Ticket.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QDebug>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Ticket::Ticket(TICKET_VARIANT ticketVariant, QObject *parent )
 | 
				
			||||||
 | 
					    : QObject(parent)
 | 
				
			||||||
 | 
					    , ticketVariant(ticketVariant)
 | 
				
			||||||
 | 
					    , _hasTemplateDynData(false)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					TICKET_VARIANT Ticket::variant()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    return this->ticketVariant;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QList<quint8> * Ticket::templateList()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    return &(this->_templateList);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool Ticket::hasTemplateDynData()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    return this->_hasTemplateDynData;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					quint8 Ticket::getCurrentProcessedTemplateNumber()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    return this->currentProcessedTemplateNumber;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void Ticket::setCurrentTemplateProcessed()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    this->currentProcessedTemplateNumber++;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool Ticket::initNew(TICKET_VARIANT ticketVariant, const QList<quint8> & templateList, const QHash<QString, QVariant> & printingData)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    this->clear();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    this->ticketVariant = ticketVariant;
 | 
				
			||||||
 | 
					    this->printingData = printingData;
 | 
				
			||||||
 | 
					    this->_templateList = templateList;
 | 
				
			||||||
 | 
					    this->currentProcessedTemplateNumber = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // DEBUG
 | 
				
			||||||
 | 
					    qCritical() << "Ticket::initNew():";
 | 
				
			||||||
 | 
					    qCritical() << "      -> " << ticketVariant;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    int multiplicatorInt = 1;  // default
 | 
				
			||||||
 | 
					    quint8 headerTemplate;
 | 
				
			||||||
 | 
					    quint8 multiTemplate;
 | 
				
			||||||
 | 
					    quint8 footerTemplate;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    switch (this->ticketVariant) {
 | 
				
			||||||
 | 
					    case TICKET_VARIANT::START_RECEIPT:
 | 
				
			||||||
 | 
					        if (templateList.isEmpty()) {
 | 
				
			||||||
 | 
					            this->_templateList << 21 << 22 << 23;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        else {
 | 
				
			||||||
 | 
					            this->_templateList = templateList;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        break;
 | 
				
			||||||
 | 
					    case TICKET_VARIANT::STOP_RECEIPT:
 | 
				
			||||||
 | 
					        if (templateList.isEmpty()) {
 | 
				
			||||||
 | 
					            this->_templateList << 24 << 25 << 26;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        else {
 | 
				
			||||||
 | 
					            this->_templateList = templateList;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        break;
 | 
				
			||||||
 | 
					    case TICKET_VARIANT::FINE_PAYMENT:
 | 
				
			||||||
 | 
					        if (templateList.isEmpty()) {
 | 
				
			||||||
 | 
					            this->_templateList << 24 << 25 << 26;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        else {
 | 
				
			||||||
 | 
					            this->_templateList = templateList;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        break;
 | 
				
			||||||
 | 
					    case TICKET_VARIANT::FREE_TICKET:
 | 
				
			||||||
 | 
					        if (templateList.isEmpty()) {
 | 
				
			||||||
 | 
					            this->_templateList << 24 << 25 << 26;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        else {
 | 
				
			||||||
 | 
					            this->_templateList = templateList;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        break;
 | 
				
			||||||
 | 
					    case TICKET_VARIANT::FOOD_STAMP:
 | 
				
			||||||
 | 
					         if (printingData.contains("dyn1_list")) {
 | 
				
			||||||
 | 
					            this->_hasTemplateDynData = true;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            this->dyn1List = printingData["dyn1_list"].toStringList();
 | 
				
			||||||
 | 
					            this->dyn2List = printingData["dyn2_list"].toStringList();
 | 
				
			||||||
 | 
					         }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					         if (templateList.isEmpty()) {
 | 
				
			||||||
 | 
					             headerTemplate  = 0;
 | 
				
			||||||
 | 
					             multiTemplate   = 1;
 | 
				
			||||||
 | 
					             footerTemplate  = 2;
 | 
				
			||||||
 | 
					         }
 | 
				
			||||||
 | 
					         else
 | 
				
			||||||
 | 
					         if (templateList.size() == 2) {
 | 
				
			||||||
 | 
					             headerTemplate  = 0;
 | 
				
			||||||
 | 
					             multiTemplate   = templateList.at(0);
 | 
				
			||||||
 | 
					             footerTemplate  = templateList.at(1);
 | 
				
			||||||
 | 
					         }
 | 
				
			||||||
 | 
					         else
 | 
				
			||||||
 | 
					         if (templateList.size() == 3) {
 | 
				
			||||||
 | 
					             headerTemplate  = templateList.at(0);
 | 
				
			||||||
 | 
					             multiTemplate   = templateList.at(1);
 | 
				
			||||||
 | 
					             footerTemplate  = templateList.at(2);
 | 
				
			||||||
 | 
					         }
 | 
				
			||||||
 | 
					         else {
 | 
				
			||||||
 | 
					             headerTemplate  = 0;
 | 
				
			||||||
 | 
					             multiTemplate   = 1;
 | 
				
			||||||
 | 
					             footerTemplate  = 2;
 | 
				
			||||||
 | 
					         }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					         // header is optional:
 | 
				
			||||||
 | 
					         if (headerTemplate != 0) {
 | 
				
			||||||
 | 
					             this->_templateList << headerTemplate;
 | 
				
			||||||
 | 
					         }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					         if (printingData.contains("multiplicator")) {
 | 
				
			||||||
 | 
					             multiplicatorInt = printingData["multiplicator"].toInt();
 | 
				
			||||||
 | 
					             for (int i = 1; i < multiplicatorInt; i++) {
 | 
				
			||||||
 | 
					                 this->_templateList << multiTemplate;
 | 
				
			||||||
 | 
					             }
 | 
				
			||||||
 | 
					             // last template:
 | 
				
			||||||
 | 
					             this->_templateList << footerTemplate;
 | 
				
			||||||
 | 
					         }
 | 
				
			||||||
 | 
					         else {
 | 
				
			||||||
 | 
					             this->_templateList = templateList;
 | 
				
			||||||
 | 
					         }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					         // DEBUG FOOD_STAMP:
 | 
				
			||||||
 | 
					         qCritical() << "     --> printingData[\"multiplicator\"]" << multiplicatorInt;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        break;
 | 
				
			||||||
 | 
					    default:
 | 
				
			||||||
 | 
					        this->_templateList = templateList;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // DEBUG
 | 
				
			||||||
 | 
					    QString templateListString;
 | 
				
			||||||
 | 
					    for (int i =0; i < this->_templateList.size(); ++i) {
 | 
				
			||||||
 | 
					        templateListString.append(QString(" %1").arg(this->_templateList.at(i)));
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    qCritical() << "     -> templates: " << templateListString;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return true;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void Ticket::clear()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    this->ticketVariant = TICKET_VARIANT::PARKING_TICKET;
 | 
				
			||||||
 | 
					    this->printingData.clear();
 | 
				
			||||||
 | 
					    this->_templateList.clear();
 | 
				
			||||||
 | 
					    this->errorCode.clear();
 | 
				
			||||||
 | 
					    this->errorDescription.clear();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    this->_hasTemplateDynData = false;
 | 
				
			||||||
 | 
					    this->dyn1List.clear();
 | 
				
			||||||
 | 
					    this->dyn1List.clear();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QString Ticket::getErrorCode()         {  return this->errorCode;        }
 | 
				
			||||||
 | 
					QString Ticket::getErrorDescription()  {  return this->errorDescription; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/**
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					QStringList Ticket::getDyn1List()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    return this->dyn1List;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QStringList Ticket::getDyn2List()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    return this->dyn2List;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QHash<QString, QVariant> & Ticket::getPrintingData()
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    return this->printingData;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/************************************************************************************************
 | 
				
			||||||
 | 
					 * operator
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					QDebug operator<<(QDebug debug, TICKET_VARIANT ticketVariant)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    switch (ticketVariant) {
 | 
				
			||||||
 | 
					        case TICKET_VARIANT::PARKING_TICKET:
 | 
				
			||||||
 | 
					            debug << "TICKET_VARIANT::PARKING_TICKET";
 | 
				
			||||||
 | 
					            break;
 | 
				
			||||||
 | 
					        case TICKET_VARIANT::RECEIPT:
 | 
				
			||||||
 | 
					            debug << "TICKET_VARIANT::RECEIPT";
 | 
				
			||||||
 | 
					            break;
 | 
				
			||||||
 | 
					        case TICKET_VARIANT::ERROR_RECEIPT:
 | 
				
			||||||
 | 
					            debug << "TICKET_VARIANT::ERROR_RECEIPT";
 | 
				
			||||||
 | 
					            break;
 | 
				
			||||||
 | 
					        case TICKET_VARIANT::START_RECEIPT:
 | 
				
			||||||
 | 
					            debug << "TICKET_VARIANT::START_RECEIPT";
 | 
				
			||||||
 | 
					            break;
 | 
				
			||||||
 | 
					        case TICKET_VARIANT::STOP_RECEIPT:
 | 
				
			||||||
 | 
					            debug << "TICKET_VARIANT::STOP_RECEIPT";
 | 
				
			||||||
 | 
					            break;
 | 
				
			||||||
 | 
					        case TICKET_VARIANT::FINE_PAYMENT:
 | 
				
			||||||
 | 
					            debug << "TICKET_VARIANT::FINE_PAYMENT";
 | 
				
			||||||
 | 
					            break;
 | 
				
			||||||
 | 
					        case TICKET_VARIANT::FOOD_STAMP:
 | 
				
			||||||
 | 
					            debug << "TICKET_VARIANT::FOOD_STAMP";
 | 
				
			||||||
 | 
					            break;
 | 
				
			||||||
 | 
					        case TICKET_VARIANT::FREE_TICKET:
 | 
				
			||||||
 | 
					            debug << "TICKET_VARIANT::FREE_TICKET";
 | 
				
			||||||
 | 
					            break;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return debug;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										88
									
								
								src/ATBAPP/support/Ticket.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										88
									
								
								src/ATBAPP/support/Ticket.h
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,88 @@
 | 
				
			|||||||
 | 
					#ifndef TICKET_H
 | 
				
			||||||
 | 
					#define TICKET_H
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QObject>
 | 
				
			||||||
 | 
					#include <QHash>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "../DeviceControllerInterface.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					using namespace nsDeviceControllerInterface;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QDebug operator<<(QDebug debug, TICKET_VARIANT ticketVariant);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class Ticket : public QObject
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    Q_OBJECT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					public:
 | 
				
			||||||
 | 
					    Ticket(TICKET_VARIANT ticketVariant, QObject *parent = nullptr);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    bool initNew(TICKET_VARIANT ticketVariant, const QList<quint8> & templateList, const QHash<QString, QVariant> & printingData);
 | 
				
			||||||
 | 
					    void clear();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    TICKET_VARIANT variant();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QList<quint8> * templateList();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * @brief getPrintingData - generic getter for printingData
 | 
				
			||||||
 | 
					     * Used mainly for simple tickets (single tickets e.g. ParkingTicket)
 | 
				
			||||||
 | 
					     * @return
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    QHash<QString, QVariant> & getPrintingData();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * @brief hasTemplateDynData
 | 
				
			||||||
 | 
					     * @return true, if ticket has dynamic data for each template.
 | 
				
			||||||
 | 
					     *
 | 
				
			||||||
 | 
					     * This depends on TICKET_VARIANT and printingData
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    bool hasTemplateDynData();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * @brief getDyn1List
 | 
				
			||||||
 | 
					     * contains dynamic template data
 | 
				
			||||||
 | 
					     * The size of the lists must be exactly the same as the number of templates.
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    QStringList getDyn1List();
 | 
				
			||||||
 | 
					    QStringList getDyn2List();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    quint8 getCurrentProcessedTemplateNumber();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * Mark current template as processed
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    void setCurrentTemplateProcessed();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // error handling
 | 
				
			||||||
 | 
					    QString getErrorCode();
 | 
				
			||||||
 | 
					    QString getErrorDescription();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					private:
 | 
				
			||||||
 | 
					    TICKET_VARIANT ticketVariant;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // printingData from application
 | 
				
			||||||
 | 
					    QHash<QString, QVariant> printingData;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // templateList, from .ini or created by ticketVariant...
 | 
				
			||||||
 | 
					    QList<quint8> _templateList;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    bool _hasTemplateDynData;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    quint8 currentProcessedTemplateNumber;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QStringList dyn1List;
 | 
				
			||||||
 | 
					    QStringList dyn2List;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // error handling
 | 
				
			||||||
 | 
					    QString errorCode;
 | 
				
			||||||
 | 
					    QString errorDescription;
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#endif // TICKET_H
 | 
				
			||||||
							
								
								
									
										26
									
								
								src/ATBAPP/support/TicketUtils.cpp
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										26
									
								
								src/ATBAPP/support/TicketUtils.cpp
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,26 @@
 | 
				
			|||||||
 | 
					#include "TicketUtils.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QLocale>
 | 
				
			||||||
 | 
					#include <QDate>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					TicketUtils::TicketUtils(QObject *parent) : QObject(parent)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QString TicketUtils::getLocaleDateString(const QLocale & qLocale, const QDate & qDate)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    QString dateString;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (qLocale.language() == QLocale::Lithuanian) {
 | 
				
			||||||
 | 
					        // QLocale::ShortFormat produces date string: "yyyy-mm-dd" ...
 | 
				
			||||||
 | 
					        // this is to long for the printer.
 | 
				
			||||||
 | 
					        dateString = qDate.toString("yy-MM-dd");
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    else {
 | 
				
			||||||
 | 
					        dateString = qLocale.toString(qDate, QLocale::ShortFormat);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return dateString;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
							
								
								
									
										34
									
								
								src/ATBAPP/support/TicketUtils.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										34
									
								
								src/ATBAPP/support/TicketUtils.h
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,34 @@
 | 
				
			|||||||
 | 
					#ifndef TICKETUTILS_H
 | 
				
			||||||
 | 
					#define TICKETUTILS_H
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <QObject>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class TicketUtils : public QObject
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    Q_OBJECT
 | 
				
			||||||
 | 
					public:
 | 
				
			||||||
 | 
					    explicit TicketUtils(QObject *parent = nullptr);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * @brief getLocaleDateString
 | 
				
			||||||
 | 
					     * @param qLocale
 | 
				
			||||||
 | 
					     * @param qDate
 | 
				
			||||||
 | 
					     * @return a localized date string short format
 | 
				
			||||||
 | 
					     *
 | 
				
			||||||
 | 
					     * Note QLocale::ShortFormat does not result to the
 | 
				
			||||||
 | 
					     * string we need for ticket printing therefore this
 | 
				
			||||||
 | 
					     * helper method was created.
 | 
				
			||||||
 | 
					     *
 | 
				
			||||||
 | 
					     * e.g. using Lithuanian (lt_LT) we get a date in short format:
 | 
				
			||||||
 | 
					     *      "2024-08-08" unfortunately this is to long, we need
 | 
				
			||||||
 | 
					     * the year with only two digits.
 | 
				
			||||||
 | 
					     * e.g. in German (de_DE) it is enought: "08.08.24"
 | 
				
			||||||
 | 
					     *
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    static QString getLocaleDateString(const QLocale &qLocale, const QDate &qDate);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					signals:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#endif // TICKETUTILS_H
 | 
				
			||||||
		Reference in New Issue
	
	Block a user