DCLibraries.pri

@@ -81,23 +81,29 @@ contains( CONFIG, PTU5_YOCTO ) {
 }
 
 HEADERS += \
+    $${PWD}/include/com.h \
     $${PWD}/include/datei.h \
     $${PWD}/include/runProc.h \
     $${PWD}/include/controlBus.h \
+    $${PWD}/include/datIf.h \
     $${PWD}/include/dcBL.h \
     $${PWD}/include/hwapi.h \
     $${PWD}/include/interfaces.h \
+    $${PWD}/include/prot.h \
     $${PWD}/include/sendWRcmd.h \
     $${PWD}/include/storeINdata.h \
     $${PWD}/include/tslib.h \
     $${PWD}/include/shared_mem_buffer.h
 
 SOURCES += \
+    $${PWD}/src/com.cpp \
     $${PWD}/src/datei.cpp \
     $${PWD}/src/runProc.cpp \
     $${PWD}/src/controlBus.cpp \
+    $${PWD}/src/datIf.cpp \
     $${PWD}/src/dcBL.cpp \
     $${PWD}/src/hwapi.cpp \
+    $${PWD}/src/prot.cpp \
     $${PWD}/src/sendWRcmd.cpp \
     $${PWD}/src/storeINdata.cpp \
     $${PWD}/src/tslib.cpp \

DCLibraries.pro

@@ -5,3 +5,9 @@ SUBDIRS = lib_ca_master lib_ca_slave CArunGUI dCArun
 
 CArunGUI.depends = lib_ca_master lib_ca_slave
 dCArun.depends = lib_ca_master lib_ca_slave
+
+TEMPLATE = lib
+INCLUDEPATH += $${PWD}/plugins
+INCLUDEPATH += $${PWD}/include
+QT -= gui
+QT += widgets serialport

lib_ca_master/lib_ca_master.pro

@@ -2,20 +2,10 @@ TEMPLATE = lib
 TARGET = CAmaster
 VERSION="1.0.0"
 
-HEADERS += \
-    ../include/com.h \
-    ../include/datIf.h \
-    ../include/prot.h
-
-SOURCES += \
-    ../src/com.cpp \
-    ../src/datIf.cpp \
-    ../src/prot.cpp
-
 include(../DCLibraries.pri)
 
-
 DEFINES+=THIS_IS_CA_MASTER
+DEFINES-=THIS_IS_CA_SLAVE
 DESTDIR=$${_PRO_FILE_PWD_}/../build
 
 unix {

lib_ca_slave/lib_ca_slave.pro

@@ -4,6 +4,15 @@ VERSION="1.0.0"
 
 include(../DCLibraries.pri)
 
+HEADERS -= $$PWD/include/com.h \
+	$$PWD/include/datIf.h \
+	$$PWD/include/prot.h
+
+SOURCES -= \
+    $${PWD}/src/datIf.cpp \
+    $${PWD}/src/prot.cpp \
+	$${PWD}/src/com.cpp
+    
 DEFINES+=THIS_IS_CA_SLAVE
 DESTDIR=$${_PRO_FILE_PWD_}/../build
 

src/hwapi.cpp

@@ -56,9 +56,7 @@ hwapi::hwapi(QWidget *parent) : QObject(parent)
 
         myDatif = new T_datif();    // für die  CAslave-Lib auskommentieren!
 
-#endif
+#else
-
-#ifdef THIS_IS_CA_SLAVE
 
 #ifdef THIS_IS_CA_MASTER
 #error "MASTER LIB COMPILED INTO MASTER"
@@ -1794,8 +1792,6 @@ void hwapi::prn_sendText(QByteArray *buf) const
     uint16_t nn, pp, mm, leng_byt, leng_blk, llb, freeStak;
     uint8_t  tmp66[66];
 
-    qCritical() << __PRETTY_FUNCTION__ << "RESET DC DATA VALID";
-
     epi_clearDynMachineConditions();    // 24.6.23
     gpi_storeDcDataValid(0);
 
@@ -2900,8 +2896,6 @@ bool hwapi::prn_printTemplate(uint8_t nrOftemplate) const
 {
     // return true if sending, false if cmd-stack is full
 
-    qCritical() << __PRETTY_FUNCTION__ << "RESET DC DATA VALID";
-
     epi_clearDynMachineConditions();    // 24.6.23
     gpi_storeDcDataValid(0);
 
@@ -3006,8 +3000,6 @@ bool hwapi::log_getVaultRecord(struct T_vaultRecord *retVR) const
 
 bool hwapi::prn_printAccountReceipt(void) const
 {
-    qCritical() << __PRETTY_FUNCTION__ << "RESET DC DATA VALID";
-
     epi_clearDynMachineConditions();    // 24.6.23
     gpi_storeDcDataValid(0);
     return sendFDcmd_set(154, 0,0, 0,0,0,0);
@@ -3015,8 +3007,6 @@ bool hwapi::prn_printAccountReceipt(void) const
 
 bool hwapi::prn_printTestTicket(void) const
 {
-    qCritical() << __PRETTY_FUNCTION__ << "RESET DC DATA VALID";
-
     // return true if sending to DC OK, false if cmd-stack is full
     epi_clearDynMachineConditions();    // 24.6.23
     gpi_storeDcDataValid(0);
@@ -3446,8 +3436,6 @@ bool hwapi::prn_printKombiticket(uint8_t nrOfKombi) const
     if ((nrOfKombi<1) || (nrOfKombi>8))
         return false;
 
-    qCritical() << __PRETTY_FUNCTION__ << "RESET DC DATA VALID";
-
     epi_clearDynMachineConditions();    // 24.6.23
     gpi_storeDcDataValid(0);
 
@@ -3578,8 +3566,6 @@ bool hwapi::log_getVaultData(uint8_t *data) const
 // new from 1.8.23
 bool hwapi::prn_printOneAccountReceipt(uint16_t accountNr) const
 {
-    qCritical() << __PRETTY_FUNCTION__ << "RESET DC DATA VALID";
-
     // print one out of eight stored last accounting receipts
     // function log_getHoldAccountNumbers() gives a list of acc-Nr. of the stored receipts
     epi_clearDynMachineConditions();    // 24.6.23