Include memory for all json file names.

contains the necessary connects.

CArunGUI/CArunGUI.pro

@@ -21,15 +21,14 @@ 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,9 +375,6 @@ 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
@@ -388,29 +385,22 @@ 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)
+
-        {
+        //uint32_t len= datei_nrOfEntriesInFile(myBA);
-            bs=csv_getEntryAsString(myBA,0);      // read the 's'     war 2!??
+        //uint64_t ulltmp=csv_getEntryAs2Ulong(myBA,0);
-            br=csv_getEntryAsInt(myBA,1);               // z.B. 5 (5.Eintrag in der Baud-Liste)
+        //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
-            cn=csv_getEntryAsString(myBA,3);       // z.B. COM9
+        QString  cn=csv_getEntryAsString(myBA,3);       // z.B. COM9
-            ci=csv_getEntryAsInt(myBA,4);               // Eintragsnummer in COM-Fenster
+        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"
-        } else
-        {
-            // 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);
-
-        }
         myTO->start(100);     // restart
         myStep++;
     } else
@@ -420,13 +410,9 @@ bool T_winComPort::working(uint16_t *nextScreen, uint8_t *useNavi)
         if (!myTO->isActive())
         {
             if (HWaccess->dc_isPortOpen())
-            {
                 myStep++;
-            } else
+            else
-            {
+                myStep=99;  // stop automatic connection and wait for manual start
-                myStep=6;   // 13.12.23: start Autoconnect cycle
-                qDebug()<<"CArunGui: port is still closed, restarting..";
-            }
             myTO->start(100);
         }
     } else
@@ -448,10 +434,7 @@ 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);
         }
 
@@ -462,38 +445,23 @@ 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)
     {
-        if (!myTO->isActive())
+        // got next screen:
-        {
+        //myNextStep=2; // nicht bei CArun
-            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
+        // stop here, everything done
-        myTO->start(100);     // restart
-        myStep=0;
     } else
 
     if (myStep==7)
     {
-        // stay here, DC connection is up and running
-
 
     } else
     {
@@ -502,6 +470,7 @@ bool T_winComPort::working(uint16_t *nextScreen, uint8_t *useNavi)
 
     if (myNextStep)
     {
+        //qDebug()<<"fenster1 working: "<< myNextStep;
         *nextScreen=myNextStep;
         myNextStep=0;
     }

DCLibraries.pri

@@ -33,8 +33,6 @@ QMAKE_CXXFLAGS += -C
 QMAKE_CXXFLAGS += -O2 -O
 QMAKE_CXXFLAGS += -g
 QMAKE_CXXFLAGS += -Wno-deprecated-copy
-# QMAKE_CXXFLAGS += -fsanitize=address
-# QMAKE_CXXFLAGS += -fno-omit-frame-pointer
 
 QMAKE_LFLAGS += -Wl,-e,main
 
@@ -83,27 +81,37 @@ 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/shared_mem_buffer.h \
+    $${PWD}/include/download_thread.h \
+    $${PWD}/include/reporting_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/shared_mem_buffer.cpp \
+    $${PWD}/src/download_thread.cpp \
+    $${PWD}/src/reporting_thread.cpp
 
 
 # INTERFACE = DeviceController

DCLibraries.pro

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

dCArun/dCArun.pro

@@ -25,16 +25,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\\\"
 DEFINES+=APP_BUILD_TIME=\\\"$$BUILD_TIME\\\"

dCArun/win01_com.cpp

@@ -375,9 +375,6 @@ 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
@@ -388,29 +385,22 @@ 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)
+
-        {
+        //uint32_t len= datei_nrOfEntriesInFile(myBA);
-            bs=csv_getEntryAsString(myBA,0);      // read the 's'     war 2!??
+        //uint64_t ulltmp=csv_getEntryAs2Ulong(myBA,0);
-            br=csv_getEntryAsInt(myBA,1);               // z.B. 5 (5.Eintrag in der Baud-Liste)
+        //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
-            cn=csv_getEntryAsString(myBA,3);       // z.B. COM9
+        QString  cn=csv_getEntryAsString(myBA,3);       // z.B. COM9
-            ci=csv_getEntryAsInt(myBA,4);               // Eintragsnummer in COM-Fenster
+        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"
-        } else
-        {
-            // 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);
-
-        }
         myTO->start(100);     // restart
         myStep++;
     } else
@@ -420,13 +410,9 @@ bool T_winComPort::working(uint16_t *nextScreen, uint8_t *useNavi)
         if (!myTO->isActive())
         {
             if (HWaccess->dc_isPortOpen())
-            {
                 myStep++;
-            } else
+            else
-            {
+                myStep=99;  // stop automatic connection and wait for manual start
-                myStep=6;   // 13.12.23: start Autoconnect cycle
-                qDebug()<<"CArunGui: port is still closed, restarting..";
-            }
             myTO->start(100);
         }
     } else
@@ -448,10 +434,7 @@ 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);
         }
 
