Compare commits
5 Commits
790c2fd031
...
1.1.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
8f8947482a
|
|||
|
42c817ddce
|
|||
|
2c799e1cd2
|
|||
| 9cac6a6461 | |||
| aa10d3b275 |
@@ -90,7 +90,9 @@ HEADERS += \
|
|||||||
$${PWD}/include/sendWRcmd.h \
|
$${PWD}/include/sendWRcmd.h \
|
||||||
$${PWD}/include/storeINdata.h \
|
$${PWD}/include/storeINdata.h \
|
||||||
$${PWD}/include/tslib.h \
|
$${PWD}/include/tslib.h \
|
||||||
$${PWD}/include/shared_mem_buffer.h
|
$${PWD}/include/shared_mem_buffer.h \
|
||||||
|
$${PWD}/include/reporting_thread.h \
|
||||||
|
$${PWD}/include/download_thread.h
|
||||||
|
|
||||||
SOURCES += \
|
SOURCES += \
|
||||||
$${PWD}/src/datei.cpp \
|
$${PWD}/src/datei.cpp \
|
||||||
@@ -101,7 +103,9 @@ SOURCES += \
|
|||||||
$${PWD}/src/sendWRcmd.cpp \
|
$${PWD}/src/sendWRcmd.cpp \
|
||||||
$${PWD}/src/storeINdata.cpp \
|
$${PWD}/src/storeINdata.cpp \
|
||||||
$${PWD}/src/tslib.cpp \
|
$${PWD}/src/tslib.cpp \
|
||||||
$${PWD}/src/shared_mem_buffer.cpp
|
$${PWD}/src/shared_mem_buffer.cpp \
|
||||||
|
$${PWD}/src/reporting_thread.cpp \
|
||||||
|
$${PWD}/src/download_thread.cpp
|
||||||
|
|
||||||
|
|
||||||
# INTERFACE = DeviceController
|
# INTERFACE = DeviceController
|
||||||
|
|||||||
@@ -15,6 +15,7 @@
|
|||||||
#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"
|
||||||
@@ -35,6 +36,10 @@ 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);
|
||||||
|
|||||||
@@ -5,14 +5,12 @@ VERSION="1.0.1"
|
|||||||
HEADERS += \
|
HEADERS += \
|
||||||
../include/com.h \
|
../include/com.h \
|
||||||
../include/datIf.h \
|
../include/datIf.h \
|
||||||
../include/prot.h \
|
../include/prot.h
|
||||||
../include/download_thread.h
|
|
||||||
|
|
||||||
SOURCES += \
|
SOURCES += \
|
||||||
../src/com.cpp \
|
../src/com.cpp \
|
||||||
../src/datIf.cpp \
|
../src/datIf.cpp \
|
||||||
../src/prot.cpp \
|
../src/prot.cpp
|
||||||
../src/download_thread.cpp
|
|
||||||
|
|
||||||
include(../DCLibraries.pri)
|
include(../DCLibraries.pri)
|
||||||
|
|
||||||
|
|||||||
@@ -2,12 +2,6 @@ TEMPLATE = lib
|
|||||||
TARGET = CAslave
|
TARGET = CAslave
|
||||||
VERSION="1.0.1"
|
VERSION="1.0.1"
|
||||||
|
|
||||||
HEADERS += \
|
|
||||||
../include/reporting_thread.h
|
|
||||||
|
|
||||||
SOURCES += \
|
|
||||||
../src/reporting_thread.cpp
|
|
||||||
|
|
||||||
include(../DCLibraries.pri)
|
include(../DCLibraries.pri)
|
||||||
|
|
||||||
win32 {
|
win32 {
|
||||||
|
|||||||
@@ -48,9 +48,16 @@ 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
|
||||||
if (epi_getDI_CoinAttach()) {
|
bool const coinAttached = epi_getDI_CoinAttach();
|
||||||
|
// exchange: (atomically) replaces the underlying value of m_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();
|
emit runProc_coinAttached();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
cash_paymentProcessing();
|
cash_paymentProcessing();
|
||||||
doors_supervise();
|
doors_supervise();
|
||||||
bl_performComplStart(); // neu 1.12.23
|
bl_performComplStart(); // neu 1.12.23
|
||||||
|
|||||||
Reference in New Issue
Block a user