From 5c9578ebefdabd9c437a7eb04f49dd8dcebee9f2 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Thu, 17 Oct 2024 12:40:37 +0200 Subject: [PATCH 1/3] Minor: debug output (commented out) --- src/com.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/com.cpp b/src/com.cpp index 51163bc..a72ee4f 100644 --- a/src/com.cpp +++ b/src/com.cpp @@ -55,9 +55,10 @@ void T_com::writeToSerial(const QByteArray &data, uint16_t sendLength) writeCount += 1; // only for debugging - // qCritical() << __func__ << ":" << __LINE__ << QDateTime::currentDateTime().time().toString(Qt::ISODateWithMs) - // << "write cmd" << (unsigned int)data.constData()[2]; - + // 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"; From 1cc14e9a4c1116465224ed826e9c1dc8d4592b2e Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Thu, 17 Oct 2024 12:41:31 +0200 Subject: [PATCH 2/3] Add some debug out-put (in error case). --- src/datIf.cpp | 155 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 154 insertions(+), 1 deletion(-) diff --git a/src/datIf.cpp b/src/datIf.cpp index 0b470da..a9f0b29 100755 --- a/src/datIf.cpp +++ b/src/datIf.cpp @@ -483,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) @@ -556,12 +626,86 @@ char T_datif::loadRecDataFromFrame() readCount = writeCount; if (readSource != myDCIF->getReadSource()) { qCritical() << __func__ << ":" << __LINE__ << ": ERROR length" << RdDleng << ", ignore data" - << QByteArray((char const *)receivedData, RdDleng).toHex(':'); + << 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); @@ -569,6 +713,15 @@ char T_datif::loadRecDataFromFrame() << 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); + } + readCount = writeCount; return 0; } From 3e7f71899c7553f01a965d7a70fe3e982d70b0ad Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Mon, 21 Oct 2024 16:16:26 +0200 Subject: [PATCH 3/3] loadRecDataFromFrame(): Move coinAttached from error-state to normal debug output. --- src/datIf.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/datIf.cpp b/src/datIf.cpp index a9f0b29..0d70b65 100755 --- a/src/datIf.cpp +++ b/src/datIf.cpp @@ -720,6 +720,10 @@ char T_datif::loadRecDataFromFrame() 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;