Merge branch 'master' into palanga-switch-terminal-on-off

Use commands credit_switchWake/switchPower to reboot cc-terminal.

include/com.h

@@ -7,6 +7,7 @@
 //#include <QString>
 #include <QTimer>
 #include <QSerialPort>
+#include <QVector>
 #include "tslib.h"
 #include "controlBus.h"
 #include "interfaces.h"
@@ -32,6 +33,8 @@ class T_com : public QObject        //,  public QPlainTextEdit
 //    QSerialPort *CatSerial = nullptr;
     QSerialPort *CatSerial;
 
+    uint32_t writeCount = 0;
+
     //char oeffneSerialPort();
     char open_Serial_Port();
     void closeSerialPort();
@@ -61,6 +64,8 @@ public:
     bool readFromSerial(QByteArray &data, uint16_t &sendLength);
         // retval: true: data available
 
+    uint32_t getWriteCount() { return writeCount; }
+
 /*
     uint8_t getAllPortPins(void);
         // rs232pins: all signals bitwise coded in one byte:

include/datIf.h

@@ -168,6 +168,9 @@ class T_datif : public QObject
     QTimer *datif_trigger;
     uint8_t selectedSlaveAddr;
 
+    bool waitForTestResponse = false;
+    uint32_t readCount = 0;
+
 private slots:
     char datif_cycleSend();
     void StoredRecData();

include/hwapi.h

@@ -63,7 +63,8 @@ V4.0  6.9.2023: activating DC-Bootloader in slve-lib (SM)
 #include "shared_mem_buffer.h"
 #include "runProc.h"
 #include "interfaces.h"
-
+#include <QScopedPointer>
+#include <QFileSystemWatcher>
 
 /*
  * select Plugin Type here
@@ -98,7 +99,7 @@ V4.0  6.9.2023: activating DC-Bootloader in slve-lib (SM)
 //#define THIS_IS_CA_MASTER
 
 
-
+class QFileSystemWatcher;
 class QSharedMemory;
 class DownloadThread;
 class ReportingThread;
@@ -115,7 +116,11 @@ private:
     QSharedMemory *m_sharedMem;
     ReportingThread *m_reportingThread;
     DownloadThread *m_downloadThread;
-    //QTimer *hwapi_triggerBL;
+    QScopedPointer<QFileSystemWatcher> m_fileSystemWatcher;
+    QString m_watchedFile;
+
+private slots:
+    void onCCWakeGpioChanged(QString const &file);
 
 public:
     explicit hwapi(QObject *parent = nullptr);

include/prot.h

@@ -122,6 +122,9 @@ public:
                            uint8_t  *RdDlen, uint8_t *receivedData);
         // retval: data valid, only one time true
 
+    uint16_t getReadSource() { return readSource; } // readSource contains last command sent to device controller
+    T_com *getSerialPort() { return mySerialPort; } // utility function
+
 
 signals:
     void framerecieved();   //bool gotINdata);

src/com.cpp

@@ -1,5 +1,6 @@
 #include "com.h"
 #include <QDebug>
+#include <QDateTime>
 //#include "controlBus.h"
 
 //////////////////////////////////////////////////////////////////////////////////
@@ -20,13 +21,48 @@ void T_com::writeToSerial(const QByteArray &data, uint16_t sendLength)
 {
     sendBuffer=data;
     sendLen=sendLength;
-    if (CatSerial->isOpen())
-    {
-        //qDebug() << "sending..." << sendBuffer;
-        CatSerial->write(sendBuffer);
-    } else
-        qDebug() << "error sending, port is not open";
 
+    // logic: exactly one command is sent to DC. no other command can be sent
+    // until the respond has been read from the serial line.
+
+    if (CatSerial->isOpen()) {
+        if (CatSerial->error() != QSerialPort::NoError) {
+            qCritical() << __func__ << "" << __LINE__ << "ERROR on serial line" << CatSerial->errorString();
+            CatSerial->clearError();
+            qCritical() << __func__ << "" << __LINE__ << "cleared error on serial line";
+        }
+
+        if (!CatSerial->atEnd()) {
+            qCritical() << QString("ERROR %1 bytes available on serial line before write").arg(CatSerial->bytesAvailable());
+            qCritical() << CatSerial->readAll().toHex(':');
+            CatSerial->clear();
+            qCritical() << __func__ << "" << __LINE__ << "read all data from serial line";
+        }
+
+        CatSerial->clear();
+
+        QByteArray buffer(data);
+        int bytesWritten = CatSerial->write(buffer);
+        if (bytesWritten == -1) {
+            qCritical() << __func__ << ":" << __LINE__
+                        << QString("ERROR %1 for sending %2").arg(CatSerial->errorString()).arg(data.toHex(':').constData());
+            CatSerial->clearError();
+            qCritical() << __func__ << ":" << __LINE__ << "cleared error on serial line. returning ...";
+            return;
+        }
+
+        CatSerial->flush();
+        writeCount += 1;
+
+        // only for debugging
+        // if ((unsigned int)data.constData()[2] == 31) { // request dynamic data
+        //    qCritical() << __func__ << ":" << __LINE__ << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
+        //                << "write cmd" << (unsigned int)data.constData()[2];
+        //}
+    } else {
+        qCritical() << __func__ << ":" << __LINE__
+                    << "ERROR sending" << data.toHex(':') << "port is not open";
+    }
 }
 
 
@@ -82,6 +118,7 @@ T_com::T_com(QObject *parent) : QObject(parent)
     ChkConnectTimer->setSingleShot(false);
     ChkConnectTimer->start(100);     // in ms
     com_want2read=0;
+    writeCount = 0;
 }
 
 

src/datIf.cpp

@@ -6,10 +6,12 @@ History:
 
 */
 #include "datIf.h"
