Fix: return value prn_getPrintResult()

This reverts commit 3cdd11cc36.

CArunGUI/CArunGUI.pro

@@ -4,6 +4,8 @@ QT      +=network
     # for TCP-IP
 
 TARGET  = CArunGui
+TEMPLATE = app
+
 VERSION = "1.0.0"
 
 DESTDIR=$${_PRO_FILE_PWD_}/../build
@@ -50,7 +52,3 @@ HEADERS += \
     datei.h \
     plugin.h
 
-# Default rules for deployment.
-qnx: target.path = /tmp/$${TARGET}/bin
-else: unix:!android: target.path = /opt/$${TARGET}/bin
-!isEmpty(target.path): INSTALLS += target

CArunGUI/mainwindow.cpp

@@ -9,7 +9,8 @@ char MainWindow::loadPlugIn(char lade1_entlade2)
     //pluginLoader->setFileName("../MasterPlug/libCAmaster.so");   // for suse
     //pluginLoader->setFileName("../SlavePlug/libCAslave.so");  // for ptu5
     //pluginLoader->setFileName("../../MasterPlug/CAmaster.dll"); // for windows
-    pluginLoader->setFileName("CAmaster.dll"); // for windows
+    //pluginLoader->setFileName("CAmaster.dll"); // for windows
+    pluginLoader->setFileName("/usr/lib/libCAmaster.so"); // for ptu5
 
     if (lade1_entlade2==2)
     {

DCLibraries.pri

@@ -126,9 +126,3 @@ SOURCES += \
 # version.variable_out = HEADERS
 # QMAKE_EXTRA_COMPILERS += version
 # QMAKE_CLEAN += $${PWD}/include/version.h
-
-
-# Default rules for deployment.
-qnx: target.path = /tmp/$${TARGET}/bin
-else: unix:!android: target.path = /opt/$${TARGET}/bin
-!isEmpty(target.path): INSTALLS += target

config/comport.csv

@@ -0,0 +1 @@
+s,5,115200,ttymxc2,2,

dCArun/dCArun.pro

@@ -4,6 +4,8 @@ QT      +=network
     # for TCP-IP
 
 TARGET  = dCArun
+TEMPLATE = app
+
 VERSION = "1.0.0"
 
 DESTDIR=$${_PRO_FILE_PWD_}/../build
@@ -53,8 +55,3 @@ HEADERS += \
     win01_com.h \
     datei.h \
     plugin.h
-
-# Default rules for deployment.
-qnx: target.path = /tmp/$${TARGET}/bin
-else: unix:!android: target.path = /opt/$${TARGET}/bin
-!isEmpty(target.path): INSTALLS += target

dCArun/mainwindow.cpp

@@ -9,7 +9,8 @@ char MainWindow::loadPlugIn(char lade1_entlade2)
     //pluginLoader->setFileName("../MasterPlug/libCAmaster.so");   // for suse
     //pluginLoader->setFileName("../SlavePlug/libCAslave.so");  // for ptu5
     //pluginLoader->setFileName("../../MasterPlug/CAmaster.dll"); // for windows
-    pluginLoader->setFileName("CAmaster.dll"); // for windows
+    //pluginLoader->setFileName("CAmaster.dll"); // for windows
+    pluginLoader->setFileName("/usr/lib/libCAmaster.so"); // for ptu5
 
     if (lade1_entlade2==2)
     {

include/interfaces.h

@@ -1834,6 +1834,9 @@ public:
     virtual uint8_t prn_getPrintResult() const {
        return 0;
     }
+    // return:  0: just printing, wait
+    //          1: OK - last print was succesful
+    //          2: error - not printed
 
 
 

src/hwapi.cpp

@@ -3230,10 +3230,17 @@ uint16_t hwapi::cash_getNrCoinsInVault(void) const
 
 uint8_t hwapi::prn_getPrintResult() const
 {
-    // return:  0: unknown
-    //          1: OK - last template was printed succesful
-    //          2: error - last template was not printed
-    return 1;
+    // return:  0: just printing, wait
+    //          1: OK - last print was succesful
+    //          2: error - not printed
+
+    struct T_dynamicCondition myDynMachCond;
+    sys_getDynMachineConditions(&myDynMachCond);
+
+    return myDynMachCond.resultOfLastTemplPrint;
+        // 0: unknown or printing in progress
+        // 1: OK, doc was printed   2: error, doc was not printed
+
 }
 
 uint8_t hwapi::prn_getCurrentPrinterState() const
@@ -3257,6 +3264,12 @@ uint8_t hwapi::prn_getCurrentPrinterState() const
     lastPrinterStatus=buf[52];
 
     return lastPrinterStatus;
+
+    // oder mit:
+    //struct T_dynamicCondition myDynMachCond;
+    //sys_getDynMachineConditions(&myDynMachCond);
+    //myDynMachCond.lastPrinterStatus
+
 }
 
 // 21.4.23TS: change function "sendDeviceSettings()" to use this struct: "struct T_devices"