SiegfriedSiegert/DCLibraries
1
0
Fork 0
forked from GerhardHoffmann/DCLibraries
Code Pull Requests Activity

Fix: correct order of steps in cash_paymentProcessing (NOTE: not compatible with Szeged at the moment.

Browse Source 
This will require an update of the firmware device controller).
This commit is contained in:
Thomas Sax 2023-12-08 12:02:25 +01:00
parent 1fdbf3b9ca
commit 8163be5022
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/runProc.cpp
View File

@ -205,11 +205,11 @@ uint8_t T_runProc::cash_paymentProcessing(void)
emit runProc_coinCollectionAborted(); emit runProc_coinCollectionAborted();
//sendFDcmd_set(156, 0,0, 2,0,0,0); // cancel payment //sendFDcmd_set(156, 0,0, 2,0,0,0); // cancel payment
} }
return 10; // error cannot start return 10; // error cannot start
} }*/
if (empState>=10 && empState<=12 && (payInProg==1 || payInProg==2) ) // if (empState>=10 && empState<=12 && (payInProg==1 || payInProg==2) ) // Szeged
if ( payInProg==2 ) //8.12.23
{ {
// coin acceptance is active now: // coin acceptance is active now:
if (hwapi_paymentStarted==1) // && (( payInProg==0) || ( payInProg>5))) //16.6.23 if (hwapi_paymentStarted==1) // && (( payInProg==0) || ( payInProg>5))) //16.6.23
@ -242,7 +242,8 @@ uint8_t T_runProc::cash_paymentProcessing(void)
} else } else
if (payInProg==3) // user pressed "Next/Continue", keep coin //if (payInProg==3) // user pressed "Next/Continue", keep coin
if (payInProg==4) // user pressed "Next/Continue", keep coin since nov2023
{ {
hwapi_paymentStarted++; hwapi_paymentStarted++;
collActiv=3; collActiv=3;
@ -250,7 +251,8 @@ uint8_t T_runProc::cash_paymentProcessing(void)
emit runProc_payStopByPushbutton(); emit runProc_payStopByPushbutton();
} else } else
if (payInProg==4) // max achieved, keep coins //if (payInProg==4) // max achieved, keep coins
if (payInProg==5) // max achieved, keep coins since nov2023
{ {
hwapi_paymentStarted++; hwapi_paymentStarted++;
collActiv=4; collActiv=4;
@ -258,7 +260,8 @@ uint8_t T_runProc::cash_paymentProcessing(void)
emit runProc_payStopByMax(); emit runProc_payStopByMax();
} else } else
if (payInProg==5) // escrow full, keep coins //if (payInProg==5) // escrow full, keep coins
if (payInProg==6) // escrow full, keep coins since nov2023
{ {
hwapi_paymentStarted++; hwapi_paymentStarted++;
collActiv=5; collActiv=5;
@ -281,7 +284,8 @@ uint8_t T_runProc::cash_paymentProcessing(void)
{ {
// coin collection finished, but coins kept until printing done // coin collection finished, but coins kept until printing done
collActiv=2; collActiv=2;
if (payInProg==6) // coins encashed //if (payInProg==6) // coins encashed
if (payInProg==7) // coins encashed since nov2023
{ {
collActiv=6; collActiv=6;
hwapi_paymentStarted++; hwapi_paymentStarted++;
@ -289,7 +293,8 @@ uint8_t T_runProc::cash_paymentProcessing(void)
emit runProc_coinProcessJustStopped(); emit runProc_coinProcessJustStopped();
} else } else
if (payInProg==7) // coins returned, printing failed //if (payInProg==7) // coins returned, printing failed
if (payInProg==0) // coins returned, printing failed since nov2023
{ {
collActiv=7; collActiv=7;
hwapi_paymentStarted++; hwapi_paymentStarted++;