+#include "hwapi.h"
 #include "sendWRcmd.h"
 #include "controlBus.h"
 #include "storeINdata.h"
 #include <QDebug>
+#include <QDateTime>
 #include <datei.h>
 #include <QDir>
 
@@ -124,6 +126,7 @@ T_datif::T_datif(QObject *parent) : QObject(parent)
     datif_pNextCmd=0;
     datif_sendSlowCmd=0;
 
+    readCount = 0;
 }
 
 void T_datif::resetChain(void)
@@ -400,7 +403,7 @@ char T_datif::sendINrequestsAutomatic(void)
     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_vendRequCommandList[15]={102,107,108,110,112,115,116,30,31,32,40,41,42,23,0};
     uint8_t datif_maxVendingCmds=13;
 
     // special commands:
@@ -480,6 +483,76 @@ void T_datif::StoredRecData()
     gpi_storeLastResult(res);
 }
 
+static void dump(T_moduleCondition const *modCond) {
+    qCritical() << QString("modCond->ram                %1 (%2)").arg(modCond->ram).arg(modCond->ram, 0, 16);
+    qCritical() << QString("modCond->intEe              %1 (%2)").arg(modCond->intEe).arg(modCond->intEe, 0, 16);
+    qCritical() << QString("modCond->extEe              %1 (%2)").arg(modCond->extEe).arg(modCond->extEe, 0, 16);
+    qCritical() << QString("modCond->rtc                %1 (%2)").arg(modCond->rtc).arg(modCond->rtc, 0, 16);
+    qCritical() << QString("modCond->boardHw            %1 (%2)").arg(modCond->boardHw).arg(modCond->boardHw, 0, 16);
+    qCritical() << QString("modCond->printer            %1 (%2)").arg(modCond->printer).arg(modCond->printer, 0, 16);
+    qCritical() << QString("modCond->modem              %1 (%2)").arg(modCond->modem).arg(modCond->modem, 0, 16);
+    qCritical() << QString("modCond->signal             %1 (%2)").arg(modCond->signal).arg(modCond->signal, 0, 16);
+
+    qCritical() << QString("modCond->regist             %1 (%2)").arg(modCond->regist).arg(modCond->regist, 0, 16);
+    qCritical() << QString("modCond->mdbBus             %1 (%2)").arg(modCond->mdbBus).arg(modCond->mdbBus, 0, 16);
+    qCritical() << QString("modCond->coinChecker        %1 (%2)").arg(modCond->coinChecker).arg(modCond->coinChecker, 0, 16);
+    qCritical() << QString("modCond->coinEscrow         %1 (%2)").arg(modCond->coinEscrow).arg(modCond->coinEscrow, 0, 16);
+
+    qCritical() << QString("modCond->mifareReader       %1 (%2)").arg(modCond->mifareReader).arg(modCond->mifareReader, 0, 16);
+    qCritical() << QString("modCond->creditTerm         %1 (%2)").arg(modCond->creditTerm).arg(modCond->creditTerm, 0, 16);
+    qCritical() << QString("modCond->coinReject         %1 (%2)").arg(modCond->coinReject).arg(modCond->coinReject, 0, 16);
+    qCritical() << QString("modCond->coinSafe           %1 (%2)").arg(modCond->coinSafe).arg(modCond->coinSafe, 0, 16);
+
+    qCritical() << QString("modCond->billSafe           %1 (%2)").arg(modCond->billSafe).arg(modCond->billSafe, 0, 16);
+    qCritical() << QString("modCond->voltage            %1 (%2)").arg(modCond->voltage).arg(modCond->voltage, 0, 16);
+    qCritical() << QString("modCond->temper             %1 (%2)").arg(modCond->temper).arg(modCond->temper, 0, 16);
+    qCritical() << QString("modCond->poweronTest        %1 (%2)").arg(modCond->poweronTest).arg(modCond->poweronTest, 0, 16);
+
+    qCritical() << QString("modCond->doorState          %1 (%2)").arg(modCond->doorState).arg(modCond->doorState, 0, 16);
+    qCritical() << QString("modCond->doorWasOpened      %1 (%2)").arg(modCond->doorWasOpened).arg(modCond->doorWasOpened, 0, 16);
+    qCritical() << QString("modCond->changer            %1 (%2)").arg(modCond->changer).arg(modCond->changer, 0, 16);
+    qCritical() << QString("modCond->coinBlocker        %1 (%2)").arg(modCond->coinBlocker).arg(modCond->coinBlocker, 0, 16);
+
+    qCritical() << QString("modCond->billReader         %1 (%2)").arg(modCond->billReader).arg(modCond->billReader, 0, 16);
+    qCritical() << QString("modCond->ResetReason        %1 (%2)").arg(modCond->ResetReason).arg(modCond->ResetReason, 0, 16);
+    qCritical() << QString("modCond->allModulesChecked  %1 (%2)").arg(modCond->allModulesChecked).arg(modCond->allModulesChecked, 0, 16);
+    qCritical() << QString("modCond->alarmState         %1 (%2)").arg(modCond->alarmState).arg(modCond->alarmState, 0, 16);
+    qCritical() << QString("modCond->fuses              %1 (%2)").arg(modCond->fuses).arg(modCond->fuses, 0, 16);
+}
+
+static void dump(T_dynamicCondition const *dynCond) {
+    qCritical() << QString("dynCond->allDoorsDebounced      %1 (%2)").arg((unsigned char)dynCond->allDoorsDebounced).arg((unsigned char)dynCond->allDoorsDebounced, 0, 16);
+    qCritical() << QString("dynCond->openedAuthorized       %1 (%2)").arg((unsigned char)dynCond->openedAuthorized).arg((unsigned char)dynCond->openedAuthorized, 0, 16);
+    qCritical() << QString("dynCond->CBinDebounced          %1 (%2)").arg((unsigned char)dynCond->CBinDebounced).arg((unsigned char)dynCond->CBinDebounced, 0, 16);
+    qCritical() << QString("dynCond->upperDoor              %1 (%2)").arg((unsigned char)dynCond->upperDoor).arg((unsigned char)dynCond->upperDoor, 0, 16);
+    qCritical() << QString("dynCond->middleDoor             %1 (%2)").arg((unsigned char)dynCond->middleDoor).arg((unsigned char)dynCond->middleDoor, 0, 16);
+    qCritical() << QString("dynCond->lowerDoor              %1 (%2)").arg((unsigned char)dynCond->lowerDoor).arg((unsigned char)dynCond->lowerDoor, 0, 16);
+    qCritical() << QString("dynCond->middleDoor             %1 (%2)").arg((unsigned char)dynCond->middleDoor).arg((unsigned char)dynCond->middleDoor, 0, 16);
+    qCritical() << QString("dynCond->coinAttached           %1 (%2)").arg((unsigned char)dynCond->coinAttached).arg((unsigned char)dynCond->coinAttached, 0, 16);
+    qCritical() << QString("dynCond->billBox                %1 (%2)").arg((unsigned char)dynCond->billBox).arg((unsigned char)dynCond->billBox, 0, 16);
+    qCritical() << QString("dynCond->modeAbrech             %1 (%2)").arg((unsigned char)dynCond->modeAbrech).arg((unsigned char)dynCond->modeAbrech, 0, 16);
+    qCritical() << QString("dynCond->onAlarm                %1 (%2)").arg((unsigned char)dynCond->onAlarm).arg((unsigned char)dynCond->onAlarm, 0, 16);
+    qCritical() << QString("dynCond->nowCardTest            %1 (%2)").arg((unsigned char)dynCond->nowCardTest).arg((unsigned char)dynCond->nowCardTest, 0, 16);
+    qCritical() << QString("dynCond->nowPayment             %1 (%2)").arg((unsigned char)dynCond->nowPayment).arg((unsigned char)dynCond->nowPayment, 0, 16);
+    qCritical() << QString("dynCond->lastMifCardType        %1 (%2)").arg((unsigned char)dynCond->lastMifCardType).arg((unsigned char)dynCond->lastMifCardType, 0, 16);
+    qCritical() << QString("dynCond->lastSDoorState         %1 (%2)").arg(dynCond->lastSDoorState).arg(dynCond->lastSDoorState, 0, 16);
+    qCritical() << QString("dynCond->lastVDoorState         %1 (%2)").arg(dynCond->lastVDoorState).arg(dynCond->lastVDoorState, 0, 16);
+    qCritical() << QString("dynCond->lastCBstate            %1 (%2)").arg(dynCond->lastCBstate).arg(dynCond->lastCBstate, 0, 16);
+    qCritical() << QString("dynCond->paymentInProgress      %1 (%2)").arg((unsigned char)dynCond->paymentInProgress).arg((unsigned char)dynCond->paymentInProgress, 0, 16);
+    qCritical() << QString("dynCond->U_Batt                 %1 (%2)").arg(dynCond->U_Batt).arg(dynCond->U_Batt, 0, 16);
+    qCritical() << QString("dynCond->nrCoinsInBox           %1 (%2)").arg(dynCond->nrCoinsInBox).arg(dynCond->nrCoinsInBox, 0, 16);
+    qCritical() << QString("dynCond->amountInBox            %1 (%2)").arg(dynCond->amountInBox).arg(dynCond->amountInBox, 0, 16);
+    qCritical() << QString("dynCond->totalTransVolume       %1 (%2)").arg(dynCond->totalTransVolume).arg(dynCond->totalTransVolume, 0, 16);
+    qCritical() << QString("dynCond->totalNrOfVends         %1 (%2)").arg(dynCond->totalNrOfVends).arg(dynCond->totalNrOfVends, 0, 16);
+    qCritical() << QString("dynCond->resultOfLastTemplPrint %1 (%2)").arg((unsigned char)dynCond->resultOfLastTemplPrint).arg((unsigned char)dynCond->resultOfLastTemplPrint, 0, 16);
+    qCritical() << QString("dynCond->lastPrinterStatus      %1 (%2)").arg(dynCond->lastPrinterStatus).arg(dynCond->lastPrinterStatus, 0, 16);
+    qCritical() << QString("dynCond->startupTestIsRunning   %1 (%2)").arg(dynCond->startupTestIsRunning).arg(dynCond->startupTestIsRunning, 0, 16);
+    qCritical() << QString("dynCond->totalNrOfCuts          %1 (%2)").arg(dynCond->totalNrOfCuts).arg(dynCond->totalNrOfCuts, 0, 16);
+    qCritical() << QString("dynCond->nextAccountNumber      %1 (%2)").arg(dynCond->nextAccountNumber).arg(dynCond->nextAccountNumber, 0, 16);
+    qCritical() << QString("dynCond->nrOfBillsInBox         %1 (%2)").arg(dynCond->nrOfBillsInBox).arg(dynCond->nrOfBillsInBox, 0, 16);
+    qCritical() << QString("dynCond->UbatAtLastPrint        %1 (%2)").arg(dynCond->UbatAtLastPrint).arg(dynCond->UbatAtLastPrint, 0, 16);
+}
+
 char T_datif::loadRecDataFromFrame()
 {
     // is called even with wrong received data in order to speed up the process (stop waiting for response)
@@ -513,6 +586,8 @@ char T_datif::loadRecDataFromFrame()
         return 0;
     }
 
