diff --git a/include/hwapi.h b/include/hwapi.h index 23235bd..9175d84 100644 --- a/include/hwapi.h +++ b/include/hwapi.h @@ -100,6 +100,8 @@ class hwapi : public QObject, Q_OBJECT Q_PLUGIN_METADATA(IID "Atb.Psa2020.software.HWapi/1.0" ) //FILE "HWapi.json") Q_INTERFACES(hwinf) +private: + void sub_storeSendingText(QByteArray *buf) const; DownloadResult sendNextAddress(int bNum) const; DownloadResult sendNextDataBlock(QByteArray const &b, int bNum) const; @@ -992,19 +994,6 @@ public: // uint16_t borough, uint16_t zone, // uint16_t alias, char *location) const override; - /* - uint8_t emp_getInsertedCoinSignal(void) const override; - // can be called one time after each coin - // emp_chkIfCoinInserted() must be called before! - - uint16_t emp_getInsertedCoinValue(void) const override; - // can be called one time after each coin - // emp_chkIfCoinInserted() must be called before! - - uint8_t emp_getCoinError(void) const override; - // can be called one time after each coin - // emp_chkIfCoinInserted() must be called before! - */ bool rtc_setTimeDateDirect(struct Trtc_DateTime *DateTime) const override; // return true if successful. could fail if more the 8 commands are waiting @@ -1056,7 +1045,8 @@ public: bool prn_printTestTicket(void) const override; // return true if sending to DC OK, false if cmd-stack is full - bool cash_startPayment(uint16_t amount) const override; + bool cash_startPayment(uint32_t amount) const override; + // 17.4.23TS: extended to 32bit bool cash_cancelPayment(void) const override; // and return coins @@ -1091,7 +1081,6 @@ public: uint64_t sys_getWakeSource(void) const override; // retval: 6 bytes, bit coded, 1=event keeps DC awake - //void sys_getDeviceConditions(struct T_moduleCondition *devCond) const override; void sys_getDeviceConditions(uint8_t *leng, uint8_t *data) const override; void sys_getDeviceConditions(struct T_moduleCondition *devCond) const override; @@ -1104,16 +1093,28 @@ public: uint16_t cash_getNrCoinsInVault(void) const override; + uint8_t prn_getPrintResult() const override; + + uint8_t prn_getCurrentPrinterState() const override; + // 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: + void hwapi_templatePrintFinished_OK(void) const override; + void hwapi_templatePrintFinished_Err(void) const override; + void hwapi_gotNewCoin(void) const override; + void hwapi_vendStopByMax(void) const override; + void hwapi_vendStopByPushbutton(void) const override; -private: - void sub_storeSendingText(QByteArray *buf) const; - - - - - + private slots: + void hwapi_slotPrintFinished_OK(void); + void hwapi_slotPrintFinished_Err(void); + void hwapi_slotGotCoin(void); };