Compare commits

..

14 Commits

Author SHA1 Message Date
7b1ea963e2 Merge https://git.mimbach49.de/GerhardHoffmann/DCLibraries 2023-12-08 12:05:53 +01:00
8163be5022 Fix: correct order of steps in cash_paymentProcessing (NOTE: not compatible with Szeged at the moment.
This will require an update of the firmware device controller).
2023-12-08 12:02:25 +01:00
1fdbf3b9ca Minor: add some comments. 2023-12-08 11:58:55 +01:00
d380bcafe8 Check if THIS_IS_CA_MASTER is already defined.
Thomas has some issues in his environment.
2023-12-06 14:57:01 +01:00
27c0aa56ee Prepare new implementation of downloading the bootloader. 2023-12-06 14:45:22 +01:00
6377c6c18f Include previous main for windows. 2023-12-06 14:42:57 +01:00
e906213441 Change as for cash_cancelPayment(). 2023-12-06 14:37:37 +01:00
57b4ade2e5 cashCancelPayment(): while printing quick request while printing and changing. 2023-12-06 14:35:57 +01:00
f817d07e8c Extend sendINrequestsAutomatic(): add several requests. 2023-12-06 14:33:30 +01:00
fc2bc6bafc Mark hwapi-functions as overridden. 2023-12-06 14:30:45 +01:00
7f672db841 Add new timer myTO. 2023-12-06 14:28:24 +01:00
d8232e0163 Change hwapi_functions as pure virtual signals due to compiler problems. 2023-12-06 14:26:06 +01:00
fc2132184e Minor: add header. 2023-12-06 14:20:02 +01:00
78700e7bea Fix: return value prn_getPrintResult() 2023-11-30 14:27:17 +01:00
8 changed files with 232 additions and 114 deletions

View File

@@ -1,6 +1,7 @@
#ifndef DATEI_H
#define DATEI_H
#include <stdint.h>
#include <QFile>
#include <QFileInfo>
#include <QDebug>

View File

@@ -26,6 +26,8 @@ V4.0 6.9.2023: activating DC-Bootloader in slve-lib (SM)
#ifndef hwapi_H
#define hwapi_H
#include <stdint.h>
//#include <QTabWidget>
#include <QtPlugin>
#include <QTimer>
#include <QObject>
@@ -69,9 +71,14 @@ V4.0 6.9.2023: activating DC-Bootloader in slve-lib (SM)
*/
//for CAslave:
//#undef THIS_IS_CA_MASTER
//#undef THIS_IS_CA_MASTER
//for CAmaster:
#ifndef THIS_IS_CA_MASTER
#define THIS_IS_CA_MASTER
#endif
//for CAmaster:
class QSharedMemory;
@@ -1305,31 +1312,35 @@ public:
signals:
// already declared in interfaces.h
void hwapi_templatePrintFinished_OK(void) const;
void hwapi_templatePrintFinished_Err(void) const;
void hwapi_templatePrintFinished_OK(void) const override;
void hwapi_templatePrintFinished_Err(void) const override;
void hwapi_coinCollectionJustStarted(void) const;
void hwapi_coinCollectionAborted(void) const;
void hwapi_coinCollectionJustStarted(void) const override;
void hwapi_coinCollectionAborted(void) const override;
void hwapi_gotNewCoin(void) const;
void hwapi_payStopByMax(void) const;
void hwapi_payStopByPushbutton(void) const;
void hwapi_gotNewCoin(void) const override;
void hwapi_payStopByMax(void) const override;
void hwapi_payStopByPushbutton(void) const override;
void hwapi_payStopByEscrow(void) const;
void hwapi_payStopByError(void) const;
void hwapi_payStopByTimeout(void) const;
void hwapi_payCancelled(void) const;
void hwapi_coinProcessJustStopped(void) const;
void hwapi_payStopByEscrow(void) const override;
void hwapi_payStopByError(void) const override;
void hwapi_payStopByTimeout(void) const override;
void hwapi_payCancelled(void) const override;
void hwapi_coinProcessJustStopped(void) const override;
// new from 2023.06.12
void hwapi_doorServiceDoorOpened(void) const;
void hwapi_doorVaultDoorOpened(void) const;
void hwapi_doorCoinBoxRemoved(void) const;
void hwapi_doorCoinBoxInserted(void) const;
void hwapi_doorCBinAndAllDoorsClosed(void) const;
void hwapi_doorAllDoorsClosed(void) const;
void hwapi_doorServiceDoorOpened(void) const override;
void hwapi_doorVaultDoorOpened(void) const override;
void hwapi_doorCoinBoxRemoved(void) const override;
void hwapi_doorCoinBoxInserted(void) const override;
void hwapi_doorCBinAndAllDoorsClosed(void) const override;
void hwapi_doorAllDoorsClosed(void) const override;
private slots:
//void hwapi_slotPrintFinished_OK(void);

