Compare commits
No commits in common. "master" and "master" have entirely different histories.
@ -114,7 +114,7 @@ void CArun::chainControl(void)
|
|||||||
case SETUP_STEP::OPEN_SERIAL_PORT:
|
case SETUP_STEP::OPEN_SERIAL_PORT:
|
||||||
qCritical() << "CArun: SETUP_STEP::OPEN_SERIAL_PORT";
|
qCritical() << "CArun: SETUP_STEP::OPEN_SERIAL_PORT";
|
||||||
this->openSerialPort();
|
this->openSerialPort();
|
||||||
this->setupStep = SETUP_STEP::TEST_OPEN_PORT;
|
this->setupStep = SETUP_STEP::CHECK_VALID_DATA;
|
||||||
this->timerChainCtrl->start();
|
this->timerChainCtrl->start();
|
||||||
break;
|
break;
|
||||||
case SETUP_STEP::TEST_OPEN_PORT:
|
case SETUP_STEP::TEST_OPEN_PORT:
|
||||||
@ -151,7 +151,7 @@ void CArun::chainControl(void)
|
|||||||
|
|
||||||
this->HWaccess->dc_autoRequest(1);
|
this->HWaccess->dc_autoRequest(1);
|
||||||
this->setupStep = SETUP_STEP::CHECK_VALID_DATA;
|
this->setupStep = SETUP_STEP::CHECK_VALID_DATA;
|
||||||
this->timerChainCtrl->start(2000);
|
this->timerChainCtrl->start();
|
||||||
break;
|
break;
|
||||||
case SETUP_STEP::CHECK_VALID_DATA:
|
case SETUP_STEP::CHECK_VALID_DATA:
|
||||||
qCritical() << "CArun: SETUP_STEP::CHECK_VALID_DATA";
|
qCritical() << "CArun: SETUP_STEP::CHECK_VALID_DATA";
|
||||||
|
@ -161,8 +161,6 @@ class T_datif : public QObject
|
|||||||
// blockNr=transmitted in WRITEADDRESS low byte
|
// blockNr=transmitted in WRITEADDRESS low byte
|
||||||
|
|
||||||
int datif_noResponseCtr;
|
int datif_noResponseCtr;
|
||||||
int datif_nowNewDyns;
|
|
||||||
int datif_nowNewStats;
|
|
||||||
|
|
||||||
T_prot *myDCIF;
|
T_prot *myDCIF;
|
||||||
QTimer *datif_trigger;
|
QTimer *datif_trigger;
|
||||||
|
@ -91,8 +91,6 @@ T_datif::T_datif(QObject *parent) : QObject(parent)
|
|||||||
epi_resetDcDataValid(1); // data are not yet valid, no response from DC by now
|
epi_resetDcDataValid(1); // data are not yet valid, no response from DC by now
|
||||||
|
|
||||||
datif_noResponseCtr=0;
|
datif_noResponseCtr=0;
|
||||||
datif_nowNewDyns=0;
|
|
||||||
datif_nowNewStats=0;
|
|
||||||
|
|
||||||
datif_repeatCtr=0;
|
datif_repeatCtr=0;
|
||||||
datif_cmdWasPerformed=0; // 0: no response by now
|
datif_cmdWasPerformed=0; // 0: no response by now
|
||||||
@ -153,24 +151,13 @@ char T_datif::datif_cycleSend()
|
|||||||
{
|
{
|
||||||
//qDebug() << "com port not available"; // wird ununterbrochen ausgegeben
|
//qDebug() << "com port not available"; // wird ununterbrochen ausgegeben
|
||||||
epi_resetDcDataValid(2); // DC data not valid
|
epi_resetDcDataValid(2); // DC data not valid
|
||||||
datif_nowNewDyns=0;
|
|
||||||
datif_nowNewStats=0;
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
// supervise if DC data are valid
|
// supervise if DC data are valid
|
||||||
datif_noResponseCtr++; // inc every 20ms
|
datif_noResponseCtr++; // inc every 20ms
|
||||||
if (datif_noResponseCtr>50) // no life sign from device controller (DC) for about a sec
|
if (datif_noResponseCtr>250) // no life sign from device controller (DC) for about 3s
|
||||||
{
|
|
||||||
epi_resetDcDataValid(3); // DC data has not updated for >=5s -> no longer valid!
|
epi_resetDcDataValid(3); // DC data has not updated for >=5s -> no longer valid!
|
||||||
datif_nowNewDyns=0;
|
|
||||||
datif_nowNewStats=0;
|
|
||||||
|
|
||||||
}
|
|
||||||
// 24.7.24 new, data are valid if dynamic machine conditions AND dyn machine states came in
|
|
||||||
if (datif_nowNewDyns && datif_nowNewStats && !epi_areDcDataValid() )
|
|
||||||
epi_setDcDataValid();
|
|
||||||
|
|
||||||
// Ueberwachung ob ein oder mehrere Commands am Stueck erfolgreich waren
|
// Ueberwachung ob ein oder mehrere Commands am Stueck erfolgreich waren
|
||||||
if (gpi_wantToResetSupervision())
|
if (gpi_wantToResetSupervision())
|
||||||
@ -373,9 +360,6 @@ char T_datif::datif_cycleSend()
|
|||||||
{
|
{
|
||||||
dif_scanStep=0; // always start from beginning
|
dif_scanStep=0; // always start from beginning
|
||||||
epi_resetDcDataValid(4);
|
epi_resetDcDataValid(4);
|
||||||
datif_nowNewDyns=0;
|
|
||||||
datif_nowNewStats=0;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
datif_cmdWasPerformed=0; // 0: no response by now
|
datif_cmdWasPerformed=0; // 0: no response by now
|
||||||
@ -400,7 +384,7 @@ char T_datif::sendINrequestsAutomatic(void)
|
|||||||
uint8_t datif_maxNrCommands=35, datif_sendNow;
|
uint8_t datif_maxNrCommands=35, datif_sendNow;
|
||||||
|
|
||||||
// send quicker while transaction is ongoing:
|
// send quicker while transaction is ongoing:
|
||||||
uint8_t datif_vendRequCommandList[15]={102,107,108,110,112,115,116,30,31,32,40,41,42,23,0};
|
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;
|
uint8_t datif_maxVendingCmds=13;
|
||||||
|
|
||||||
// special commands:
|
// special commands:
|
||||||
@ -1012,24 +996,18 @@ char T_datif::loadRecDataFromFrame()
|
|||||||
uit2=uchar2uint(receivedData[7],receivedData[6]); // value of last coin
|
uit2=uchar2uint(receivedData[7],receivedData[6]); // value of last coin
|
||||||
//if (uitmp>0) // nur 1x bei neuer Münze 6.10.23 aendern:
|
//if (uitmp>0) // nur 1x bei neuer Münze 6.10.23 aendern:
|
||||||
// beim Wechsler hat die kleinste Muenze immer coin type 0!
|
// beim Wechsler hat die kleinste Muenze immer coin type 0!
|
||||||
|
|
||||||
if (uitmp>10000 || uit2>10000)
|
if (uitmp>10000 || uit2>10000)
|
||||||
{
|
{
|
||||||
uitmp=0;
|
uitmp=0;
|
||||||
uit2=0;
|
uit2=0;
|
||||||
}
|
}
|
||||||
|
if ((newInsertedAmount != lastInsertedAmount) || uit2>0 )
|
||||||
if (uit2==3 || uit2==5 || uit2==10 || uit2==20 || uit2==50 || uit2==100 || uit2==200 || uit2==500)
|
{
|
||||||
{
|
gpi_storeCurrentPayment(newInsertedAmount, uitmp, uit2);
|
||||||
// valid coin
|
emit datif_gotNewCoin(); // OR BILL if (uitmp & 0x8000)>0
|
||||||
if ((newInsertedAmount != lastInsertedAmount) || uit2>0 )
|
//qDebug()<<"emit new coin";
|
||||||
{
|
lastInsertedAmount=newInsertedAmount;
|
||||||
gpi_storeCurrentPayment(newInsertedAmount, uitmp, uit2);
|
//qCritical()<<"datif 112 store and emit new coin "<<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;
|
break;
|
||||||
@ -1057,7 +1035,6 @@ char T_datif::loadRecDataFromFrame()
|
|||||||
if (RdDleng>28)
|
if (RdDleng>28)
|
||||||
{
|
{
|
||||||
gpi_storeDeviceConditions(RdDleng, receivedData);
|
gpi_storeDeviceConditions(RdDleng, receivedData);
|
||||||
datif_nowNewStats=1; // 24.7.24 new
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@ -1066,9 +1043,9 @@ char T_datif::loadRecDataFromFrame()
|
|||||||
|
|
||||||
if (RdDleng>60)
|
if (RdDleng>60)
|
||||||
{
|
{
|
||||||
//epi_setDcDataValid(); // 24.7.24 remove here
|
epi_setDcDataValid(); // DC-Data are valid as DC responded.
|
||||||
datif_nowNewDyns=1; // 24.7.24 new
|
// Could be set to every response but this (31)
|
||||||
|
// is a very common and very important request
|
||||||
gpi_storeDynMachineConditions(RdDleng, receivedData);
|
gpi_storeDynMachineConditions(RdDleng, receivedData);
|
||||||
|
|
||||||
gpi_storeDI_CoinAttach(receivedData[6]); // new, 14.2.24 needed for direct coin insertion
|
gpi_storeDI_CoinAttach(receivedData[6]); // new, 14.2.24 needed for direct coin insertion
|
||||||
|
Loading…
Reference in New Issue
Block a user