src/runProc.cpp

@@ -2,6 +2,7 @@
 #include <QDebug>
 #include "controlBus.h"
 #include "dcBL.h"
+#include "interfaces.h"
 
 static uint32_t hwapi_lastStartAmount;
 static uint32_t hwapi_lastTotalAmount;
@@ -165,7 +166,6 @@ uint8_t T_runProc::cash_paymentProcessing(void)
 
     sub_getDynMachineConditions(&myDynMachCond);
     payInProg= myDynMachCond.paymentInProgress;
-    // Version Szeged:  aug2023
     //	0: stopped by timeout
     //  1: running  2: wait4lastCoin
     //				3: payment stopped manually, coins in Escrow
@@ -175,26 +175,9 @@ uint8_t T_runProc::cash_paymentProcessing(void)
     //              7: coins returned 2 cases: due to cancel-button or printer-error
     //				8: CoinChecker or MDB on Error
 
-    // since Schoenau with bill and changer, nov2023
-    //0 = no payment
-    //will be set to 1 by cash_startCollection()
-    //neu 1: wait for devices getting ready for payment
-    //2 = payment,
-    //3 = wait for last coin/bill
-    //4 = Bezahlvorgang manuell beendet
-    //5 = payment stopped autom, amount collected, coins in Escrow
-    //6 = Bezahlvorgang beendet weil ZK voll
-    //4,5,6: payment done, keep on polling, wait for cash or return command
-    //7 = encash collected money from coin escrow into cash box
-    //8 = return "amountToReturn", can be complete inserted amount or only overpayment
-    //9 = wait for changer result
-    //10= print refund receipt with "amountToReturn"
-
-
 //    qCritical() << "emitting signal payCancelled";
 //    emit runProc_payCancelled();
-    /*
+
-     // gabs bei Szeged, jetzt nicht mehr:
     if (payInProg==8)
     {
         // coin checker faulty, cannot start
@@ -205,11 +188,11 @@ uint8_t T_runProc::cash_paymentProcessing(void)
             emit runProc_coinCollectionAborted();
             //sendFDcmd_set(156, 0,0, 2,0,0,0);       // cancel payment
         }
-        return 10;    // error cannot start
-    }*/
 
-//    if (empState>=10 && empState<=12 && (payInProg==1 || payInProg==2)  )     // Szeged
+        return 10;    // error cannot start
-    if ( payInProg==2 )       //8.12.23
+    }
+
+    if (empState>=10 && empState<=12 && (payInProg==1 || payInProg==2)  )
     {
         // coin acceptance is active now:
         if (hwapi_paymentStarted==1)    // && (( payInProg==0) || ( payInProg>5)))     //16.6.23
@@ -242,8 +225,7 @@ uint8_t T_runProc::cash_paymentProcessing(void)
 
         } 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++;
             collActiv=3;
@@ -251,8 +233,7 @@ uint8_t T_runProc::cash_paymentProcessing(void)
             emit runProc_payStopByPushbutton();
         } 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++;
             collActiv=4;
@@ -260,8 +241,7 @@ uint8_t T_runProc::cash_paymentProcessing(void)
             emit runProc_payStopByMax();
         } 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++;
             collActiv=5;
@@ -284,8 +264,7 @@ uint8_t T_runProc::cash_paymentProcessing(void)
     {
         // coin collection finished, but coins kept until printing done
         collActiv=2;
-        //if (payInProg==6)   // coins encashed
+        if (payInProg==6)   // coins encashed
-        if (payInProg==7)   // coins encashed        since nov2023
         {
             collActiv=6;
             hwapi_paymentStarted++;
@@ -293,8 +272,7 @@ uint8_t T_runProc::cash_paymentProcessing(void)
             emit runProc_coinProcessJustStopped();
         } 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;
             hwapi_paymentStarted++;