update to next version
This commit is contained in:
		@@ -128,13 +128,11 @@ struct T_vaultRecord
 | 
				
			|||||||
        uint32_t AbsReserve;
 | 
					        uint32_t AbsReserve;
 | 
				
			||||||
        uint32_t AbsNrOfCuts;
 | 
					        uint32_t AbsNrOfCuts;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
//16
 | 
					 | 
				
			||||||
        char label3buffer[4];	// mw >
 | 
					        char label3buffer[4];	// mw >
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        // Verkauf, Tuer zu:
 | 
					        // Verkauf, Tuer zu:
 | 
				
			||||||
        uint32_t VKcoinsInserted[16];		// nur fuer Wechsler, soviel wurde eingeworfen
 | 
					        uint32_t VKcoinsInserted[16];		// nur fuer Wechsler, soviel wurde eingeworfen
 | 
				
			||||||
        uint32_t VKcoinsReturned[6];		// nur fuer Wechsler, Anzahl Muenzen pro Typ, soviel wurde zurueckgegeben
 | 
					        uint32_t VKcoinsReturned[6];		// nur fuer Wechsler, Anzahl Muenzen pro Typ, soviel wurde zurueckgegeben
 | 
				
			||||||
//88
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
        // Service, Tuer offen:
 | 
					        // Service, Tuer offen:
 | 
				
			||||||
        uint16_t ServCoinsInserted[16];		// nur fuer Wechsler, soviel wurde eingeworfen
 | 
					        uint16_t ServCoinsInserted[16];		// nur fuer Wechsler, soviel wurde eingeworfen
 | 
				
			||||||
@@ -144,12 +142,10 @@ struct T_vaultRecord
 | 
				
			|||||||
        uint16_t currentTubeContent[6];		//  nur fuer Wechsler, aktueller Fuellstand
 | 
					        uint16_t currentTubeContent[6];		//  nur fuer Wechsler, aktueller Fuellstand
 | 
				
			||||||
        uint16_t resint5;
 | 
					        uint16_t resint5;
 | 
				
			||||||
        uint16_t resint6;
 | 
					        uint16_t resint6;
 | 
				
			||||||
// 56
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
        char label4buffer[4];	// box>
 | 
					        char label4buffer[4];	// box>
 | 
				
			||||||
        uint16_t coinsInVault[16];
 | 
					        uint16_t coinsInVault[16];
 | 
				
			||||||
        uint16_t billsInStacker[8];
 | 
					        uint16_t billsInStacker[8];
 | 
				
			||||||
// 48
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
        char label5buffer[4];	// val>
 | 
					        char label5buffer[4];	// val>
 | 
				
			||||||
        // actually constant unless exchange rate is changed
 | 
					        // actually constant unless exchange rate is changed
 | 
				
			||||||
