// minor add comment for function bna_getCurrentNotes

CArunGUI/win01_com.cpp

@@ -375,6 +375,9 @@ bool T_winComPort::working(uint16_t *nextScreen, uint8_t *useNavi)
     // bit0,1: enable/disable button "next"
     // bit2,3: enable/disable button "home"
     // bit4,5: enable/disable button "back"
+    QString  bs, cn;
+    int br, ci;
+
 
     this->updateGui();
     *nextScreen=0;   // 0=no change
@@ -385,22 +388,29 @@ bool T_winComPort::working(uint16_t *nextScreen, uint8_t *useNavi)
         // load and use last settings:  --------------------
         QByteArray myBA;
         myBA=datei_readFromFile(FILENAME_COMPORT);
+        if (myBA.length()>0)
+        {
+            bs=csv_getEntryAsString(myBA,0);      // read the 's'     war 2!??
+            br=csv_getEntryAsInt(myBA,1);               // z.B. 5 (5.Eintrag in der Baud-Liste)
+            bs=csv_getEntryAsString(myBA,2);                // z.B 115200
+            cn=csv_getEntryAsString(myBA,3);       // z.B. COM9
+            ci=csv_getEntryAsInt(myBA,4);               // Eintragsnummer in COM-Fenster
+            HWaccess->dc_openSerial(br,bs,cn,1);
+            CB_portSel->setCurrentIndex(ci);    // den Port aus der Datei hier vorgeben
+            connectButton->setChecked(true);    // connect Taste "druecken"
+        } else
+        {
+            // open with default settings
+            qDebug()<<"CArunGui: open serial with default values";
 
-        //uint32_t len= datei_nrOfEntriesInFile(myBA);
-        //uint64_t ulltmp=csv_getEntryAs2Ulong(myBA,0);
-        //qDebug()<<"win_startup load long numer: "<<ulltmp;
-
-        QString  bs=csv_getEntryAsString(myBA,0);      // read the 's'     war 2!??
-        int br=csv_getEntryAsInt(myBA,1);               // z.B. 5 (5.Eintrag in der Baud-Liste)
-        bs=csv_getEntryAsString(myBA,2);                // z.B 115200
-        QString  cn=csv_getEntryAsString(myBA,3);       // z.B. COM9
-        int ci=csv_getEntryAsInt(myBA,4);               // Eintragsnummer in COM-Fenster
-        //qDebug()<<"win_startup loaded com settings: "<<br<<" "<<bs<<" "<<cn;
-        HWaccess->dc_openSerial(br,bs,cn,1);
-        //CB_baudSel->setCurrentIndex(br);    // im BR auswahlfenster diese Baud vorgeben
-        CB_portSel->setCurrentIndex(ci);    // den Port aus der Datei hier vorgeben
-        connectButton->setChecked(true);    // connect Taste "druecken"
+            bs="115200";
+            br=5;
+            //cn="COM14";     // Windows
+            cn="ttymxc2";   // PTU5
+            ci=2;
+            HWaccess->dc_openSerial(br,bs,cn,1);
 
+        }
         myTO->start(100);     // restart
         myStep++;
     } else
@@ -410,9 +420,13 @@ bool T_winComPort::working(uint16_t *nextScreen, uint8_t *useNavi)
         if (!myTO->isActive())
         {
             if (HWaccess->dc_isPortOpen())
+            {
                 myStep++;
-            else
-                myStep=99;  // stop automatic connection and wait for manual start
+            } else
+            {
+                myStep=6;   // 13.12.23: start Autoconnect cycle
+                qDebug()<<"CArunGui: port is still closed, restarting..";
+            }
             myTO->start(100);
         }
     } else
@@ -434,7 +448,10 @@ bool T_winComPort::working(uint16_t *nextScreen, uint8_t *useNavi)
             if (HWaccess->dc_readAnswTestResponse())
                 myStep++;   // response was correct
             else
-                myStep=99;  // stop automatic connection and wait for manual start
+            {
+                myStep=6;   // 13.12.23: start Autoconnect cycle
+                qDebug()<<"CArunGui: got no answer from DC, retry..";
+            }
             myTO->start(100);
         }
 
@@ -445,23 +462,38 @@ bool T_winComPort::working(uint16_t *nextScreen, uint8_t *useNavi)
         HWaccess->dc_autoRequest(1);
         AutSendButton->setChecked(true);        // taste "druecken"
         myStep++;
