Proposal: remove Widgets

send signal runProc_coinAttached only if state changes from false true.

CArunGUI/CArunGUI.pro

@@ -21,14 +21,15 @@ INCLUDEPATH += ../include
 win32 {
     BUILD_DATE=$$system("date /t")
     BUILD_TIME=$$system("time /t")
+    GIT_COMMIT=""
+    EXTENDED_VERSION=""
 } else {
     BUILD_DATE=$$system("date +%d-%m-%y")
     BUILD_TIME=$$system("date +%H:%M:%S")
+    GIT_COMMIT=$$system("git log -1 --format=oneline | cut -d' ' -f1")
+    EXTENDED_VERSION="$${VERSION}-$${GIT_COMMIT}"
 }
 
-GIT_COMMIT=$$system("git log -1 --format=oneline | cut -d' ' -f1")
-
-EXTENDED_VERSION="$${VERSION}-$${GIT_COMMIT}"
 
 DEFINES+=APP_VERSION=\\\"$$VERSION\\\"
 DEFINES+=APP_BUILD_DATE=\\\"$$BUILD_DATE\\\"

CArunGUI/win01_com.cpp

@@ -375,6 +375,9 @@ bool T_winComPort::working(uint16_t *nextScreen, uint8_t *useNavi)
     // bit0,1: enable/disable button "next"
     // bit2,3: enable/disable button "home"
     // bit4,5: enable/disable button "back"
+    QString  bs, cn;
+    int br, ci;
+
 
     this->updateGui();
     *nextScreen=0;   // 0=no change
@@ -385,22 +388,29 @@ bool T_winComPort::working(uint16_t *nextScreen, uint8_t *useNavi)
         // load and use last settings:  --------------------
         QByteArray myBA;
         myBA=datei_readFromFile(FILENAME_COMPORT);
+        if (myBA.length()>0)
+        {
+            bs=csv_getEntryAsString(myBA,0);      // read the 's'     war 2!??
+            br=csv_getEntryAsInt(myBA,1);               // z.B. 5 (5.Eintrag in der Baud-Liste)
+            bs=csv_getEntryAsString(myBA,2);                // z.B 115200
+            cn=csv_getEntryAsString(myBA,3);       // z.B. COM9
+            ci=csv_getEntryAsInt(myBA,4);               // Eintragsnummer in COM-Fenster
+            HWaccess->dc_openSerial(br,bs,cn,1);
+            CB_portSel->setCurrentIndex(ci);    // den Port aus der Datei hier vorgeben
+            connectButton->setChecked(true);    // connect Taste "druecken"
+        } else
+        {
+            // open with default settings
+            qDebug()<<"CArunGui: open serial with default values";
 
-        //uint32_t len= datei_nrOfEntriesInFile(myBA);
-        //uint64_t ulltmp=csv_getEntryAs2Ulong(myBA,0);
-        //qDebug()<<"win_startup load long numer: "<<ulltmp;
-
-        QString  bs=csv_getEntryAsString(myBA,0);      // read the 's'     war 2!??
-        int br=csv_getEntryAsInt(myBA,1);               // z.B. 5 (5.Eintrag in der Baud-Liste)
-        bs=csv_getEntryAsString(myBA,2);                // z.B 115200
-        QString  cn=csv_getEntryAsString(myBA,3);       // z.B. COM9
-        int ci=csv_getEntryAsInt(myBA,4);               // Eintragsnummer in COM-Fenster
-        //qDebug()<<"win_startup loaded com settings: "<<br<<" "<<bs<<" "<<cn;
-        HWaccess->dc_openSerial(br,bs,cn,1);
-        //CB_baudSel->setCurrentIndex(br);    // im BR auswahlfenster diese Baud vorgeben
-        CB_portSel->setCurrentIndex(ci);    // den Port aus der Datei hier vorgeben
-        connectButton->setChecked(true);    // connect Taste "druecken"
+            bs="115200";
+            br=5;
+            //cn="COM14";     // Windows
+            cn="ttymxc2";   // PTU5
+            ci=2;
+            HWaccess->dc_openSerial(br,bs,cn,1);
 
+        }
         myTO->start(100);     // restart
         myStep++;
     } else
@@ -410,9 +420,13 @@ bool T_winComPort::working(uint16_t *nextScreen, uint8_t *useNavi)
         if (!myTO->isActive())
         {
             if (HWaccess->dc_isPortOpen())
+            {
                 myStep++;
-            else
-                myStep=99;  // stop automatic connection and wait for manual start
+            } else
+            {
+                myStep=6;   // 13.12.23: start Autoconnect cycle
+                qDebug()<<"CArunGui: port is still closed, restarting..";
+            }
             myTO->start(100);
         }
     } else
@@ -434,7 +448,10 @@ bool T_winComPort::working(uint16_t *nextScreen, uint8_t *useNavi)
             if (HWaccess->dc_readAnswTestResponse())
                 myStep++;   // response was correct
             else
-                myStep=99;  // stop automatic connection and wait for manual start
+            {
+                myStep=6;   // 13.12.23: start Autoconnect cycle
+                qDebug()<<"CArunGui: got no answer from DC, retry..";
+            }
             myTO->start(100);
         }
 
@@ -445,23 +462,38 @@ bool T_winComPort::working(uint16_t *nextScreen, uint8_t *useNavi)
         HWaccess->dc_autoRequest(1);
         AutSendButton->setChecked(true);        // taste "druecken"
         myStep++;
