Compare commits
No commits in common. "9cac6a6461d3da607f6495bbec46fe8537340e3b" and "790c2fd0316a99db347e0406c5532d35fb7e2148" have entirely different histories.
9cac6a6461
...
790c2fd031
@ -15,7 +15,6 @@
|
|||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
#include "datIf.h"
|
#include "datIf.h"
|
||||||
#include <QSharedMemory>
|
#include <QSharedMemory>
|
||||||
#include <atomic>
|
|
||||||
#include "sendWRcmd.h"
|
#include "sendWRcmd.h"
|
||||||
#include "controlBus.h"
|
#include "controlBus.h"
|
||||||
#include "storeINdata.h"
|
#include "storeINdata.h"
|
||||||
@ -36,10 +35,6 @@ class T_runProc : public QObject
|
|||||||
|
|
||||||
void restoreDeviceParameter(struct T_devices *deviceSettings);
|
void restoreDeviceParameter(struct T_devices *deviceSettings);
|
||||||
|
|
||||||
#ifndef THIS_IS_CA_MASTER
|
|
||||||
std::atomic_bool m_coinAttached{false};
|
|
||||||
#endif
|
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void runProc_slotProcess(void);
|
void runProc_slotProcess(void);
|
||||||
bool bl_performComplStart(void);
|
bool bl_performComplStart(void);
|
||||||
|
@ -48,15 +48,8 @@ T_runProc::T_runProc()
|
|||||||
void T_runProc::runProc_slotProcess(void)
|
void T_runProc::runProc_slotProcess(void)
|
||||||
{
|
{
|
||||||
#ifndef THIS_IS_CA_MASTER
|
#ifndef THIS_IS_CA_MASTER
|
||||||
bool const coinAttached = epi_getDI_CoinAttach();
|
if (epi_getDI_CoinAttach()) {
|
||||||
// exchange: (atomically) replaces the underlying value of m_coinAttached
|
emit runProc_coinAttached();
|
||||||
// with the value of coinAttached, returns the value of m_coinAttached
|
|
||||||
// before the call
|
|
||||||
if (m_coinAttached.exchange(coinAttached) == false) {
|
|
||||||
if (coinAttached) {
|
|
||||||
// old value was false, and new value is true
|
|
||||||
emit runProc_coinAttached();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
cash_paymentProcessing();
|
cash_paymentProcessing();
|
||||||
doors_supervise();
|
doors_supervise();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user