From e5f6405a191197edf9dae7cbf06220d9b325845f Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Thu, 21 Sep 2023 16:04:50 +0200 Subject: [PATCH] Update HWapi/4.6 (interfaces.h) --- include/interfaces.h | 51 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 46 insertions(+), 5 deletions(-) diff --git a/include/interfaces.h b/include/interfaces.h index d9f31b6..15462a8 100755 --- a/include/interfaces.h +++ b/include/interfaces.h @@ -193,7 +193,7 @@ struct T_moduleCondition uint8_t coinChecker; // EMP, OMP or mei-cashflow uint8_t coinEscrow; - uint8_t mifareReader; + uint8_t mifareReader; // 0: unknown 1=OK 200=no response 201=wrong response 202: Reader reports HW-error 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,13 +840,16 @@ 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; @@ -1289,7 +1292,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; @@ -1299,6 +1302,7 @@ 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 @@ -1343,6 +1347,37 @@ 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; @@ -1413,9 +1448,15 @@ 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" - +//#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.6" + // 20.9.2023: speeding up door and cash box signals Q_DECLARE_INTERFACE(hwinf, HWINF_iid)