From 790c2fd0316a99db347e0406c5532d35fb7e2148 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Mon, 19 Feb 2024 15:59:41 +0100 Subject: [PATCH] add coin-attach signal --- include/hwapi.h | 7 ++----- include/interfaces.h | 1 + include/runProc.h | 1 + src/hwapi.cpp | 6 ++++-- src/runProc.cpp | 3 +++ 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/include/hwapi.h b/include/hwapi.h index b8e0ff7..f34692d 100644 --- a/include/hwapi.h +++ b/include/hwapi.h @@ -1384,9 +1384,7 @@ signals: void hwapi_doorCBinAndAllDoorsClosed(void) const override; void hwapi_doorAllDoorsClosed(void) const override; - - - + void hwapi_coinAttached() const override; private slots: //void hwapi_slotPrintFinished_OK(void); @@ -1414,8 +1412,7 @@ signals: void sub_slotCoin15(void); void sub_slotCoin16(void); - - + void coinAttached(); }; diff --git a/include/interfaces.h b/include/interfaces.h index 0aa4a1e..81afbdd 100755 --- a/include/interfaces.h +++ b/include/interfaces.h @@ -2390,6 +2390,7 @@ signals: virtual void hwapi_doorCBinAndAllDoorsClosed(void) const=0; virtual void hwapi_doorAllDoorsClosed(void) const=0; + virtual void hwapi_coinAttached() const = 0; // NOTE: declaring a "pure virtual" "signal" should be an error and thus not valid. /* GH Version, bringt Fehler diff --git a/include/runProc.h b/include/runProc.h index 0e7d724..c2eb001 100755 --- a/include/runProc.h +++ b/include/runProc.h @@ -80,6 +80,7 @@ signals: void runProc_doorCBinAndAllDoorsClosed(void); void runProc_doorAllDoorsClosed(void); + void runProc_coinAttached(); }; diff --git a/src/hwapi.cpp b/src/hwapi.cpp index 304ed32..f76fc33 100644 --- a/src/hwapi.cpp +++ b/src/hwapi.cpp @@ -128,8 +128,7 @@ hwapi::hwapi(QWidget *parent) : QObject(parent) connect(runProcess, SIGNAL(runProc_doorCoinBoxInserted()), this, SLOT(sub_slotCoin14())); // hwapi_doorCoinBoxInserted())); connect(runProcess, SIGNAL(runProc_doorCBinAndAllDoorsClosed()), this, SLOT(sub_slotCoin15())); // hwapi_doorCBinAndAllDoorsClosed())); connect(runProcess, SIGNAL(runProc_doorAllDoorsClosed()), this, SLOT(sub_slotCoin16())); // hwapi_doorAllDoorsClosed())); - - + connect(runProcess, SIGNAL(runProc_coinAttached()), this, SLOT(coinAttached())); } void hwapi::hwapi_slotPayProc(void) @@ -227,6 +226,9 @@ void hwapi::sub_slotCoin16(void) emit hwapi_doorAllDoorsClosed(); } +void hwapi::coinAttached() { + emit hwapi_coinAttached(); +} /* diff --git a/src/runProc.cpp b/src/runProc.cpp index 137e7e5..1666de8 100644 --- a/src/runProc.cpp +++ b/src/runProc.cpp @@ -48,6 +48,9 @@ T_runProc::T_runProc() void T_runProc::runProc_slotProcess(void) { #ifndef THIS_IS_CA_MASTER + if (epi_getDI_CoinAttach()) { + emit runProc_coinAttached(); + } cash_paymentProcessing(); doors_supervise(); bl_performComplStart(); // neu 1.12.23