+        myTO->start(2000);
     } else
 
     if (myStep==5)
     {
-        // got next screen:
-        //myNextStep=2; // nicht bei CArun
-        myStep++;
+        if (!myTO->isActive())
+        {
+            if (HWaccess->sys_areDCdataValid())
+            {
+                qDebug()<<"CArunGui: DC is connected";
+                myStep=7;  // OK, connection is up and running
+            }  else
+            {
+                qDebug()<<"CArunGui: auto request is not running, retry...";
+                myStep++;
+                myTO->start(100);
+            }
+        }
 
     } else
 
     if (myStep==6)
     {
-        // stop here, everything done
+        // restart autoconnect cycle
+        myTO->start(100);     // restart
+        myStep=0;
     } else
 
     if (myStep==7)
     {
+        // stay here, DC connection is up and running
+
 
     } else
     {
@@ -470,7 +502,6 @@ bool T_winComPort::working(uint16_t *nextScreen, uint8_t *useNavi)
 
     if (myNextStep)
     {
-        //qDebug()<<"fenster1 working: "<< myNextStep;
         *nextScreen=myNextStep;
         myNextStep=0;
     }

DCLibraries.pri

@@ -81,37 +81,31 @@ 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 \
-    $${PWD}/include/download_thread.h \
-    $${PWD}/include/reporting_thread.h
+    $${PWD}/include/reporting_thread.h \
+    $${PWD}/include/download_thread.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 \
     $${PWD}/src/shared_mem_buffer.cpp \
-    $${PWD}/src/download_thread.cpp \
-    $${PWD}/src/reporting_thread.cpp
+    $${PWD}/src/reporting_thread.cpp \
+    $${PWD}/src/download_thread.cpp
 
 
 # INTERFACE = DeviceController

DCLibraries.pro

@@ -1,4 +1,5 @@
 TEMPLATE = subdirs
+
 CONFIG += ordered
 SUBDIRS = lib_ca_master lib_ca_slave CArunGUI dCArun
 

dCArun/CArun.cpp

@@ -0,0 +1,199 @@
+#include "CArun.h"
+
+#include "datei.h"
+
+
+#define         UPDATE_PERIOD_MS        100
+    // period to call chain steps
+
+#define         VENDINGTIMEOUT_MS       30000
+
+
+
+CArun::CArun(QObject *parent)
+    : QObject{parent}
+{
+    loadPlugIn(1);
+
+    timerChainCtrl = new QTimer(this);
+    connect(timerChainCtrl, SIGNAL(timeout()), this, SLOT(chainControl()));
+    timerChainCtrl->setSingleShot(0);
+    timerChainCtrl->start(UPDATE_PERIOD_MS);     // 1000: call every 1000ms
+}
+
+
+char CArun::loadPlugIn(char lade1_entlade2)
+{
+    plugInDir.cd("plugins");
+    QPluginLoader *pluginLoader = new QPluginLoader();
+
+    pluginLoader->setFileName("/usr/lib/libCAmaster.so"); // for ptu5
+
+    if (lade1_entlade2==2)
+    {
+        pluginLoader->unload();
+        return 0;
+    }
+
+    if (!pluginLoader->load())
+    {
+        qDebug()<<"cannot load plugin";
+    } else
+        qDebug() <<"loaded plugin: " << pluginLoader->fileName();
+
+    if (!pluginLoader->isLoaded())
+    {
+        qDebug()<<pluginLoader->errorString();
+        return 0;
+    }
+
+    QObject *plugin = pluginLoader->instance();
+    if ( plugin == nullptr)
+    {
+        // make instance of the root component (which can hold more then one clases)
+        // also loads the lib if not yet done
+        qDebug()<<"cannot start instance";
+        return 0;
+    }
+
+    HWaccess= qobject_cast<hwinf *>(plugin);
+    // make instance to class "hwinf" in dll_HWapi.h over "interfaces.h"
+
+    qDebug()<<"loadPlugIn, HWAccess: " << HWaccess;
+    return 0;
+}
+
+
+
+void CArun::chainControl(void)
+{
+        #define FILENAME_COMPORT            "../comport.csv"  // TODO: use absolute path
+                                                              // use settings (ini-file)
+
+        QString  bs, cn;
+        int br, ci;
+
+
+        // load and use last settings:  --------------------
+        QByteArray myBA;
+        myBA=datei_readFromFile(FILENAME_COMPORT);
+        if (myBA.length()>0)
+        {
+            bs=csv_getEntryAsString(myBA,0);      // read the 's'     war 2!??
+            br=csv_getEntryAsInt(myBA,1);               // z.B. 5 (5.Eintrag in der Baud-Liste)
+            bs=csv_getEntryAsString(myBA,2);                // z.B 115200
+            cn=csv_getEntryAsString(myBA,3);       // z.B. COM9
+            ci=csv_getEntryAsInt(myBA,4);               // Eintragsnummer in COM-Fenster
+            HWaccess->dc_openSerial(br,bs,cn,1);
+        } else
+        {
+            // vermutlich wird dies hier ausgeführt, weil eine csv-Datei wird nicht installiert
+
+            // open with default settings
+            qDebug()<<"CArunGui: open serial with default values";
+
+            bs="115200";
+            br=5;
+            //cn="COM14";     // Windows
+            cn="ttymxc2";   // PTU5
+            ci=2;
+            HWaccess->dc_openSerial(br,bs,cn,1);
+        }
+
+        // TIMER myTO: hat keinen timeout-slot!
+        // wird nur verwendet, um isActive() abzufragen, d.h. ~x zu warten
+
+        // pruefen, of Port nach x s open:
+                if (HWaccess->dc_isPortOpen())
+                {
+
+                } else
+                {
+                  // wenn nicht: step 6
+                }
+                myTO->start(100);
+            }
+        } else
+
+        if (myStep==2)
+        {
+            if (!myTO->isActive())
+            {
+                HWaccess->dc_requTestResponse();
+                myStep++;
+                myTO->start(100);
+            }
+        } else
+
+        if (myStep==3)
+        {
+            if (!myTO->isActive())
+            {
+                if (HWaccess->dc_readAnswTestResponse())
+                    myStep++;   // response was correct
+                else
+                {
+                    myStep=6;   // 13.12.23: start Autoconnect cycle
+                    qDebug()<<"CArunGui: got no answer from DC, retry..";
+                }
+                myTO->start(100);
+            }
+
+        } else
+
+        if (myStep==4)
+        {
+            HWaccess->dc_autoRequest(1);
+            AutSendButton->setChecked(true);        // taste "druecken"
+            myStep++;
+            myTO->start(2000);
+        } else
+
+        if (myStep==5)
+        {
+            if (!myTO->isActive())
+            {
+                if (HWaccess->sys_areDCdataValid())
+                {
+                    qDebug()<<"CArunGui: DC is connected";
+                    myStep=7;  // OK, connection is up and running
+                }  else
+                {
+                    qDebug()<<"CArunGui: auto request is not running, retry...";
+                    myStep++;
+                    myTO->start(100);
+                }
+            }
+
+        } else
+
+        if (myStep==6)
+        {
+            // restart autoconnect cycle
+            myTO->start(100);     // restart
+            myStep=0;
+        } else
+
+        if (myStep==7)
+        {
+            // stay here, DC connection is up and running
+
+
+        } else
+        {
+
+        }
+
+        if (myNextStep)
+        {
+            *nextScreen=myNextStep;
+            myNextStep=0;
+        }
+        return false;
+
+
+
+
+}
+
+

dCArun/CArun.h

@@ -0,0 +1,42 @@
+#ifndef CARUN_H
+#define CARUN_H
+
+#include <QObject>
+#include <QTimer>
+#include <QDebug>
+#include <QDateTime>
+
+#include <QPluginLoader>
+#include <QDir>
+#include "plugin.h"
+#include "stepList.h"
+//#include "stepList.h" // define all working chain steps here
+
+
+class CArun : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit CArun(QObject *parent = nullptr);
+
+    QTimer      *timerChainCtrl;
+    QTimer      *timerVendingTimeout;
+
+    char loadPlugIn(char lade1_entlade2);
+
+    QDir plugInDir;
+
+private:
+
+    hwinf *HWaccess=nullptr;        // global pointer to plugin-class
+
+
+
+signals:
+    void chainControl();
+    void vendingTimeout();
+
+};
+
+#endif // CARUN_H

dCArun/dCArun.pro

@@ -25,21 +25,23 @@ INCLUDEPATH += ../include
 win32 {
     BUILD_DATE=$$system("date /t")
     BUILD_TIME=$$system("time /t")
+    GIT_COMMIT=""
+    EXTENDED_VERSION=""
 } else {
     BUILD_DATE=$$system("date +%d-%m-%y")
     BUILD_TIME=$$system("date +%H:%M:%S")
+
+    GIT_COMMIT=$$system("git log -1 --format=oneline | cut -d' ' -f1")
+    EXTENDED_VERSION="$${VERSION}-$${GIT_COMMIT}"
 }
 
-GIT_COMMIT=$$system("git log -1 --format=oneline | cut -d' ' -f1")
-
-EXTENDED_VERSION="$${VERSION}-$${GIT_COMMIT}"
-
 DEFINES+=APP_VERSION=\\\"$$VERSION\\\"
 DEFINES+=APP_BUILD_DATE=\\\"$$BUILD_DATE\\\"
 DEFINES+=APP_BUILD_TIME=\\\"$$BUILD_TIME\\\"
 DEFINES+=APP_EXTENDED_VERSION=\\\"$$EXTENDED_VERSION\\\"
 
 SOURCES += \
+    CArun.cpp \
     main.cpp \
     mainwindow.cpp \
     tslib.cpp \
@@ -47,6 +49,7 @@ SOURCES += \
     datei.cpp
 
 HEADERS += \
+    CArun.h \
     guidefs.h \
     mainwindow.h \
     stepList.h \

dCArun/main.cpp

@@ -1,15 +1,14 @@
-#include "mainwindow.h"
+#include "CArun.h"
 //#include "message_handler.h"
-#include <QApplication>
-
-int thisisglobal;
+#include <QCoreApplication>
 
 int main(int argc, char *argv[])
 {
-    int ret;
-    QApplication myapp(argc, argv);
-    QApplication::setApplicationName("CArunGui");
-    QApplication::setApplicationVersion(APP_VERSION);
+    QCoreApplication myapp(argc, argv);
+
+    QCoreApplication::setOrganizationName("ATB");
+    QCoreApplication::setApplicationName("CArun");
+    QCoreApplication::setApplicationVersion(APP_VERSION);
 
 /*
     if (!messageHandlerInstalled()) { // change internal qt-QDebug-handling
@@ -18,16 +17,9 @@ int main(int argc, char *argv[])
         //setDebugLevel(QtMsgType::QtDebugMsg);
     }
 */
-    MainWindow myMainWin;
-    QSize myMainSize={800, 480};    // breite, höhe, PTU: 800x440
-    myMainWin.setMinimumSize(myMainSize);
-    myMainWin.setMaximumSize(myMainSize);
-    myMainWin.setWindowTitle("CArun_V4.2 run cash agent master lib");
-    //myMainWin.show();
+    CArun carun;
 
-    ret=myapp.exec();
-
-    return ret;
+    return myapp.exec();
 }
 
 

dCArun/win01_com.cpp

@@ -375,6 +375,9 @@ bool T_winComPort::working(uint16_t *nextScreen, uint8_t *useNavi)
     // bit0,1: enable/disable button "next"
     // bit2,3: enable/disable button "home"
     // bit4,5: enable/disable button "back"
+    QString  bs, cn;
+    int br, ci;
+
 
     this->updateGui();
     *nextScreen=0;   // 0=no change
@@ -385,22 +388,29 @@ bool T_winComPort::working(uint16_t *nextScreen, uint8_t *useNavi)
         // load and use last settings:  --------------------
         QByteArray myBA;
         myBA=datei_readFromFile(FILENAME_COMPORT);