@@ -462,38 +445,23 @@ 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)
     {
-        if (!myTO->isActive())
+        // got next screen:
-        {
+        //myNextStep=2; // nicht bei CArun
-            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
+        // stop here, everything done
-        myTO->start(100);     // restart
-        myStep=0;
     } else
 
     if (myStep==7)
     {
-        // stay here, DC connection is up and running
-
 
     } else
     {
@@ -502,6 +470,7 @@ bool T_winComPort::working(uint16_t *nextScreen, uint8_t *useNavi)
 
     if (myNextStep)
     {
+        //qDebug()<<"fenster1 working: "<< myNextStep;
         *nextScreen=myNextStep;
         myNextStep=0;
     }

include/datIf.h

@@ -133,9 +133,8 @@
 #define SENDCOMBINED            0
 
 
-
-class DownloadThread;
 class hwinf;
+class DownloadThread;
 class T_datif : public QObject
 {
     Q_OBJECT    
@@ -166,7 +165,8 @@ class T_datif : public QObject
     T_prot *myDCIF;
     QTimer *datif_trigger;
     uint8_t selectedSlaveAddr;
-    hwinf *m_hw = nullptr;
+    DownloadThread *m_downloadThread;
+    hwinf *m_hw;
 
 private slots:
     char datif_cycleSend();

include/datei.h

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

include/hwapi.h

@@ -26,8 +26,6 @@ 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>
@@ -39,11 +37,11 @@ V4.0  6.9.2023: activating DC-Bootloader in slve-lib (SM)
 #include "controlBus.h"
 #include "storeINdata.h"
 #include "dcBL.h"
-//#include <../plugins/interfaces.h>
+#include "interfaces.h"
 #include "shared_mem_buffer.h"
 #include "runProc.h"
-#include "interfaces.h"
+#include "download_thread.h"
-
+#include "reporting_thread.h"
 
 /*
  * select Plugin Type here
@@ -75,13 +73,10 @@ 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 DownloadThread;
 class ReportingThread;
+class DownloadThread;
 class hwapi :   public QObject,
                 public hwinf
 {
@@ -93,13 +88,13 @@ private:
     void sub_storeSendingText(QByteArray *buf) const;
     QTimer *hwapi_TimerPayment;
     QSharedMemory *m_sharedMem;
-    ReportingThread *m_reportingThread = nullptr;
+    ReportingThread *m_reportingThread;
-    DownloadThread *m_downloadThread = nullptr;
+    DownloadThread *m_downloadThread;
-    //QTimer *hwapi_triggerBL;
 
 public:
     explicit hwapi(QWidget *parent = nullptr);
 
+
     #ifdef  THIS_IS_CA_MASTER
     T_datif *myDatif;
     #endif
@@ -1301,15 +1296,8 @@ public:
 
     uint8_t bna_getCurrentNotes(uint16_t latestBill, uint16_t *currentNotes) const override;
         // returns number of collected bank notes since start-command (current transaction)
-        // return value: numbers of bills or 99 in case of error
+        //  latestBill: last accepted bank note, value in cent
-        //  latestBill: not used
+        //  currentNotes an array with up to 16 (further) notes collected
-        // 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;
 
@@ -1318,6 +1306,7 @@ 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;
@@ -1330,6 +1319,7 @@ public:
     bool dcDownloadReportRunning() const override;
     bool dcDownloadReportFinished() override;
 
+
     bool dcDownloadThreadStart() override;
     bool dcDownloadThreadRunning() const override;
     void dcDownloadThreadFinalize(DownloadThread *) override;
@@ -1354,38 +1344,34 @@ public:
 
     virtual QObject const *getAPI() override;
 
-signals:
+signals:    // for download
     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_templatePrintFinished_OK(void) const override;
+    void hwapi_coinCollectionJustStarted(void) const;
-    void hwapi_templatePrintFinished_Err(void) const override;
+    void hwapi_coinCollectionAborted(void) const;
 
-    void hwapi_coinCollectionJustStarted(void) const override;
+    void hwapi_gotNewCoin(void) const;
-    void hwapi_coinCollectionAborted(void) const override;
+    void hwapi_payStopByMax(void) const;
+    void hwapi_payStopByPushbutton(void) const;
 
-    void hwapi_gotNewCoin(void) const override;
+    void hwapi_payStopByEscrow(void) const;
-    void hwapi_payStopByMax(void) const override;
+    void hwapi_payStopByError(void) const;
-    void hwapi_payStopByPushbutton(void) const override;
+    void hwapi_payStopByTimeout(void) const;
-
+    void hwapi_payCancelled(void) const;
-    void hwapi_payStopByEscrow(void) const override;
+    void hwapi_coinProcessJustStopped(void) const;
-    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 override;
+    void hwapi_doorServiceDoorOpened(void) const;
-    void hwapi_doorVaultDoorOpened(void) const override;
+    void hwapi_doorVaultDoorOpened(void) const;
-    void hwapi_doorCoinBoxRemoved(void) const override;
+    void hwapi_doorCoinBoxRemoved(void) const;
-    void hwapi_doorCoinBoxInserted(void) const override;
+    void hwapi_doorCoinBoxInserted(void) const;
-    void hwapi_doorCBinAndAllDoorsClosed(void) const override;
+    void hwapi_doorCBinAndAllDoorsClosed(void) const;
-    void hwapi_doorAllDoorsClosed(void) const override;
+    void hwapi_doorAllDoorsClosed(void) const;
-
-
-
-
 
  private slots:
     //void hwapi_slotPrintFinished_OK(void);

include/interfaces.h

@@ -2,6 +2,7 @@
 #define INTERFACE_H
 
 #include <QtPlugin>
+#include <QString>
 
 
 
@@ -24,7 +25,6 @@ struct T_emp
 
    // dynamic:
    uint8_t state;      // step counter of EMP (electronic coin checker) FSM (finite state machine):
-   /*
        // 0=start command
        // 1=powered, do emp ini, send reset
        // 2=delay
@@ -40,7 +40,7 @@ struct T_emp
        // 90: stop all, 1s delay
        // 99: off, all stopped
 
-*/
+
    uint8_t pollingRunning;
    uint8_t paymentRunning;
 
@@ -239,7 +239,6 @@ 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
@@ -248,21 +247,6 @@ 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;
@@ -414,6 +398,7 @@ struct T_bna
 
 };
 
+class hwapi;
 class DownloadThread;
 class hwinf
 {
@@ -2270,23 +2255,14 @@ 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)
-    // return value: numbers of bills or 99 in case of error
+    //  latestBill: last accepted bank note, value in cent
-    //  latestBill: not used
+    //  currentNotes an array with up to 16 (further) notes collected
-    // 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 {}
 
@@ -2350,49 +2326,12 @@ public:
 
     virtual QObject const *getAPI() { return nullptr; }
 
-
+signals:    // for download
-signals:
+    void hwapi_reportDCDownloadStatus(QString const&) const;
-    /*
+    void hwapi_reportDCDownloadSuccess(QString const&) const;
-        NOTE: the difference between a virtual Qt signal and a normal Qt signal:
+    void hwapi_reportDCDownloadFailure(QString const&) const;
-        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;
-
 
     // 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;
 
@@ -2415,7 +2354,6 @@ signals:
     void hwapi_doorCoinBoxInserted() const;
     void hwapi_doorCBinAndAllDoorsClosed() const;
     void hwapi_doorAllDoorsClosed() const;
-    */
 };
 
 

include/reporting_thread.h

@@ -3,7 +3,6 @@
 
 #include <QThread>
 #include <QString>
-// #include <functional>
 
 class hwapi;
 class ReportingThread : public QThread {
@@ -13,14 +12,6 @@ public:
     ReportingThread(hwapi *hw);
     ~ReportingThread();
 
-    //void setFunction(std::function<void(QString const&)> f) {
-    //    m_f = f;
-    //}
-
-    //std::function<void(QString const&)> function() {
-    //    return m_f;
-    //}
-
 protected:
     // reporting thread does not have a running event queue, and therefore
     // no slots. signals work the usual way.
@@ -29,7 +20,6 @@ protected:
 private:
     hwapi *m_hw;
     QString m_fileToDownload;
-    //std::function<void(QString const&)> m_f;
 };
 
 #endif // REPORTING_THREAD_H_INCLUDED

include/runProc.h

@@ -2,7 +2,6 @@
 #ifndef RUN_PROCESS_H
 #define RUN_PROCESS_H
 
-#include <stdint.h>
 #include <QMainWindow>
 #include <QString>
 #include <QTimer>
@@ -26,7 +25,7 @@
 class T_runProc : public QObject
 {
     Q_OBJECT
-    QTimer *hwapi_TimerPayment, *hwapi_triggerBL, *myTO;
+    QTimer *hwapi_TimerPayment, *hwapi_triggerBL;
 
     void sub_emp_getAllParameters(struct T_emp *emp);
     void changer_getAllParameters(struct T_changer *mw);

include/shared_mem_buffer.h

@@ -300,6 +300,7 @@ struct SharedMem
 
     uint8_t  p_nextFDcmdsInQueue;
 
+
     // download of device controller and json files
     struct DCDownload {
         enum class FILE_INDEX {
@@ -321,11 +322,6 @@ struct SharedMem
         std::atomic_bool m_finished{false};
     } m_downLoadDC;
 
-    // meta-data
-    char os_release[64];
-    char date_of_creation[32];
-    char creator[128]; // name of application plus pid
-
     static QSharedMemory *getShm(std::size_t s = 0);
 
     static SharedMem *getData()

include/shared_mem_buffer.h.new

@@ -1,601 +0,0 @@
-#ifndef SHARED_MEM_BUFFER_INCLUDED_H
-#define SHARED_MEM_BUFFER_INCLUDED_H
-
-#include <cinttypes>
-#include <atomic>
-
-#include <QSharedMemory>
-#include <QtGlobal>
-#include <QDebug>
-
-
-bool shdMem_firstUse(void);
-
-// Vorsicht: im shared memory ist kein QString erlaubt!!!!!!!!!!!!!!!!!!!!!!
-//    nur standard C Typen!!!!!!
-//    also auch kein QByteArray o.ä.
-
-// Vorsicht: Zugriffe auf Comport NICHT ins shared mem --> Absturz!!!!
-
-struct SharedMem
-{
-#ifndef QT_NO_DEBUG
-    char mem_guard_1;
-#endif
-
-    // ------------------ Comport Control --------------------------------
-    bool     rs_portIsOpen;
-    bool     AutoEmissionOn;
-    bool     Sdata_serialTestResult;
-    uint8_t  Sdata_pProtResultOk;
-    uint16_t Sdata_receivedDataLength;
-    uint8_t  Sdata_receivedDataBlock[64];
-    uint8_t  ndbs, pari, nsb, br;
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_2;
-#endif
-
-    uint8_t  Sdata_lastResult;
-    uint8_t  Sdata_OverallResult;
-    bool     Sdata_startSV;
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_3;
-#endif
-
-    // ------------------ Data INPUT --------------------------------
-
-    bool indat_savePrnPwr;
-    bool indat_saveMifPwr;
-    bool indat_MdbIsOn;
-    //QString indat_HWversion;
-    //QString indat_SWversion;
-    //QString indat_DCstate;
-
-    #define versionBufferLen   32
-    char indat_HWversion[versionBufferLen];
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_4;
-#endif
-
-    char indat_SWversion[versionBufferLen];
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_5;
-#endif
-
-    char indat_DCstate[versionBufferLen];
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_6;
-#endif
-
-    struct Sdata
-    {
-        uint64_t slaveUID;
-        uint8_t UIDstr[8];
-    } Sdata;
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_7;
-#endif
-
-    struct T_globTime
-    {
-        // Reihenfolge nicht vertauschen!!!!!
-        uint8_t     hour;
-        uint8_t     minute;
-        uint8_t     second;
-        uint8_t     Year;
-        uint8_t     Month;
-        uint8_t     DayOfMonth;
-        uint8_t     DayOfWeek;          // 1=monday...7
-        uint8_t     reserve1;
-
-        uint16_t     MinutesOfToday;
-        uint16_t     reserve2;
-
-        uint32_t     SecondsOfToday;
-
-        uint8_t      IsLeapyear;
-        uint8_t      nextLeap;
-        uint8_t      lastLeap;
-        uint8_t      hoursOfWeek;
-
-        uint16_t     minOfWeek;
-        uint16_t     hoursOfMonth;
-        uint16_t     minOfMonth;
-        uint16_t     dayOfYear;
-        uint16_t     hoursOfYear;
-        uint16_t     reserve3;
-
-        uint32_t     minOfYear;
-
-        uint8_t      squareOutMode;
-        uint8_t      free1;
-        uint16_t     reserve4;
-        uint32_t     minOfMillenium;
-        // bis hierher 44byts
-        uint32_t    free2;
-        uint32_t    free3;
-        uint32_t    free4;
-
-    } getGlobalTime;
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_8;
-#endif
-
-    #define MAXNROF_AI              4
-    uint16_t   AI_val[MAXNROF_AI];
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_9;
-#endif
-
-    #define MAXNROF_MEASURE         4
-    uint32_t   Sdata_measurement[MAXNROF_MEASURE];
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_10;
-#endif
-
-    uint8_t di_doorSwitch;
-    uint8_t di_vaultSwitch;
-    uint8_t di_lockSwitch;
-    uint8_t di_opto;
-    uint8_t di_aux;
-    bool di_wakeFromPtu;
-    bool di_wakeFromMdb;
-    bool di_PrnReady;
-    bool di_CoinAttach;
-    bool di_CoinEscrowOpen;
-    bool di_mifCardTap;
-    bool di_wakeFromModem;
-    bool di_contactPwrOn;
-    bool di_mifarePwrOn;
-    bool di_rdbk_mdbTxd;
-    bool di_AuxPwrOn;
-    bool di_gsmPwrOn;
-    bool di_creditPwrOn;
-    bool di_printerPwrOn;
-    bool di_mdbPwrOn;
-    bool di_rejMot_home;
-    uint8_t di_npe_sensor;
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_11;
-#endif
-
-    uint8_t do_mbdRxTst;
-    uint8_t do_motorBits;
-    uint8_t do_serialSwitch;
-    uint8_t do_ledsAndFan;
-    uint8_t do_laermUndRelay;
-    uint8_t do_ptuWake;
-    uint8_t do_auxPower;
-    uint8_t do_coinShutter;
-    uint8_t do_coinEscrow;
-    uint8_t do_printerPower;
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_12;
-#endif
-
-    //#define NROFMIFSTATEBYTES   40
-    //uint8_t Sdata_MIF_STATE[NROFMIFSTATEBYTES];
-    uint8_t Sdata_MIF_DATA[64];
-    //uint8_t mif_cardType;
-    //uint8_t mif_cardHolder[8];
-    uint8_t Sdata_MIF_ATB[64];
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_13;
-#endif
-
-    #define pi_prnStateArraySize    20
-    uint8_t Sdata_PRN_STATE[pi_prnStateArraySize];
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_14;
-#endif
-
-    #define pi_prnFontArraySize     20
-    uint8_t Sdata_PRN_FONTS[pi_prnFontArraySize];
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_15;
-#endif
-
-    bool Sdata_mdb_busRdy;
-    bool Sdata_mdb_V12on;
-    bool Sdata_mdb_V5on;
-
-    uint8_t Sdata_mdbNrOfRecData;
-    uint8_t Sdata_RecBuff[40];
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_16;
-#endif
-
-    uint8_t Sdata_empNrOfsettings;
-    uint8_t Sdata_emp_settingsBuff[66];
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_17;
-#endif
-
-    struct T_coin
-    {
-        uint8_t valid;
-        uint8_t signal;
-        uint8_t error;
-        uint8_t pad;
-        uint16_t value;
-    };
-
-    #define     MEMDEPTH_GOTCOINS       16
-    struct T_coin gotCoin[MEMDEPTH_GOTCOINS];
-    uint8_t ctr_gotCoin;
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_18;
-#endif
-
-    uint8_t Sdata_NrOfDeviceSetting;
-    uint8_t Sdata_DeviceSettingBuff[66];
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_19;
-#endif
-
-    uint8_t SizeMachineIDBuff;
-    uint8_t MachineIDBuff[66];
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_20;
-#endif
-
-    uint32_t store_insertedAmount;
-    uint16_t store_lastCoinType[64];
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_21;
-#endif
-
-    uint16_t store_lastCoinValue[64];
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_22;
-#endif
-
-    uint8_t  p_lastCoin;
-    char     store_curPayNewCoin;
-
-    uint64_t stor_wakSrc;
-    uint8_t  stor_reason;
-
-    uint8_t store_rbDevParamLen;
-    uint8_t store_rbDevParams[66];
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_23;
-#endif
-
-    uint8_t store_deviceCondLen;
-    uint8_t store_deviceCond[66];
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_24;
-#endif
-
-    uint8_t store_machCondLen;
-    uint8_t store_machCond[66];
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_25;
-#endif
-
-    uint8_t  store_DcBackupNrOfAccNr;
-    uint16_t store_DcBackupAccNr[16];    // z.Z. nur 8
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_26;
-#endif
-
-    #define PI_SIZOFVAULTRECORD    400
-    uint8_t store_gotNrBlocksOfVaultRec;
-    uint8_t store_vaultrecord[PI_SIZOFVAULTRECORD];
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_27;
-#endif
-
-    uint32_t store_amount;
-    uint16_t store_nrOfCoins;
-
-    bool store_DcDataAreValid;
-
-    uint8_t storeDCdynPrinterData[64];
-    uint8_t DCdynPrinterDataActual;
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_28;
-#endif
-
-    uint16_t store_DCNextAccountNumber;
-
-    uint16_t storeMifCardTypDataLen;
-    uint8_t  storeMcardTypData[64];
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_29;
-#endif
-
-    // new from 6.9.23:
-    #define RAW_BL_DATALEN      150
-    uint8_t Sdata_rawData[RAW_BL_DATALEN];
-    uint8_t Sdata_LengthRawData;
-
-#define  numberOfJsons     36
-#define  versionStringLength    16
-    char    store_jsonVersion[versionStringLength][numberOfJsons];
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_30;
-#endif
-
-    uint8_t Sdata_changeResult;
-    uint32_t Sdata_changedAmount;
-    uint8_t  store_tubeLev[64];
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_31;
-#endif
-
-    uint8_t  store_bnaParameter[64];
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_32;
-#endif
-
-    uint8_t  store_bnaCollect[8];
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_33;
-#endif
-
-    uint8_t  store_bnaContent[64];
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_34;
-#endif
-
-
-    // Mitteilung von Hwapi zu Datif:
-    bool    Sdata_coinPaymentNow;
-    bool    Sdata_bootloadingNow;
-
-
-    // ------------------ Data OUTPUT --------------------------------
-
-    // sendWRcmd.cpp
-    #define CMDSTACKDEPTH   16
-    uint16_t nextAsynchsendCmd0[CMDSTACKDEPTH];
-    uint8_t  nrOfCmdsInQueue;
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_35;
-#endif
-
-    #define CMD4STACKDEPTH   8
-    uint16_t    nextAsynchsendCmd4[CMD4STACKDEPTH];
-    uint8_t     nextCmd4para1[CMD4STACKDEPTH];
-    uint8_t     nextCmd4para2[CMD4STACKDEPTH];
-    uint8_t     nextCmd4para3[CMD4STACKDEPTH];
-    uint8_t     nextCmd4para4[CMD4STACKDEPTH];
-    uint8_t     nrOfCmds4InQueue;
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_36;
-#endif
-
-    #define CMD8STACKDEPTH   4
-    uint16_t  nextAsynchsendCmd8[CMD8STACKDEPTH];
-    uint8_t   nextCmd8para1[CMD8STACKDEPTH];
-    uint8_t   nextCmd8para2[CMD8STACKDEPTH];
-    uint16_t  nextCmd8para3[CMD8STACKDEPTH];
-    uint32_t  nextCmd8para4[CMD8STACKDEPTH];
-    uint8_t   nrOfCmds8InQueue;
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_37;
-#endif
-
-    #define SENDASYDAT_BUFFSIZE     200
-    uint8_t sendAsynchDataBuf[SENDASYDAT_BUFFSIZE]; // no stack, only ONE buffer
-    uint8_t sendAsyDatLen;
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_38;
-#endif
-
-    #define MDBSEND_BUFFSIZE    64
-    uint8_t     Sdata_mdbSendBuffer[MDBSEND_BUFFSIZE];
-    uint8_t     Sdata_mdbSendLen;
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_39;
-#endif
-
-    uint8_t     prnDataParameters[4];
-    uint8_t     prnDataBufferUser;
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_40;
-#endif
-
-
-    // ONE printer doc consists of 20 x 64 byte
-    #define MAXNROF_PRNBYTES   64
-    #define MAXNROF_PRNBLOCKS  20
-    char        Sdata_PRN_TEXT[MAXNROF_PRNBLOCKS][MAXNROF_PRNBYTES];
-    uint8_t     pPrnDataBuff;        // points to next PRINTER_BLOCK
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_41;
-#endif
-
-    //#define     FDCMD_STACKDEPTH    16      // up to 1024 byte
-    #define     FDCMD_STACKDEPTH    32      // up to 2048 byte
-    // header
-    uint8_t nextFDwrCmd[FDCMD_STACKDEPTH];
-    uint8_t nextFDrdCmd[FDCMD_STACKDEPTH];
-    uint8_t nextFDblkNr[FDCMD_STACKDEPTH];
-    uint8_t nextFDshort[FDCMD_STACKDEPTH];
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_42;
-#endif
-
-    // short data
-    uint8_t  nextFDpara1[FDCMD_STACKDEPTH];
-    uint8_t  nextFDpara2[FDCMD_STACKDEPTH];
-    uint8_t  nextFDpara3[FDCMD_STACKDEPTH];
-    uint8_t  nextFDpara4[FDCMD_STACKDEPTH];
-    // long data:
-    uint8_t longFDlength[FDCMD_STACKDEPTH];
-    uint8_t longFDpara[FDCMD_STACKDEPTH][64];
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_43;
-#endif
-
-    uint8_t  p_nextFDcmdsInQueue;
-
-    // download of device controller and json files
-    struct DCDownload {
-        enum class FILE_INDEX {
-            DC_BINARY = 0, DC2C_CASH = 1, DC2C_CONF = 2, DC2C_SERIAL=3,
-            DC2C_PRINT_01, DC2C_PRINT_02, DC2C_PRINT_03, DC2C_PRINT_04,
-            DC2C_PRINT_05, DC2C_PRINT_06, DC2C_PRINT_07, DC2C_PRINT_08,
-            DC2C_PRINT_09, DC2C_PRINT_10, DC2C_PRINT_11, DC2C_PRINT_12,
-            DC2C_PRINT_13, DC2C_PRINT_14, DC2C_PRINT_15, DC2C_PRINT_16,
-            DC2C_PRINT_17, DC2C_PRINT_18, DC2C_PRINT_19, DC2C_PRINT_20,
-            DC2C_PRINT_21, DC2C_PRINT_22, DC2C_PRINT_23, DC2C_PRINT_24,
-            DC2C_PRINT_25, DC2C_PRINT_26, DC2C_PRINT_27, DC2C_PRINT_28,
-            DC2C_PRINT_29, DC2C_PRINT_30, DC2C_PRINT_31, DC2C_PRINT_32
-        };
-        char m_filename[(int)FILE_INDEX::DC2C_PRINT_32][512];
-        std::atomic_ushort m_totalBlocks;
-        std::atomic_ushort m_currentblockNumber;
-        std::atomic_bool m_requested{false};
-        std::atomic_bool m_running{false};
-        std::atomic_bool m_finished{false};
-    } m_downLoadDC;
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_44;
-#endif
-
-    // meta-data
-    char os_release[64];
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_45;
-#endif
-
-    char date_of_creation[32];
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_46;
-#endif
-
-    char creator[128]; // name of application plus pid
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_47;
-#endif
-
-    static QSharedMemory *getShm(std::size_t s = 0);
-
-    static SharedMem *getData()
-    {
-        Q_ASSERT_X(getShm()->data() != nullptr, "pointer access", "nullptr");
-        return (SharedMem *)getShm()->data();
-    }
-
-    static SharedMem const *getDataConst()
-    {
-        Q_ASSERT_X(getShm()->data() != nullptr, "pointer access", "nullptr");
-        return (SharedMem const *)getShm()->data();
-    }
-
-//    static SharedMemBuffer *write()
-    static SharedMem *write()
-    {
-        Q_ASSERT_X(getShm()->data() != nullptr, "pointer access", "nullptr");
-        return (SharedMem *)getShm()->data();
-    }
-
-//    static SharedMemBuffer const *read()
-    static SharedMem const *read()
-    {
-        Q_ASSERT_X(getShm()->data() != nullptr, "pointer access", "nullptr");
-        return (SharedMem const *)getShm()->data();
-    }
-
-    bool thisIsTheFirstUse(void);
-
-
-#ifndef QT_NO_DEBUG
-    char mem_guard_0;
-#endif
-
-    static void check_mem_guards() {
-#ifndef QT_NO_DEBUG
-        static const char memcmp_array[48] = {0,};
-        char mem[48];
-
-        Q_ASSERT_X(getShm()->data() != nullptr, "pointer access", "nullptr");
-        SharedMem const *d = (SharedMem const *)getShm()->data();
-
-        mem[0] = d->mem_guard_0;
-        mem[1] = d->mem_guard_1; mem[2] = d->mem_guard_2; mem[3] = d->mem_guard_3;
-        mem[4] = d->mem_guard_4; mem[5] = d->mem_guard_5; mem[6] = d->mem_guard_6;
-        mem[7] = d->mem_guard_7; mem[8] = d->mem_guard_8; mem[9] = d->mem_guard_9;
-
-        mem[10] = d->mem_guard_10;
-        mem[11] = d->mem_guard_11; mem[12] = d->mem_guard_12; mem[13] = d->mem_guard_13;
-        mem[14] = d->mem_guard_14; mem[15] = d->mem_guard_15; mem[16] = d->mem_guard_16;
-        mem[17] = d->mem_guard_17; mem[18] = d->mem_guard_18; mem[19] = d->mem_guard_19;
-
-        mem[20] = d->mem_guard_20;
-        mem[21] = d->mem_guard_21; mem[22] = d->mem_guard_22; mem[23] = d->mem_guard_23;
-        mem[24] = d->mem_guard_24; mem[25] = d->mem_guard_25; mem[26] = d->mem_guard_26;
-        mem[27] = d->mem_guard_27; mem[28] = d->mem_guard_28; mem[29] = d->mem_guard_29;
-
-        mem[30] = d->mem_guard_30;
-        mem[31] = d->mem_guard_31; mem[32] = d->mem_guard_32; mem[33] = d->mem_guard_33;
-        mem[34] = d->mem_guard_34; mem[35] = d->mem_guard_35; mem[36] = d->mem_guard_36;
-        mem[37] = d->mem_guard_37; mem[38] = d->mem_guard_38; mem[39] = d->mem_guard_39;
-
-        mem[40] = d->mem_guard_40;
-        mem[41] = d->mem_guard_41; mem[42] = d->mem_guard_42; mem[43] = d->mem_guard_43;
-        mem[44] = d->mem_guard_44; mem[45] = d->mem_guard_45; mem[46] = d->mem_guard_46;
-        mem[47] = d->mem_guard_47;
-
-        if (memcmp(mem, memcmp_array, sizeof(memcmp_array))) {
-            qCritical() << QByteArray(mem, sizeof(memcmp_array)).toHex(':');
-            for (uint i = 0; i < sizeof(memcmp_array); ++i) {
-                fprintf(stderr, "%02d -> %02x", i, (unsigned char)mem[i]);
-            } fprintf(stderr, "\n");
-        }
-#endif
-    }
-
-};
-
-#endif // SHARED_MEM_BUFFER_INCLUDED_H

include/storeINdata.h

@@ -527,9 +527,6 @@ 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,42 +1,11 @@
 TEMPLATE = lib
 TARGET = CAmaster
-VERSION="1.0.2"
+VERSION="1.0.0"
-
-HEADERS += \
-    ../include/com.h \
-    ../include/datIf.h \
-    ../include/prot.h \
-    ../include/download_thread.h
-
-SOURCES += \
-    ../src/com.cpp \
-    ../src/datIf.cpp \
-    ../src/prot.cpp \
-    ../src/download_thread.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,36 +1,12 @@
 TEMPLATE = lib
 TARGET = CAslave
-VERSION="1.0.2"
+VERSION="1.0.0"
-
-HEADERS += \
-    ../include/reporting_thread.h
-
-SOURCES += \
-    ../src/reporting_thread.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_="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
+DEFINES-=THIS_IS_CA_MASTER
+
 DESTDIR=$${_PRO_FILE_PWD_}/../build
 
 unix {

src/datIf.cpp

@@ -1,22 +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>
-#include <QString>
+
-#include <QDateTime>
 
 
 
@@ -94,8 +86,7 @@ T_datif::T_datif(hwinf *hw, QObject *parent) : QObject(parent)
     dif_scanStep=0;
     selectedSlaveAddr=FIX_SLAVE_ADDR;
     cycl_running=0;
-    epi_resetDcDataValid();        // data are not yet valid, no response from DC by now
+    gpi_storeDcDataValid(0);        // data are not yet valid, no response from DC by now
-
     datif_noResponseCtr=0;
 
     datif_repeatCtr=0;
@@ -151,14 +142,14 @@ char T_datif::datif_cycleSend()
     if ( !myDCIF->isPortOpen())
     {
         //qDebug()  << "com port not available";    // wird ununterbrochen ausgegeben
-        epi_resetDcDataValid();    // DC data not valid
+        gpi_storeDcDataValid(0);    // 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
-        epi_resetDcDataValid();    // DC data has not updated for >=5s -> no longer valid!
+        gpi_storeDcDataValid(0);    // DC data has not updated for >=5s -> no longer valid!
 
     // Ueberwachung ob ein oder mehrere Commands am Stueck erfolgreich waren
     if (gpi_wantToResetSupervision())
@@ -176,22 +167,10 @@ char T_datif::datif_cycleSend()
     // b) Antwort meldet Fehler -> 2x wiederholen (nach einer Luecke von 10ms )
     // c) gar keine Antwort, Timeout nach 100ms -> 2x wiederholen (nach einer Luecke von 10ms )
     // cycl_running=0: nichts zu tun    1: Mitteilung: Kommando wurde soeben abgesendet, 2,3,4 = Wiederholung
-    if (cycl_running == 0) {
-        if (m_hw) {
-            if (m_hw->dcDownloadRequested()) { // only happens in ca-master
-                qCritical() << "DOWNLOAD REQUESTED";
-                if (!m_hw->dcDownloadThreadStart()) {
-                    qCritical() << "DOWNLOAD-THREAD NOT RUNNING WITHIN 1000ms";
-                } else {
-                    qCritical() << "DOWNLOAD-THREAD RUNNING";
-                }
-                return 0;
-            }
-        }
-    } else {
-        // 21.9.23 doRepeat hier raus sonst gehts warten auch nicht mehr (BL)
-        //   if (cycl_running && doRepeat)
 
+    if (cycl_running)   // 21.9.23 doRepeat hier raus sonst gehts warten auch nicht mehr (BL)
+     //   if (cycl_running && doRepeat)
+    {
         // request is still running, wait for response before next sending
         //qDebug()<< "datif wait for response";
         datif_trigger->stop();
@@ -224,8 +203,21 @@ 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
@@ -363,7 +355,7 @@ char T_datif::datif_cycleSend()
     else
     {
         dif_scanStep=0;         // always start from beginning
-        epi_resetDcDataValid();
+        gpi_storeDcDataValid(0);
     }
 
     datif_cmdWasPerformed=0;    // 0: no response by now
@@ -376,20 +368,9 @@ char T_datif::datif_cycleSend()
 char T_datif::sendINrequestsAutomatic(void)
 {
     //qDebug() << "send IN request " << dif_scanStep;
-    //uint8_t datif_autoRequCommandList[30]={11, 12, 14, 17, 18, 19, 22, 23, 27, 30,
+//    uint8_t datif_autoRequCommandList[50]={11, 12, 18, 104, 106, 103, 14, 27, 109, 17, 19, 23, 30, 31, 32, 33, 114, 35};
-    //                                       31, 32, 33, 35, 102, 103, 104, 106, 107, 109,
+    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};
-    //                                       114,0,0,0,0,0,0,0,0,0};
+    uint8_t datif_maxNrCommands=21, datif_sendNow;
-
-    // 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!!!
@@ -399,44 +380,40 @@ char T_datif::sendINrequestsAutomatic(void)
     // 107, 22: MDB: poll if needed
 
     doRepeat=true;  // 20.9.23 15uhr (after release)
-
+    if (datif_sendSlowCmd>0)
-    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
-    {
-        // no transaction, request all but request DI's more frequently
-        if (datif_sendSlowCmd>0)    // send slow and fast commands alternating
     {
         // send special command, slowly
-            if (datif_pNextCmd>=datif_maxNrCommands ) datif_pNextCmd=0;
         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);
-               // qDebug() << "datif, auto-requ: " << datif_sendNow;
+        else
-            } else
             datif_pNextCmd=0;       // falls in der Liste 0 vorkommt dann von vorne beginnen
+
+        //qDebug()<< "datif send request " << datif_sendNow;
+
+    } else
+    {
+        if (gpi_getNowCoinPay())
+        {
+            // request coin input, high priority
+            datif_sendIOrequest(0, 112, 0);
+            //qDebug()<< "datif send request 112 get coins";
         } else
         {
             // request inputs, high priority
             datif_sendIOrequest(0, 31, 0);         // 102
-            // while coin collection DIs are polled slower
+            // while coin collection DIs are polled slowly with datif_autoRequCommandList[]
-            //qDebug()<< "datif send requ.31 get DIs";
+
+            //qDebug()<< "datif send request 102 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!!!!
+
 }
 
 
@@ -480,7 +457,7 @@ char T_datif::loadRecDataFromFrame()
     uint32_t ultmp;
     //int portNr;
     bool ret;
-    uint8_t uctmp;  //, nn;  //, res;      // maxai
+    uint8_t uctmp;  //, res;      // maxai
     char ctmp;
     //static uint8_t lastResult;
     //uint8_t prnResult;
@@ -1055,7 +1032,7 @@ char T_datif::loadRecDataFromFrame()
     case 31:        // Get dynamic machine conditions (doors, voltage, alarm….)
         if (RdDleng>50)
         {
-            epi_setDcDataValid();    // DC-Data are valid as DC responded.
+            gpi_storeDcDataValid(1);    // 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);
@@ -1146,7 +1123,9 @@ char T_datif::loadRecDataFromFrame()
         break;
 
     case 42:        // get BNA box content and value of types
-        //qDebug()<<  "CAslave datif_got 42";
+//        qDebug()<<  "CAmaster datif_got 42 ";
+//        for (uctmp=0; uctmp<64; uctmp++)
+//            qDebug()<<receivedData[uctmp]<<" ";
 
         if (RdDleng>60)
         {

src/download_thread.cpp

@@ -104,25 +104,7 @@ void DownloadThread::run() {
 
     m_hw->dcDownloadRequestAck();
 
-    qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
+    qCritical() << "DownloadThread::run(): DOWNLOAD THREAD STARTED";
-                << "DownloadThread::run(): DOWNLOAD THREAD STARTED:";
-    qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                << "               DownloadThread::run(): Filename:" << m_hw->dcDownloadFileName();
-
-    QDateTime const start = QDateTime::currentDateTime();
-
-#if 1
-    QFile fn(m_hw->dcDownloadFileName());
-
-    if (!fn.exists()) {
-        // output via CONSOLE() etc
-        qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                    << "               DownloadThread::run(): Filename:" << m_hw->dcDownloadFileName() << "DOES NOT EXIST";;
-    } else {
-
-        qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                    << "DownloadThread::run(): DC-CONTROLLER SW-VERSION BEFORE"
-                    << m_hw->dc_getSWversion();
 
     // load binary device controller file into memory
     QByteArray ba = loadBinaryDCFile(m_hw->dcDownloadFileName());
@@ -133,53 +115,25 @@ void DownloadThread::run() {
         // fill last block of data to be sent with 0xFF
         ba = ba.leftJustified(totalBlocks*64, (char)(0xFF));
 
-            qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                        << "DownloadThread::run(): TOTAL NUMBER OF BYTES TO SEND TO DC" << ba.size();
-            qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                        << "DownloadThread::run(): TOTAL NUMBER OF BLOCKS" << totalBlocks;
-
-            m_hw->dc_autoRequest(true); // turn auto-request setting on
-
-            m_hw->request_DC2_HWversion();
-            m_hw->request_DC2_SWversion();
-            QThread::sleep(1);
-
-            // m_hw->dc_autoRequest(false); // turn auto-request setting on
-
         resetDeviceController();
-
-            qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                        << "DownloadThread::run(): RESET DEVICE-CONTROLLER";
-
         if (startBootloader()) {
 
-                qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
+            qCritical() << "DownloadThread::run(): TOTAL NUMBER OF BYTES TO SEND TO DC" << ba.size();
-                            << "DownloadThread::run(): STARTED BOOT-LOADER";
+            qCritical() << "DownloadThread::run(): TOTAL NUMBER OF BLOCKS" << totalBlocks;
 
-                m_hw->dc_autoRequest(false);// turn auto-request setting off for
+            int currentBlock = 0;
-                                            // download of binary dc
-
-                qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                            << "DownloadThread::run(): TOTAL NUMBER OF FIRMWARE BLOCKS" << totalBlocks;
-
-                int currentBlock = 0; // download of binary dc
             DownloadResult res = DownloadResult::OK;
-
+            qCritical() << "64-byte block " << currentBlock;
             while (res != DownloadResult::ERROR &&  currentBlock < totalBlocks) {
                 if ((res = sendNextAddress(currentBlock)) != DownloadResult::ERROR) {
                     if ((res = sendNextDataBlock(ba, currentBlock)) != DownloadResult::ERROR) {
                         m_hw->dcDownloadSetCurrentBlockNumber(currentBlock);
-
-                            qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                                        << "DownloadThread::run(): currentBlockNumber ..." << currentBlock;
-
                         currentBlock += 1;
                     }
                 }
             }
 
-                qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
+            qCritical() << "DownloadThread::run(): last 64-byte block %04d" << currentBlock;
-                            << QString("DownloadThread::run(): last 64-byte block %1").arg(currentBlock);
 
             int const rest = ba.size() % 64;
             int const offset = ba.size() - rest;
@@ -195,92 +149,27 @@ void DownloadThread::run() {
             } else {
                 m_hw->bl_sendLastBlock();
                 m_hw->dcDownloadSetCurrentBlockNumber(currentBlock);
-
-                    qCritical() << "DownloadThread::run(): currentBlockNumber" << currentBlock;
-                    // QThread::msleep(250);
             }
             qCritical() << "DownloadThread::run(): last result" << (int)sendStatus(m_hw->bl_wasSendingDataOK());
-
-                stopBootloader();   // stop bootloader several times: if it
-                QThread::sleep(1);  // is not stopped, then the PSA has to be
         }
-            // restarted manually (!!!)
-            stopBootloader();
-            QThread::sleep(1);
-        }
-
-        qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                    << "DownloadThread::run(): STOPPED BOOT-LOADER";
-
         stopBootloader();   // there is no harm in stopping the bootloader even
-                            // if it was not started at all
+    }                       // if it was not started at all
 
-        m_hw->dc_autoRequest(true);
+#if 0
-    }
+    // test code:
-
+    uint16_t const totalBlocks = 100;
-#else // test
-    // load binary device controller file into memory
-    QByteArray ba = loadBinaryDCFile(m_hw->dcDownloadFileName());
-    if (ba.size() > 0) {
-        uint16_t const totalBlocks = (((ba.size())%64)==0) ? (ba.size()/64) : (ba.size()/64)+1;
     m_hw->dcDownloadSetTotalBlockNumber(totalBlocks);
 
-        // fill last block of data to be sent with 0xFF
-        ba = ba.leftJustified(totalBlocks*64, (char)(0xFF));
-
-        qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                    << "DownloadThread::run(): TOTAL NUMBER OF BYTES TO SEND TO DC" << ba.size();
-        qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                    << "DownloadThread::run(): TOTAL NUMBER OF BLOCKS" << totalBlocks;
-
-        m_hw->dc_autoRequest(true); // turn auto-request setting on
-
-        m_hw->request_DC2_HWversion();
-        m_hw->request_DC2_SWversion();
-        QThread::sleep(1);
-
-        resetDeviceController();
-
-        qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                    << "DownloadThread::run(): RESET DEVICE-CONTROLLER";
-        QThread::sleep(1);
-
-        if (startBootloader()) {
-            qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                        << "DownloadThread::run(): STARTED BOOT-LOADER";
-
-            m_hw->dc_autoRequest(false);// turn auto-request setting off for
-                                        // download of binary dc
     for (uint16_t currentBlock = 0; currentBlock <= totalBlocks; ++currentBlock) {
         m_hw->dcDownloadSetCurrentBlockNumber(currentBlock);
-                qCritical() << "DownloadThread::run(): currentBlockNumber" << currentBlock;
+        QThread::msleep(100);
-                QThread::msleep(250);
-            }
-            m_hw->dc_autoRequest(true); // turn auto-request setting on again
-        }
-
-        stopBootloader();   // there is no harm in stopping the bootloader even
-                            // if it was not started at all
-        qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                    << "DownloadThread::run(): STOPPED BOOT-LOADER";
     }
 #endif
 
     m_hw->dcDownloadSetRunning(false);
     m_hw->dcDownloadSetFinished(true);
 
-    QDateTime const end = QDateTime::currentDateTime();
+    qCritical() << QDateTime::currentDateTime().toString(Qt::ISODate) + "DOWNLOAD THREAD FINISHED";
-    quint64 secs = start.secsTo(end);
-    QString runtime;
-    if (secs % 60) {
-        runtime = QString("%1min %2s").arg(secs / 60).arg(secs % 60);
-    } else {
-        runtime = QString("%1min").arg((secs / 60) + 1);
-    }
-
-    qCritical() << end.time().toString(Qt::ISODateWithMs)
-                << QString("DOWNLOAD THREAD FINISHED (RUNTIME %1)")
-                   .arg(runtime);
 
     // the object deletes itself ! This is the last line in run().
     // Never touch the object after this statement
@@ -304,6 +193,7 @@ DownloadThread::sendNextAddress(int bNum) const {
     int noAnswerCount = 0;
     int errorCount = 0;
     if ( bNum==0 || bNum==1024 || bNum==2048 || bNum==3072 || bNum==4096 ) {
+        // qDebug() << "addr-block" << bNum << "...";
         while (noAnswerCount <= 250) {
             m_hw->bl_sendAddress(bNum);
             QThread::msleep(100);
@@ -342,6 +232,9 @@ DownloadThread::sendNextDataBlock(QByteArray const &binary, int bNum) const {
     memcpy(local, binary.constData() + bAddr, 64);
     local[64] = local[65] = 0x00;
 
+    // QByteArray b((const char *)(&local[0]), 64);
+    // qCritical() << "SNDB" << bNum << b.size() << b.toHex();
+
     while (noAnswerCount <= 250) {
         m_hw->bl_sendDataBlock(64, local);
         QThread::msleep(10);
@@ -354,7 +247,9 @@ DownloadThread::sendNextDataBlock(QByteArray const &binary, int bNum) const {
                 }
             } else {
                 // qInfo() << "data for block" << bNum << "OK";
+
                     // TODO: hier ins shared mem schreiben
+
                 return res;
             }
         } else {
@@ -366,65 +261,50 @@ DownloadThread::sendNextDataBlock(QByteArray const &binary, int bNum) const {
 }
 
 bool DownloadThread::startBootloader() const {
-    qDebug() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
+    qDebug() << "starting bootloader...";
-             << "starting bootloader...";
     int nTry = 5;
     while (--nTry >= 0) {
         m_hw->bl_startBL();
-        qDebug() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs) << "bl_startBL() ..." << nTry;
+        QThread::msleep(5000);
-        QThread::msleep(500);
         m_hw->bl_checkBL();
-        qDebug() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs) << "bl_checkBL() ..." << nTry;
-        QThread::msleep(500);
         if (m_hw->bl_isUp()) {
-            qInfo() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs) << "bootloader... isUP" << nTry;
+            qInfo() << "starting bootloader...OK";
+            QThread::msleep(5000);
             return true;
         } else {
-            qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
+            qCritical() << "bootloader not up (" << nTry << ")";
-                        << "bootloader not up (" << nTry << ")";
         }
     }
-    qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
+    qCritical() << "starting bootloader...FAILED";
-                << "starting bootloader FAILED";
     return false;
 }
 
 bool DownloadThread::stopBootloader() const {
-    qDebug() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
+    qDebug() << "stopping bootloader...";
-             << "stopping bootloader...";
     int nTry = 5;
     while (--nTry >= 0) {
         m_hw->bl_stopBL();
-        qDebug() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-                 << "bl_stopBL() ...";
         QThread::msleep(500);
-        m_hw->bl_checkBL();
-        qDebug() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs) << "bl_checkBL() ..." << nTry;
         if (!m_hw->bl_isUp()) {
-            qInfo() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
+            qInfo() << "stopping bootloader...OK";
-                    << "stopping bootloader OK";
             return true;
         }
     }
-    qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
+    qCritical() << "stopping bootloader...FAILED";
-                << "stopping bootloader FAILED";
     return false;
 }
 
 bool DownloadThread::resetDeviceController() const {
-    qDebug() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
+    qDebug() << "resetting device controller...";
-             << "resetting device controller...";
     m_hw->bl_rebootDC();
     // wait maximally 3 seconds, before starting bootloader
     QThread::sleep(1);
-    qInfo() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
+    qInfo() << "resetting device controller...OK";
-            << "resetting device controller...OK";
     return true;
 }
 
 QByteArray DownloadThread::loadBinaryDCFile(QString filename) const {
-    qInfo() << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
+    qDebug() << "loading dc binary" << filename << "...";
-            << "loading dc binary" << filename << "...";
 
     QFile file(filename); // closed in destructor call
     if (!file.exists()) {

src/hwapi.cpp

@@ -20,14 +20,12 @@
 */
 
 #include "hwapi.h"
-#include "download_thread.h"
 #include "reporting_thread.h"
-#include "shared_mem_buffer.h"
+#include "download_thread.h"
 
+#include <algorithm>
 #include <cstring>
-#include <QThread>
+#include <atomic>
-#include <QDebug>
-#include <QApplication>
 
 static uint32_t hwapi_lastStartAmount;
 static uint32_t hwapi_lastTotalAmount;
@@ -41,12 +39,6 @@ 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));
@@ -59,30 +51,13 @@ hwapi::hwapi(QWidget *parent) : QObject(parent)
         qCritical() << "Creating/attaching shared memory failed";
     }
 
-    Q_ASSERT_X(sizeof(SharedMem) == m_sharedMem->size(), "check shm-sizes",
-               QString("sizes different %1 != %2")
-                .arg(sizeof(SharedMem))
-                .arg(m_sharedMem->size()).toStdString().c_str());
-
     //if (shdMem_firstUse())        // für Master raus
 //    {
 
 #ifdef THIS_IS_CA_MASTER
-
-#ifdef THIS_IS_CA_SLAVE
-#error "SLAVE LIB COMPILED INTO MASTER"
-#endif
-
         myDatif = new T_datif(this);    // für die  CAslave-Lib auskommentieren!
-
+#else
-#endif
+    qCritical()<<"hwapi: error CAslave cannot include T_datif";
-
-#ifdef THIS_IS_CA_SLAVE
-
-#ifdef THIS_IS_CA_MASTER
-#error "MASTER LIB COMPILED INTO MASTER"
-#endif
-
 #endif
 
 //    }
@@ -140,6 +115,10 @@ hwapi::hwapi(QWidget *parent) : QObject(parent)
 
 void hwapi::hwapi_slotPayProc(void)
 {
+    //cash_paymentProcessing();
+    //doors_supervise();
+    //dcBL_cycle();
+
 
 }
 
@@ -1813,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);
 
@@ -2640,23 +2617,12 @@ void hwapi::bl_openBinary(void) const
 void hwapi::bl_sendDataBlock(uint8_t length, uint8_t *buffer) const
 {
     // send 64 byte from bin file
-    // gh, 09/02/2024: extend sendBuf. Buffer sometimes too small, sendLen=81
+    uint8_t LL=length, sendBuf[80], sendLen;
-    uint8_t LL=length, sendBuf[80+32], sendLen;
     if (LL>64) LL=64;
 
-    memset(sendBuf, 0, sizeof(sendBuf));
+    tslib_strclr(sendBuf,0,80);
     sendLen=dcBL_prepareDC_BLcmd(0x22, LL, buffer, sendBuf);   // pack into protocol frame
-
-    // qCritical() << "(" __func__ << ":" << __LINE__ << ") sendLen=" << sendLen
-    //             << ":" << QByteArray((const char *)sendBuf, sendLen);
-
     sendWRcmd_setSendBlock160(sendLen, sendBuf);                  // send 140 bytes
-
-    // if (sendLen > 80) {
-    //    qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-    //                << QByteArray((const char *)&sendBuf[80], 32).toHex(':');
-    // }
-
     delay(100);
 }
 
@@ -2930,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);
 
@@ -3036,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);
@@ -3045,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);
@@ -3102,9 +3062,7 @@ 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);
 }
@@ -3114,8 +3072,7 @@ 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();
@@ -3349,15 +3306,22 @@ 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;
+    uint8_t LL, nn;
     tslib_strclr(buf,0,64);
+    uint8_t *start;
 
     //runProcess->epi_restore64BdevParameter(&LL, buf); // wozu die???
     epi_restoreRbDeviceSettings(&LL, buf);      // viel besser, stimmt immer
 
-    Q_STATIC_ASSERT(sizeof(*deviceSettings) <= sizeof(buf));
+    // Puffer in struct eintragen:
+    start = &deviceSettings->kindOfPrinter;
+    nn=0;
+    do
+    {
+        *start = buf[nn];
+        start++;
+    } while(++nn<LL);
 
-    memcpy(deviceSettings, buf, sizeof(*deviceSettings));
 }
 
 bool hwapi::sys_areDCdataValid(void) const
@@ -3469,8 +3433,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);
 
