GerhardHoffmann/DCLibraries
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix_validDataIssue'

Browse Source
This commit is contained in:
Siegfried Siegert 2024-09-26 13:26:19 +02:00
commit de61de85f1
Signed by untrusted user: SiegfriedSiegert
GPG Key ID: 68371E015E8F0B03
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/datIf.cpp
View File

@ -400,7 +400,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,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; uint8_t datif_maxVendingCmds=13;
// special commands: // special commands:
@ -1012,18 +1012,24 @@ 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); {
emit datif_gotNewCoin(); // OR BILL if (uitmp & 0x8000)>0 // valid coin
//qDebug()<<"emit new coin"; if ((newInsertedAmount != lastInsertedAmount) || uit2>0 )
lastInsertedAmount=newInsertedAmount; {
//qCritical()<<"datif 112 store and emit new coin "<<newInsertedAmount<<" "<<uitmp<<" "<<uit2; 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; break;