Merge branch 'pu/integration' into pu/accountRequest

This commit is contained in:
Siegfried Siegert 2023-06-19 16:41:08 +02:00
commit 18ff5d42a7
Signed by: SiegfriedSiegert
GPG Key ID: 68371E015E8F0B03

View File

@ -3,10 +3,7 @@
#include <QtPlugin>
#define THIS_IS_CA_MASTER
// undef for slvae
struct T_emp
{
@ -1327,6 +1324,7 @@ signals:
// getAllInsertedCoins() fixed, also in datif and storeINdata
// 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
//#define HWINF_iid "Atb.Psa2020.software.HWapi/3.1"
@ -1337,7 +1335,8 @@ signals:
//#define HWINF_iid "Atb.Psa1256ptu5.software.HWapi/3.6"
//#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.2"
//#define HWINF_iid "Atb.Psa1256ptu5.software.HWapi/4.2"
#define HWINF_iid "Atb.Psa1256ptu5.software.HWapi/4.3"