+    memset(receivedData, 0x00, sizeof(receivedData));
+
     ret=myDCIF->getReceivedInData(&SlaveAdr, &readSource, &readAddress,  &RdDleng, receivedData);
         // nur true wenn CommandState OK und readState OK
 
@@ -545,6 +620,117 @@ char T_datif::loadRecDataFromFrame()
 
     gpi_storeRecPayLoad(RdDleng, receivedData); //  save for host (user of hwapi)
 
+    if (myDCIF && myDCIF->getSerialPort()) {
+        uint32_t writeCount = myDCIF->getSerialPort()->getWriteCount();
+        if ((readCount + 1) == writeCount) { // there can be only one command sent to the DC
+            readCount = writeCount;
+            if (readSource != myDCIF->getReadSource()) {
+                qCritical() << __func__ << ":" << __LINE__ << ": ERROR length" << RdDleng << ", ignore data"
+                            << QByteArray(reinterpret_cast<char const *>(receivedData), RdDleng).toHex(':');
+                qCritical() << __func__ << ":" << __LINE__ << "would be interpretated as" << readSource << myDCIF->getReadSource();
+                return 0;
+            } else {
+                // only for debugging
+                // qCritical() << __func__ << ":" << __LINE__ << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs) << readSource << myDCIF->getReadSource();
+                if (readSource == 30) {
+                    T_moduleCondition const *modCond = reinterpret_cast<T_moduleCondition const *>(receivedData);
+
+                    if(modCond->rtc >= 200) {
+                        dump(modCond);
+                        qCritical() << __func__ << ":" << __LINE__ << ": ERROR E002 (modCond->rtc >= 200)"
+                            << QByteArray(reinterpret_cast<char const *>(receivedData), RdDleng).toHex(':');
+                    }
+                    if (modCond->printer == 200 || modCond->printer == 201) {
+                        dump(modCond);
+                        qCritical() << __func__ << ":" << __LINE__ << ": ERROR E020 (modCond->printer == 200 || modCond->printer == 201)"
+                            << QByteArray(reinterpret_cast<char const *>(receivedData), RdDleng).toHex(':');
+                    }
+                    if (modCond->printer == 202) {
+                        dump(modCond);
+                        qCritical() << __func__ << ":" << __LINE__ << ": ERROR E018 (modCond->printer == 202)"
+                            << QByteArray(reinterpret_cast<char const *>(receivedData), RdDleng).toHex(':');
+                    }
+                    if (modCond->coinBlocker >= 200) {
+                        dump(modCond);
+                        qCritical() << __func__ << ":" << __LINE__ << ": ERROR E025 (modCond->coinBlocker >= 200)"
+                            << QByteArray(reinterpret_cast<char const *>(receivedData), RdDleng).toHex(':');
+                    }
+                    if (modCond->mdbBus >= 200) {
+                        dump(modCond);
+                        qCritical() << __func__ << ":" << __LINE__ << ": ERROR E034 (modCond->mdbBus >= 200)"
+                            << QByteArray(reinterpret_cast<char const *>(receivedData), RdDleng).toHex(':');
+                    }
+                    if (modCond->intEe >= 200) {
+                        dump(modCond);
+                        qCritical() << __func__ << ":" << __LINE__ << ": ERROR E011 (modCond->intEe >= 200)"
+                            << QByteArray(reinterpret_cast<char const *>(receivedData), RdDleng).toHex(':');
+                    }
+                    if (modCond->voltage >= 200) {
+                        dump(modCond);
+                        qCritical() << __func__ << ":" << __LINE__ << ": ERROR E003 (modCond->voltage >= 200)"
+                            << QByteArray(reinterpret_cast<char const *>(receivedData), RdDleng).toHex(':');
+                    }
+                    if (modCond->changer >= 200) {
+                        dump(modCond);
+                        qCritical() << __func__ << ":" << __LINE__ << ": ERROR E026 (modCond->changer >= 200)"
+                            << QByteArray(reinterpret_cast<char const *>(receivedData), RdDleng).toHex(':');
+                    }
+                    if (modCond->coinSafe == 201) {
+                        dump(modCond);
+                        qCritical() << __func__ << ":" << __LINE__ << ": ERROR E007 (modCond->coinSafe == 201)"
+                            << QByteArray(reinterpret_cast<char const *>(receivedData), RdDleng).toHex(':');
+                    }
+                    if (modCond->coinSafe == 200) {
+                        dump(modCond);
+                        qCritical() << __func__ << ":" << __LINE__ << ": ERROR E009 (modCond->coinSafe == 200)"
+                            << QByteArray(reinterpret_cast<char const *>(receivedData), RdDleng).toHex(':');
+                    }
+                }
+
+                if (readSource == 31) {
+                    T_dynamicCondition const *dynCond = reinterpret_cast<T_dynamicCondition const *>(receivedData);
+
+                    if (dynCond->modeAbrech > 0) {
+                        dump(dynCond);
+                        qCritical() << __func__ << ":" << __LINE__ << ": ERROR E011 (dynCond->modeAbrech > 0)"
+                            << QByteArray(reinterpret_cast<char const *>(receivedData), RdDleng).toHex(':');
+                    }
+                    if (dynCond->nowCardTest > 0) {
+                        dump(dynCond);
+                        qCritical() << __func__ << ":" << __LINE__ << ": ERROR E072 (dynCond->nowCardTest > 0)"
+                            << QByteArray(reinterpret_cast<char const *>(receivedData), RdDleng).toHex(':');
+                    }
+                    if (dynCond->startupTestIsRunning > 0) {
+                        dump(dynCond);
+                        qCritical() << __func__ << ":" << __LINE__ << ": ERROR E073 (dynCond->startupTestIsRunning > 0)"
+                            << QByteArray(reinterpret_cast<char const *>(receivedData), RdDleng).toHex(':');
+                    }
+                }
+            }
+        } else {
+            qCritical() << __func__ << ":" << __LINE__ << QString(": ERROR readCount + 1 != writeCount: %1 != %2").arg(readCount + 1).arg(writeCount);
+            qCritical() << __func__ << ":" << __LINE__ << ": ERROR length" << RdDleng << ", ignore data"
+                        << QByteArray((char const *)receivedData, RdDleng).toHex(':');
+            qCritical() << __func__ << ":" << __LINE__ << "would be interpretated as" << readSource << myDCIF->getReadSource();
+
+            if (readSource == 30) {
+                T_moduleCondition const *modCond = reinterpret_cast<T_moduleCondition const *>(receivedData);
+                dump(modCond);
+            }
+            if (readSource == 31) {
+                T_dynamicCondition const *dynCond = reinterpret_cast<T_dynamicCondition const *>(receivedData);
+                dump(dynCond);
+                if (dynCond->coinAttached > 0) {
+                    qCritical() << __func__ << ":" << __LINE__ << ": dynCond->coinAttached"
+                        << QByteArray(reinterpret_cast<char const *>(receivedData), RdDleng).toHex(':');
+                }
+            }
+
+            readCount = writeCount;
+            return 0;
+        }
+    }
+
     // uint8_t nn;
     //qDebug() << "\n datif: got valid data, rdsrc:" << readSource << "  rdadd:" << readAddress
      //        << "  rdlen:" << RdDleng;
