Compare commits
3 Commits
palanga-sw
...
1.99.11
Author | SHA1 | Date | |
---|---|---|---|
dd29fb0762
|
|||
c9e5834e29
|
|||
8fa6d40a0c
|
@@ -63,8 +63,7 @@ V4.0 6.9.2023: activating DC-Bootloader in slve-lib (SM)
|
|||||||
#include "shared_mem_buffer.h"
|
#include "shared_mem_buffer.h"
|
||||||
#include "runProc.h"
|
#include "runProc.h"
|
||||||
#include "interfaces.h"
|
#include "interfaces.h"
|
||||||
#include <QScopedPointer>
|
|
||||||
#include <QFileSystemWatcher>
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* select Plugin Type here
|
* select Plugin Type here
|
||||||
@@ -99,7 +98,7 @@ V4.0 6.9.2023: activating DC-Bootloader in slve-lib (SM)
|
|||||||
//#define THIS_IS_CA_MASTER
|
//#define THIS_IS_CA_MASTER
|
||||||
|
|
||||||
|
|
||||||
class QFileSystemWatcher;
|
|
||||||
class QSharedMemory;
|
class QSharedMemory;
|
||||||
class DownloadThread;
|
class DownloadThread;
|
||||||
class ReportingThread;
|
class ReportingThread;
|
||||||
@@ -116,11 +115,7 @@ private:
|
|||||||
QSharedMemory *m_sharedMem;
|
QSharedMemory *m_sharedMem;
|
||||||
ReportingThread *m_reportingThread;
|
ReportingThread *m_reportingThread;
|
||||||
DownloadThread *m_downloadThread;
|
DownloadThread *m_downloadThread;
|
||||||
QScopedPointer<QFileSystemWatcher> m_fileSystemWatcher;
|
//QTimer *hwapi_triggerBL;
|
||||||
QString m_watchedFile;
|
|
||||||
|
|
||||||
private slots:
|
|
||||||
void onCCWakeGpioChanged(QString const &file);
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit hwapi(QObject *parent = nullptr);
|
explicit hwapi(QObject *parent = nullptr);
|
||||||
|
@@ -1205,7 +1205,7 @@ char T_datif::loadRecDataFromFrame()
|
|||||||
uit2=0;
|
uit2=0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (uit2==3 || uit2==5 || uit2==10 || uit2==20 || uit2==50 || uit2==100 || uit2==200 || uit2==500)
|
if (uit2==3 || uit2==5 || uit2==10 || uit2==20 || uit2==40 || uit2==50 || uit2==100 || uit2==200 || uit2==500)
|
||||||
{
|
{
|
||||||
// valid coin
|
// valid coin
|
||||||
if ((newInsertedAmount != lastInsertedAmount) || uit2>0 )
|
if ((newInsertedAmount != lastInsertedAmount) || uit2>0 )
|
||||||
|
@@ -15,8 +15,6 @@
|
|||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include <QThread>
|
#include <QThread>
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
#include <QFileSystemWatcher>
|
|
||||||
#include <QSettings>
|
|
||||||
|
|
||||||
|
|
||||||
static uint32_t hwapi_lastStartAmount;
|
static uint32_t hwapi_lastStartAmount;
|
||||||
@@ -37,7 +35,6 @@ hwapi::hwapi(QObject *parent) : QObject(parent)
|
|||||||
qCritical() << " hwapi::hwapi() APP_EXTENDED_VERSION:" << APP_EXTENDED_VERSION;
|
qCritical() << " hwapi::hwapi() APP_EXTENDED_VERSION:" << APP_EXTENDED_VERSION;
|
||||||
qCritical() << "hwapi::hwapi() APP_EXTENDED_VERSION_LIB:" << APP_EXTENDED_VERSION_LIB;
|
qCritical() << "hwapi::hwapi() APP_EXTENDED_VERSION_LIB:" << APP_EXTENDED_VERSION_LIB;
|
||||||
|
|
||||||
m_fileSystemWatcher.reset();
|
|
||||||
|
|
||||||
// create or attach shared memory segment
|
// create or attach shared memory segment
|
||||||
m_sharedMem = SharedMem::getShm(sizeof(SharedMem));
|
m_sharedMem = SharedMem::getShm(sizeof(SharedMem));
|
||||||
@@ -59,21 +56,8 @@ hwapi::hwapi(QObject *parent) : QObject(parent)
|
|||||||
#error "SLAVE LIB COMPILED INTO MASTER"
|
#error "SLAVE LIB COMPILED INTO MASTER"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
QSettings settings("/opt/app/ATBAPP/ATBQT.ini", QSettings::IniFormat);
|
|
||||||
m_watchedFile = settings.value("AsyncPOS_CCPlugin/terminal_watch_file",
|
|
||||||
"/opt/app/ATBAPP/watch.txt").toString();
|
|
||||||
|
|
||||||
m_fileSystemWatcher.reset(new QFileSystemWatcher());
|
|
||||||
if (!m_fileSystemWatcher->addPath(m_watchedFile)) {
|
|
||||||
qCritical() << "cannot add path for" << m_watchedFile;
|
|
||||||
} else {
|
|
||||||
if (connect(m_fileSystemWatcher.get(), SIGNAL(fileChanged(QString const&)),
|
|
||||||
this, SLOT(onCCWakeGpioChanged(QString const&)))) {
|
|
||||||
qCritical() << "connected file watcher with" << m_watchedFile;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
myDatif = new T_datif(this); // für die CAslave-Lib auskommentieren!
|
myDatif = new T_datif(this); // für die CAslave-Lib auskommentieren!
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef THIS_IS_CA_SLAVE
|
#ifdef THIS_IS_CA_SLAVE
|
||||||
@@ -136,44 +120,6 @@ hwapi::hwapi(QObject *parent) : QObject(parent)
|
|||||||
connect(runProcess, SIGNAL(runProc_coinAttached()), this, SLOT(coinAttached()));
|
connect(runProcess, SIGNAL(runProc_coinAttached()), this, SLOT(coinAttached()));
|
||||||
}
|
}
|
||||||
|
|
||||||
void hwapi::onCCWakeGpioChanged(QString const &fileName) {
|
|
||||||
if (fileName == m_watchedFile) {
|
|
||||||
QFile f(m_watchedFile);
|
|
||||||
if (f.open(QFile::ReadOnly | QFile::Text)) {
|
|
||||||
QTextStream stream(&f);
|
|
||||||
QString const &content = stream.readAll();
|
|
||||||
if (content.startsWith("0")) {
|
|
||||||
qCritical() << __func__ << ":" << __LINE__ << "switching terminal off...";
|
|
||||||
mod_switchWake(false);
|
|
||||||
mod_switchPower(false);
|
|
||||||
f.close();
|
|
||||||
f.setFileName(m_watchedFile);
|
|
||||||
// to turn off cc-terminal, the content must be "0"
|
|
||||||
if (f.open(QFile::WriteOnly | QIODevice::Truncate | QIODevice::Text)) {
|
|
||||||
QTextStream s(&f);
|
|
||||||
s << "switching terminal off";
|
|
||||||
}
|
|
||||||
} else
|
|
||||||
if (content.startsWith("1")) {
|
|
||||||
qCritical() << __func__ << ":" << __LINE__ << "switching terminal on...";
|
|
||||||
mod_switchPower(true);
|
|
||||||
mod_switchWake(true);
|
|
||||||
f.close();
|
|
||||||
f.setFileName(m_watchedFile);
|
|
||||||
// to turn on cc-terminal, the content must be "1"
|
|
||||||
if (f.open(QFile::WriteOnly | QIODevice::Truncate | QIODevice::Text)) {
|
|
||||||
QTextStream s(&f);
|
|
||||||
s << "switching terminal on";
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
qCritical() << "watched file contained" << content;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
qCritical() << "ERROR watching the wrong file" << fileName;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void hwapi::hwapi_slotPayProc(void)
|
void hwapi::hwapi_slotPayProc(void)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user