@@ -3601,8 +3563,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
@@ -4422,7 +4382,6 @@ QObject const *hwapi::getAPI() {
 }
 
 bool hwapi::dcDownloadRequest(QString const &dcFileToDownload) const {
-    // called by worker-thread (see atbupdatetool)
     SharedMem *data = SharedMem::getData();
     if (!data) {
         return false;
@@ -4446,15 +4405,9 @@ bool hwapi::dcDownloadRequest(QString const &dcFileToDownload) const {
 }
 
 bool hwapi::dcDownloadRequested() const {
-    SharedMem *data = SharedMem::getData();
+    SharedMem const *data = SharedMem::getData();
-    Q_ASSERT_X(data != nullptr, "check", "pointer invalid");
+    // should be false at entry
-    Q_ASSERT_X((void *)data == m_sharedMem->data(), "compare pointers", "pointers different");
+    return data ? data->m_downLoadDC.m_requested.load() : false;
-    Q_ASSERT_X(sizeof(*data) == m_sharedMem->size(), "compare sizes", "sizes different");
-
-    // called by download-thread
-    // 1: true at entry: reset atomically to false
-    // 2: false at entry: no change
-    return data ? data->m_downLoadDC.m_requested.exchange(false) : false;
 }
 
 bool hwapi::dcDownloadResetRequest() const {
@@ -4466,12 +4419,14 @@ bool hwapi::dcDownloadResetRequest() const {
 }
 
 bool hwapi::dcDownloadRequestAck() const {
-    // called by download-thread
     SharedMem *data = SharedMem::getData();
     if (data) {
+        if (data->m_downLoadDC.m_requested) {
+            data->m_downLoadDC.m_requested = false;
             data->m_downLoadDC.m_running = true;
             data->m_downLoadDC.m_finished = false;
         }
+    }
     return false;
 }
 
@@ -4480,16 +4435,14 @@ bool hwapi::dcDownloadRunning() const {
     if (data) {
         int cnt = 10;
         while (--cnt > 0) {
-            bool running = data->m_downLoadDC.m_running;
+            bool running = data->m_downLoadDC.m_running.load();
-            bool finished = data->m_downLoadDC.m_finished;
+            bool finished = data->m_downLoadDC.m_finished.load();
-            if ((running == true) && (finished == false)) {
+            if (!running || finished) {
-                // see dcDownloadRequestAck()
-                break;
-            }
                 if (cnt < 3) {
                     qCritical() << "DOWNLOAD THREAD NOT RUNNING" << running << finished;
                 }
                 QThread::msleep(500);
+            } else break;
         }
         // qCritical() << "DOWNLOAD RUNNING" << cnt << (cnt > 0);
         return (cnt > 0);
@@ -4498,16 +4451,18 @@ bool hwapi::dcDownloadRunning() const {
 }
 
 void hwapi::dcDownloadThreadFinalize(DownloadThread *dthread) {
-    Q_UNUSED(dthread);
+    delete dthread;
-    // delete dthread;
     m_downloadThread = nullptr;
 }
 
 bool hwapi::dcDownloadFinished() {
+    SharedMem const *data = SharedMem::getDataConst();
+    if (data) {
         int cnt = 10;
-    while (dcDownloadRunning()) {
+        while ((--cnt > 0) &&
-        if (--cnt == 0) {
+               ((data->m_downLoadDC.m_running.load() == true) &&
-            return false;
+                (data->m_downLoadDC.m_finished.load() == false))) {
+            QThread::sleep(1);
         }
 
         //if (cnt > 0) {
@@ -4516,13 +4471,12 @@ bool hwapi::dcDownloadFinished() {
         //    return true;
         //}
     }
-    return true;
+    return false;
 }
 
 // download thread
 
 bool hwapi::dcDownloadThreadStart() {
-    // called by timer in datIf.cpp: T_datif::datif_cycleSend()
     m_downloadThread = new DownloadThread(this);
     if (m_downloadThread) {
         m_downloadThread->start();
@@ -4554,7 +4508,6 @@ bool hwapi::dcDownloadReportThreadStart() { // only start reporting thread
     if (cnt > 0) {
         m_reportingThread = new ReportingThread(this);
         if (m_reportingThread) {
-            m_reportingThread->moveToThread(QApplication::instance()->thread());
             m_reportingThread->start();
             cnt  = 10;
             while (--cnt > 0 && !dcDownloadReportThreadRunning()) {
@@ -4586,9 +4539,7 @@ void hwapi::dcDownloadReportThreadQuit() {
 }
 
 bool hwapi::dcDownloadReportThreadFinished() const {
-    // if the pointer to the underlying c++-object is not valid, the thread
+    return m_reportingThread ? m_reportingThread->isFinished() : false;
-    // counts as finished
-    return m_reportingThread ? m_reportingThread->isFinished() : true;
 }
 
 bool hwapi::dcDownloadReportStart() const {
@@ -4614,11 +4565,9 @@ bool hwapi::dcDownloadReportFinished() {
     }
 
     if (dcDownloadReportThreadFinished()) {
-        if (m_reportingThread) {
         delete m_reportingThread;
         m_reportingThread = nullptr;
     }
-    }
 
     return true;
 }

src/main.cpp

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

src/reporting_thread.cpp

@@ -4,16 +4,10 @@
 
 #include <QDateTime>
 #include <QDebug>
-#include <QApplication>
-#include <QCoreApplication>
-
-#include <cmath>
-#include <algorithm>
 
 ReportingThread::ReportingThread(hwapi *hw)
   : m_hw(hw)
   , m_fileToDownload(m_hw->dcDownloadFileName()) {
-  // , m_f([](QString const&){}) {
 }
 
 ReportingThread::~ReportingThread() {
@@ -23,10 +17,7 @@ ReportingThread::~ReportingThread() {
 // each component which has connects for the corresponding signals.
 void ReportingThread::run() {
 
-    qCritical()
+    qCritical() << QDateTime::currentDateTime() << "START DOWNLOAD THREAD";
-        << QDateTime::currentDateTime().time().toString(Qt::ISODate)
-        << "START REPORT THREAD"
-        << "(PART OF APPLICATION" << QCoreApplication::applicationName() << ")";
 
     static QString report("");
 
@@ -34,9 +25,9 @@ void ReportingThread::run() {
     while (!m_hw->dcDownloadGetRunning()) {
         if (--cnt > 0) {
             report =  QString("%1 waiting for download to start %2")
-                            .arg(QDateTime::currentDateTime().time().toString(Qt::ISODate))
+                            .arg(QDateTime::currentDateTime().toString(Qt::ISODate))
                             .arg(cnt);
-            qCritical() << "(" << __func__ << ":" << __LINE__ << ") STATUS" << report;
+            qCritical() << __LINE__ << "STATUS" << report;
             emit m_hw->hwapi_reportDCDownloadStatus(report);
             QThread::sleep(1);
         } else break;
@@ -100,79 +91,33 @@ void ReportingThread::run() {
 
 #endif
 
-    uint16_t totalBlocks = m_hw->dcDownloadGetTotalBlockNumber();
+    uint16_t const totalBlocks = m_hw->dcDownloadGetTotalBlockNumber();
-    cnt = 10;
-    while(--cnt > 0 && totalBlocks == 0) {
-        totalBlocks = m_hw->dcDownloadGetTotalBlockNumber();
-        qCritical() << QDateTime::currentDateTime() << __PRETTY_FUNCTION__
-                    << QString("line=%1 TOTAL BLOCKS=%2 (%3)")
-                        .arg(__LINE__).arg(totalBlocks).arg(cnt);
-        QThread::sleep(1);
-    }
 
-    qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODate) << __PRETTY_FUNCTION__
+    qCritical() << QDateTime::currentDateTime() << "TOTAL BLOCKS" << totalBlocks;
-                << QString("line=%1 TOTAL BLOCKS=%2").arg(__LINE__).arg(totalBlocks);
 
     if (totalBlocks) {
-        QDateTime const start = QDateTime::currentDateTime();
+        qint64 const start = QDateTime::currentMSecsSinceEpoch();
+        double durationMillis = 0;
         uint16_t currentBlockNumber = 0;
-        uint16_t prevBlockNumber = ~0;
-        uint64_t estimatedMinutesLeftMax = ~0ULL;
-        uint64_t estimatedSecondsLeftMax = ~0ULL;
-        uint64_t estimatedMinutesLeftPrev = 0;
-        uint64_t estimatedSecondsLeftPrev = 0;
 
         while (m_hw->dcDownloadGetRunning()) {
             currentBlockNumber = m_hw->dcDownloadGetCurrentBlockNumber();
-            if (prevBlockNumber != currentBlockNumber) {
-                double durationSecs = start.secsTo(QDateTime::currentDateTime());
 
-                double const timeAveragePerBlock = (currentBlockNumber > 0) ? (durationSecs / currentBlockNumber) : durationSecs;
+            durationMillis += QDateTime::currentMSecsSinceEpoch() - start;
-                uint64_t estimatedSecondsLeft = lround((timeAveragePerBlock * (totalBlocks - currentBlockNumber)));
-                uint64_t estimatedMinutesLeft =
-                    ((estimatedSecondsLeft % 60) == 0) ?
-                        (estimatedSecondsLeft / 60) :
-                            ((estimatedSecondsLeft + 60) / 60);
 
-                estimatedSecondsLeft = (estimatedSecondsLeft % 60);
+            double const timeAveragePerBlock = (currentBlockNumber > 0) ? (durationMillis / currentBlockNumber) : durationMillis;
-
+            double const estimatedSecondsLeft = (timeAveragePerBlock * (totalBlocks - currentBlockNumber)) / 1000.0;
-                if ((estimatedMinutesLeft <= estimatedMinutesLeftMax)
-                 || (estimatedSecondsLeft <= estimatedSecondsLeftMax)) {
-                    estimatedMinutesLeftMax = estimatedMinutesLeft;
-                    estimatedSecondsLeftMax = estimatedSecondsLeft;
-                    estimatedMinutesLeftPrev = estimatedMinutesLeft;
-                    estimatedSecondsLeftPrev = estimatedSecondsLeft;
 
             double percent = ((double)currentBlockNumber / (double)totalBlocks) * 100.0;
-                    report = QString(": total blocks %1, current block %2 [%3] (est. time left: %4min %5s)")
+            report = QString(": total blocks %1, current block %2 [%3] (est. time left: %4s)")
                         .arg(totalBlocks)
                         .arg(currentBlockNumber)
                         .arg(percent, 0, 'f', 2)
-                                .arg(estimatedMinutesLeft)
+                        .arg(estimatedSecondsLeft, 0, 'f', 2);
-                                .arg(estimatedSecondsLeft, 2);
 
-                    qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODate)
+            qCritical() << "RT report" << report;
-                                << QString("line=%1: RT report").arg(__LINE__) << report;
 
             emit m_hw->hwapi_reportDCDownloadStatus(report);
-
-                } else {
-                    double percent = ((double)currentBlockNumber / (double)totalBlocks) * 100.0;
-                    report = QString(": total blocks %1, current block %2 [%3] (est. time left: %4min %5s)")
-                                .arg(totalBlocks)
-                                .arg(currentBlockNumber)
-                                .arg(percent, 0, 'f', 2)
-                                .arg(estimatedMinutesLeftPrev)
-                                .arg(estimatedSecondsLeftPrev, 2);
-
-                    qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODate)
-                                << QString("line=%1: RT report").arg(__LINE__) << report;
-
-                    emit m_hw->hwapi_reportDCDownloadStatus(report);
-                }
-
-                prevBlockNumber = currentBlockNumber;
-            }
             QThread::msleep(100);
         }
 
@@ -188,7 +133,7 @@ void ReportingThread::run() {
         }
     }
 
-    qCritical() << QDateTime::currentDateTime().time().toString(Qt::ISODate) << __PRETTY_FUNCTION__
+    qCritical() << QDateTime::currentDateTime() << __PRETTY_FUNCTION__
                 << QString("line=%1 REPORT THREAD ABOUT TO FINISH").arg(__LINE__);
 
     cnt = 10;

src/runProc.cpp

@@ -2,6 +2,7 @@
 #include <QDebug>
 #include "controlBus.h"
 #include "dcBL.h"
+#include "interfaces.h"
 
 static uint32_t hwapi_lastStartAmount;
 static uint32_t hwapi_lastTotalAmount;
@@ -28,31 +29,25 @@ 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(10);     // in ms
+    runProc_callProcesses->start(100);     // 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();
+    hwapi_triggerBL = new QTimer();
-//    connect(hwapi_triggerBL, SIGNAL(timeout()), this, SLOT(bl_performComplStart()));
+    connect(hwapi_triggerBL, SIGNAL(timeout()), this, SLOT(bl_performComplStart()));
-//    hwapi_triggerBL->setSingleShot(false);
+    hwapi_triggerBL->setSingleShot(false);
-//    hwapi_triggerBL->stop();
+    hwapi_triggerBL->stop();
-
-    myTO = new QTimer();
-    myTO->setSingleShot(true);
-    myTO->start(200);
 
 }
 
 
 void T_runProc::runProc_slotProcess(void)
 {
-#ifndef THIS_IS_CA_MASTER
     cash_paymentProcessing();
     doors_supervise();
-    bl_performComplStart();     // neu 1.12.23
     dcBL_cycle();
-#endif
+
 }
 
 bool T_runProc::cash_startPayment(uint32_t amount)
@@ -165,7 +160,6 @@ 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
@@ -175,26 +169,9 @@ 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
@@ -205,11 +182,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)  )     // Szeged
+        return 10;    // error cannot start
-    if ( payInProg==2 )       //8.12.23
+    }
+
+    if (empState>=10 && empState<=12 && (payInProg==1 || payInProg==2)  )
     {
         // coin acceptance is active now:
         if (hwapi_paymentStarted==1)    // && (( payInProg==0) || ( payInProg>5)))     //16.6.23
@@ -242,8 +219,7 @@ 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;
@@ -251,8 +227,7 @@ 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;
@@ -260,8 +235,7 @@ 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;
@@ -269,14 +243,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;
+            collActiv=13;
-            //hwapi_paymentStarted=90;
+            hwapi_paymentStarted=90;
-            //qCritical() << "emitting signal payStopByError" << empState;
+            qCritical() << "emitting signal payStopByError" << empState;
-            //emit runProc_payStopByError();
+            emit runProc_payStopByError();
-        }
+        }  */
 
     }
 
@@ -284,8 +258,7 @@ 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++;
@@ -293,8 +266,7 @@ 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++;
@@ -641,11 +613,8 @@ void T_runProc::bl_rebootDC(void)
     // BL is working for 5s after power-on-reset.
 
     uint8_t len, buf[20];
-    memset(buf, 0x00, sizeof(buf));
 
     len=dcBL_restartDC(buf);
-
-    qCritical() << __func__ << QByteArray((const char *)buf, len).toHex(':');
     sendWRcmd_setSendBlock160(len, buf);
 }
 
@@ -655,13 +624,8 @@ void T_runProc::bl_startBL(void)
     // otherwise the BL jumps to normal DC application
     uint8_t len, buf[20];
 
-    memset(buf, 0x00, sizeof(buf));
-
     len=dcBL_activatBootloader(buf);
-
-    qCritical() << __func__ << QByteArray((const char *)buf, len).toHex(':');
     sendWRcmd_setSendBlock160(len, buf);
-
     epi_setNowIsBootload(true);
 }
 
@@ -669,11 +633,8 @@ void T_runProc::bl_checkBL(void)
 {
     // call this function in order to get information, afterwards use "bl_isUp()"
     uint8_t len, buf[20];
-    memset(buf, 0x00, sizeof(buf));
 
     len=dcBL_readFWversion(buf);
-
-    qCritical() << __func__ << QByteArray((const char *)buf, len).toHex(':');
     sendWRcmd_setSendBlock160(len, buf);
 }
 
@@ -684,7 +645,6 @@ bool T_runProc::bl_isUp(void)
 
     for (nn=0; nn<160; nn++) receivedData[nn]=0;
     LL=epi_getRawRecLength();
-
     if (LL>0)
     {
         epi_getRawReceivedData(receivedData);
@@ -694,29 +654,18 @@ 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"
-        // response to "start BL"     {   2,  101,   48,  223,  131,    3}
+        if (receivedData[0]==2 && receivedData[1]==101 && receivedData[2]==48 &&
-        static uint8_t const cmp[6] = {0x02, 0x65, 0x30, 0xdf, 0x83, 0x03};
+            receivedData[3]==223 && receivedData[4] ==131 )
-
+        {
-        if (LL >= 6 && LL <= 13) {
+            qDebug() << "hwapi_bl_isUp: got BL response to start";
-            // (1) "02:63:34:35:62:33:03:02:65:30:df:83:03"
+            epi_clrRawReceivedString();
-            // (2) "02:65:30:df:83:03"
-
-            // qCritical() << "(" << __func__ << ":" << __LINE__
-            //             << ") CHECK" << QByteArray((char const*)receivedData, LL).toHex(':');
-
-            for (int i=0; i <= LL-6; ++i) {
-                if (memcmp(cmp, &receivedData[i], 6) == 0) {
-                    qCritical() << "(" << __func__ << ":" << __LINE__
-                                << ") BL RESPONSE to bl_start(): BOOTLOADER IS UP";
             return true;
         }
     }
-        }
-    }
     return false;
 }
 
@@ -728,8 +677,7 @@ void T_runProc::bl_completeStart(void)
 
 bool T_runProc::bl_performComplStart(void)
 {
-    bool result;
+    // must be called cyclic by timer
-
     static uint8_t retryCtr;
 
     if ((bl_startupStep<1) || (bl_startupStep>10))
@@ -743,69 +691,58 @@ bool T_runProc::bl_performComplStart(void)
 
     if (bl_startupStep==2)
     {
-        qDebug()<<"rebooting";
         bl_rebootDC();
-        myTO->stop();
+        hwapi_triggerBL->stop();
-        myTO->start(500);
+        hwapi_triggerBL->start(1000);    // call next step in 1s
         retryCtr=0;
         bl_startupStep++;
     } else
 
     if (bl_startupStep==3)
     {
-        if (!myTO->isActive())
+        //qDebug()<<"starting BL";
-        {
-            qDebug()<<"starting BL";
         bl_startBL();
-            myTO->stop();
+        hwapi_triggerBL->stop();
-            myTO->start(500);
+        hwapi_triggerBL->start(100);
         bl_startupStep++;
-        }
+
     } else
 
     if (bl_startupStep==4)
     {
-        if (!myTO->isActive())
+        //if (!myTO->isActive())
-        {
+        //{
-            qDebug()<<"checking BL";
         bl_checkBL();
-            myTO->stop();
+        hwapi_triggerBL->stop();
-            myTO->start(200);
+        hwapi_triggerBL->start(100);
         bl_startupStep++;
-        }
+
+        //}
 
     } else
 
     if (bl_startupStep==5)
     {
-        if (!myTO->isActive())
+        hwapi_triggerBL->stop();
-        {
+        if (bl_isUp())
-            qDebug()<<"step 5";
-            result = bl_isUp();
-            qDebug()<<"BL result: "<< result;
-            if (result)
         {
             bl_startupStep=99;
-                qDebug()<<"BL is working now...";
             //  BL is up and running
-                return true;
         } else
         {
             retryCtr++;    // start again
-                if (retryCtr>=10)
+            if (retryCtr>=15)
             {
                 bl_startupStep=99;
-                    qDebug()<<"BL error!!!";
+                //qDebug()<<"BL error!!!";
             } else
             {
                 bl_startupStep=3;
-                    myTO->stop();
+                //qDebug()<<"BL retry...";
-                    myTO->start(200);
-                    qDebug()<<"BL retry...";
             }
         }
+
     }
-    }
+    return true;
-    return false;
 }
 

src/shared_mem_buffer.cpp

@@ -1,13 +1,7 @@
 #include "shared_mem_buffer.h"
 
 #include <QDebug>
-#include <QFile>
-#include <QString>
-#include <QTextStream>
-#include <QDateTime>
-#include <QCoreApplication>
 #include <atomic>
-#include <algorithm>
 
 #ifdef QT_POSIX_IPC
     // The POSIX backend can be explicitly selected using the -feature-ipc_posix
@@ -15,124 +9,33 @@
     // macro will be defined. -> we use SystemV shared memory
 #error "QT_POSIX_IPC defined"
 #else
-#ifdef linux
+#ifdef __linux__
-#include <stdlib.h>
-#include <string.h>
 #include <sys/ipc.h>    // ftok
 #endif
 #endif
 
 //static bool shdMemFirstUse;
 
-static QString read1stLineOfFile(QString fileName) { // read for instance /etc/os-release
-    QFile f(fileName);
-    if (f.exists()) {
-        if (f.open(QIODevice::ReadOnly | QIODevice::Text)) {
-            QTextStream in(&f);
-            in.setCodec("UTF-8");
-            while(!in.atEnd()) {
-                return in.readLine();
-            }
-        }
-    }
-    return "N/A";
-}
-
 
 //QSharedMemory *SharedMemBuffer::getShm(std::size_t size) {
 QSharedMemory *SharedMem::getShm(std::size_t size) {
     static QSharedMemory shMem;
     if (size > 0) {
-#ifdef linux
+#ifdef __linux__
-        static const long nativeKey = ftok("/etc/os-release", 'H');
+        //static const long nativeKey = ftok("/etc/os-release", 'H');
-        static const QString fkey = std::to_string(nativeKey).c_str();
+        //static const QString fkey = std::to_string(nativeKey).c_str();
-        //static const QString fkey = "0123456?000=7";
+        static const QString fkey = "0123456?000=7";
 #else
         static const QString fkey = "0123456?000=9";
 #endif
 
-        qCritical() << __func__ << ":" << __LINE__ << ": size" << size;
-
         shMem.setKey(fkey);
         if (!shMem.isAttached()) {
             if (shMem.create(size)) {
-                qCritical() << __func__ << ":" << __LINE__ << ": created shared memory";
-
-#ifdef linux
-                if ((size != (std::size_t)shMem.size()) || (sizeof(SharedMem) != shMem.size())) {
-                    qCritical() << __func__ << ":" << __LINE__
-                                << "size=" << size
-                                << "shMem.size=" << shMem.size()
-                                << "sizeof(SharedMem)=" << sizeof(SharedMem)
-                                << "ABOUT TO REBOOT SYSTEM...";
-                    if (system("reboot")) {
-                        // reboot system -> shared memory re-created
-                    }
-                }
-
-                struct SharedMem *sh = (SharedMem *)(shMem.data());
-
-                memset(sh->indat_HWversion, 0x00, sizeof(sh->indat_HWversion));
-                memset(sh->indat_SWversion, 0x00, sizeof(sh->indat_SWversion));
-
-                memset(sh->os_release, 0x00, sizeof(sh->os_release));
-                memset(sh->date_of_creation, 0x00, sizeof(sh->date_of_creation));
-                memset(sh->creator, 0x00, sizeof(sh->creator));
-
-                QString const &os_release = read1stLineOfFile("/etc/os-release");
-                strncpy(sh->os_release, os_release.toStdString().c_str(),
-                        std::min((int)os_release.size(), (int)sizeof(sh->os_release)-1));
-
-                QString const &currentDateTime = QDateTime::currentDateTime().toString(Qt::ISODate);
-                char const *current = currentDateTime.toUtf8().constData();
-                strncpy(sh->date_of_creation, current,
-                        std::min((int)strlen(current), (int)sizeof(sh->date_of_creation)-1));
-
-                QString const &appPid = QString("%1 (%2)").arg(QCoreApplication::applicationName())
-                                                          .arg(QCoreApplication::applicationPid());
-
-                strncpy(sh->creator, appPid.toStdString().c_str(),
-                        std::min((int)strlen(appPid.toStdString().c_str()),
-                                 (int)sizeof(sh->creator)-1));
-
-                qCritical() << "os-release:" << sh->os_release;
-                qCritical() << "   creator:" << sh->creator;
-                qCritical() << "      date:" << sh->date_of_creation;
-
-#else
-                Q_ASSERT_X(size != shMem.size(), "compare sizes", "sizes different");
-                Q_ASSERT_X(sizeof(SharedMem) != shMem.size(), "compare sizes", "sizes different");
-#endif
                 return &shMem;
             } else {
                 if (shMem.error() == QSharedMemory::AlreadyExists) {
                     if (shMem.attach()) {
-#ifdef linux
-                        if ((size != (std::size_t)shMem.size()) || (sizeof(SharedMem) != shMem.size())) {
-                            qCritical() << __func__ << ":" << __LINE__
-                                        << "size=" << size
-                                        << "shMem.size=" << shMem.size()
-                                        << "sizeof(SharedMem)=" << sizeof(SharedMem)
-                                        << "ABOUT TO REBOOT SYSTEM...";
-                            if (system("reboot")) {
-                                // reboot system -> shared memory re-created
-                            }
-                        }
-#else
-                        Q_ASSERT_X(size != shMem.size(), "compare sizes", "sizes different");
-                        Q_ASSERT_X(sizeof(SharedMem) != shMem.size(), "compare sizes", "sizes different");
-#endif
-
-                        QString const &appPid = QString("%1 (%2)").arg(QCoreApplication::applicationName())
-                                                                  .arg(QCoreApplication::applicationPid());
-
-                        qCritical() << __func__ << ":" << __LINE__ << appPid << "attached shared memory";
-
-                        struct SharedMem const *sh = (SharedMem const *)(shMem.data());
-                        qCritical() << "os-release:" << sh->os_release;
-                        qCritical() << "   creator:" << sh->creator;
-                        qCritical() << "      date:" << sh->date_of_creation;
-
                         return &shMem;
                     }
                 }
@@ -140,13 +43,6 @@ QSharedMemory *SharedMem::getShm(std::size_t size) {
             qCritical() << shMem.nativeKey() << shMem.key() << shMem.data()
                         << shMem.error() << shMem.errorString();
             return nullptr;
-        } else {
-            qCritical() << __func__ << ":" << __LINE__ << "shared memory already attached";
-
-            struct SharedMem const *sh = (SharedMem const *)(shMem.data());
-            qCritical() << "os-release:" << sh->os_release;
-            qCritical() << "   creator:" << sh->creator;
-            qCritical() << "      date:" << sh->date_of_creation;
         }
     }
     return &shMem;

src/shared_mem_buffer.cpp.new

@@ -1,232 +0,0 @@
-#include "shared_mem_buffer.h"
-
-#include <QDebug>
-#include <QFile>
-#include <QString>
-#include <QTextStream>
-#include <QDateTime>
-#include <QCoreApplication>
-#include <atomic>
-#include <algorithm>
-
-#ifdef QT_POSIX_IPC
-    // The POSIX backend can be explicitly selected using the -feature-ipc_posix
-    // option to the Qt configure script. If it is enabled, the QT_POSIX_IPC
-    // macro will be defined. -> we use SystemV shared memory
-#error "QT_POSIX_IPC defined"
-#else
-#ifdef linux
-#include <stdlib.h>
-#include <string.h>
-#include <sys/ipc.h>    // ftok
-#endif
-#endif
-
-//static bool shdMemFirstUse;
-
-static QString read1stLineOfFile(QString fileName) { // read for instance /etc/os-release
-    QFile f(fileName);
-    if (f.exists()) {
-        if (f.open(QIODevice::ReadOnly | QIODevice::Text)) {
-            QTextStream in(&f);
-            in.setCodec("UTF-8");
-            while(!in.atEnd()) {
-                return in.readLine();
-            }
-        }
-    }
-    return "N/A";
-}
-
-
-//QSharedMemory *SharedMemBuffer::getShm(std::size_t size) {
-QSharedMemory *SharedMem::getShm(std::size_t size) {
-    static QSharedMemory shMem;
-    if (size > 0) {
-#ifdef linux
-        static const long nativeKey = ftok("/etc/os-release", 'H');
-        static const QString fkey = std::to_string(nativeKey).c_str();
-        //static const QString fkey = "0123456?000=7";
-#else
-        static const QString fkey = "0123456?000=9";
-#endif
-
-        qCritical() << __func__ << ":" << __LINE__ << ": size" << size;
-
-        shMem.setKey(fkey);
-        if (!shMem.isAttached()) {
-            if (shMem.create(size)) {
-                qCritical() << __func__ << ":" << __LINE__ << ": created shared memory";
-
-#ifdef linux
-                if ((size != (std::size_t)shMem.size()) || (sizeof(SharedMem) != shMem.size())) {
-                    qCritical() << __func__ << ":" << __LINE__
-                                << "size=" << size
-                                << "shMem.size=" << shMem.size()
-                                << "sizeof(SharedMem)=" << sizeof(SharedMem)
-                                << "ABOUT TO REBOOT SYSTEM...";
-                    if (system("reboot")) {
-                        // reboot system -> shared memory re-created
-                    }
-                }
-
-                struct SharedMem *sh = (SharedMem *)(shMem.data());
-
-#ifndef QT_NO_DEBUG
-                sh->mem_guard_0 = 0;
-                sh->mem_guard_1 = 0; sh->mem_guard_2 = 0; sh->mem_guard_3 = 0;
-                sh->mem_guard_4 = 0; sh->mem_guard_5 = 0; sh->mem_guard_6 = 0;
-                sh->mem_guard_7 = 0; sh->mem_guard_8 = 0; sh->mem_guard_9 = 0;
-
-                sh->mem_guard_10 = 0;
-                sh->mem_guard_11 = 0; sh->mem_guard_12 = 0; sh->mem_guard_13 = 0;
-                sh->mem_guard_14 = 0; sh->mem_guard_15 = 0; sh->mem_guard_16 = 0;
-                sh->mem_guard_17 = 0; sh->mem_guard_18 = 0; sh->mem_guard_19 = 0;
-
-                sh->mem_guard_20 = 0;
-                sh->mem_guard_21 = 0; sh->mem_guard_22 = 0; sh->mem_guard_23 = 0;
-                sh->mem_guard_24 = 0; sh->mem_guard_25 = 0; sh->mem_guard_26 = 0;
-                sh->mem_guard_27 = 0; sh->mem_guard_28 = 0; sh->mem_guard_29 = 0;
-
-                sh->mem_guard_30 = 0;
-                sh->mem_guard_31 = 0; sh->mem_guard_32 = 0; sh->mem_guard_33 = 0;
-                sh->mem_guard_34 = 0; sh->mem_guard_35 = 0; sh->mem_guard_36 = 0;
-                sh->mem_guard_37 = 0; sh->mem_guard_38 = 0; sh->mem_guard_39 = 0;
-
-                sh->mem_guard_40 = 0;
-                sh->mem_guard_41 = 0; sh->mem_guard_42 = 0; sh->mem_guard_43 = 0;
-                sh->mem_guard_44 = 0; sh->mem_guard_45 = 0; sh->mem_guard_46 = 0;
-                sh->mem_guard_47 = 0;
-#endif
-
-                memset(sh->indat_HWversion, 0x00, sizeof(sh->indat_HWversion));
-                memset(sh->indat_SWversion, 0x00, sizeof(sh->indat_SWversion));
-
-                memset(sh->os_release, 0x00, sizeof(sh->os_release));
-                memset(sh->date_of_creation, 0x00, sizeof(sh->date_of_creation));
-                memset(sh->creator, 0x00, sizeof(sh->creator));
-
-                QString const &os_release = read1stLineOfFile("/etc/os-release");
-                strncpy(sh->os_release, os_release.toStdString().c_str(),
-                        std::min((int)os_release.size(), (int)sizeof(sh->os_release)-1));
-
-                QString const &currentDateTime = QDateTime::currentDateTime().toString(Qt::ISODate);
-                char const *current = currentDateTime.toUtf8().constData();
-                strncpy(sh->date_of_creation, current,
-                        std::min((int)strlen(current), (int)sizeof(sh->date_of_creation)-1));
-
-                QString const &appPid = QString("%1 (%2)").arg(QCoreApplication::applicationName())
-                                                          .arg(QCoreApplication::applicationPid());
-
-                strncpy(sh->creator, appPid.toStdString().c_str(),
-                        std::min((int)strlen(appPid.toStdString().c_str()),
-                                 (int)sizeof(sh->creator)-1));
-
-                qCritical() << "os-release:" << sh->os_release;
-                qCritical() << "   creator:" << sh->creator;
-                qCritical() << "      date:" << sh->date_of_creation;
-
-#else
-                Q_ASSERT_X(size != shMem.size(), "compare sizes", "sizes different");
-                Q_ASSERT_X(sizeof(SharedMem) != shMem.size(), "compare sizes", "sizes different");
-#endif
-                return &shMem;
-            } else {
-                if (shMem.error() == QSharedMemory::AlreadyExists) {
-                    if (shMem.attach()) {
-#ifdef linux
-                        if ((size != (std::size_t)shMem.size()) || (sizeof(SharedMem) != shMem.size())) {
-                            qCritical() << __func__ << ":" << __LINE__
-                                        << "size=" << size
-                                        << "shMem.size=" << shMem.size()
-                                        << "sizeof(SharedMem)=" << sizeof(SharedMem)
-                                        << "ABOUT TO REBOOT SYSTEM...";
-                            if (system("reboot")) {
-                                // reboot system -> shared memory re-created
-                            }
-                        }
-#else
-                        Q_ASSERT_X(size != shMem.size(), "compare sizes", "sizes different");
-                        Q_ASSERT_X(sizeof(SharedMem) != shMem.size(), "compare sizes", "sizes different");
-#endif
-
-                        QString const &appPid = QString("%1 (%2)").arg(QCoreApplication::applicationName())
-                                                                  .arg(QCoreApplication::applicationPid());
-
-                        qCritical() << __func__ << ":" << __LINE__ << appPid << "attached shared memory";
-
-                        struct SharedMem const *sh = (SharedMem const *)(shMem.data());
-                        qCritical() << "os-release:" << sh->os_release;
-                        qCritical() << "   creator:" << sh->creator;
-                        qCritical() << "      date:" << sh->date_of_creation;
-
-                        return &shMem;
-                    }
-                }
-            }
-            qCritical() << shMem.nativeKey() << shMem.key() << shMem.data()
-                        << shMem.error() << shMem.errorString();
-            return nullptr;
-        } else {
-            qCritical() << __func__ << ":" << __LINE__ << "shared memory already attached";
-
-            struct SharedMem const *sh = (SharedMem const *)(shMem.data());
-            qCritical() << "os-release:" << sh->os_release;
-            qCritical() << "   creator:" << sh->creator;
-            qCritical() << "      date:" << sh->date_of_creation;
-        }
-    }
-    return &shMem;
-}
-
-
-// std::atomic_bool SharedMemBuffer::__sharedMemLocked{false};
-/*
-//QSharedMemory *SharedMemBuffer::getShm(std::size_t size) {
-QSharedMemory *SharedMem::getShm(std::size_t size) {
-
-    static QSharedMemory shMem;
-    if (size > 0) {
-#ifdef __linux__
-        static const long nativeKey = ftok("/etc/os-release", 'H');
-        static const QString fkey = std::to_string(nativeKey).c_str();
-#else
-        static const QString fkey = "0123456?000=9";
-#endif
-        shdMemFirstUse=false;
-        shMem.setKey(fkey);
-        if (!shMem.isAttached())
-        {
-            if (shMem.create(size))
-            {
-                //  sm was created successful, did not exist before
-                shdMemFirstUse=true;
-                return &shMem;
-            } else
-            {
-                // create was false because mem already existed
-                if (shMem.error() == QSharedMemory::AlreadyExists)
-                {
-                    if (shMem.attach())
-                    {
-                        return &shMem;
-                    }
-                }
-            }
-            qCritical() << shMem.nativeKey() << shMem.key() << shMem.data()
-                        << shMem.error() << shMem.errorString();
-            return nullptr;
-        }
-    }
-    return &shMem;
-}
-
-
-bool shdMem_firstUse(void)
-{
-    return shdMemFirstUse;
-}
-*/
-
-
-

src/storeINdata.cpp

@@ -6,15 +6,12 @@
 #include "shared_mem_buffer.h"
 #include "datei.h"
 
-#include <QTextCodec>
-
 // gpi: grafical access to PI: access from external devices over device controller FOR GUI
 // epi: external access from GUI to PI:  FOR external devices (DC)
 
 
 
 
-
 // store power on/off condition of the devices to control the data request
 
 //static bool indat_savePrnPwr;
@@ -66,64 +63,66 @@ bool indat_isMdbOn()
 
 void gpi_storeHWver(QString text)
 {
-    QString prev(QByteArray(SharedMem::read()->indat_HWversion, versionBufferLen-1));
+    // change Qstring to array of chars, because shared mem allowes no QString!
-    prev = prev.trimmed();
+    int  nn, LL = text.length();
+    if (LL >= versionBufferLen)
+        LL=versionBufferLen-1;   // leave place for termination
 
-    QString const textTruncated = text.mid(0, qMin(versionBufferLen-1, text.size())).trimmed();
+    for (nn=0; nn<LL; nn++)
-
+    {
-    if (textTruncated.startsWith("DC2C", Qt::CaseInsensitive)
+        SharedMem::write()->indat_HWversion[nn] = text.at(nn).toLatin1();
-     && textTruncated != prev) {
-        QTextCodec *codec = QTextCodec::codecForName("Windows-1252");
-        QString string = codec->toUnicode(textTruncated.toUtf8());
-        if (!string.isEmpty()) {
-            memset(SharedMem::write()->indat_HWversion, 0, versionBufferLen);
-            char *p = (char *)SharedMem::write()->indat_HWversion;
-            char *q = (char *)string.constData();
-            for (int i=0; i < qMin(versionBufferLen, string.size()); ++i) {
-                int const j = (sizeof(QChar) == 2) ? i*2 : i;
-                if (q[j]) {
-                    *p++ = q[j];
-                }
-            }
-        }
     }
+    for (nn=LL; nn<versionBufferLen; nn++)
+        SharedMem::write()->indat_HWversion[nn] =0;
 }
 
 QString epi_loadHWver(void)
 {
-    QString text(SharedMem::read()->indat_HWversion);
+    // load array of chars from SM and change to QString
-    return text.mid(0, qMin(versionBufferLen-1, text.size())).trimmed();
+    int  nn, LL = versionBufferLen;
+    char cc;
+    QString myStr;
+
+    myStr.clear();
+
+    for (nn=0; nn<LL; nn++)
+    {
+        cc = SharedMem::read()->indat_HWversion[nn];
+        myStr.append(cc);
+    }
+    return myStr;
 }
 
 void gpi_storeSWver(QString text)
 {    
-    QString prev(QByteArray(SharedMem::read()->indat_SWversion, 12));
+    int  nn, LL = text.length();
-    prev = prev.trimmed();
+    if (LL >= versionBufferLen)
+        LL=versionBufferLen-1;   // leave place for termination
 
-    QString const textTruncated = text.mid(0, qMin(12, text.size())).trimmed();
+    for (nn=0; nn<LL; nn++)
+    {
+        SharedMem::write()->indat_SWversion[nn] = text.at(nn).toLatin1();
+    }
+    for (nn=LL; nn<versionBufferLen; nn++)
+        SharedMem::write()->indat_SWversion[nn] =0;
 
-    if (textTruncated.startsWith("DC2C", Qt::CaseInsensitive)
-     && textTruncated != prev) {
-        QTextCodec *codec = QTextCodec::codecForName("Windows-1252");
-        QString string = codec->toUnicode(textTruncated.toUtf8());
-        if (!string.isEmpty()) {
-            memset(SharedMem::write()->indat_SWversion, 0, versionBufferLen);
-            char *p = (char *)SharedMem::write()->indat_SWversion;
-            char *q = (char *)string.constData();
-            for (int i=0; i < qMin(versionBufferLen, string.size()); ++i) {
-                int const j = (sizeof(QChar) == 2) ? i*2 : i;
-                if (q[j]) {
-                    *p++ = q[j];
-                }
-            }
-        }
-    }
 }
 
 QString epi_loadSWver(void)
 {
-    QString text(SharedMem::read()->indat_SWversion);
+    int  nn, LL = versionBufferLen;
-    return text.mid(0, qMin(12, text.size())).trimmed();
+    char cc;
+    QString myStr;
+
+    myStr.clear();
+
+    for (nn=0; nn<LL; nn++)
+    {
+        cc = SharedMem::read()->indat_SWversion[nn];
+        myStr.append(cc);
+    }
+    return myStr;
+
 }
 
 void gpi_storeDCstate(QString text)
@@ -1985,7 +1984,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
@@ -2055,50 +2054,13 @@ uint16_t epi_getNrOfCoinsInCashBox(void)
 
 void gpi_storeDcDataValid(bool 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;
-
 }
 
 // ....................................................................................
@@ -2203,8 +2165,8 @@ void gpi_storeRawReceivedData(uint8_t  RdDlen, uint8_t *receivedData)
     SharedMem::write()->Sdata_LengthRawData=lrd;
     for (nn=0; nn<lrd; nn++)
         SharedMem::write()->Sdata_rawData[nn]=receivedData[nn];
-
     //qDebug()<<"dcBL got data"<<  Sdata_LengthRawData << "bytes :)";
+
 }
 
 uint8_t epi_getRawReceivedData(uint8_t *receivedData)