bugfix: banknotes have been summed with the coins. Now they are handled separately.

This commit is contained in:
Thomas Sax 2024-03-21 15:55:50 +01:00
parent c59de6cad8
commit 3612fc28ee

View File

@ -992,20 +992,22 @@ char T_datif::loadRecDataFromFrame()
newInsertedAmount=uchar2ulong(receivedData[3],receivedData[2],receivedData[1],receivedData[0]); newInsertedAmount=uchar2ulong(receivedData[3],receivedData[2],receivedData[1],receivedData[0]);
uitmp=uchar2uint(receivedData[5],receivedData[4]); uitmp=uchar2uint(receivedData[5],receivedData[4]);
uit2=uchar2uint(receivedData[7],receivedData[6]); uit2=uchar2uint(receivedData[7],receivedData[6]);
//if (uitmp>0) // nur 1x bei neuer Münze 6.10.23 aendern: beim Wechsler hat die kleinste Muenze immer coin type 0! //if (uitmp>0) // nur 1x bei neuer Münze 6.10.23 aendern:
if (uit2>0) // beim Wechsler hat die kleinste Muenze immer coin type 0!
if (uitmp>10000 || uit2>10000)
{ {
gpi_storeCurrentPayment(newInsertedAmount, uitmp, uit2); uitmp=0;
//void gpi_storeCurrentPayment(uint32_t insertedAmount, uint16_t lastCoinType, uint16_t lastCoinValue) uit2=0;
}
if (newInsertedAmount != lastInsertedAmount) if (newInsertedAmount != lastInsertedAmount)
{ {
emit datif_gotNewCoin(); gpi_storeCurrentPayment(newInsertedAmount, uitmp, uit2);
emit datif_gotNewCoin(); // OR BILL if (uitmp & 0x8000)>0
//qDebug()<<"emit new coin"; //qDebug()<<"emit new coin";
lastInsertedAmount=newInsertedAmount; lastInsertedAmount=newInsertedAmount;
//qCritical()<<"datif 112 store and emit new coin "<<newInsertedAmount<<" "<<uitmp<<" "<<uit2;
} }
// qDebug()<<"datif store new coin"<<newInsertedAmount<<" "<<uitmp<<" "<<uit2;
}
break; break;
case 113: // get wake source, 8byte case 113: // get wake source, 8byte