View File

@@ -1834,6 +1834,9 @@ public:
virtual uint8_t prn_getPrintResult() const {
return 0;
}
// return: 0: just printing, wait
// 1: OK - last print was succesful
// 2: error - not printed
@@ -2273,7 +2276,32 @@ public:
signals:
virtual void hwapi_templatePrintFinished_OK(void) const=0;
virtual void hwapi_templatePrintFinished_Err(void) const=0;
virtual void hwapi_coinCollectionJustStarted(void) const=0;
virtual void hwapi_coinCollectionAborted(void) const=0;
virtual void hwapi_gotNewCoin(void) const=0;
virtual void hwapi_payStopByMax(void) const=0;
virtual void hwapi_payStopByPushbutton(void) const=0;
virtual void hwapi_payStopByEscrow(void) const=0;
virtual void hwapi_payStopByError(void) const=0;
virtual void hwapi_payStopByTimeout(void) const=0;
virtual void hwapi_payCancelled(void) const=0;
virtual void hwapi_coinProcessJustStopped(void) const=0;
virtual void hwapi_doorServiceDoorOpened(void) const=0;
virtual void hwapi_doorVaultDoorOpened(void) const=0;
virtual void hwapi_doorCoinBoxRemoved(void) const=0;
virtual void hwapi_doorCoinBoxInserted(void) const=0;
virtual void hwapi_doorCBinAndAllDoorsClosed(void) const=0;
virtual void hwapi_doorAllDoorsClosed(void) const=0;
// NOTE: declaring a "pure virtual" "signal" should be an error and thus not valid.
/* GH Version, bringt Fehler
void hwapi_templatePrintFinished_OK() const;
void hwapi_templatePrintFinished_Err() const;
@@ -2296,6 +2324,7 @@ signals:
void hwapi_doorCoinBoxInserted() const;
void hwapi_doorCBinAndAllDoorsClosed() const;
void hwapi_doorAllDoorsClosed() const;
*/
};

View File