@@ -159,11 +155,17 @@ struct T_vaultRecord
 | 
				
			|||||||
        uint16_t exchangeRate;
 | 
					        uint16_t exchangeRate;
 | 
				
			||||||
        uint16_t resint9;
 | 
					        uint16_t resint9;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// 64
 | 
					        // new from 1.8.23
 | 
				
			||||||
 | 
					        uint32_t cutsSinceCBchange;
 | 
				
			||||||
 | 
					        uint32_t CBcontent_cent;
 | 
				
			||||||
 | 
					        uint32_t CBnrofCoins;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        char endofblock[4];	// end>
 | 
					        char endofblock[4];	// end
 | 
				
			||||||
 | 
					// 332 bytes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// 316 byte Block im Speicher
 | 
					        uint16_t CRC16;     // Xmodem16 from startbuffer[0] to endofblock[3]
 | 
				
			||||||
 | 
					        uint16_t resint11;
 | 
				
			||||||
 | 
					        char  endofRecord[4];	// ----
 | 
				
			||||||
 | 
					
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -317,7 +319,8 @@ struct T_devices
 | 
				
			|||||||
    UCHAR   kindOfPrinter;			// 0:off   1:Gebe
 | 
					    UCHAR   kindOfPrinter;			// 0:off   1:Gebe
 | 
				
			||||||
    UCHAR	kindOfCoinChecker;		// 0: without  1=EMP820   2=EMP900    3=currenza Csquare  (MW)
 | 
					    UCHAR	kindOfCoinChecker;		// 0: without  1=EMP820   2=EMP900    3=currenza Csquare  (MW)
 | 
				
			||||||
    UCHAR	kindOfMifareReader;		// by now only stronglink SL025 =1
 | 
					    UCHAR	kindOfMifareReader;		// by now only stronglink SL025 =1
 | 
				
			||||||
    UCHAR   suppressSleepMode;		// 0:sleep allowed   1: no sleep
 | 
					    UCHAR   solarPower;             // 1:sleep allowed   0: no sleep
 | 
				
			||||||
 | 
					    //UCHAR   suppressSleepMode;	// 0:sleep allowed   1: no sleep
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    UCHAR	kindOfModem;			// 0:off    1:Sunlink
 | 
					    UCHAR	kindOfModem;			// 0:off    1:Sunlink
 | 
				
			||||||
    UCHAR	kindOfCreditcard;		// 0:off    1:Feig NFC
 | 
					    UCHAR	kindOfCreditcard;		// 0:off    1:Feig NFC
 | 
				
			||||||
@@ -336,6 +339,8 @@ struct T_devices
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    UINT	VaultFullWarnLevel;
 | 
					    UINT	VaultFullWarnLevel;
 | 
				
			||||||
    UINT	VaultFullErrorLevel;
 | 
					    UINT	VaultFullErrorLevel;
 | 
				
			||||||
 | 
					    UINT    BattEmptyWarnLevel;
 | 
				
			||||||
 | 
					    UINT    BattEmptyErrorLevel;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -1151,14 +1156,13 @@ public:
 | 
				
			|||||||
        // to be forwarded to Ismas
 | 
					        // to be forwarded to Ismas
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    virtual bool prn_printAccountReceipt(void) const =0;
 | 
					    virtual bool prn_printAccountReceipt(void) const =0;
 | 
				
			||||||
 | 
					        // print all 8 backuped accounting receipts
 | 
				
			||||||
        // return true if sending to DC OK, false if cmd-stack is full
 | 
					        // return true if sending to DC OK, false if cmd-stack is full
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    virtual bool prn_printTestTicket(void) const =0;
 | 
					    virtual bool prn_printTestTicket(void) const =0;
 | 
				
			||||||
        // return true if sending to DC OK, false if cmd-stack is full
 | 
					        // return true if sending to DC OK, false if cmd-stack is full
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    virtual bool cash_startPayment(uint32_t amount) const =0;
 | 
					    virtual bool cash_startPayment(uint32_t amount) const =0;
 | 
				
			||||||
        // 17.4.23TS: extended to 32bit
 | 
					        // 17.4.23TS: extended to 32bit
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -1273,7 +1277,7 @@ public:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    virtual uint16_t log_getLatestAccountNumber(void) const=0;
 | 
					    virtual uint16_t log_getLatestAccountNumber(void) const=0;
 | 
				
			||||||
    // new function 27.6.2023
 | 
					    // new function 27.6.2023
 | 
				
			||||||
    // latest = highest
 | 
					    // latest = highest of the backup's
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    virtual uint8_t log_getAvailableVaultBlocks(void) const=0;
 | 
					    virtual uint8_t log_getAvailableVaultBlocks(void) const=0;
 | 
				
			||||||
        // return 0x0011 1111 if all 6 blocks are loaded (one bit per block)
 | 
					        // return 0x0011 1111 if all 6 blocks are loaded (one bit per block)
 | 
				
			||||||