+        myTO->start(2000);
     } else
 
     if (myStep==5)
     {
-        // got next screen:
-        //myNextStep=2; // nicht bei CArun
-        myStep++;
+        if (!myTO->isActive())
+        {
+            if (HWaccess->sys_areDCdataValid())
+            {
+                qDebug()<<"CArunGui: DC is connected";
+                myStep=7;  // OK, connection is up and running
+            }  else
+            {
+                qDebug()<<"CArunGui: auto request is not running, retry...";
+                myStep++;
+                myTO->start(100);
+            }
+        }
 
     } else
 
     if (myStep==6)
     {
-        // stop here, everything done
+        // restart autoconnect cycle
+        myTO->start(100);     // restart
+        myStep=0;
     } else
 
     if (myStep==7)
     {
+        // stay here, DC connection is up and running
+
 
     } else
     {
@@ -470,7 +502,6 @@ bool T_winComPort::working(uint16_t *nextScreen, uint8_t *useNavi)
 
     if (myNextStep)
     {
-        //qDebug()<<"fenster1 working: "<< myNextStep;
         *nextScreen=myNextStep;
         myNextStep=0;
     }

dCArun/win01_com.cpp

@@ -375,6 +375,9 @@ bool T_winComPort::working(uint16_t *nextScreen, uint8_t *useNavi)
     // bit0,1: enable/disable button "next"
     // bit2,3: enable/disable button "home"
     // bit4,5: enable/disable button "back"
+    QString  bs, cn;
+    int br, ci;
+
 
     this->updateGui();
     *nextScreen=0;   // 0=no change
@@ -385,22 +388,29 @@ bool T_winComPort::working(uint16_t *nextScreen, uint8_t *useNavi)
         // load and use last settings:  --------------------
         QByteArray myBA;
         myBA=datei_readFromFile(FILENAME_COMPORT);
+        if (myBA.length()>0)
+        {
+            bs=csv_getEntryAsString(myBA,0);      // read the 's'     war 2!??
+            br=csv_getEntryAsInt(myBA,1);               // z.B. 5 (5.Eintrag in der Baud-Liste)
+            bs=csv_getEntryAsString(myBA,2);                // z.B 115200
+            cn=csv_getEntryAsString(myBA,3);       // z.B. COM9
+            ci=csv_getEntryAsInt(myBA,4);               // Eintragsnummer in COM-Fenster
+            HWaccess->dc_openSerial(br,bs,cn,1);
+            CB_portSel->setCurrentIndex(ci);    // den Port aus der Datei hier vorgeben
+            connectButton->setChecked(true);    // connect Taste "druecken"
+        } else
+        {
+            // open with default settings
+            qDebug()<<"CArunGui: open serial with default values";
 
-        //uint32_t len= datei_nrOfEntriesInFile(myBA);
-        //uint64_t ulltmp=csv_getEntryAs2Ulong(myBA,0);
-        //qDebug()<<"win_startup load long numer: "<<ulltmp;
-
-        QString  bs=csv_getEntryAsString(myBA,0);      // read the 's'     war 2!??
-        int br=csv_getEntryAsInt(myBA,1);               // z.B. 5 (5.Eintrag in der Baud-Liste)
-        bs=csv_getEntryAsString(myBA,2);                // z.B 115200
-        QString  cn=csv_getEntryAsString(myBA,3);       // z.B. COM9
-        int ci=csv_getEntryAsInt(myBA,4);               // Eintragsnummer in COM-Fenster
-        //qDebug()<<"win_startup loaded com settings: "<<br<<" "<<bs<<" "<<cn;
-        HWaccess->dc_openSerial(br,bs,cn,1);
-        //CB_baudSel->setCurrentIndex(br);    // im BR auswahlfenster diese Baud vorgeben
-        CB_portSel->setCurrentIndex(ci);    // den Port aus der Datei hier vorgeben
-        connectButton->setChecked(true);    // connect Taste "druecken"
+            bs="115200";
+            br=5;
+            //cn="COM14";     // Windows
+            cn="ttymxc2";   // PTU5
+            ci=2;
+            HWaccess->dc_openSerial(br,bs,cn,1);
 
+        }
         myTO->start(100);     // restart
         myStep++;
     } else
@@ -410,9 +420,13 @@ bool T_winComPort::working(uint16_t *nextScreen, uint8_t *useNavi)
         if (!myTO->isActive())
         {
             if (HWaccess->dc_isPortOpen())
+            {
                 myStep++;
-            else
-                myStep=99;  // stop automatic connection and wait for manual start
+            } else
+            {
+                myStep=6;   // 13.12.23: start Autoconnect cycle
+                qDebug()<<"CArunGui: port is still closed, restarting..";
+            }
             myTO->start(100);
         }
     } else