@@ -1012,18 +1198,24 @@ char T_datif::loadRecDataFromFrame()
         uit2=uchar2uint(receivedData[7],receivedData[6]);  //  value of last coin
         //if (uitmp>0) // nur 1x bei neuer Münze  6.10.23 aendern:
                         // beim Wechsler hat die kleinste Muenze immer coin type 0!
+
         if (uitmp>10000 || uit2>10000)
         {
             uitmp=0;
             uit2=0;
         }
-        if ((newInsertedAmount != lastInsertedAmount) || uit2>0 )
-        {
-            gpi_storeCurrentPayment(newInsertedAmount, uitmp, uit2);
-            emit datif_gotNewCoin();    // OR BILL  if (uitmp & 0x8000)>0
-            //qDebug()<<"emit new coin";
-            lastInsertedAmount=newInsertedAmount;
-            //qCritical()<<"datif 112 store and emit new coin "<<newInsertedAmount<<" "<<uitmp<<" "<<uit2;
+
+        if (uit2==3 || uit2==5 || uit2==10 || uit2==20  || uit2==40 || uit2==50 || uit2==100 || uit2==200 || uit2==500)
+         {
+            // valid coin
+            if ((newInsertedAmount != lastInsertedAmount) || uit2>0 )
+            {
+                gpi_storeCurrentPayment(newInsertedAmount, uitmp, uit2);
+                emit datif_gotNewCoin();    // OR BILL  if (uitmp & 0x8000)>0
+                //qDebug()<<"emit new coin";
+                lastInsertedAmount=newInsertedAmount;
+                //qCritical()<<"datif 112 store and emit new coin "<<newInsertedAmount<<" "<<uitmp<<" "<<uit2;
+            }
         }
 
         break;

src/hwapi.cpp

@@ -15,6 +15,8 @@
 #include <cstring>
 #include <QThread>
 #include <QDebug>
+#include <QFileSystemWatcher>
+#include <QSettings>
 
 
 static uint32_t hwapi_lastStartAmount;
@@ -35,6 +37,7 @@ hwapi::hwapi(QObject *parent) : QObject(parent)
     qCritical() << "    hwapi::hwapi() APP_EXTENDED_VERSION:" << APP_EXTENDED_VERSION;
     qCritical() << "hwapi::hwapi() APP_EXTENDED_VERSION_LIB:" << APP_EXTENDED_VERSION_LIB;
 
+    m_fileSystemWatcher.reset();
 
     // create or attach shared memory segment
     m_sharedMem = SharedMem::getShm(sizeof(SharedMem));
@@ -56,8 +59,21 @@ hwapi::hwapi(QObject *parent) : QObject(parent)
 #error "SLAVE LIB COMPILED INTO MASTER"
 #endif
 
-        myDatif = new T_datif();    // für die  CAslave-Lib auskommentieren!
+        QSettings settings("/opt/app/ATBAPP/ATBQT.ini", QSettings::IniFormat);
+        m_watchedFile = settings.value("AsyncPOS_CCPlugin/terminal_watch_file",
+                                       "/run/powerctrl_cc").toString();
 
+        m_fileSystemWatcher.reset(new QFileSystemWatcher());
+        if (!m_fileSystemWatcher->addPath(m_watchedFile)) {
+            qCritical() << "cannot add path for" << m_watchedFile;
+        } else {
+            if (connect(m_fileSystemWatcher.get(), SIGNAL(fileChanged(QString const&)),
+                        this, SLOT(onCCWakeGpioChanged(QString const&)))) {
+                qCritical() << "connected file watcher with" << m_watchedFile;
+            }
+        }
+
+        myDatif = new T_datif(this);    // für die  CAslave-Lib auskommentieren!
 #endif
 
 #ifdef THIS_IS_CA_SLAVE
@@ -120,6 +136,40 @@ hwapi::hwapi(QObject *parent) : QObject(parent)
     connect(runProcess, SIGNAL(runProc_coinAttached()),                 this, SLOT(coinAttached()));
 }
 
