From 87a6ed0795e22f2b9ba79d102839c415d9c463ed Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 18 Apr 2023 13:38:07 +0200 Subject: [PATCH] Include changes of Thomas for version 3.5. virtual bool cash_startPayment(uint32_t amount) const=0; // 17.4.23TS: extended to 32bit virtual uint8_t prn_getPrintResult() const=0; // in case of print-error get detailed error: virtual uint8_t prn_getCurrentPrinterState() const=0; // 0: printer OK // bit0: near paper end bit1: no paper // bit2: temperature error bit3: error head open // bit4: paper jam in cutter // bit6: no response bit7: serial rec. error // bit5: printer not ready signals: virtual void hwapi_templatePrintFinished_OK(void) const=0; virtual void hwapi_templatePrintFinished_Err(void) const=0; virtual void hwapi_gotNewCoin(void) const=0; virtual void hwapi_vendStopByMax(void) const=0; virtual void hwapi_vendStopByPushbutton(void) const=0; --- include/interfaces.h | 39 ++++++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/include/interfaces.h b/include/interfaces.h index c1794e5..774d3d6 100644 --- a/include/interfaces.h +++ b/include/interfaces.h @@ -241,7 +241,19 @@ struct T_dynamicCondition char jsonValid_serial; char jsonValid_time; char lastFileType; - +// 44 + uint8_t MifCardHolder[8]; + uint8_t resultOfLastTemplPrint; + // 0: unknown or printing in progress + // 1: OK, doc was printed 2: error, doc was not printed + uint8_t lastPrinterStatus; + // 0: printer OK + // bit0: near paper end bit1: no paper + // bit2: temperature error bit3: error head open + // bit4: paper jam in cutter + // bit6: no response bit7: serial rec. error + // bit5: printer not ready +//54 }; struct T_extTime @@ -1432,7 +1444,8 @@ public: virtual bool prn_printTestTicket(void) const=0; // return true if sending to DC OK, false if cmd-stack is full - virtual bool cash_startPayment(uint16_t amount) const=0; + virtual bool cash_startPayment(uint32_t amount) const=0; + // 17.4.23TS: extended to 32bit virtual uint32_t getInsertedAmount(void) const=0; @@ -1463,7 +1476,6 @@ public: virtual uint64_t sys_getWakeSource(void) const =0; // retval: 6 bytes, bit coded, 1=event keeps DC awake - //virtual void sys_getDeviceConditions(struct T_moduleCondition *devCond) const=0; virtual void sys_getDeviceConditions(uint8_t *leng, uint8_t *data) const=0; /* @@ -1501,7 +1513,6 @@ public: */ virtual void sys_getDeviceConditions(struct T_moduleCondition *devCond) const=0; - //virtual void sys_getDynMachineConditions(struct T_dynamicCondition *dynMachCond) const=0; virtual void sys_getDynMachineConditions(uint8_t *leng, uint8_t *data) const=0; /* @@ -1575,6 +1586,23 @@ public: virtual uint16_t cash_getNrCoinsInVault(void) const=0; + virtual uint8_t prn_getPrintResult() const=0; + + // in case of print-error get detailed error: + virtual uint8_t prn_getCurrentPrinterState() const=0; + // 0: printer OK + // bit0: near paper end bit1: no paper + // bit2: temperature error bit3: error head open + // bit4: paper jam in cutter + // bit6: no response bit7: serial rec. error + // bit5: printer not ready + +signals: + virtual void hwapi_templatePrintFinished_OK(void) const=0; + virtual void hwapi_templatePrintFinished_Err(void) const=0; + virtual void hwapi_gotNewCoin(void) const=0; + virtual void hwapi_vendStopByMax(void) const=0; + virtual void hwapi_vendStopByPushbutton(void) const=0; }; @@ -1599,7 +1627,8 @@ public: //#define HWINF_iid "Atb.Psa2020.software.HWapi/3.1" //#define HWINF_iid "Atb.Psa1256ptu5.software.HWapi/3.1" //#define HWINF_iid "Atb.Psa1256ptu5.software.HWapi/3.3" -#define HWINF_iid "Atb.Psa1256ptu5.software.HWapi/3.4" +//#define HWINF_iid "Atb.Psa1256ptu5.software.HWapi/3.4" +#define HWINF_iid "Atb.Psa1256ptu5.software.HWapi/3.5"