@@ -1297,7 +1301,45 @@ public:
 | 
				
			|||||||
        // 2: done and error
 | 
					        // 2: done and error
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    virtual bool log_getVaultData(uint8_t *data) const =0;
 | 
					    virtual bool log_getVaultData(uint8_t *data) const =0;
 | 
				
			||||||
        // get vault record in linear 8bit buffer with 320 byte
 | 
					        // get vault record in linear 8bit buffer with 384 byte
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // new from 1.8.23
 | 
				
			||||||
 | 
					    virtual bool prn_printOneAccountReceipt(uint16_t accountNr) const =0;
 | 
				
			||||||
 | 
					        // print one out of eight stored last accounting receipts
 | 
				
			||||||
 | 
					        // function log_getHoldAccountNumbers() gives a list of acc-Nr. of the stored receipts
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    virtual bool prn_printAllAvailAccountReceipts(void) const =0;
 | 
				
			||||||
 | 
					        // same as: prn_printAccountReceipt() from line 1153
 | 
				
			||||||
 | 
					        // return true if sending to DC OK, false if cmd-stack is full
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    virtual bool log_verifyVaultRecordByCrc(void) const =0;
 | 
				
			||||||
 | 
					        // return true if CRC16 is correct, data are 100% OK. Security level 1:65536
 | 
				
			||||||
 | 
					        // verification is strongly recommended before further processing
 | 
				
			||||||
 | 
					        // in case of "false"-result please reload from DC
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    virtual uint16_t log_DC_getNextAccountNumber(void) const=0;
 | 
				
			||||||
 | 
					        // the current cash box content will be backuped with this number on next cashbox-change
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    virtual void log_DC_setNextAccountNumber(uint16_t newAccountingNumber) const=0;
 | 
				
			||||||
 | 
					        // the current cash box content will be backuped with this number on next cashbox-change
 | 
				
			||||||
 | 
					        // use only in case of hardware replacements or errors which derailed the number
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    virtual void log_DC_deleteAllVaultrecordsInDc(void) const=0;
 | 
				
			||||||
 | 
					        // use only in case of hardware replacements or errors which derailed the number
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    virtual void log_DC_deleteAllTotalCounters(void) const=0;
 | 
				
			||||||
 | 
					        // use only in case of hardware replacements or errors which derailed the number
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    virtual void dc_setNewCustomerNumber(uint16_t newCustNr) const =0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    virtual void dc_setNewMachineNumber(uint16_t newMachNr) const =0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    virtual void dc_setNewBorough(uint16_t newBorough) const =0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    virtual void dc_setNewZone(uint16_t newZone) const =0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -1356,6 +1398,10 @@ signals:
 | 
				
			|||||||
// 15.06.2023 V4.2  bring into same order as hwapi in order to set the THIS_IS_CA_MASTER correct
 | 
					// 15.06.2023 V4.2  bring into same order as hwapi in order to set the THIS_IS_CA_MASTER correct
 | 
				
			||||||
// 19.06.2023 V4.3  added some qCriticals to see emits
 | 
					// 19.06.2023 V4.3  added some qCriticals to see emits
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					// 01.08.2023 V4.4  some new values at the end of struct T_vaultRecord
 | 
				
			||||||
 | 
					//                  two more values in struct T_devices
 | 
				
			||||||
 | 
					//                  7 new functions at the end of the file
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
//#define HWINF_iid "Atb.Psa2020.software.HWapi/3.1"
 | 
					//#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.1"
 | 
				
			||||||
@@ -1366,7 +1412,8 @@ signals:
 | 
				
			|||||||
//#define HWINF_iid "Atb.Psa1256ptu5.software.HWapi/4.0"
 | 
					//#define HWINF_iid "Atb.Psa1256ptu5.software.HWapi/4.0"
 | 
				
			||||||
//#define HWINF_iid "Atb.Psa1256ptu5.software.HWapi/4.1"
 | 
					//#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.2"
 | 
				
			||||||
#define HWINF_iid "Atb.Psa1256ptu5.software.HWapi/4.3"
 | 
					//#define HWINF_iid "Atb.Psa1256ptu5.software.HWapi/4.3"
 | 
				
			||||||
 | 
					#define HWINF_iid "Atb.Psa1256ptu5.software.HWapi/4.4"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user