+void hwapi::onCCWakeGpioChanged(QString const &fileName) {
+    if (fileName == m_watchedFile) {
+        qCritical() << __func__ << ":" << __LINE__ << " " << m_watchedFile;
+        QFile f(m_watchedFile);
+        if (f.exists() && f.open(QFile::ReadOnly | QFile::Text)) {
+            QTextStream stream(&f);
+            QString const &content = stream.readAll();
+            if (content.startsWith("0")) {
+                qCritical() << __func__ << ":" << __LINE__ << "switching cc-terminal off...";
+                credit_switchWake(false);
+                credit_switchPower(false);
+            } else
+            if (content.startsWith("1")) {
+                qCritical() << __func__ << ":" << __LINE__ << "switching cc-terminal on...";
+                credit_switchPower(true);
+                credit_switchWake(true);
+            } else
+            if (content.startsWith("2")) {
+                qCritical() << __func__ << ":" << __LINE__ << "switching cc-terminal off and on...";
+                credit_switchWake(false);
+                credit_switchPower(false);
+                QThread::sleep(1);
+                credit_switchPower(true);
+                credit_switchWake(true);
+            } else {
+                qCritical() << "switching cc-terminal watched file contained" << content;
+                QFile::resize(m_watchedFile, 0); // empty file
+            }
+        }
+    } else {
+        qCritical() << "ERROR watching the wrong file" << fileName << m_watchedFile;
+    }
+}
+
 void hwapi::hwapi_slotPayProc(void)
 {
 

src/prot.cpp

@@ -368,6 +368,9 @@ uint8_t recBuffer[FRAME_MAXLEN];
     // read from "VCP":
     mySerialPort->readFromSerial(Indata, recLength);
 //qDebug()<<"prot: got data " << recLength;
+
+    memset(recBuffer, 0x00, sizeof(recBuffer));
+
     if (recLength>FRAME_MAXLEN)
         recLength=FRAME_MAXLEN;
     for (int nn=0; nn<recLength; nn++)