include/com.h

@@ -33,7 +33,9 @@ class T_com : public QObject        //,  public QPlainTextEdit
 //    QSerialPort *CatSerial = nullptr;
     QSerialPort *CatSerial;
 
-    uint32_t writeCount = 0;
+    QVector<uint16_t> readCmds;     // list of active commands sent to DC
+
+
 
     //char oeffneSerialPort();
     char open_Serial_Port();
@@ -64,7 +66,8 @@ public:
     bool readFromSerial(QByteArray &data, uint16_t &sendLength);
         // retval: true: data available
 
-    uint32_t getWriteCount() { return writeCount; }
+    QVector<uint16_t> &getReadCmds() { return readCmds; }
+    QVector<uint16_t> const &getReadCmds() const { return readCmds; }
 
 /*
     uint8_t getAllPortPins(void);

include/datIf.h

@@ -169,7 +169,6 @@ class T_datif : public QObject
     uint8_t selectedSlaveAddr;
 
     bool waitForTestResponse = false;
-    uint32_t readCount = 0;
 
 private slots:
     char datif_cycleSend();

src/com.cpp

@@ -1,6 +1,5 @@
 #include "com.h"
 #include <QDebug>
-#include <QDateTime>
 //#include "controlBus.h"
 
 //////////////////////////////////////////////////////////////////////////////////
@@ -25,48 +24,67 @@ void T_com::writeToSerial(const QByteArray &data, uint16_t sendLength)
     // 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()) {
+    static int errorCnt = 0;
-        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()) {
+    if (readCmds.size() == 0) { // no other read command active: ok
-            qCritical() << QString("ERROR %1 bytes available on serial line before write").arg(CatSerial->bytesAvailable());
+        if (CatSerial->isOpen())
-            qCritical() << CatSerial->readAll().toHex(':');
+        {
-            CatSerial->clear();
+            if (CatSerial->error() != QSerialPort::NoError) {
-            qCritical() << __func__ << "" << __LINE__ << "read all data from serial line";
+                qCritical() << __func__ << "" << __LINE__ << "ERROR on serial line" << CatSerial->errorString();
-        }
-
-        CatSerial->clear();
-
-        QByteArray buffer(data);
-        int bytesToWrite = buffer.size();
-        while (bytesToWrite > 0 && !buffer.isEmpty()) {
-            int bytesWritten = CatSerial->write(buffer);
-            if (bytesWritten != -1) {
-                bytesToWrite -= bytesWritten;
-                buffer = buffer.right(bytesWritten);
-            } else {
-                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 ...";
+                qCritical() << __func__ << "" << __LINE__ << "cleared error on serial line";
-                return;
             }
+
+            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";
+            }
+
+            QByteArray buffer(data);
+
+            int bytesToWrite = buffer.size();
+            while (bytesToWrite > 0 && !buffer.isEmpty()) {
+                int bytesWritten = CatSerial->write(buffer);
+                if (bytesWritten != -1) {
+                    bytesToWrite -= bytesWritten;
+                    buffer = buffer.right(bytesWritten);
+                } else {
+                    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;
+                }
+            }
+
+            // save last command sent.
+            readCmds.append(data.constData()[2]); // 2: index of the last command
+
+        } else {
+            qCritical() << __func__ << ":" << __LINE__
+                        << "ERROR sending" << data.toHex(':') << "port is not open";
         }
-
-        CatSerial->flush();
-        writeCount += 1;
-
-        // only for debugging
-        // qCritical() << __func__ << ":" << __LINE__ << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs)
-        //            << "write cmd" << (unsigned int)data.constData()[2];
-
     } else {
-        qCritical() << __func__ << ":" << __LINE__
+        qCritical() << __func__ << "" << __LINE__ << errorCnt << "ERROR about to send cmd" << QString("0x%1").arg((unsigned char)data.constData()[2], 0, 16);
-                    << "ERROR sending" << data.toHex(':') << "port is not open";
+        qCritical() << __func__ << "" << __LINE__ << errorCnt << "ERROR detected active read cmds" << readCmds;
+        if (CatSerial->isOpen()) {
+            int availableBytes = CatSerial->bytesAvailable();
+            qCritical() << __func__ << "" << __LINE__ << "ERROR available bytes" << availableBytes;
+            if (availableBytes == 0) {
+                errorCnt += 1;
+                if (errorCnt > 20) {
+                    readCmds.clear();
+                    errorCnt = 0;
+                }
+            } else {
+                errorCnt = 0;
+            }
+        } else {
+            qCritical() << __func__ << ":" << __LINE__
+                        << "ERROR sending" << data.toHex(':') << "port is not open";
+        }
     }
 }
 
@@ -123,7 +141,6 @@ T_com::T_com(QObject *parent) : QObject(parent)
     ChkConnectTimer->setSingleShot(false);
     ChkConnectTimer->start(100);     // in ms
     com_want2read=0;
-    writeCount = 0;
 }
 
 

src/datIf.cpp

@@ -11,7 +11,6 @@ History:
 #include "controlBus.h"
 #include "storeINdata.h"
 #include <QDebug>
-#include <QDateTime>
 #include <datei.h>
 #include <QDir>
 
@@ -126,7 +125,6 @@ T_datif::T_datif(QObject *parent) : QObject(parent)
     datif_pNextCmd=0;
     datif_sendSlowCmd=0;
 
-    readCount = 0;
 }
 
 void T_datif::resetChain(void)
@@ -551,25 +549,50 @@ char T_datif::loadRecDataFromFrame()
     gpi_storeRecPayLoad(RdDleng, receivedData); //  save for host (user of hwapi)
 
     if (myDCIF && myDCIF->getSerialPort()) {
-        uint32_t writeCount = myDCIF->getSerialPort()->getWriteCount();
+        QVector<uint16_t> &readCmds = myDCIF->getSerialPort()->getReadCmds();
-        if ((readCount + 1) == writeCount) { // there can be only one command sent to the DC
+
-            readCount = writeCount;
+        if (readCmds.size() == 1) { // there can be only one command been sent to the DC
-            if (readSource != myDCIF->getReadSource()) {
+            // the command number active at the moment must be the same as the saved one
-                qCritical() << __func__ << ":" << __LINE__ << ": ERROR length" << RdDleng << ", ignore data"
+            if (readSource == myDCIF->getReadSource() && readSource == readCmds[0]) {
+                // maybe we have sent a explicit request for a test-response
+                if (waitForTestResponse) {
+                    qCritical() << __func__ << ":" << __LINE__ << "turn on auto-request";
+                    if (readCmds[0] == CMD2DC_TestSerial) {
+                        if (QString(QByteArray((char const *)receivedData, RdDleng)) == "< SlaveResponse") {
+                            waitForTestResponse = false;
+                            qCritical() << __func__ << ":" << __LINE__ << "turn on auto-request";
+                            ((hwapi *)parent())->dc_autoRequest(true); // return autorequest to true
+                        } else {
+                            qCritical() << __func__ << ":" << __LINE__ << "ERROR received wrong test-response"
+                                        << QString(QByteArray((char const *)receivedData, RdDleng));
+                        }
+                    }
+                } else {
+                    // usual handling of response
+                    // qCritical() << __func__ << ":" << __LINE__ << ":" << readSource << myDCIF->getReadSource() << readCmds[0];
+                    // qCritical() << __func__ << ":" << __LINE__ << ":" << QByteArray((char const *)receivedData, RdDleng).toHex(':');
+                }
+                readCmds.clear();
+            } else { // error
+                qCritical() << __func__ << ":" << __LINE__ << ": ERROR " << readSource << myDCIF->getReadSource() << readCmds[0];
+                qCritical() << __func__ << ":" << __LINE__ << ": ERROR length" << RdDleng << QString(", ignore data for cmd 0x%1").arg(readCmds[0], 0, 16)
                             << QByteArray((char const *)receivedData, RdDleng).toHex(':');
-                qCritical() << __func__ << ":" << __LINE__ << "would be interpretated as" << readSource << myDCIF->getReadSource();
+                readCmds.clear();
                 return 0;
-            } else {
-                // only for debugging
-                // qCritical() << __func__ << ":" << __LINE__ << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs) << readSource << myDCIF->getReadSource();
             }
         } else {
-            qCritical() << __func__ << ":" << __LINE__ << QString(": ERROR readCount + 1 != writeCount: %1 != %2").arg(readCount + 1).arg(writeCount);
+            // error: read commands has not size 1 as it should be: turn off
-            qCritical() << __func__ << ":" << __LINE__ << ": ERROR length" << RdDleng << ", ignore data"
+            // auto requests and send explicit request for test-response:
-                        << QByteArray((char const *)receivedData, RdDleng).toHex(':');
+            // once this response has been received, turn on the autmatic requests
-            qCritical() << __func__ << ":" << __LINE__ << "would be interpretated as" << readSource << myDCIF->getReadSource();
+            // again.
-
+            readCmds.clear();
-            readCount = writeCount;
+            if (parent()) {
+                qCritical() << __func__ << ":" << __LINE__ << "ERROR turn off auto-request";
+                qCritical() << __func__ << ":" << __LINE__ << "ERROR send request for test-response";
+                waitForTestResponse = true;
+                ((hwapi *)parent())->dc_autoRequest(false);
+                ((hwapi *)parent())->dc_requTestResponse();
+            }
             return 0;
         }
     }