+        if (myBA.length()>0)
+        {
+            bs=csv_getEntryAsString(myBA,0);      // read the 's'     war 2!??
+            br=csv_getEntryAsInt(myBA,1);               // z.B. 5 (5.Eintrag in der Baud-Liste)
+            bs=csv_getEntryAsString(myBA,2);                // z.B 115200
+            cn=csv_getEntryAsString(myBA,3);       // z.B. COM9
+            ci=csv_getEntryAsInt(myBA,4);               // Eintragsnummer in COM-Fenster
+            HWaccess->dc_openSerial(br,bs,cn,1);
+            CB_portSel->setCurrentIndex(ci);    // den Port aus der Datei hier vorgeben
+            connectButton->setChecked(true);    // connect Taste "druecken"
+        } else
+        {
+            // open with default settings
+            qDebug()<<"CArunGui: open serial with default values";
 
-        //uint32_t len= datei_nrOfEntriesInFile(myBA);
-        //uint64_t ulltmp=csv_getEntryAs2Ulong(myBA,0);
-        //qDebug()<<"win_startup load long numer: "<<ulltmp;
-
-        QString  bs=csv_getEntryAsString(myBA,0);      // read the 's'     war 2!??
-        int br=csv_getEntryAsInt(myBA,1);               // z.B. 5 (5.Eintrag in der Baud-Liste)
-        bs=csv_getEntryAsString(myBA,2);                // z.B 115200
-        QString  cn=csv_getEntryAsString(myBA,3);       // z.B. COM9
-        int ci=csv_getEntryAsInt(myBA,4);               // Eintragsnummer in COM-Fenster
-        //qDebug()<<"win_startup loaded com settings: "<<br<<" "<<bs<<" "<<cn;
-        HWaccess->dc_openSerial(br,bs,cn,1);
-        //CB_baudSel->setCurrentIndex(br);    // im BR auswahlfenster diese Baud vorgeben
-        CB_portSel->setCurrentIndex(ci);    // den Port aus der Datei hier vorgeben
-        connectButton->setChecked(true);    // connect Taste "druecken"
+            bs="115200";
+            br=5;
+            //cn="COM14";     // Windows
+            cn="ttymxc2";   // PTU5
+            ci=2;
+            HWaccess->dc_openSerial(br,bs,cn,1);
 
+        }
         myTO->start(100);     // restart
         myStep++;
     } else
@@ -410,9 +420,13 @@ bool T_winComPort::working(uint16_t *nextScreen, uint8_t *useNavi)
         if (!myTO->isActive())
         {
             if (HWaccess->dc_isPortOpen())
+            {
                 myStep++;
-            else
-                myStep=99;  // stop automatic connection and wait for manual start
+            } else
+            {
+                myStep=6;   // 13.12.23: start Autoconnect cycle
+                qDebug()<<"CArunGui: port is still closed, restarting..";
+            }
             myTO->start(100);
         }
     } else
@@ -434,7 +448,10 @@ bool T_winComPort::working(uint16_t *nextScreen, uint8_t *useNavi)
             if (HWaccess->dc_readAnswTestResponse())
                 myStep++;   // response was correct
             else
-                myStep=99;  // stop automatic connection and wait for manual start
+            {
+                myStep=6;   // 13.12.23: start Autoconnect cycle
+                qDebug()<<"CArunGui: got no answer from DC, retry..";
+            }
             myTO->start(100);
         }
 
@@ -445,23 +462,38 @@ bool T_winComPort::working(uint16_t *nextScreen, uint8_t *useNavi)
         HWaccess->dc_autoRequest(1);
         AutSendButton->setChecked(true);        // taste "druecken"
         myStep++;
