Compare commits

...

7 Commits

3 changed files with 58 additions and 33 deletions

View File

@@ -117,7 +117,9 @@ private:
ReportingThread *m_reportingThread;
DownloadThread *m_downloadThread;
QScopedPointer<QFileSystemWatcher> m_fileSystemWatcher;
QString m_watchedFile;
QString m_powerctrl_cc;
QString m_powerctrl_modem;
private slots:
void onCCWakeGpioChanged(QString const &file);

View File

@@ -1205,7 +1205,7 @@ char T_datif::loadRecDataFromFrame()
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
if ((newInsertedAmount != lastInsertedAmount) || uit2>0 )

View File

@@ -60,16 +60,21 @@ hwapi::hwapi(QObject *parent) : QObject(parent)
#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_powerctrl_cc = settings.value("AsyncPOS_CCPlugin/terminal_watch_file",
"/run/powerctrl_cc").toString();
m_fileSystemWatcher.reset(new QFileSystemWatcher());
if (!m_fileSystemWatcher->addPath(m_watchedFile)) {
qCritical() << "cannot add path for" << m_watchedFile;
m_powerctrl_modem = "/run/powerctrl_modem";
m_fileSystemWatcher->addPath(m_powerctrl_modem);
if (!m_fileSystemWatcher->addPath(m_powerctrl_cc)) {
qCritical() << "cannot add path for" << m_powerctrl_cc;
} else {
if (connect(m_fileSystemWatcher.get(), SIGNAL(fileChanged(QString const&)),
this, SLOT(onCCWakeGpioChanged(QString const&)))) {
qCritical() << "connected file watcher with" << m_watchedFile;
qCritical() << "connected file watcher with" << m_powerctrl_cc;
}
}
@@ -137,40 +142,58 @@ hwapi::hwapi(QObject *parent) : QObject(parent)
}
void hwapi::onCCWakeGpioChanged(QString const &fileName) {
if (fileName == m_watchedFile) {
QFile f(m_watchedFile);
if (f.open(QFile::ReadOnly | QFile::Text)) {
qCritical() << __func__ << ":" << __LINE__ << fileName;
if (fileName == m_powerctrl_cc) {
QFile f(m_powerctrl_cc);
if (f.exists() && 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";
}
qCritical() << __func__ << ":" << __LINE__ << "switching cc-terminal off...";
credit_switchWake(false);
credit_switchPower(false);
} else
if (content.startsWith("1")) {
qCritical() << __func__ << ":" << __LINE__ << "switching terminal on...";
mod_switchPower(true);
qCritical() << __func__ << ":" << __LINE__ << "switching cc-terminal on...";
credit_switchPower(true);
credit_switchWake(true);
} else
if (content.startsWith("2")) {
qCritical() << __func__ << ":" << __LINE__ << "switching cc-terminal off and on...";
credit_switchWake(false);
credit_switchPower(false);
QThread::sleep(1);
credit_switchPower(true);
credit_switchWake(true);
} else {
qCritical() << "switching cc-terminal watched file contained" << content;
QFile::resize(m_powerctrl_cc, 0); // empty file
}
}
}
else if (fileName == m_powerctrl_modem) {
QFile f(m_powerctrl_modem);
if (f.exists() && f.open(QFile::ReadOnly | QFile::Text)) {
QTextStream stream(&f);
QString const &content = stream.readAll();
if (content.startsWith("0")) {
qCritical() << __func__ << ":" << __LINE__ << "switching modem off...";
mod_switchWake(false);
mod_switchPower(false);
} else
if (content.startsWith("1")) {
qCritical() << __func__ << ":" << __LINE__ << "switching modem on...";
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;
mod_switchPower(true);
}
}
} else {
qCritical() << "ERROR watching the wrong file" << fileName;
}
else {
qCritical() << "ERROR watching the wrong file" << fileName << m_powerctrl_cc;
}
}