From f938a75742ae1e991d40cd5e501f31140d65d439 Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Wed, 29 Nov 2023 16:10:38 +0100 Subject: [PATCH] Account: read bill stacker values --- src/ATBAPP/ATBDeviceControllerPlugin.cpp | 25 ++++++++++++------------ 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/ATBAPP/ATBDeviceControllerPlugin.cpp b/src/ATBAPP/ATBDeviceControllerPlugin.cpp index e383dd0..9c14c17 100644 --- a/src/ATBAPP/ATBDeviceControllerPlugin.cpp +++ b/src/ATBAPP/ATBDeviceControllerPlugin.cpp @@ -342,7 +342,7 @@ void ATBDeviceControllerPlugin::private_getAccountData() // COINS in Vault: -------------------------------------------------------- - int numberOfCoinVariants = sizeof(retVR.coinsInVault); + int numberOfCoinVariants = sizeof(retVR.coinsInVault)/sizeof(retVR.coinsInVault[0]); // DEBUG qCritical() << " NumberOfCoinVariants = " << numberOfCoinVariants; @@ -351,18 +351,18 @@ void ATBDeviceControllerPlugin::private_getAccountData() if (numberOfCoinVariants > 16) { numberOfCoinVariants = 16; } accountData.insert("NumberOfCoinVariants", numberOfCoinVariants); - for (int i = 1; i <= numberOfCoinVariants; ++i) { - accountData.insert("COIN_" + QString::number(i) + "_Quantity", retVR.coinsInVault[i]); - accountData.insert("COIN_" + QString::number(i) + "_Value", retVR.coinDenomination[i]); + for (int i = 0; i < numberOfCoinVariants; ++i) { + accountData.insert("COIN_" + QString::number(i+1) + "_Quantity", retVR.coinsInVault[i]); + accountData.insert("COIN_" + QString::number(i+1) + "_Value", retVR.coinDenomination[i]); // DEBUG - qCritical() << "COIN_" + QString::number(i) + "_Quantity = " << accountData["COIN_" + QString::number(i) + "_Quantity"]; - qCritical() << "COIN_" + QString::number(i) + "_Value = " << accountData["COIN_" + QString::number(i) + "_Value"]; + qCritical() << "COIN_" + QString::number(i+1) + "_Quantity = " << accountData["COIN_" + QString::number(i) + "_Quantity"]; + qCritical() << "COIN_" + QString::number(i+1) + "_Value = " << accountData["COIN_" + QString::number(i) + "_Value"]; } // NOTES in stacker: -------------------------------------------------------- - int numberOfBillVariants = sizeof(retVR.billsInStacker); + int numberOfBillVariants = sizeof(retVR.billsInStacker)/sizeof(retVR.billsInStacker[0]); // DEBUG qCritical() << " numberOfBillVariants = " << numberOfBillVariants; @@ -371,18 +371,17 @@ void ATBDeviceControllerPlugin::private_getAccountData() if (numberOfBillVariants > 16) { numberOfBillVariants = 16; } accountData.insert("NumberOfBillVariants", numberOfBillVariants); - for (int i = 1; i <= numberOfBillVariants; ++i) { - accountData.insert("NOTE_" + QString::number(i) + "_Quantity", retVR.coinsInVault[i]); - accountData.insert("NOET_" + QString::number(i) + "_Value", retVR.coinDenomination[i]); + for (int i = 0; i < numberOfBillVariants; ++i) { + accountData.insert("NOTE_" + QString::number(i+1) + "_Quantity", retVR.billsInStacker[i]); + accountData.insert("NOTE_" + QString::number(i+1) + "_Value", retVR.billDenom[i]); // DEBUG - qCritical() << "NOTE_" + QString::number(i) + "_Quantity = " << accountData["COIN_" + QString::number(i) + "_Quantity"]; - qCritical() << "NOTE_" + QString::number(i) + "_Value = " << accountData["COIN_" + QString::number(i) + "_Value"]; + qCritical() << "NOTE_" + QString::number(i+1) + "_Quantity = " << accountData["NOTE_" + QString::number(i+1) + "_Quantity"]; + qCritical() << "NOTE_" + QString::number(i+1) + "_Value = " << accountData["NOTE_" + QString::number(i+1) + "_Value"]; } - emit requestAccountResponse(accountData); }