Added m_sharedMem.
Added cash_getAmountInVault. Added cash_getNrCoinsInVault. Added sys_getDynMachineConditions() with new interface. Added sys_getDeviceConditions() with new interface. Added log_chkIfVaultRecordAvailable().
This commit is contained in:
		@@ -93,8 +93,7 @@ Level 3): send command: "start payment process"
 | 
			
		||||
#include "interfaces.h"
 | 
			
		||||
#include "datIf.h"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class QSharedMemory;
 | 
			
		||||
class hwapi :   public QObject,
 | 
			
		||||
                public hwinf
 | 
			
		||||
{
 | 
			
		||||
@@ -114,8 +113,11 @@ class hwapi :   public QObject,
 | 
			
		||||
    bool resetDeviceController() const;
 | 
			
		||||
    QByteArray loadBinaryDCFile(QString filename) const;
 | 
			
		||||
    bool downloadBinaryToDC(QString const &bFile) const;
 | 
			
		||||
 | 
			
		||||
    QSharedMemory *m_sharedMem;
 | 
			
		||||
public:
 | 
			
		||||
    explicit hwapi(QWidget *parent = nullptr);
 | 
			
		||||
    virtual ~hwapi();
 | 
			
		||||
 | 
			
		||||
    T_datif *myDatif;
 | 
			
		||||
 | 
			
		||||
@@ -1008,6 +1010,7 @@ public:
 | 
			
		||||
        // return true if successful. could fail if more the 8 commands are waiting
 | 
			
		||||
 | 
			
		||||
    bool rtc_getExtendedTime(uint8_t *leng, uint8_t *data) const override;
 | 
			
		||||
    bool rtc_getExtendedTime(struct T_extTime *exTime) const override;
 | 
			
		||||
 | 
			
		||||
    bool sys_runCompleteTest(void) const override;
 | 
			
		||||
        // warning: lasts 20s in one pace
 | 
			
		||||
@@ -1032,15 +1035,18 @@ public:
 | 
			
		||||
        // nr = 1..32
 | 
			
		||||
        // return true if sending, false if cmd-stack is full
 | 
			
		||||
 | 
			
		||||
    void log_getHoldAccountNumbers(uint32_t *accNr ) const override;
 | 
			
		||||
        // returns all acc nrs of the backuped vault records
 | 
			
		||||
        // use: uint32_t backupedAccNumbers[8]
 | 
			
		||||
    void log_getHoldAccountNumbers(uint8_t *nrOfVals, uint16_t *accNr ) const override;
 | 
			
		||||
    // returns all acc nrs of the backuped vault records
 | 
			
		||||
    // use: uint16_t backupedAccNumbers[8]
 | 
			
		||||
 | 
			
		||||
    bool log_selectVaultRecord(uint16_t accountNr ) const override;
 | 
			
		||||
        // return true if sending, false if cmd-stack is full
 | 
			
		||||
        // and trigger transfer
 | 
			
		||||
 | 
			
		||||
//request, isAvailable
 | 
			
		||||
    void log_getVaultRecord(struct T_vaultRecord *retVR) const override;
 | 
			
		||||
    bool log_chkIfVaultRecordAvailable(void) const override;
 | 
			
		||||
        // return true if completly received
 | 
			
		||||
 | 
			
		||||
    bool log_getVaultRecord(struct T_vaultRecord *retVR) const override;
 | 
			
		||||
        // which was selected by: log_selectVaultRecord()
 | 
			
		||||
        // to be forwarded to Ismas
 | 
			
		||||
 | 
			
		||||
@@ -1078,7 +1084,7 @@ public:
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    uint8_t mif_getCardType(QString cardholder) const override;
 | 
			
		||||
    uint8_t mif_getCardType(QString *cardholder) const override;
 | 
			
		||||
        // return 1,2,3,4 = upper, lower access card, printer test, coin test
 | 
			
		||||
        // cardholder: 7byte Name-String
 | 
			
		||||
 | 
			
		||||
@@ -1088,9 +1094,15 @@ public:
 | 
			
		||||
    //void sys_getDeviceConditions(struct T_moduleCondition *devCond) const override;
 | 
			
		||||
    void sys_getDeviceConditions(uint8_t *leng, uint8_t *data) const override;
 | 
			
		||||
 | 
			
		||||
    //void sys_getDynMachineConditions(struct T_dynamicCondition *dynMachCond) const override;
 | 
			
		||||
    void sys_getDynMachineConditions(uint8_t *leng, uint8_t *data) const override;
 | 
			
		||||
    void sys_getDeviceConditions(struct T_moduleCondition *devCond) const override;
 | 
			
		||||
 | 
			
		||||
    void sys_getDynMachineConditions(uint8_t *leng, uint8_t *data) const override;
 | 
			
		||||
    void sys_getDynMachineConditions(struct T_dynamicCondition *dynMachCond) const override;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    uint32_t cash_getAmountInVault(void) const override;
 | 
			
		||||
 | 
			
		||||
    uint16_t cash_getNrCoinsInVault(void) const override;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user