@@ -434,7 +448,10 @@ bool T_winComPort::working(uint16_t *nextScreen, uint8_t *useNavi)
             if (HWaccess->dc_readAnswTestResponse())
                 myStep++;   // response was correct
             else
-                myStep=99;  // stop automatic connection and wait for manual start
+            {
+                myStep=6;   // 13.12.23: start Autoconnect cycle
+                qDebug()<<"CArunGui: got no answer from DC, retry..";
+            }
             myTO->start(100);
         }
 
@@ -445,23 +462,38 @@ bool T_winComPort::working(uint16_t *nextScreen, uint8_t *useNavi)
         HWaccess->dc_autoRequest(1);
         AutSendButton->setChecked(true);        // taste "druecken"
         myStep++;
+        myTO->start(2000);
     } else
 
     if (myStep==5)
     {
-        // got next screen:
-        //myNextStep=2; // nicht bei CArun
-        myStep++;
+        if (!myTO->isActive())
+        {
+            if (HWaccess->sys_areDCdataValid())
+            {
+                qDebug()<<"CArunGui: DC is connected";
+                myStep=7;  // OK, connection is up and running
+            }  else
+            {
+                qDebug()<<"CArunGui: auto request is not running, retry...";
+                myStep++;
+                myTO->start(100);
+            }
+        }
 
     } else
 
     if (myStep==6)
     {
-        // stop here, everything done
+        // restart autoconnect cycle
+        myTO->start(100);     // restart
+        myStep=0;
     } else
 
     if (myStep==7)
     {
+        // stay here, DC connection is up and running
+
 
     } else
     {
@@ -470,7 +502,6 @@ bool T_winComPort::working(uint16_t *nextScreen, uint8_t *useNavi)
 
     if (myNextStep)
     {
-        //qDebug()<<"fenster1 working: "<< myNextStep;
         *nextScreen=myNextStep;
         myNextStep=0;
     }

include/interfaces.h

@@ -24,7 +24,8 @@ struct T_emp
 
    // dynamic:
    uint8_t state;      // step counter of EMP (electronic coin checker) FSM (finite state machine):
-       // 0=start command
+   /*
+   // 0=start command
        // 1=powered, do emp ini, send reset
        // 2=delay
        // 3=wait for response, requesting status after response
@@ -39,7 +40,7 @@ struct T_emp
        // 90: stop all, 1s delay
        // 99: off, all stopped
 
-
+*/
    uint8_t pollingRunning;
    uint8_t paymentRunning;
 
@@ -238,6 +239,7 @@ struct T_dynamicCondition
         uint8_t lastVDoorState;
         uint8_t lastCBstate;
         char        paymentInProgress;
+        // Version Szeged:  aug2023
         //	0: stopped by timeout
         //  1: running  2: wait4lastCoin
         //				3: payment stopped manually, coins in Escrow
@@ -246,6 +248,21 @@ struct T_dynamicCondition
         //			    6: coins encashed   7:coins returned
         //				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"
+
 
         char        res1;
         uint16_t    U_Batt;
@@ -2252,14 +2269,23 @@ public:
     virtual void bna_requestCurrentNotes() const {}
     // send command to DC in order to get transaction data
 
-    virtual uint8_t bna_getCurrentNotes(uint16_t latestBill, uint16_t *currentNotes) const {
+    virtual uint8_t bna_getCurrentNotes(uint16_t latestBill, uint16_t *currentNotes) const
+    {
         Q_UNUSED(latestBill);
         Q_UNUSED(currentNotes);
         return 0;
     }
     // returns number of collected bank notes since start-command (current transaction)
-    //  latestBill: last accepted bank note, value in cent
-    //  currentNotes an array with up to 16 (further) notes collected
+    // return value: numbers of bills or 99 in case of error
+    //  latestBill: not used
+    // in case of error: currentNotes[0,1,2,3] = 1..4 error number(s)
+    // in normal case:
+    //  currentNotes[0]: last bill in cent (e.g. 1000 = 10€)
+    //  currentNotes[1]: bin 1 = bill is still in escrow   else bill is stacked
+    //       note: by now (dec2023) escrow is not used, bills always go to stacker (box)
+    //  currentNotes[2]: total sum of bills in cent, low word (16bit)
+    //  currentNotes[3]: total sum of bills in cent, high word (16bit)
+
 
     virtual void bna_requestStackerLevel() const {}