Merge commit '8b301a91dc0d4ae7a4ddd5f470016b4cd68b85c4'.

DCPlugin/src/datIf.cpp

@@ -863,6 +863,11 @@ char T_datif::loadRecDataFromFrame()
     //int portNr;
     bool ret;
     uint8_t uctmp;      // maxai
+    char ctmp;
+    static uint8_t lastResult;
+    uint8_t prnResult;
+    static uint32_t lastInsertedAmount;
+    uint32_t newInsertedAmount;
 
     ret=myDCIF->getReceivedInData(&SlaveAdr, &readSource, &readAddress,  &RdDleng, receivedData);
         // retval: data valid, only one time true, true if CommandState OK and readState OK
@@ -902,7 +907,8 @@ char T_datif::loadRecDataFromFrame()
 
     for (int ii=0; ii<RdDleng; ii++)
     {
-        localStr.append(receivedData[ii]);
+        ctmp=receivedData[ii];
+        localStr.append(ctmp);
     }
 
     //qDebug() << "got HW version: " << localStr;
@@ -936,7 +942,7 @@ char T_datif::loadRecDataFromFrame()
 
         case CMD2DC_RdBkDCstate:                            //101
             //qDebug() << "got DC state " << localStr;
-            localStr[8]=0;
+            //localStr[8]=0;
             gpi_storeGenerals(2, localStr);
                 // 0=HW   1=SW  2=State
             break;
@@ -1112,7 +1118,9 @@ char T_datif::loadRecDataFromFrame()
     case CMD2DC_RdBk_MifState:          //109
         // get reader status and card type
 
-        gpi_storeMifReaderStateAndCardType(receivedData);
+        //gpi_storeMifReaderStateAndCardType(receivedData);
+        gpi_storeNewMifareCard(receivedData[0], &receivedData[1]);
+
         break;
 
     case CMD2DC_RdBk_MifData:           //24
@@ -1216,7 +1224,7 @@ char T_datif::loadRecDataFromFrame()
 
 
 
-// ab hier neu:    XXX
+// ab hier neu:    12.4.23
 
     case CMD2DC_RDBK_DEV_PARA:      //14
 /*
@@ -1350,10 +1358,16 @@ char T_datif::loadRecDataFromFrame()
 
     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
-        ultmp=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]);
         uit2=uchar2uint(receivedData[7],receivedData[6]);
-        gpi_storeCurrentPayment(ultmp, uitmp, uit2);
+        gpi_storeCurrentPayment(newInsertedAmount, uitmp, uit2);
+        if (newInsertedAmount != lastInsertedAmount)
+        {
+            emit datif_gotNewCoin();
+            lastInsertedAmount=newInsertedAmount;
+        }
+
         break;
 
     case 113:       // get wake source, 8byte
@@ -1465,17 +1479,35 @@ char T_datif::loadRecDataFromFrame()
 */
 
         gpi_storeDynMachineConditions(RdDleng, receivedData);
+
+        prnResult=receivedData[52];
+        if (prnResult != lastResult)
+        {
+            // new result
+            if (prnResult==1)
+            {
+                emit datif_templatePrintFinished_OK();
+            } else
+            if (prnResult==2)
+            {
+                emit datif_templatePrintFinished_Err();
+            }
+
+            lastResult=prnResult;
+        }
+
         break;
 
     case 32:        // Get current cash level (in vault)
                     // bytes 0..3: amount   bytes 4,5=Nr.ofCoins in vault
-
+        ultmp=uchar2ulong(receivedData[3],receivedData[2],receivedData[1],receivedData[0]);
+        uitmp=uchar2uint(receivedData[5],receivedData[4]);
+        gpi_storeCBlevel(ultmp, uitmp);
         break;
 
     case 33:        // Get all backuped acc. Numbers
                     // 8 UINTs with acc-nr
-
-
+        gpi_storeDCbackupAccNr(RdDleng, receivedData);
         break;
 
     case 38:        // Get stored account record backup
@@ -1541,7 +1573,8 @@ struct T_vaultRecord
     UCHAR endofblock[4];	// end>
 // 316 byte Block im Speicher
 */
-
+        // readAddress,  &RdDleng, receivedData
+        gpi_storeVaultRecord(readAddress, receivedData );   // always 64byte
         break;
 
     }
@@ -1644,11 +1677,15 @@ bool T_datif::verifyLineTestresponse(uint8_t RdDlen, uint8_t *receivedData)
     if (RdDlen < 16)
         return false;
     QString myStr;
+    char ctmp;
+
     myStr.clear();
     myStr.append("< Slave Response");
 
     for (int nn=0; nn<16; nn++)
-        if (myStr[nn] !=receivedData[nn])
+    {
+        ctmp=receivedData[nn];
+        if (myStr[nn] != ctmp)
         {
             //qDebug() << " datif cmd 10: got wrong string ";
             //qDebug() << myStr;
@@ -1656,6 +1693,7 @@ bool T_datif::verifyLineTestresponse(uint8_t RdDlen, uint8_t *receivedData)
             //qDebug() << nn;
             return false;
         }
+    }
     return true;
 }