diff --git a/include/com.h b/include/com.h index 0cee78d..1684b80 100644 --- a/include/com.h +++ b/include/com.h @@ -7,6 +7,7 @@ //#include #include #include +#include #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: diff --git a/include/datIf.h b/include/datIf.h index 566f068..ede2918 100644 --- a/include/datIf.h +++ b/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(); diff --git a/include/prot.h b/include/prot.h index 36ca14c..fa059d3 100644 --- a/include/prot.h +++ b/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); diff --git a/src/com.cpp b/src/com.cpp index b89119d..a72ee4f 100644 --- a/src/com.cpp +++ b/src/com.cpp @@ -1,5 +1,6 @@ #include "com.h" #include +#include //#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; } diff --git a/src/datIf.cpp b/src/datIf.cpp index 25e4365..0d70b65 100755 --- a/src/datIf.cpp +++ b/src/datIf.cpp @@ -6,10 +6,12 @@ History: */ #include "datIf.h" +#include "hwapi.h" #include "sendWRcmd.h" #include "controlBus.h" #include "storeINdata.h" #include +#include #include #include @@ -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) @@ -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(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(receivedData); + + if(modCond->rtc >= 200) { + dump(modCond); + qCritical() << __func__ << ":" << __LINE__ << ": ERROR E002 (modCond->rtc >= 200)" + << QByteArray(reinterpret_cast(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(receivedData), RdDleng).toHex(':'); + } + if (modCond->printer == 202) { + dump(modCond); + qCritical() << __func__ << ":" << __LINE__ << ": ERROR E018 (modCond->printer == 202)" + << QByteArray(reinterpret_cast(receivedData), RdDleng).toHex(':'); + } + if (modCond->coinBlocker >= 200) { + dump(modCond); + qCritical() << __func__ << ":" << __LINE__ << ": ERROR E025 (modCond->coinBlocker >= 200)" + << QByteArray(reinterpret_cast(receivedData), RdDleng).toHex(':'); + } + if (modCond->mdbBus >= 200) { + dump(modCond); + qCritical() << __func__ << ":" << __LINE__ << ": ERROR E034 (modCond->mdbBus >= 200)" + << QByteArray(reinterpret_cast(receivedData), RdDleng).toHex(':'); + } + if (modCond->intEe >= 200) { + dump(modCond); + qCritical() << __func__ << ":" << __LINE__ << ": ERROR E011 (modCond->intEe >= 200)" + << QByteArray(reinterpret_cast(receivedData), RdDleng).toHex(':'); + } + if (modCond->voltage >= 200) { + dump(modCond); + qCritical() << __func__ << ":" << __LINE__ << ": ERROR E003 (modCond->voltage >= 200)" + << QByteArray(reinterpret_cast(receivedData), RdDleng).toHex(':'); + } + if (modCond->changer >= 200) { + dump(modCond); + qCritical() << __func__ << ":" << __LINE__ << ": ERROR E026 (modCond->changer >= 200)" + << QByteArray(reinterpret_cast(receivedData), RdDleng).toHex(':'); + } + if (modCond->coinSafe == 201) { + dump(modCond); + qCritical() << __func__ << ":" << __LINE__ << ": ERROR E007 (modCond->coinSafe == 201)" + << QByteArray(reinterpret_cast(receivedData), RdDleng).toHex(':'); + } + if (modCond->coinSafe == 200) { + dump(modCond); + qCritical() << __func__ << ":" << __LINE__ << ": ERROR E009 (modCond->coinSafe == 200)" + << QByteArray(reinterpret_cast(receivedData), RdDleng).toHex(':'); + } + } + + if (readSource == 31) { + T_dynamicCondition const *dynCond = reinterpret_cast(receivedData); + + if (dynCond->modeAbrech > 0) { + dump(dynCond); + qCritical() << __func__ << ":" << __LINE__ << ": ERROR E011 (dynCond->modeAbrech > 0)" + << QByteArray(reinterpret_cast(receivedData), RdDleng).toHex(':'); + } + if (dynCond->nowCardTest > 0) { + dump(dynCond); + qCritical() << __func__ << ":" << __LINE__ << ": ERROR E072 (dynCond->nowCardTest > 0)" + << QByteArray(reinterpret_cast(receivedData), RdDleng).toHex(':'); + } + if (dynCond->startupTestIsRunning > 0) { + dump(dynCond); + qCritical() << __func__ << ":" << __LINE__ << ": ERROR E073 (dynCond->startupTestIsRunning > 0)" + << QByteArray(reinterpret_cast(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(receivedData); + dump(modCond); + } + if (readSource == 31) { + T_dynamicCondition const *dynCond = reinterpret_cast(receivedData); + dump(dynCond); + if (dynCond->coinAttached > 0) { + qCritical() << __func__ << ":" << __LINE__ << ": dynCond->coinAttached" + << QByteArray(reinterpret_cast(receivedData), RdDleng).toHex(':'); + } + } + + readCount = writeCount; + return 0; + } + } + // uint8_t nn; //qDebug() << "\n datif: got valid data, rdsrc:" << readSource << " rdadd:" << readAddress // << " rdlen:" << RdDleng; diff --git a/src/hwapi.cpp b/src/hwapi.cpp index 69d561a..ee32e98 100755 --- a/src/hwapi.cpp +++ b/src/hwapi.cpp @@ -56,7 +56,7 @@ hwapi::hwapi(QObject *parent) : QObject(parent) #error "SLAVE LIB COMPILED INTO MASTER" #endif - myDatif = new T_datif(); // für die CAslave-Lib auskommentieren! + myDatif = new T_datif(this); // für die CAslave-Lib auskommentieren! #endif diff --git a/src/prot.cpp b/src/prot.cpp index ca1e397..e242690 100755 --- a/src/prot.cpp +++ b/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