Print: set font on bank-receipt

include/interfaces.h

@@ -193,7 +193,7 @@ struct T_moduleCondition
         uint8_t	coinChecker;		// EMP, OMP or mei-cashflow
 
         uint8_t	coinEscrow;
-        uint8_t	mifareReader;       // 0: unknown  1=OK  200=no response  201=wrong response   202: Reader reports HW-error
+        uint8_t	mifareReader;
         uint8_t	creditTerm;
         uint8_t	coinReject;
 
@@ -818,7 +818,7 @@ public:
 // --------------------------------------------- MIFARE -----------------------------------------------------
 // ----------------------------------------------------------------------------------------------------------
 
-// obsolete
+
     virtual uint8_t mif_returnReaderStateAndCardType(uint8_t *buf, uint8_t maxBufferSize) const =0;
         // retval 0=OK 1=error host buffer too small
     /* data description, new fast version:
@@ -840,16 +840,13 @@ public:
     virtual bool mif_readerIsOK(void) const =0;
 
     virtual bool mif_cardAttached(void) const =0;
-        // not working! use mif_cardIsAttached() instead
 
     virtual uint8_t mif_readResult(void) const =0;
         // result: 0: unknown or still in progress
         //         1: card read successful
         //         2: reading error
-        // not working!
 
     virtual QString mif_cardUID(void) const =0;
-        // not working
 
     virtual uint8_t mif_getCardDataDec(uint8_t blkNr, uint8_t *buf, uint8_t maxBufferSize) const =0;
 
@@ -1292,7 +1289,7 @@ public:
         // 1= wrong length    2=wrong start sign           5= wrong crc
         // 6= slave: master cmd was wrong       7: slave: could not write/read data
         // 8=timeout, got no response from slave
-        // 0,8 work, 1..6 not yet tested. 8 comes immed. and stays 8 until reconnect
+
 
     // use for important and extended commands (print several templates, print ticket...)
     virtual void log_startSupervision(void) const =0;
@@ -1302,7 +1299,6 @@ public:
         // 0: started, in progress
         // 1: done and OK
         // 2: done and error
-        // not working properly, always 0
 
     virtual bool log_getVaultData(uint8_t *data) const =0;
         // get vault record in linear 8bit buffer with 384 byte
@@ -1347,37 +1343,6 @@ public:
 
 
 
-    // new functions from 8.9.23
-    virtual QString mif_getReaderType(void) const =0;
-        // return "SL025" if correct reader is connected
-
-    virtual void mif_getCardSize(uint8_t *cardSize, uint8_t *idLeng) const =0;
-        // cardSize=1k or 4kByte
-        // idLeng =4Byte or 7 byte
-
-    virtual char mif_getAtbCardData(uint8_t *buf, uint8_t maxBuffSiz) const =0;
-        // return complete buffer binary, just for test purpose
-
-    virtual bool mif_isValidAtbCard(void) const =0;
-
-    virtual uint32_t mif_getAtbCardCuNu(void) const =0;
-
-    virtual uint8_t mif_getAtbCardTyp(void) const =0;
-        // return 1=upper door card     1=lower door    3=printer-test   4=coin-test
-        //          0: not a valid atb2020 card
-
-    virtual QString mif_getAtbCardPerso(void) const =0;
-        // e.g. "PNsax001" used for personal number, name shortcode, card number
-        // free to use, can be set in AtbMcw23.exe tool
-
-    virtual void mif_getAtbCardExpire(uint8_t *year, uint8_t *month, uint8_t *day, uint8_t *hour, uint8_t *minute) const =0;
-
-
-
-
-
-
-
 signals:
     virtual void hwapi_templatePrintFinished_OK(void) const=0;
     virtual void hwapi_templatePrintFinished_Err(void) const=0;
@@ -1448,15 +1413,9 @@ signals:
 //#define HWINF_iid "Atb.Psa1256ptu5.software.HWapi/4.1"
 //#define HWINF_iid "Atb.Psa1256ptu5.software.HWapi/4.2"
 //#define HWINF_iid "Atb.Psa1256ptu5.software.HWapi/4.3"
-//#define HWINF_iid "Atb.Psa1256ptu5.software.HWapi/4.4"
-    // 8.9.2023 two new functions (end of file) for mifare test
-//#define HWINF_iid "Atb.Psa1256ptu5.software.HWapi/4.5"
-    // 18.9.2023 major improvements for DC data exchange
-    // verification of door and cash box signals
-    // intensive verification of Json-Programming Master-Slave (PTU to DC), 100% ok
+#define HWINF_iid "Atb.Psa1256ptu5.software.HWapi/4.4"
+
 
-#define HWINF_iid "Atb.Psa1256ptu5.software.HWapi/4.6"
-    // 20.9.2023: speeding up door and cash box signals
 
 
 Q_DECLARE_INTERFACE(hwinf, HWINF_iid)

src/ATBAPP/ATBDeviceControllerPlugin.cpp

@@ -362,7 +362,7 @@ void ATBDeviceControllerPlugin::onVaultDoorOpened()
     // this is started here because we want to keep ptu awake in order to get
     // coin box removed / inserted etc.
     // BackgroundTask("ACCOUNT") is finished, if account message is sent to ISMAS!
-    this->dbus->startBackgroundTask("DOOR_OPEN");
+    this->dbus->startBackgroundTask("ACCOUNT");
 
     // do not: emit this->requestModeSERVICE();
 }
@@ -371,9 +371,6 @@ void ATBDeviceControllerPlugin::onCoinBoxRemoved()
 {
     qCritical() << "ATBDeviceControllerPlugin::onCoinBoxRemoved()";
 
-    // BackgroundTask("ACCOUNT") is finished, if account message is sent to ISMAS!
-    this->dbus->startBackgroundTask("ACCOUNT");
-
     QTimer::singleShot(4000, this, SLOT(private_startAccount()));
 }
 
@@ -382,31 +379,19 @@ void ATBDeviceControllerPlugin::onCoinBoxInserted()
     qCritical() << "ATBDeviceControllerPlugin::onCoinBoxInserted()";
 }
 
-/**
- * This is called, when all CoinBox is inserted and all doors
- * are closed.
- */
 void ATBDeviceControllerPlugin::onCBinAndAllDoorsClosed()
 {
     qCritical() << "ATBDeviceControllerPlugin::onCBinAndAllDoorsClosed()";
 
     QTimer::singleShot(2000, this, SIGNAL(requestModeIDLE()));
-
-    this->dbus->finishedBackgroundTask("DOOR_OPEN");
 }
 
-/**
- *  This is called, when all no coinbox is inserted and all doors are
- *  closed.
- */
+
 void ATBDeviceControllerPlugin::onAllDoorsClosed()
 {
     qCritical() << "ATBDeviceControllerPlugin::onAllDoorsClosed()";
 
     emit this->requestModeIDLE();
-    this->dbus->finishedBackgroundTask("DOOR_OPEN");
-
-    // TODO: check for errors and create a machine event
 }
 
 void ATBDeviceControllerPlugin::onNewVoltage(uint32_t voltage)
@@ -556,6 +541,7 @@ void ATBDeviceControllerPlugin::requestPrintReceipt(const QString & printingStri
 {
     QByteArray ba = printingString.toUtf8();
     hw->prn_switchPower(true);
+    hw->prn_setFonts(8,12,0,0);
     hw->prn_sendText(&ba);
     QTimer::singleShot(4000, this, SLOT(onPrinterWaitForPrintingReceipt()));