+        myTO->start(2000);
     } else
 
     if (myStep==5)
     {
-        // got next screen:
-        //myNextStep=2; // nicht bei CArun
-        myStep++;
+        if (!myTO->isActive())
+        {
+            if (HWaccess->sys_areDCdataValid())
+            {
+                qDebug()<<"CArunGui: DC is connected";
+                myStep=7;  // OK, connection is up and running
+            }  else
+            {
+                qDebug()<<"CArunGui: auto request is not running, retry...";
+                myStep++;
+                myTO->start(100);
+            }
+        }
 
     } else
 
     if (myStep==6)
     {
-        // stop here, everything done
+        // restart autoconnect cycle
+        myTO->start(100);     // restart
+        myStep=0;
     } else
 
     if (myStep==7)
     {
+        // stay here, DC connection is up and running
+
 
     } else
     {
@@ -470,7 +502,6 @@ bool T_winComPort::working(uint16_t *nextScreen, uint8_t *useNavi)
 
     if (myNextStep)
     {
-        //qDebug()<<"fenster1 working: "<< myNextStep;
         *nextScreen=myNextStep;
         myNextStep=0;
     }

include/datIf.h

@@ -133,8 +133,8 @@
 #define SENDCOMBINED            0
 
 
-class hwinf;
-class DownloadThread;
+
+
 class T_datif : public QObject
 {
     Q_OBJECT    
@@ -165,15 +165,13 @@ class T_datif : public QObject
     T_prot *myDCIF;
     QTimer *datif_trigger;
     uint8_t selectedSlaveAddr;
-    DownloadThread *m_downloadThread;
-    hwinf *m_hw;
 
 private slots:
     char datif_cycleSend();
     void StoredRecData();
 
 public:
-    T_datif(hwinf *hw, QObject *parent = nullptr);
+    T_datif(QObject *parent = nullptr);
 
     void resetChain(void);
     char isPortOpen(void);

include/datei.h

@@ -1,6 +1,7 @@
 #ifndef DATEI_H
 #define DATEI_H
 
+#include <stdint.h>
 #include <QFile>
 #include <QFileInfo>
 #include <QDebug>

include/hwapi.h

@@ -26,6 +26,8 @@ V4.0  6.9.2023: activating DC-Bootloader in slve-lib (SM)
 #ifndef hwapi_H
 #define hwapi_H
 
+#include <stdint.h>
+//#include <QTabWidget>
 #include <QtPlugin>
 #include <QTimer>
 #include <QObject>
@@ -37,11 +39,11 @@ V4.0  6.9.2023: activating DC-Bootloader in slve-lib (SM)
 #include "controlBus.h"
 #include "storeINdata.h"
 #include "dcBL.h"
-#include "interfaces.h"
+//#include <../plugins/interfaces.h>
 #include "shared_mem_buffer.h"
 #include "runProc.h"
-#include "download_thread.h"
-#include "reporting_thread.h"
+#include "interfaces.h"
+
 
 /*
  * select Plugin Type here
@@ -73,10 +75,13 @@ V4.0  6.9.2023: activating DC-Bootloader in slve-lib (SM)
 //#undef THIS_IS_CA_MASTER
 
 //for CAmaster:
+//#define THIS_IS_CA_MASTER
+
+
 
 class QSharedMemory;
-class ReportingThread;
 class DownloadThread;
+class ReportingThread;
 class hwapi :   public QObject,
                 public hwinf
 {
@@ -90,6 +95,7 @@ private:
     QSharedMemory *m_sharedMem;
     ReportingThread *m_reportingThread;
     DownloadThread *m_downloadThread;
+    //QTimer *hwapi_triggerBL;
 
 public:
     explicit hwapi(QWidget *parent = nullptr);
@@ -1296,8 +1302,15 @@ public:
 
     uint8_t bna_getCurrentNotes(uint16_t latestBill, uint16_t *currentNotes) const override;
         // returns number of collected bank notes since start-command (current transaction)
-        //  latestBill: last accepted bank note, value in cent
-        //  currentNotes an array with up to 16 (further) notes collected
+        // return value: numbers of bills or 99 in case of error
+        //  latestBill: not used
+        // in case of error: currentNotes[0,1,2,3] = 1..4 error number(s)
+        // in normal case:
+        //  currentNotes[0]: last bill in cent (e.g. 1000 = 10€)
+        //  currentNotes[1]: bin 1 = bill is still in escrow   else bill is stacked
+        //       note: by now (dec2023) escrow is not used, bills always go to stacker (box)
+        //  currentNotes[2]: total sum of bills in cent, low word (16bit)
+        //  currentNotes[3]: total sum of bills in cent, high word (16bit)
 
     void bna_requestStackerLevel(void) const override;
 
@@ -1306,7 +1319,6 @@ public:
         // countOfBills: array of up to 16 sums,    countOfBills[0]=nr of 5€-bills in stacker
         //                                          countOfBills[1] for 10€   and so on
 
-
     // download device controller
     bool dcDownloadRequest(QString const &fileToDownload) const override;
     bool dcDownloadRequested() const override;
@@ -1319,7 +1331,6 @@ public:
     bool dcDownloadReportRunning() const override;
     bool dcDownloadReportFinished() override;
 
-
     bool dcDownloadThreadStart() override;
     bool dcDownloadThreadRunning() const override;
     void dcDownloadThreadFinalize(DownloadThread *) override;
@@ -1344,34 +1355,36 @@ public:
 
     virtual QObject const *getAPI() override;
 
-signals:    // for download
+signals:
     void hwapi_reportDCDownloadStatus(QString const&) const;
     void hwapi_reportDCDownloadSuccess(QString const&) const;
     void hwapi_reportDCDownloadFailure(QString const&) const;
-    // already declared in interfaces.h
-    void hwapi_templatePrintFinished_OK(void) const;
-    void hwapi_templatePrintFinished_Err(void) const;
 
-    void hwapi_coinCollectionJustStarted(void) const;
-    void hwapi_coinCollectionAborted(void) const;
+    void hwapi_templatePrintFinished_OK(void) const override;
+    void hwapi_templatePrintFinished_Err(void) const override;
 
-    void hwapi_gotNewCoin(void) const;
-    void hwapi_payStopByMax(void) const;
-    void hwapi_payStopByPushbutton(void) const;
+    void hwapi_coinCollectionJustStarted(void) const override;
+    void hwapi_coinCollectionAborted(void) const override;
 
-    void hwapi_payStopByEscrow(void) const;
-    void hwapi_payStopByError(void) const;
-    void hwapi_payStopByTimeout(void) const;
-    void hwapi_payCancelled(void) const;
-    void hwapi_coinProcessJustStopped(void) const;
+    void hwapi_gotNewCoin(void) const override;
+    void hwapi_payStopByMax(void) const override;
+    void hwapi_payStopByPushbutton(void) const override;
+
+    void hwapi_payStopByEscrow(void) const override;
+    void hwapi_payStopByError(void) const override;
+    void hwapi_payStopByTimeout(void) const override;
+    void hwapi_payCancelled(void) const override;
+    void hwapi_coinProcessJustStopped(void) const override;
 
     // new from 2023.06.12
-    void hwapi_doorServiceDoorOpened(void) const;
-    void hwapi_doorVaultDoorOpened(void) const;
-    void hwapi_doorCoinBoxRemoved(void) const;
-    void hwapi_doorCoinBoxInserted(void) const;
-    void hwapi_doorCBinAndAllDoorsClosed(void) const;
-    void hwapi_doorAllDoorsClosed(void) const;
+    void hwapi_doorServiceDoorOpened(void) const override;
+    void hwapi_doorVaultDoorOpened(void) const override;
+    void hwapi_doorCoinBoxRemoved(void) const override;
+    void hwapi_doorCoinBoxInserted(void) const override;
+    void hwapi_doorCBinAndAllDoorsClosed(void) const override;
+    void hwapi_doorAllDoorsClosed(void) const override;
+
+    void hwapi_coinAttached() const override;
 
  private slots:
     //void hwapi_slotPrintFinished_OK(void);
@@ -1399,8 +1412,7 @@ signals:    // for download
     void sub_slotCoin15(void);
     void sub_slotCoin16(void);
 
-
-
+    void coinAttached();
 
 };
 

include/interfaces.h

@@ -2,7 +2,6 @@
 #define INTERFACE_H
 
 #include <QtPlugin>
-#include <QString>
 
 
 
@@ -25,7 +24,8 @@ struct T_emp
 
    // dynamic:
    uint8_t state;      // step counter of EMP (electronic coin checker) FSM (finite state machine):
-       // 0=start command
+   /*
+   // 0=start command
        // 1=powered, do emp ini, send reset
        // 2=delay
        // 3=wait for response, requesting status after response
@@ -40,7 +40,7 @@ struct T_emp
        // 90: stop all, 1s delay
        // 99: off, all stopped
 
-
+*/
    uint8_t pollingRunning;
    uint8_t paymentRunning;
 
@@ -239,6 +239,7 @@ struct T_dynamicCondition
         uint8_t lastVDoorState;
         uint8_t lastCBstate;
         char        paymentInProgress;
+        // Version Szeged:  aug2023
         //	0: stopped by timeout
         //  1: running  2: wait4lastCoin
         //				3: payment stopped manually, coins in Escrow
@@ -247,6 +248,21 @@ struct T_dynamicCondition
         //			    6: coins encashed   7:coins returned
         //				8: CoinChecker or MDB on Error
 
+        // since Schoenau with bill and changer, nov2023
+        //0 = no payment
+        //will be set to 1 by cash_startCollection()
+        //neu 1: wait for devices getting ready for payment
+        //2 = payment,
+        //3 = wait for last coin/bill
+        //4 = Bezahlvorgang manuell beendet
+        //5 = payment stopped autom, amount collected, coins in Escrow
+        //6 = Bezahlvorgang beendet weil ZK voll
+        //4,5,6: payment done, keep on polling, wait for cash or return command
+        //7 = encash collected money from coin escrow into cash box
+        //8 = return "amountToReturn", can be complete inserted amount or only overpayment
+        //9 = wait for changer result
+        //10= print refund receipt with "amountToReturn"
+
 
         char        res1;
         uint16_t    U_Batt;
@@ -398,7 +414,6 @@ struct T_bna
 
 };
 
-class hwapi;
 class DownloadThread;
 class hwinf
 {
@@ -2255,14 +2270,23 @@ public:
     virtual void bna_requestCurrentNotes() const {}
     // send command to DC in order to get transaction data
 
-    virtual uint8_t bna_getCurrentNotes(uint16_t latestBill, uint16_t *currentNotes) const {
+    virtual uint8_t bna_getCurrentNotes(uint16_t latestBill, uint16_t *currentNotes) const
+    {
         Q_UNUSED(latestBill);
         Q_UNUSED(currentNotes);
         return 0;
     }
     // returns number of collected bank notes since start-command (current transaction)
-    //  latestBill: last accepted bank note, value in cent
-    //  currentNotes an array with up to 16 (further) notes collected
+    // return value: numbers of bills or 99 in case of error
+    //  latestBill: not used
+    // in case of error: currentNotes[0,1,2,3] = 1..4 error number(s)
+    // in normal case:
+    //  currentNotes[0]: last bill in cent (e.g. 1000 = 10€)
+    //  currentNotes[1]: bin 1 = bill is still in escrow   else bill is stacked
+    //       note: by now (dec2023) escrow is not used, bills always go to stacker (box)
+    //  currentNotes[2]: total sum of bills in cent, low word (16bit)
+    //  currentNotes[3]: total sum of bills in cent, high word (16bit)
+
 
     virtual void bna_requestStackerLevel() const {}
 
@@ -2326,12 +2350,50 @@ public:
 
     virtual QObject const *getAPI() { return nullptr; }
 
-signals:    // for download
-    void hwapi_reportDCDownloadStatus(QString const&) const;
-    void hwapi_reportDCDownloadSuccess(QString const&) const;
-    void hwapi_reportDCDownloadFailure(QString const&) const;
+
+signals:
+    /*
+        NOTE: the difference between a virtual Qt signal and a normal Qt signal:
+        A Qt virtual signal is a connection that is established using a pointer
+        or reference and is not connected to an object or data. It is therefore
+        not bound to a particular object, but to a specific class (object type).
+        Qt virtual signals are useful because they allow you to create
+        connections without worrying about whether an object or a specific data
+        element has been destroyed.
+        https://www.youtube.com/watch?v=HTH3VFfqsXw
+
+     */
+    virtual void hwapi_reportDCDownloadStatus(QString const&) const {}
+    virtual void hwapi_reportDCDownloadSuccess(QString const&) const {}
+    virtual void hwapi_reportDCDownloadFailure(QString const&) const {}
+
+    virtual void hwapi_templatePrintFinished_OK(void) const=0;
+    virtual void hwapi_templatePrintFinished_Err(void) const=0;
+
+    virtual void hwapi_coinCollectionJustStarted(void) const=0;
+    virtual void hwapi_coinCollectionAborted(void) const=0;
+
+    virtual void hwapi_gotNewCoin(void) const=0;
+    virtual void hwapi_payStopByMax(void) const=0;
+    virtual void hwapi_payStopByPushbutton(void) const=0;
+
+    virtual void hwapi_payStopByEscrow(void) const=0;
+    virtual void hwapi_payStopByError(void) const=0;
+    virtual void hwapi_payStopByTimeout(void) const=0;
+    virtual void hwapi_payCancelled(void) const=0;
+    virtual void hwapi_coinProcessJustStopped(void) const=0;
+
+    virtual void hwapi_doorServiceDoorOpened(void) const=0;
+    virtual void hwapi_doorVaultDoorOpened(void) const=0;
+    virtual void hwapi_doorCoinBoxRemoved(void) const=0;
+    virtual void hwapi_doorCoinBoxInserted(void) const=0;
+    virtual void hwapi_doorCBinAndAllDoorsClosed(void) const=0;
+    virtual void hwapi_doorAllDoorsClosed(void) const=0;
+
+    virtual void hwapi_coinAttached() const = 0;
 
     // NOTE: declaring a "pure virtual" "signal" should be an error and thus not valid.
+    /* GH Version, bringt Fehler
     void hwapi_templatePrintFinished_OK() const;
     void hwapi_templatePrintFinished_Err() const;
 
@@ -2354,6 +2416,7 @@ signals:    // for download
     void hwapi_doorCoinBoxInserted() const;
     void hwapi_doorCBinAndAllDoorsClosed() const;
     void hwapi_doorAllDoorsClosed() const;
+    */
 };
 
 

include/runProc.h

@@ -2,6 +2,7 @@
 #ifndef RUN_PROCESS_H
 #define RUN_PROCESS_H
 
+#include <stdint.h>
 #include <QMainWindow>
 #include <QString>
 #include <QTimer>
@@ -14,6 +15,7 @@
 #include <QDebug>
 #include "datIf.h"
 #include <QSharedMemory>
+#include <atomic>
 #include "sendWRcmd.h"
 #include "controlBus.h"
 #include "storeINdata.h"
@@ -25,7 +27,7 @@
 class T_runProc : public QObject
 {
     Q_OBJECT
-    QTimer *hwapi_TimerPayment, *hwapi_triggerBL;
+    QTimer *hwapi_TimerPayment, *hwapi_triggerBL, *myTO;
 
     void sub_emp_getAllParameters(struct T_emp *emp);
     void changer_getAllParameters(struct T_changer *mw);
@@ -34,6 +36,10 @@ class T_runProc : public QObject
 
     void restoreDeviceParameter(struct T_devices *deviceSettings);
 
+#ifndef THIS_IS_CA_MASTER
+    std::atomic_bool m_coinAttached{false};
+#endif
+
 private slots:
     void runProc_slotProcess(void);
     bool bl_performComplStart(void);
@@ -79,6 +85,7 @@ signals:
     void runProc_doorCBinAndAllDoorsClosed(void);
     void runProc_doorAllDoorsClosed(void);
 
+    void runProc_coinAttached();
 };
 
 

include/shared_mem_buffer.h

@@ -300,7 +300,6 @@ struct SharedMem
 
     uint8_t  p_nextFDcmdsInQueue;
 
-
     // download of device controller and json files
     struct DCDownload {
         enum class FILE_INDEX {
@@ -322,6 +321,7 @@ struct SharedMem
         std::atomic_bool m_finished{false};
     } m_downLoadDC;
 
+
     static QSharedMemory *getShm(std::size_t s = 0);
 
     static SharedMem *getData()

include/storeINdata.h

@@ -527,6 +527,9 @@ void gpi_storeDcDataValid(bool isVal);
 
 bool epi_areDcDataValid();
 
+void epi_setDcDataValid(void);
+
+void epi_resetDcDataValid(void);
 
 
 void epi_clearDynData(void);

lib_ca_master/lib_ca_master.pro

@@ -1,11 +1,40 @@
 TEMPLATE = lib
 TARGET = CAmaster
-VERSION="1.0.0"
+VERSION="1.0.1"
+
+HEADERS += \
+    ../include/com.h \
+    ../include/datIf.h \
+    ../include/prot.h
+
+SOURCES += \
+    ../src/com.cpp \
+    ../src/datIf.cpp \
+    ../src/prot.cpp
 
 include(../DCLibraries.pri)
 
+win32 {
+    BUILD_DATE=$$system("date /t")
+    BUILD_TIME=$$system("time /t")
+    GIT_COMMIT=""
+    EXTENDED_VERSION=""
+    EXTENDED_VERSION_LIB=""
+} else {
+    BUILD_DATE=$$system("date +%d-%m-%y")
+    BUILD_TIME=$$system("date +%H:%M:%S")
+
+    GIT_COMMIT=$$system("git log -1 --format=oneline . | cut -d' ' -f1")
+    EXTENDED_VERSION_LIB="libCAmaster-$${VERSION}-$${GIT_COMMIT}"
+}
+
+DEFINES+=APP_VERSION=\\\"$$VERSION\\\"
+DEFINES+=APP_BUILD_DATE=\\\"$$BUILD_DATE\\\"
+DEFINES+=APP_BUILD_TIME=\\\"$$BUILD_TIME\\\"
+DEFINES+=APP_EXTENDED_VERSION=\\\"$$EXTENDED_VERSION\\\"
+DEFINES+=APP_EXTENDED_VERSION_LIB=\\\"$$EXTENDED_VERSION_LIB\\\"
+
 DEFINES+=THIS_IS_CA_MASTER
-DEFINES-=THIS_IS_CA_SLAVE
 DESTDIR=$${_PRO_FILE_PWD_}/../build
 
 unix {

lib_ca_slave/lib_ca_slave.pro

@@ -1,12 +1,30 @@
 TEMPLATE = lib
 TARGET = CAslave
-VERSION="1.0.0"
+VERSION="1.0.1"
 
 include(../DCLibraries.pri)
 
-DEFINES+=THIS_IS_CA_SLAVE
-DEFINES-=THIS_IS_CA_MASTER
+win32 {
+    BUILD_DATE=$$system("date /t")
+    BUILD_TIME=$$system("time /t")
+    GIT_COMMIT=""
+    EXTENDED_VERSION=""
+    EXTENDED_VERSION_LIB=""
+} else {
+    BUILD_DATE=$$system("date +%d-%m-%y")
+    BUILD_TIME=$$system("date +%H:%M:%S")
 
+    GIT_COMMIT=$$system("git log -1 --format=oneline . | cut -d' ' -f1")
+    EXTENDED_VERSION_LIB_="libCAslave-$${VERSION}-$${GIT_COMMIT}"
+}
+
+DEFINES+=APP_VERSION=\\\"$$VERSION\\\"
+DEFINES+=APP_BUILD_DATE=\\\"$$BUILD_DATE\\\"
+DEFINES+=APP_BUILD_TIME=\\\"$$BUILD_TIME\\\"
+DEFINES+=APP_EXTENDED_VERSION=\\\"$$EXTENDED_VERSION\\\"
+DEFINES+=APP_EXTENDED_VERSION_LIB=\\\"$$EXTENDED_VERSION_LIB\\\"
+
+DEFINES+=THIS_IS_CA_SLAVE
 DESTDIR=$${_PRO_FILE_PWD_}/../build
 
 unix {

src/datIf.cpp

@@ -1,10 +1,14 @@
+/*
+History:
+06.12.2023: weitere IN-requests in Autorequest übernommen
+            Umschaltung mit/ohne Verkauf, während VK nur 12 wichtige, sonst alle 36
+
+
+*/
 #include "datIf.h"
 #include "sendWRcmd.h"
 #include "controlBus.h"
 #include "storeINdata.h"
-#include "download_thread.h"
-#include "hwapi.h"
-
 #include <QDebug>
 #include <datei.h>
 #include <QDir>
@@ -50,10 +54,8 @@ static uint8_t datif_pNextCmd, datif_sendSlowCmd;
 //#define     DATIF_CTR_GOTRESPVAL        100
 
 
-T_datif::T_datif(hwinf *hw, QObject *parent) : QObject(parent)
+T_datif::T_datif(QObject *parent) : QObject(parent)
 {
-    m_hw = hw;
-
     QByteArray myBA;
     QDir myDir("../dmd");
 
@@ -86,7 +88,8 @@ T_datif::T_datif(hwinf *hw, QObject *parent) : QObject(parent)
     dif_scanStep=0;
     selectedSlaveAddr=FIX_SLAVE_ADDR;
     cycl_running=0;
-    gpi_storeDcDataValid(0);        // data are not yet valid, no response from DC by now
+    epi_resetDcDataValid();        // data are not yet valid, no response from DC by now
+
     datif_noResponseCtr=0;
 
     datif_repeatCtr=0;
@@ -142,14 +145,14 @@ char T_datif::datif_cycleSend()
     if ( !myDCIF->isPortOpen())
     {
         //qDebug()  << "com port not available";    // wird ununterbrochen ausgegeben
-        gpi_storeDcDataValid(0);    // DC data not valid
+        epi_resetDcDataValid();    // DC data not valid
         return 0;
     }
 
     // supervise if DC data are valid
     datif_noResponseCtr++;         // inc every 20ms
     if (datif_noResponseCtr>250)   // no life sign from device controller (DC) for about 3s
-        gpi_storeDcDataValid(0);    // DC data has not updated for >=5s -> no longer valid!
+        epi_resetDcDataValid();    // DC data has not updated for >=5s -> no longer valid!
 
     // Ueberwachung ob ein oder mehrere Commands am Stueck erfolgreich waren
     if (gpi_wantToResetSupervision())
@@ -203,21 +206,8 @@ char T_datif::datif_cycleSend()
         return 0;
     }
 
-    if (m_hw->dcDownloadRequested()) { // only happens in ca-master
-        m_hw->dcDownloadResetRequest();
 
-        // start download-thread.
-        m_downloadThread = new DownloadThread(m_hw);
-        m_downloadThread->start();
 
-        int cnt = 10;
-        while (--cnt > 0 && !m_downloadThread->isRunning()) {
-            QThread::msleep(100);
-        }
-        if (cnt <= 0) {
-            qCritical() << "DOWNLOAD-THREAD NOT RUNNING WITHIN 1000ms";
-        }
-    }
 
     // 17.7.2023: repeat commands if result was !=OK  -------------------------------------------------------------------
     if (datif_cmdWasPerformed==2 && doRepeat)       // Cmd was not or false performed und Wiederholen erwuenscht
@@ -355,7 +345,7 @@ char T_datif::datif_cycleSend()
     else
     {
         dif_scanStep=0;         // always start from beginning
-        gpi_storeDcDataValid(0);
+        epi_resetDcDataValid();
     }
 
     datif_cmdWasPerformed=0;    // 0: no response by now
@@ -368,9 +358,20 @@ char T_datif::datif_cycleSend()
 char T_datif::sendINrequestsAutomatic(void)
 {
     //qDebug() << "send IN request " << dif_scanStep;
-//    uint8_t datif_autoRequCommandList[50]={11, 12, 18, 104, 106, 103, 14, 27, 109, 17, 19, 23, 30, 31, 32, 33, 114, 35};
-    uint8_t datif_autoRequCommandList[30]={11, 12, 14, 17, 18, 19, 22, 23, 27, 30, 31, 32, 33, 35, 102, 103, 104, 106, 107, 109, 114,0,0,0,0,0,0,0,0,0};
-    uint8_t datif_maxNrCommands=21, datif_sendNow;
+    //uint8_t datif_autoRequCommandList[30]={11, 12, 14, 17, 18, 19, 22, 23, 27, 30,
+    //                                       31, 32, 33, 35, 102, 103, 104, 106, 107, 109,
+    //                                       114,0,0,0,0,0,0,0,0,0};
+
+    // extension 6.12.23, complete list:
+    uint8_t datif_autoRequCommandList[40]={11, 12, 13, 14, 17, 18, 19, 21, 22, 23,
+                                           24, 25, 27, 30, 31, 32, 33, 35, 39, 40,
+                                           41, 42, 102,103,104,106,107,108,109,110,
+                                           112,113,114,115,116,0,  0,  0,  0,  0};
+    uint8_t datif_maxNrCommands=35, datif_sendNow;
+
+    // send quicker while transaction is ongoing:
+    uint8_t datif_vendRequCommandList[15]={102,107,108,110,112,115,116,31,32,40,41,42,23,0,0};
+    uint8_t datif_maxVendingCmds=13;
 
     // special commands:
     // 102: get IOs run constantly!!!
@@ -380,40 +381,44 @@ char T_datif::sendINrequestsAutomatic(void)
     // 107, 22: MDB: poll if needed
 
     doRepeat=true;  // 20.9.23 15uhr (after release)
-    if (datif_sendSlowCmd>0)
-    {
-        // send special command, slowly
-        datif_sendNow=datif_autoRequCommandList[datif_pNextCmd++];
-        if (datif_pNextCmd >= datif_maxNrCommands)
-            datif_pNextCmd=0;
-        if (datif_sendNow>0)    // never send Command 0
-            datif_sendIOrequest(0, datif_sendNow, 0);
-        else
-            datif_pNextCmd=0;       // falls in der Liste 0 vorkommt dann von vorne beginnen
 
-        //qDebug()<< "datif send request " << datif_sendNow;
+    if (gpi_getNowCoinPay())
+    {
+        // send only important commands while transaction in progress
+        if (datif_pNextCmd>=datif_maxVendingCmds ) datif_pNextCmd=0;
+        datif_sendNow=datif_vendRequCommandList[datif_pNextCmd++];
+        if (datif_sendNow>0)    // never send Command 0
+        {
+            datif_sendIOrequest(0, datif_sendNow, 0);
+            //qDebug() << "datif, VEND-request: " << datif_sendNow;
+        } else
+            datif_pNextCmd=0;       // falls in der Liste 0 vorkommt dann von vorne beginnen
 
     } else
     {
-        if (gpi_getNowCoinPay())
+        // no transaction, request all but request DI's more frequently
+        if (datif_sendSlowCmd>0)    // send slow and fast commands alternating
         {
-            // request coin input, high priority
-            datif_sendIOrequest(0, 112, 0);
-            //qDebug()<< "datif send request 112 get coins";
+            // send special command, slowly
+            if (datif_pNextCmd>=datif_maxNrCommands ) datif_pNextCmd=0;
+            datif_sendNow=datif_autoRequCommandList[datif_pNextCmd++];
+            if (datif_sendNow>0)    // never send Command 0
+            {
+                datif_sendIOrequest(0, datif_sendNow, 0);
+               // qDebug() << "datif, auto-requ: " << datif_sendNow;
+            } else
+                datif_pNextCmd=0;       // falls in der Liste 0 vorkommt dann von vorne beginnen
         } else
         {
             // request inputs, high priority
             datif_sendIOrequest(0, 31, 0);         // 102
-            // while coin collection DIs are polled slowly with datif_autoRequCommandList[]
-
-            //qDebug()<< "datif send request 102 get DIs";
+            // while coin collection DIs are polled slower
+            //qDebug()<< "datif send requ.31 get DIs";
         }
+        if (++datif_sendSlowCmd>1) datif_sendSlowCmd=0;     // 0,1,0,1,0,1,0....
     }
 
-    if (++datif_sendSlowCmd>1) datif_sendSlowCmd=0;     // 0,1,0,1,0,1,0....
-
     return 0;       // 25.9.2023, wichtig sonst bleibt die komplette PTU stehen!!!!
-
 }
 
 
@@ -457,7 +462,7 @@ char T_datif::loadRecDataFromFrame()
     uint32_t ultmp;
     //int portNr;
     bool ret;
-    uint8_t uctmp;  //, res;      // maxai
+    uint8_t uctmp;  //, nn;  //, res;      // maxai
     char ctmp;
     //static uint8_t lastResult;
     //uint8_t prnResult;
@@ -1032,7 +1037,7 @@ char T_datif::loadRecDataFromFrame()
     case 31:        // Get dynamic machine conditions (doors, voltage, alarm….)
         if (RdDleng>50)
         {
-            gpi_storeDcDataValid(1);    // DC-Data are valid as DC responded.
+            epi_setDcDataValid();    // DC-Data are valid as DC responded.
                                         // Could be set to every response but this (31)
                                         // is a very common and very important request
             gpi_storeDynMachineConditions(RdDleng, receivedData);
@@ -1079,11 +1084,11 @@ char T_datif::loadRecDataFromFrame()
 /*
             qDebug()<<"datif cmd38 got vault data. blockNr: "<<readAddress;
             if (readAddress==0)
-            for (nn=0; nn<64; nn+=8)
-            {
-                qDebug()<<receivedData[nn]<<" "<<receivedData[nn+1]<<" "<<receivedData[nn+2]<<" "<<receivedData[nn+3]<<" "
-                         <<receivedData[nn+4]<<" "<<receivedData[nn+5]<<" "<<receivedData[nn+6]<<" "<<receivedData[nn+7];
-            }
+                for (nn=0; nn<64; nn+=8)
+                {
+                    qDebug()<<receivedData[nn]<<" "<<receivedData[nn+1]<<" "<<receivedData[nn+2]<<" "<<receivedData[nn+3]<<" "
+                             <<receivedData[nn+4]<<" "<<receivedData[nn+5]<<" "<<receivedData[nn+6]<<" "<<receivedData[nn+7];
+                }
 */
         //}
         break;
@@ -1123,9 +1128,7 @@ char T_datif::loadRecDataFromFrame()
         break;
 
     case 42:        // get BNA box content and value of types
-//        qDebug()<<  "CAmaster datif_got 42 ";
-//        for (uctmp=0; uctmp<64; uctmp++)
-//            qDebug()<<receivedData[uctmp]<<" ";
+        //qDebug()<<  "CAslave datif_got 42";
 
         if (RdDleng>60)
         {

src/hwapi.cpp

@@ -20,12 +20,13 @@
 */
 
 #include "hwapi.h"
-#include "reporting_thread.h"
 #include "download_thread.h"
+#include "reporting_thread.h"
 
-#include <algorithm>
 #include <cstring>
-#include <atomic>
+#include <QThread>
+#include <QDebug>
+
 
 static uint32_t hwapi_lastStartAmount;
 static uint32_t hwapi_lastTotalAmount;
@@ -39,6 +40,12 @@ static uint8_t bl_startupStep;
 hwapi::hwapi(QWidget *parent) : QObject(parent)
 {
     // constructor
+    qCritical() << "             hwapi::hwapi() APP_VERSION:" << APP_VERSION;
+    qCritical() << "          hwapi::hwapi() APP_BUILD_DATE:" << APP_BUILD_DATE;
+    qCritical() << "          hwapi::hwapi() APP_BUILD_TIME:" << APP_BUILD_TIME;
+    qCritical() << "    hwapi::hwapi() APP_EXTENDED_VERSION:" << APP_EXTENDED_VERSION;
+    qCritical() << "hwapi::hwapi() APP_EXTENDED_VERSION_LIB:" << APP_EXTENDED_VERSION_LIB;
+
 
     // create or attach shared memory segment
     m_sharedMem = SharedMem::getShm(sizeof(SharedMem));
@@ -55,9 +62,21 @@ hwapi::hwapi(QWidget *parent) : QObject(parent)
 //    {
 
 #ifdef THIS_IS_CA_MASTER
-        myDatif = new T_datif(this);    // für die  CAslave-Lib auskommentieren!
-#else
-    qCritical()<<"hwapi: error CAslave cannot include T_datif";
+
+#ifdef THIS_IS_CA_SLAVE
+#error "SLAVE LIB COMPILED INTO MASTER"
+#endif
+
+        myDatif = new T_datif();    // für die  CAslave-Lib auskommentieren!
+
+#endif
+
+#ifdef THIS_IS_CA_SLAVE
+
+#ifdef THIS_IS_CA_MASTER
+#error "MASTER LIB COMPILED INTO MASTER"
+#endif
+
 #endif
 
 //    }
@@ -109,16 +128,11 @@ hwapi::hwapi(QWidget *parent) : QObject(parent)
     connect(runProcess, SIGNAL(runProc_doorCoinBoxInserted()),          this, SLOT(sub_slotCoin14())); // hwapi_doorCoinBoxInserted()));
     connect(runProcess, SIGNAL(runProc_doorCBinAndAllDoorsClosed()),    this, SLOT(sub_slotCoin15())); // hwapi_doorCBinAndAllDoorsClosed()));
     connect(runProcess, SIGNAL(runProc_doorAllDoorsClosed()),           this, SLOT(sub_slotCoin16())); // hwapi_doorAllDoorsClosed()));
-
-
+    connect(runProcess, SIGNAL(runProc_coinAttached()),                 this, SLOT(coinAttached()));
 }
 
 void hwapi::hwapi_slotPayProc(void)
 {
-    //cash_paymentProcessing();
-    //doors_supervise();
-    //dcBL_cycle();
-
 
 }
 
@@ -212,6 +226,9 @@ void hwapi::sub_slotCoin16(void)
     emit hwapi_doorAllDoorsClosed();
 }
 
+void hwapi::coinAttached() {
+    emit hwapi_coinAttached();
+}
 
 
 /*
@@ -1792,6 +1809,8 @@ 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);
 
@@ -2896,6 +2915,8 @@ 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);
 
@@ -3000,6 +3021,8 @@ 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);
@@ -3007,6 +3030,8 @@ 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);
@@ -3062,7 +3087,9 @@ bool hwapi::cash_cancelPayment(void) const
 {
     // DB1: 1=encash    2=cancel & return coins
     //      3=stop and keep coins in escrow
-    epi_setNowCoinPay(false);    // new since 20.9.23
+    //epi_setNowCoinPay(false);    // new since 20.9.23
+    // am 6.12.23 wieder raus, waehrend Druck und wechseln auch schnell abfragen
+
     //qCritical() << "cash cancel payment and return coins";
     return sendFDcmd_set(156, 0,0, 2,0,0,0);
 }
@@ -3072,7 +3099,8 @@ bool hwapi::cash_stopPayment(void) const
 {
     // DB1: 1=encash    2=cancel & return coins
     //      3=stop and keep coins in escrow
-    epi_setNowCoinPay(false);    // new since 20.9.23
+    //epi_setNowCoinPay(false);    // new since 20.9.23
+                                   // am 6.12.23 wieder raus, waehrend Druck und wechseln auch schnell abfragen
     //qCritical() << "cash stop payment and keep coins in escrow";
    // qCritical() << "emitting signal StopByPushbutton 2";
     emit hwapi_payStopByPushbutton();
@@ -3306,22 +3334,15 @@ void hwapi::sys_restoreDeviceParameter(struct T_devices *deviceSettings) const
     // attention: only applies if function "sys_sendDeviceParameter()" was used to send this settings before
     //          cannot be used to see settings programmed by JsonFile
     uint8_t buf[64];
-    uint8_t LL, nn;
+    uint8_t LL;
     tslib_strclr(buf,0,64);
-    uint8_t *start;
 
     //runProcess->epi_restore64BdevParameter(&LL, buf); // wozu die???
     epi_restoreRbDeviceSettings(&LL, buf);      // viel besser, stimmt immer
 
-    // Puffer in struct eintragen:
-    start = &deviceSettings->kindOfPrinter;
-    nn=0;
-    do
-    {
-        *start = buf[nn];
-        start++;
-    } while(++nn<LL);
+    Q_STATIC_ASSERT(sizeof(*deviceSettings) <= sizeof(buf));
 
+    memcpy(deviceSettings, buf, sizeof(*deviceSettings));
 }
 
 bool hwapi::sys_areDCdataValid(void) const
@@ -3433,6 +3454,8 @@ 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);
 
@@ -3563,6 +3586,8 @@ 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

src/main.cpp

@@ -1,5 +1,16 @@
+#ifdef WIN32
 
-#ifndef WIN32
+#include <QCoreApplication>
+#include "tslib.h"
+
+int main(int argc, char *argv[])
+{
+    QCoreApplication a(argc, argv);
+
+    return a.exec();
+}
+
+#else
 
 #undef _FORTIFY_SOURCE
 
@@ -7,11 +18,11 @@
 #include <stdio.h>
 
 // Must define the interpreter to be the dynamic linker
-#ifdef __LP64__
-#error "__LP64__ not defined for PTU5"
-#else
-const char service_interp[] __attribute__((section(".interp"))) = "/lib/ld-linux-armhf.so.3";
-#endif
+//#ifdef __LP64__
+//#error "__LP64__ not defined for PTU5"
+//#else
+//const char service_interp[] __attribute__((section(".interp"))) = "/lib/ld-linux-armhf.so.3";
+//#endif
 
 
 int main(int argc, char *argv[]) {

src/runProc.cpp

@@ -2,7 +2,6 @@
 #include <QDebug>
 #include "controlBus.h"
 #include "dcBL.h"
-#include "interfaces.h"
 
 static uint32_t hwapi_lastStartAmount;
 static uint32_t hwapi_lastTotalAmount;
@@ -29,25 +28,41 @@ T_runProc::T_runProc()
     QTimer *runProc_callProcesses = new QTimer();
     connect(runProc_callProcesses, SIGNAL(timeout()), this, SLOT(runProc_slotProcess()));
     runProc_callProcesses->setSingleShot(false);
-    runProc_callProcesses->start(100);     // in ms
+    runProc_callProcesses->start(10);     // in ms
 
     hwapi_lastDoorState=0;      // default: all doors (should be) closed, coin box inserted
         // bit0: upper door  1:middle 2:lower  3=cash-box out
 
-    hwapi_triggerBL = new QTimer();
-    connect(hwapi_triggerBL, SIGNAL(timeout()), this, SLOT(bl_performComplStart()));
-    hwapi_triggerBL->setSingleShot(false);
-    hwapi_triggerBL->stop();
+//    hwapi_triggerBL = new QTimer();
+//    connect(hwapi_triggerBL, SIGNAL(timeout()), this, SLOT(bl_performComplStart()));
+//    hwapi_triggerBL->setSingleShot(false);
+//    hwapi_triggerBL->stop();
+
+    myTO = new QTimer();
+    myTO->setSingleShot(true);
+    myTO->start(200);
 
 }
 
 
 void T_runProc::runProc_slotProcess(void)
 {
+#ifndef THIS_IS_CA_MASTER
+    bool const coinAttached = epi_getDI_CoinAttach();
+    // exchange: (atomically) replaces the underlying value of m_coinAttached
+    // with the value of coinAttached, returns the value of m_coinAttached
+    // before the call
+    if (m_coinAttached.exchange(coinAttached) == false) {
+        if (coinAttached) {
+            // old value was false, and new value is true
+            emit runProc_coinAttached();
+        }
+    }
     cash_paymentProcessing();
     doors_supervise();
+    bl_performComplStart();     // neu 1.12.23
     dcBL_cycle();
-
+#endif
 }
 
 bool T_runProc::cash_startPayment(uint32_t amount)
@@ -160,6 +175,7 @@ uint8_t T_runProc::cash_paymentProcessing(void)
 
     sub_getDynMachineConditions(&myDynMachCond);
     payInProg= myDynMachCond.paymentInProgress;
+    // Version Szeged:  aug2023
     //	0: stopped by timeout
     //  1: running  2: wait4lastCoin
     //				3: payment stopped manually, coins in Escrow
@@ -169,9 +185,26 @@ uint8_t T_runProc::cash_paymentProcessing(void)
     //              7: coins returned 2 cases: due to cancel-button or printer-error
     //				8: CoinChecker or MDB on Error
 
+    // since Schoenau with bill and changer, nov2023
+    //0 = no payment
+    //will be set to 1 by cash_startCollection()
+    //neu 1: wait for devices getting ready for payment
+    //2 = payment,
+    //3 = wait for last coin/bill
+    //4 = Bezahlvorgang manuell beendet
+    //5 = payment stopped autom, amount collected, coins in Escrow
+    //6 = Bezahlvorgang beendet weil ZK voll
+    //4,5,6: payment done, keep on polling, wait for cash or return command
+    //7 = encash collected money from coin escrow into cash box
+    //8 = return "amountToReturn", can be complete inserted amount or only overpayment
+    //9 = wait for changer result
+    //10= print refund receipt with "amountToReturn"
+
+
 //    qCritical() << "emitting signal payCancelled";
 //    emit runProc_payCancelled();
-
+    /*
+     // gabs bei Szeged, jetzt nicht mehr:
     if (payInProg==8)
     {
         // coin checker faulty, cannot start
@@ -182,11 +215,11 @@ uint8_t T_runProc::cash_paymentProcessing(void)
             emit runProc_coinCollectionAborted();
             //sendFDcmd_set(156, 0,0, 2,0,0,0);       // cancel payment
         }
-
         return 10;    // error cannot start
-    }
+    }*/
 
-    if (empState>=10 && empState<=12 && (payInProg==1 || payInProg==2)  )
+//    if (empState>=10 && empState<=12 && (payInProg==1 || payInProg==2)  )     // Szeged
+    if ( payInProg==2 )       //8.12.23
     {
         // coin acceptance is active now:
         if (hwapi_paymentStarted==1)    // && (( payInProg==0) || ( payInProg>5)))     //16.6.23
@@ -219,7 +252,8 @@ uint8_t T_runProc::cash_paymentProcessing(void)
 
         } else
 
-        if (payInProg==3)   // user pressed "Next/Continue", keep coin
+        //if (payInProg==3)   // user pressed "Next/Continue", keep coin
+        if (payInProg==4)   // user pressed "Next/Continue", keep coin     since nov2023
         {
             hwapi_paymentStarted++;
             collActiv=3;
@@ -227,7 +261,8 @@ uint8_t T_runProc::cash_paymentProcessing(void)
             emit runProc_payStopByPushbutton();
         } else
 
-        if (payInProg==4)   // max achieved, keep coins
+        //if (payInProg==4)   // max achieved, keep coins
+        if (payInProg==5)   // max achieved, keep coins    since nov2023
         {
             hwapi_paymentStarted++;
             collActiv=4;
@@ -235,7 +270,8 @@ uint8_t T_runProc::cash_paymentProcessing(void)
             emit runProc_payStopByMax();
         } else
 
-        if (payInProg==5)   // escrow full, keep coins
+        //if (payInProg==5)   // escrow full, keep coins
+        if (payInProg==6)   // escrow full, keep coins since nov2023
         {
             hwapi_paymentStarted++;
             collActiv=5;
@@ -243,14 +279,14 @@ uint8_t T_runProc::cash_paymentProcessing(void)
             emit runProc_payStopByEscrow();
         }
 
-        /* 5.10.23 raus, geht auf 99 wenn Betrag erreicht, ist aber kein fehler
+        // 5.10.23 raus, geht auf 99 wenn Betrag erreicht, ist aber kein fehler
         if ( (empState<10) || (empState>12)) // error
         {
-            collActiv=13;
-            hwapi_paymentStarted=90;
-            qCritical() << "emitting signal payStopByError" << empState;
-            emit runProc_payStopByError();
-        }  */
+            //collActiv=13;
+            //hwapi_paymentStarted=90;
+            //qCritical() << "emitting signal payStopByError" << empState;
+            //emit runProc_payStopByError();
+        }
 
     }
 
@@ -258,7 +294,8 @@ uint8_t T_runProc::cash_paymentProcessing(void)
     {
         // coin collection finished, but coins kept until printing done
         collActiv=2;
-        if (payInProg==6)   // coins encashed
+        //if (payInProg==6)   // coins encashed
+        if (payInProg==7)   // coins encashed        since nov2023
         {
             collActiv=6;
             hwapi_paymentStarted++;
@@ -266,7 +303,8 @@ uint8_t T_runProc::cash_paymentProcessing(void)
             emit runProc_coinProcessJustStopped();
         } else
 
-        if (payInProg==7)   // coins returned, printing failed
+        //if (payInProg==7)   // coins returned, printing failed
+        if (payInProg==0)   // coins returned, printing failed        since nov2023
         {
             collActiv=7;
             hwapi_paymentStarted++;
@@ -654,7 +692,7 @@ bool T_runProc::bl_isUp(void)
             receivedData[3]==45 && receivedData[4] ==95 && receivedData[5]==176)
         {
             qDebug() << "got BL response to readFWversion";
-            epi_clrRawReceivedString();
+            //epi_clrRawReceivedString();
             return true;
         }
         // response to "start BL"
@@ -662,7 +700,7 @@ bool T_runProc::bl_isUp(void)
             receivedData[3]==223 && receivedData[4] ==131 )
         {
             qDebug() << "hwapi_bl_isUp: got BL response to start";
-            epi_clrRawReceivedString();
+            //epi_clrRawReceivedString();
             return true;
         }
     }
@@ -677,7 +715,8 @@ void T_runProc::bl_completeStart(void)
 
 bool T_runProc::bl_performComplStart(void)
 {
-    // must be called cyclic by timer
+    bool result;
+
     static uint8_t retryCtr;
 
     if ((bl_startupStep<1) || (bl_startupStep>10))
@@ -691,58 +730,69 @@ bool T_runProc::bl_performComplStart(void)
 
     if (bl_startupStep==2)
     {
+        qDebug()<<"rebooting";
         bl_rebootDC();
-        hwapi_triggerBL->stop();
-        hwapi_triggerBL->start(1000);    // call next step in 1s
+        myTO->stop();
+        myTO->start(500);
         retryCtr=0;
         bl_startupStep++;
     } else
 
     if (bl_startupStep==3)
     {
-        //qDebug()<<"starting BL";
-        bl_startBL();
-        hwapi_triggerBL->stop();
-        hwapi_triggerBL->start(100);
-        bl_startupStep++;
-
+        if (!myTO->isActive())
+        {
+            qDebug()<<"starting BL";
+            bl_startBL();
+            myTO->stop();
+            myTO->start(500);
+            bl_startupStep++;
+        }
     } else
 
     if (bl_startupStep==4)
     {
-        //if (!myTO->isActive())
-        //{
-        bl_checkBL();
-        hwapi_triggerBL->stop();
-        hwapi_triggerBL->start(100);
-        bl_startupStep++;
-
-        //}
+        if (!myTO->isActive())
+        {
+            qDebug()<<"checking BL";
+            bl_checkBL();
+            myTO->stop();
+            myTO->start(200);
+            bl_startupStep++;
+        }
 
     } else
 
     if (bl_startupStep==5)
     {
-        hwapi_triggerBL->stop();
-        if (bl_isUp())
+        if (!myTO->isActive())
         {
-            bl_startupStep=99;
-            //  BL is up and running
-        } else
-        {
-            retryCtr++;    // start again
-            if (retryCtr>=15)
+            qDebug()<<"step 5";
+            result = bl_isUp();
+            qDebug()<<"BL result: "<< result;
+            if (result)
             {
                 bl_startupStep=99;
-                //qDebug()<<"BL error!!!";
+                qDebug()<<"BL is working now...";
+                //  BL is up and running
+                return true;
             } else
             {
-                bl_startupStep=3;
-                //qDebug()<<"BL retry...";
+                retryCtr++;    // start again
+                if (retryCtr>=10)
+                {
+                    bl_startupStep=99;
+                    qDebug()<<"BL error!!!";
+                } else
+                {
+                    bl_startupStep=3;
+                    myTO->stop();
+                    myTO->start(200);
+                    qDebug()<<"BL retry...";
+                }
             }
         }
-
     }
-    return true;
+    return false;
 }
 

src/storeINdata.cpp

@@ -12,6 +12,7 @@
 
 
 
+
 // store power on/off condition of the devices to control the data request
 
 //static bool indat_savePrnPwr;
@@ -1984,7 +1985,7 @@ void epi_iniVRstorage(void)
 void gpi_storeVaultRecord(uint8_t blkNr, uint8_t *data )
 {
     uint16_t start=blkNr, ii;
-    //qDebug()<<"storing vault data "<<blkNr;
+    qDebug()<<"storing vault data "<<blkNr;
     SharedMem::write()->store_gotNrBlocksOfVaultRec |= (1<<start);  // setze pro Block ein bit, wir brauchen block 0...5
                                                 // also muss store_gotNrBlocksOfVaultRec auf 0x1F stehen
     start<<=6;      // *64
@@ -2054,13 +2055,50 @@ uint16_t epi_getNrOfCoinsInCashBox(void)
 
 void gpi_storeDcDataValid(bool isVal)
 {
-    SharedMem::write()->store_DcDataAreValid = isVal;
+    bool now=SharedMem::read()->store_DcDataAreValid;
+    if (isVal != now)
+    {
+        SharedMem::write()->store_DcDataAreValid = isVal;
+#ifdef THIS_IS_CA_MASTER
+        qDebug()<<"master lib sets DcDataValid to "<<isVal;
+#else
+        qDebug()<<"slave lib sets DcDataValid to "<<isVal;
+#endif
+    }
 }
 
+void epi_setDcDataValid(void)
+{
+    bool now=SharedMem::read()->store_DcDataAreValid;
+    if (now==false)
+    {
+        SharedMem::write()->store_DcDataAreValid = true;
+#ifdef THIS_IS_CA_MASTER
+        qDebug()<<"master lib SET DcDataValid";
+#else
+        qDebug()<<"slave lib SET DcDataValid";
+#endif
+    }
+}
+
+void epi_resetDcDataValid(void)
+{
+    bool now=SharedMem::read()->store_DcDataAreValid;
+    if (now==true)
+    {
+        SharedMem::write()->store_DcDataAreValid = false;
+#ifdef THIS_IS_CA_MASTER
+        qDebug()<<"master lib RESET DcDataValid";
+#else
+        qDebug()<<"slave lib RESET DcDataValid";
+#endif
+    }
+}
 
 bool epi_areDcDataValid()
 {
     return SharedMem::read()->store_DcDataAreValid;
+
 }
 
 // ....................................................................................