@@ -2,6 +2,7 @@
#ifndef RUN_PROCESS_H
#define RUN_PROCESS_H
#include <stdint.h>
#include <QMainWindow>
#include <QString>
#include <QTimer>
@@ -25,7 +26,7 @@
class T_runProc : public QObject
{
Q_OBJECT
QTimer *hwapi_TimerPayment, *hwapi_triggerBL;
QTimer *hwapi_TimerPayment, *hwapi_triggerBL, *myTO;
void sub_emp_getAllParameters(struct T_emp *emp);
void changer_getAllParameters(struct T_changer *mw);

View File

@@ -350,9 +350,20 @@ char T_datif::datif_cycleSend()
char T_datif::sendINrequestsAutomatic(void)
{
//qDebug() << "send IN request " << dif_scanStep;
// uint8_t datif_autoRequCommandList[50]={11, 12, 18, 104, 106, 103, 14, 27, 109, 17, 19, 23, 30, 31, 32, 33, 114, 35};
uint8_t datif_autoRequCommandList[30]={11, 12, 14, 17, 18, 19, 22, 23, 27, 30, 31, 32, 33, 35, 102, 103, 104, 106, 107, 109, 114,0,0,0,0,0,0,0,0,0};
uint8_t datif_maxNrCommands=21, datif_sendNow;
//uint8_t datif_autoRequCommandList[30]={11, 12, 14, 17, 18, 19, 22, 23, 27, 30,
// 31, 32, 33, 35, 102, 103, 104, 106, 107, 109,
// 114,0,0,0,0,0,0,0,0,0};
// extension 6.12.23, complete list:
uint8_t datif_autoRequCommandList[40]={11, 12, 13, 14, 17, 18, 19, 21, 22, 23,
24, 25, 27, 30, 31, 32, 33, 35, 39, 40,
41, 42, 102,103,104,106,107,108,109,110,
112,113,114,115,116,0, 0, 0, 0, 0};
uint8_t datif_maxNrCommands=35, datif_sendNow;
// send quicker while transaction is ongoing:
uint8_t datif_vendRequCommandList[15]={102,107,108,110,112,115,116,31,32,40,41,42,0,0,0};
uint8_t datif_maxVendingCmds=12;
// special commands:
// 102: get IOs run constantly!!!
@@ -362,40 +373,44 @@ char T_datif::sendINrequestsAutomatic(void)
// 107, 22: MDB: poll if needed
doRepeat=true; // 20.9.23 15uhr (after release)
if (datif_sendSlowCmd>0)
{
// send special command, slowly
datif_sendNow=datif_autoRequCommandList[datif_pNextCmd++];
if (datif_pNextCmd >= datif_maxNrCommands)
datif_pNextCmd=0;
if (datif_sendNow>0) // never send Command 0
datif_sendIOrequest(0, datif_sendNow, 0);
else
datif_pNextCmd=0; // falls in der Liste 0 vorkommt dann von vorne beginnen
//qDebug()<< "datif send request " << datif_sendNow;
if (gpi_getNowCoinPay())
{
// send only important commands while transaction in progress
if (datif_pNextCmd>=datif_maxVendingCmds ) datif_pNextCmd=0;
datif_sendNow=datif_vendRequCommandList[datif_pNextCmd++];
if (datif_sendNow>0) // never send Command 0
{
datif_sendIOrequest(0, datif_sendNow, 0);
//qDebug() << "datif, VEND-request: " << datif_sendNow;
} else
datif_pNextCmd=0; // falls in der Liste 0 vorkommt dann von vorne beginnen
} else
{
if (gpi_getNowCoinPay())
// no transaction, request all but request DI's more frequently
if (datif_sendSlowCmd>0) // send slow and fast commands alternating
{
// request coin input, high priority
datif_sendIOrequest(0, 112, 0);
//qDebug()<< "datif send request 112 get coins";
// send special command, slowly
if (datif_pNextCmd>=datif_maxNrCommands ) datif_pNextCmd=0;
datif_sendNow=datif_autoRequCommandList[datif_pNextCmd++];
if (datif_sendNow>0) // never send Command 0
{
datif_sendIOrequest(0, datif_sendNow, 0);
// qDebug() << "datif, auto-requ: " << datif_sendNow;
} else
datif_pNextCmd=0; // falls in der Liste 0 vorkommt dann von vorne beginnen
} else
{
// request inputs, high priority
datif_sendIOrequest(0, 31, 0); // 102
// while coin collection DIs are polled slowly with datif_autoRequCommandList[]
//qDebug()<< "datif send request 102 get DIs";
// while coin collection DIs are polled slower
//qDebug()<< "datif send requ.31 get DIs";
}
if (++datif_sendSlowCmd>1) datif_sendSlowCmd=0; // 0,1,0,1,0,1,0....
}
if (++datif_sendSlowCmd>1) datif_sendSlowCmd=0; // 0,1,0,1,0,1,0....
return 0; // 25.9.2023, wichtig sonst bleibt die komplette PTU stehen!!!!
}
@@ -439,7 +454,7 @@ char T_datif::loadRecDataFromFrame()
uint32_t ultmp;
//int portNr;
bool ret;
uint8_t uctmp; //, res; // maxai
uint8_t uctmp; //, nn; //, res; // maxai
char ctmp;
//static uint8_t lastResult;
//uint8_t prnResult;
@@ -1061,11 +1076,11 @@ char T_datif::loadRecDataFromFrame()
/*
qDebug()<<"datif cmd38 got vault data. blockNr: "<<readAddress;
if (readAddress==0)
for (nn=0; nn<64; nn+=8)
{
qDebug()<<receivedData[nn]<<" "<<receivedData[nn+1]<<" "<<receivedData[nn+2]<<" "<<receivedData[nn+3]<<" "
<<receivedData[nn+4]<<" "<<receivedData[nn+5]<<" "<<receivedData[nn+6]<<" "<<receivedData[nn+7];
}
for (nn=0; nn<64; nn+=8)
{
qDebug()<<receivedData[nn]<<" "<<receivedData[nn+1]<<" "<<receivedData[nn+2]<<" "<<receivedData[nn+3]<<" "
<<receivedData[nn+4]<<" "<<receivedData[nn+5]<<" "<<receivedData[nn+6]<<" "<<receivedData[nn+7];
}
*/
//}
break;
@@ -1105,9 +1120,7 @@ char T_datif::loadRecDataFromFrame()
break;
case 42: // get BNA box content and value of types
// qDebug()<< "CAmaster datif_got 42 ";
// for (uctmp=0; uctmp<64; uctmp++)
// qDebug()<<receivedData[uctmp]<<" ";
//qDebug()<< "CAslave datif_got 42";
if (RdDleng>60)
{

View File

@@ -109,10 +109,6 @@ hwapi::hwapi(QWidget *parent) : QObject(parent)
void hwapi::hwapi_slotPayProc(void)
{
//cash_paymentProcessing();
//doors_supervise();
//dcBL_cycle();
}
@@ -3056,7 +3052,9 @@ bool hwapi::cash_cancelPayment(void) const
{
// DB1: 1=encash 2=cancel & return coins
// 3=stop and keep coins in escrow
epi_setNowCoinPay(false); // new since 20.9.23
//epi_setNowCoinPay(false); // new since 20.9.23
// am 6.12.23 wieder raus, waehrend Druck und wechseln auch schnell abfragen
//qCritical() << "cash cancel payment and return coins";
return sendFDcmd_set(156, 0,0, 2,0,0,0);
}
@@ -3066,7 +3064,8 @@ bool hwapi::cash_stopPayment(void) const
{
// DB1: 1=encash 2=cancel & return coins
// 3=stop and keep coins in escrow
epi_setNowCoinPay(false); // new since 20.9.23
//epi_setNowCoinPay(false); // new since 20.9.23
// am 6.12.23 wieder raus, waehrend Druck und wechseln auch schnell abfragen
//qCritical() << "cash stop payment and keep coins in escrow";
// qCritical() << "emitting signal StopByPushbutton 2";
emit hwapi_payStopByPushbutton();
@@ -3230,10 +3229,17 @@ uint16_t hwapi::cash_getNrCoinsInVault(void) const
uint8_t hwapi::prn_getPrintResult() const
{
// return: 0: unknown
// 1: OK - last template was printed succesful
// 2: error - last template was not printed
return 1;
// return: 0: just printing, wait
// 1: OK - last print was succesful
// 2: error - not printed
struct T_dynamicCondition myDynMachCond;
sys_getDynMachineConditions(&myDynMachCond);
return myDynMachCond.resultOfLastTemplPrint;
// 0: unknown or printing in progress
// 1: OK, doc was printed 2: error, doc was not printed
}
uint8_t hwapi::prn_getCurrentPrinterState() const
@@ -3257,6 +3263,12 @@ uint8_t hwapi::prn_getCurrentPrinterState() const
lastPrinterStatus=buf[52];
return lastPrinterStatus;
// oder mit:
//struct T_dynamicCondition myDynMachCond;
//sys_getDynMachineConditions(&myDynMachCond);
//myDynMachCond.lastPrinterStatus
}
// 21.4.23TS: change function "sendDeviceSettings()" to use this struct: "struct T_devices"

View File

@@ -1,5 +1,16 @@
#ifdef WIN32
#ifndef WIN32
#include <QCoreApplication>
#include "tslib.h"
int main(int argc, char *argv[])
{
QCoreApplication a(argc, argv);
return a.exec();
}
#else
#undef _FORTIFY_SOURCE

View File

@@ -2,7 +2,6 @@
#include <QDebug>
#include "controlBus.h"
#include "dcBL.h"
#include "interfaces.h"
static uint32_t hwapi_lastStartAmount;
static uint32_t hwapi_lastTotalAmount;
@@ -29,25 +28,31 @@ T_runProc::T_runProc()
QTimer *runProc_callProcesses = new QTimer();
connect(runProc_callProcesses, SIGNAL(timeout()), this, SLOT(runProc_slotProcess()));
runProc_callProcesses->setSingleShot(false);
runProc_callProcesses->start(100); // in ms
runProc_callProcesses->start(10); // in ms
hwapi_lastDoorState=0; // default: all doors (should be) closed, coin box inserted
// bit0: upper door 1:middle 2:lower 3=cash-box out
hwapi_triggerBL = new QTimer();
connect(hwapi_triggerBL, SIGNAL(timeout()), this, SLOT(bl_performComplStart()));
hwapi_triggerBL->setSingleShot(false);
hwapi_triggerBL->stop();
// hwapi_triggerBL = new QTimer();
// connect(hwapi_triggerBL, SIGNAL(timeout()), this, SLOT(bl_performComplStart()));
// hwapi_triggerBL->setSingleShot(false);
// hwapi_triggerBL->stop();
myTO = new QTimer();
myTO->setSingleShot(true);
myTO->start(200);
}
void T_runProc::runProc_slotProcess(void)
{
#ifndef THIS_IS_CA_MASTER
cash_paymentProcessing();
doors_supervise();
bl_performComplStart(); // neu 1.12.23
dcBL_cycle();
#endif
}
bool T_runProc::cash_startPayment(uint32_t amount)
@@ -160,6 +165,7 @@ 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
@@ -169,9 +175,26 @@ 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
@@ -182,11 +205,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) )
// if (empState>=10 && empState<=12 && (payInProg==1 || payInProg==2) ) // Szeged
if ( payInProg==2 ) //8.12.23
{
// coin acceptance is active now:
if (hwapi_paymentStarted==1) // && (( payInProg==0) || ( payInProg>5))) //16.6.23
@@ -219,7 +242,8 @@ 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;
@@ -227,7 +251,8 @@ 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;
@@ -235,7 +260,8 @@ 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;
@@ -258,7 +284,8 @@ 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++;
@@ -266,7 +293,8 @@ 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++;
@@ -654,7 +682,7 @@ bool T_runProc::bl_isUp(void)
receivedData[3]==45 && receivedData[4] ==95 && receivedData[5]==176)
{
qDebug() << "got BL response to readFWversion";
epi_clrRawReceivedString();
//epi_clrRawReceivedString();
return true;
}
// response to "start BL"
@@ -662,7 +690,7 @@ bool T_runProc::bl_isUp(void)
receivedData[3]==223 && receivedData[4] ==131 )
{
qDebug() << "hwapi_bl_isUp: got BL response to start";
epi_clrRawReceivedString();
//epi_clrRawReceivedString();
return true;
}
}
@@ -677,7 +705,8 @@ void T_runProc::bl_completeStart(void)
bool T_runProc::bl_performComplStart(void)
{
// must be called cyclic by timer
bool result;
static uint8_t retryCtr;
if ((bl_startupStep<1) || (bl_startupStep>10))
@@ -691,58 +720,69 @@ bool T_runProc::bl_performComplStart(void)
if (bl_startupStep==2)
{
qDebug()<<"rebooting";
bl_rebootDC();
hwapi_triggerBL->stop();
hwapi_triggerBL->start(1000); // call next step in 1s
myTO->stop();
myTO->start(500);
retryCtr=0;
bl_startupStep++;
} else
if (bl_startupStep==3)
{
//qDebug()<<"starting BL";
bl_startBL();
hwapi_triggerBL->stop();
hwapi_triggerBL->start(100);
bl_startupStep++;
if (!myTO->isActive())
{
qDebug()<<"starting BL";
bl_startBL();
myTO->stop();
myTO->start(500);
bl_startupStep++;
}
} else
if (bl_startupStep==4)
{
//if (!myTO->isActive())
//{
bl_checkBL();
hwapi_triggerBL->stop();
hwapi_triggerBL->start(100);
bl_startupStep++;
//}
if (!myTO->isActive())
{
qDebug()<<"checking BL";
bl_checkBL();
myTO->stop();
myTO->start(200);
bl_startupStep++;
}
} else
if (bl_startupStep==5)
{
hwapi_triggerBL->stop();
if (bl_isUp())
if (!myTO->isActive())
{
bl_startupStep=99;
// BL is up and running
} else
{
retryCtr++; // start again
if (retryCtr>=15)
qDebug()<<"step 5";
result = bl_isUp();
qDebug()<<"BL result: "<< result;
if (result)
{
bl_startupStep=99;
//qDebug()<<"BL error!!!";
qDebug()<<"BL is working now...";
// BL is up and running
return true;
} else
{
bl_startupStep=3;
//qDebug()<<"BL retry...";
retryCtr++; // start again
if (retryCtr>=10)
{
bl_startupStep=99;
qDebug()<<"BL error!!!";
} else
{
bl_startupStep=3;
myTO->stop();
myTO->start(200);
qDebug()<<"BL retry...";
}
}
}
}
return true;
return false;
}