Merge branch 'CoinInputFix'
This commit is contained in:
commit
06d43009ad
@ -990,8 +990,8 @@ char T_datif::loadRecDataFromFrame()
|
|||||||
case 112: // get inserted amount in cent in sum
|
case 112: // get inserted amount in cent in sum
|
||||||
// byte 0..3: amount just paid 4,5:last coin type 6,7: last coin value
|
// byte 0..3: amount just paid 4,5:last coin type 6,7: last coin value
|
||||||
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]); // last coin type
|
||||||
uit2=uchar2uint(receivedData[7],receivedData[6]);
|
uit2=uchar2uint(receivedData[7],receivedData[6]); // last coin value
|
||||||
//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)
|
||||||
@ -999,7 +999,7 @@ char T_datif::loadRecDataFromFrame()
|
|||||||
uitmp=0;
|
uitmp=0;
|
||||||
uit2=0;
|
uit2=0;
|
||||||
}
|
}
|
||||||
if (newInsertedAmount != lastInsertedAmount)
|
if ((newInsertedAmount != lastInsertedAmount) || uit2>0) // 22.5.2024
|
||||||
{
|
{
|
||||||
gpi_storeCurrentPayment(newInsertedAmount, uitmp, uit2);
|
gpi_storeCurrentPayment(newInsertedAmount, uitmp, uit2);
|
||||||
emit datif_gotNewCoin(); // OR BILL if (uitmp & 0x8000)>0
|
emit datif_gotNewCoin(); // OR BILL if (uitmp & 0x8000)>0
|
||||||
|
Loading…
Reference in New Issue
Block a user