Compare commits
No commits in common. "18e4811d57672b9a5a9c266d0905328787cc3460" and "0c14002f7f39ebe7b6da3d37584b75777b27ef1a" have entirely different histories.
18e4811d57
...
0c14002f7f
42
DCPlugin/.gitignore
vendored
42
DCPlugin/.gitignore
vendored
@ -1,41 +1 @@
|
|||||||
# C++ objects and libs
|
*.user
|
||||||
|
|
||||||
*.slo
|
|
||||||
*.lo
|
|
||||||
*.o
|
|
||||||
*.a
|
|
||||||
*.la
|
|
||||||
*.lai
|
|
||||||
*.so
|
|
||||||
*.dll
|
|
||||||
*.dylib
|
|
||||||
|
|
||||||
# Qt-es
|
|
||||||
|
|
||||||
*.pro.user
|
|
||||||
*.pro.user.*
|
|
||||||
moc_*.cpp
|
|
||||||
qrc_*.cpp
|
|
||||||
Makefile
|
|
||||||
Makefile.*
|
|
||||||
*-build-*
|
|
||||||
|
|
||||||
#
|
|
||||||
*.autosave
|
|
||||||
ui_*.h
|
|
||||||
version.h
|
|
||||||
version.txt
|
|
||||||
|
|
||||||
packages/*
|
|
||||||
*.pro.orig
|
|
||||||
Output/setup.exe
|
|
||||||
.directory
|
|
||||||
|
|
||||||
*~
|
|
||||||
resources/icons/*.png
|
|
||||||
resources/icons/*.jpg
|
|
||||||
resources/icons/*.gif
|
|
||||||
resources/style/*.qss
|
|
||||||
text/*.html
|
|
||||||
!text/*_template.html
|
|
||||||
text/*.xml
|
|
||||||
|
|||||||
@ -14,8 +14,6 @@ QMAKE_CXXFLAGS += -Wno-deprecated-copy
|
|||||||
# default
|
# default
|
||||||
ARCH = PTU5
|
ARCH = PTU5
|
||||||
|
|
||||||
include(DCPlugin.pri)
|
|
||||||
|
|
||||||
contains( CONFIG, DesktopLinux ) {
|
contains( CONFIG, DesktopLinux ) {
|
||||||
QMAKE_CC = ccache $$QMAKE_CC
|
QMAKE_CC = ccache $$QMAKE_CC
|
||||||
QMAKE_CXX = ccache $$QMAKE_CXX
|
QMAKE_CXX = ccache $$QMAKE_CXX
|
||||||
@ -23,6 +21,7 @@ contains( CONFIG, DesktopLinux ) {
|
|||||||
# QMAKE_CXXFLAGS += -Wno-deprecated-ctor
|
# QMAKE_CXXFLAGS += -Wno-deprecated-ctor
|
||||||
linux-clang { QMAKE_CXXFLAGS += -Qunused-arguments }
|
linux-clang { QMAKE_CXXFLAGS += -Qunused-arguments }
|
||||||
ARCH = DesktopLinux
|
ARCH = DesktopLinux
|
||||||
|
include(DCPlugin.pri)
|
||||||
}
|
}
|
||||||
|
|
||||||
contains( CONFIG, PTU5 ) {
|
contains( CONFIG, PTU5 ) {
|
||||||
@ -32,23 +31,22 @@ contains( CONFIG, PTU5 ) {
|
|||||||
linux-clang { QMAKE_CXXFLAGS += -Qunused-arguments }
|
linux-clang { QMAKE_CXXFLAGS += -Qunused-arguments }
|
||||||
CONFIG += link_pkgconfig
|
CONFIG += link_pkgconfig
|
||||||
ARCH = PTU5
|
ARCH = PTU5
|
||||||
|
|
||||||
|
# NOTE: include contents of DCPlugin.pri. Also used by ATBQT.
|
||||||
|
# Add new files in DCPlugin.pri.
|
||||||
|
include(DCPlugin.pri)
|
||||||
}
|
}
|
||||||
|
|
||||||
contains( CONFIG, PTU5_YOCTO ) {
|
contains( CONFIG, PTU5_YOCTO ) {
|
||||||
greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
|
|
||||||
PTU5BASEPATH = /opt/devel/ptu5
|
|
||||||
ARCH = PTU5
|
ARCH = PTU5
|
||||||
|
|
||||||
# add qmqtt lib
|
# add qmqtt lib
|
||||||
#LIBS += -lQt5Qmqtt
|
#LIBS += -lQt5Qmqtt
|
||||||
}
|
}
|
||||||
|
|
||||||
TARGET = ATBDeviceControllerPlugin
|
TARGET = CashAgentLib
|
||||||
#DESTDIR = ../plugins
|
DESTDIR = ../plugins
|
||||||
INTERFACE = DeviceController
|
|
||||||
INTERFACE_DEFINITION = $${PWD}/include/ATBAPP/DeviceControllerInterface.h
|
|
||||||
|
|
||||||
DEFINES += DEVICECONTROLLERPLUGIN_LIBRARY
|
|
||||||
|
|
||||||
# The following define makes your compiler emit warnings if you use
|
# The following define makes your compiler emit warnings if you use
|
||||||
# any Qt feature that has been marked deprecated (the exact warnings
|
# any Qt feature that has been marked deprecated (the exact warnings
|
||||||
@ -68,27 +66,3 @@ DEFINES += QT_DEPRECATED_WARNINGS
|
|||||||
#else: unix:!android: target.path = /opt/$${TARGET}/bin
|
#else: unix:!android: target.path = /opt/$${TARGET}/bin
|
||||||
#!isEmpty(target.path): INSTALLS += target
|
#!isEmpty(target.path): INSTALLS += target
|
||||||
|
|
||||||
# ATBAPP interface
|
|
||||||
HEADERS += \
|
|
||||||
src/ATBAPP/ATBAPPplugin.h \
|
|
||||||
src/ATBAPP/DeviceControllerInterface.h \
|
|
||||||
src/ATBAPP/ATBHealthEvent.h \
|
|
||||||
src/ATBAPP/ATBDeviceControllerPlugin.h
|
|
||||||
|
|
||||||
SOURCES += \
|
|
||||||
src/ATBAPP/ATBHealthEvent.cpp \
|
|
||||||
src/ATBAPP/ATBDeviceControllerPlugin.cpp
|
|
||||||
|
|
||||||
DISTFILES += \
|
|
||||||
generate-version.sh
|
|
||||||
|
|
||||||
|
|
||||||
# Define how to create version.h
|
|
||||||
VERSION_H = $$PWD/include/version.h
|
|
||||||
version.output = $$PWD/include/version.h
|
|
||||||
version.commands = $$PWD/generate-version.sh $${ARCH} $${TARGET} $${INTERFACE} $${INTERFACE_DEFINITION} $${VERSION_H}
|
|
||||||
version.depends = FORCE
|
|
||||||
version.input = VERSION_H
|
|
||||||
version.variable_out = HEADERS
|
|
||||||
QMAKE_EXTRA_COMPILERS += version
|
|
||||||
QMAKE_CLEAN += $${PWD}/include/version.h
|
|
||||||
|
|||||||
@ -1,155 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
VERSION_STRING=""
|
|
||||||
|
|
||||||
#GIT='/cygdrive/c/Program Files \(x86\)/Git/bin/git'
|
|
||||||
GIT=git
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
parse_git_branch () {
|
|
||||||
$GIT branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e "s/* \(.*\)/\1/"
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
ARCH=$1
|
|
||||||
TARGET=$2
|
|
||||||
INTERFACE=$3
|
|
||||||
INTERFACE_DEFINITION=$4
|
|
||||||
VERSION_H=$5
|
|
||||||
|
|
||||||
SCRIPT=$(readlink -f $0)
|
|
||||||
SCRIPTPATH=`dirname $SCRIPT`
|
|
||||||
OUTPUTDIR=$(pwd)
|
|
||||||
echo " current dir is : " $(pwd)
|
|
||||||
echo $SCRIPT
|
|
||||||
echo $SCRIPTPATH
|
|
||||||
|
|
||||||
echo "changing dir to script path: " $SCRIPTPATH
|
|
||||||
cd $SCRIPTPATH
|
|
||||||
|
|
||||||
# set version string ##################################################################
|
|
||||||
if [ -z $VERSION_STRING ] ; then
|
|
||||||
VERSION_STRING=$(date +%Y%m%d_%H%M)
|
|
||||||
fi
|
|
||||||
GIT_DESCRIBE=$($GIT describe)
|
|
||||||
GIT_BRANCH=$(parse_git_branch)
|
|
||||||
|
|
||||||
# extract path from branchname:
|
|
||||||
IFS='_' read -ra TMP_ARRAY <<< "${GIT_BRANCH}"
|
|
||||||
BRANCH_PATH=${TMP_ARRAY[0]}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# detect if we have a development version:
|
|
||||||
if [ ${#TMP_ARRAY[1]} -gt 0 ] ; then
|
|
||||||
DEV_SUFFIX="_dev"
|
|
||||||
else
|
|
||||||
DEV_SUFFIX=""
|
|
||||||
fi
|
|
||||||
|
|
||||||
# detect if git status is dirty
|
|
||||||
GIT_DESCRIBE_DIRTY=$($GIT describe --dirty)
|
|
||||||
if [ "${GIT_DESCRIBE_DIRTY:(-6)}" == "-dirty" ] ; then
|
|
||||||
DIRTY_SUFFIX="_dirty"
|
|
||||||
else
|
|
||||||
DIRTY_SUFFIX=""
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
if [ -n "$DIRTY_SUFFIX" ] || [ -n "$DEV_SUFFIX" ] ; then
|
|
||||||
DEVDIRTY=true
|
|
||||||
else
|
|
||||||
DEVDIRTY=false
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
# extract interface definition
|
|
||||||
|
|
||||||
#
|
|
||||||
#Q_DECLARE_INTERFACE(CCInterface,
|
|
||||||
# "eu.atb.ptu.plugin.CCInterface/2.9.0")
|
|
||||||
# -> extract whole string within quotation marks
|
|
||||||
INTERFACE_VERSION=$(grep 'eu.atb.ptu.plugin.' ${INTERFACE_DEFINITION})
|
|
||||||
# get string within quotes:
|
|
||||||
INTERFACE_VERSION=`echo ${INTERFACE_VERSION} | awk -F \" '{print $2}'`
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
# write version.h
|
|
||||||
|
|
||||||
|
|
||||||
echo " TARGET is: $TARGET"
|
|
||||||
echo " ARCH is: $ARCH"
|
|
||||||
echo " "
|
|
||||||
echo " PluginName: $TARGET"
|
|
||||||
echo " Interface: $INTERFACE"
|
|
||||||
echo " InterfaceVersion: $INTERFACE_VERSION"
|
|
||||||
echo " "
|
|
||||||
echo " new version is: $VERSION_STRING"
|
|
||||||
echo " git describe is: $GIT_DESCRIBE"
|
|
||||||
echo " git branch is: $GIT_BRANCH"
|
|
||||||
echo " branch-path is: $BRANCH_PATH"
|
|
||||||
echo " "
|
|
||||||
|
|
||||||
echo " dev suffix: $DEV_SUFFIX"
|
|
||||||
echo " dirty suffix: $DIRTY_SUFFIX"
|
|
||||||
|
|
||||||
|
|
||||||
PLUGIN_VERSION=${VERSION_STRING}
|
|
||||||
#ATB_QT_GIT_DESCRIBE=${GIT_DESCRIBE}_${GIT_BRANCH}
|
|
||||||
PLUGIN_GIT_DESCRIBE=${GIT_DESCRIBE}_${BRANCH_PATH}${DEV_SUFFIX}${DIRTY_SUFFIX}
|
|
||||||
|
|
||||||
#TARGET=IngenicoZVT_CCPlugin
|
|
||||||
|
|
||||||
|
|
||||||
# build version.h #####################################################################
|
|
||||||
|
|
||||||
echo " building new version info (version.h) ..."
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
echo "#ifndef VERSION_H" > ${VERSION_H}
|
|
||||||
echo "#define VERSION_H" >> ${VERSION_H}
|
|
||||||
echo "" >> ${VERSION_H}
|
|
||||||
echo "" >> ${VERSION_H}
|
|
||||||
echo "#define INTERFACE_VERSION \"${INTERFACE_VERSION}\"" >> ${VERSION_H}
|
|
||||||
echo "#define PLUGIN_VERSION \"${PLUGIN_VERSION}\"" >> ${VERSION_H}
|
|
||||||
echo "" >> ${VERSION_H}
|
|
||||||
echo "#define PLUGIN_GIT_DESCRIBE \"${PLUGIN_GIT_DESCRIBE}\"" >> ${VERSION_H}
|
|
||||||
echo "" >> ${VERSION_H}
|
|
||||||
echo "" >> ${VERSION_H}
|
|
||||||
|
|
||||||
cat <<EOT >> ${VERSION_H}
|
|
||||||
|
|
||||||
const std::string pluginInfoString = R"(
|
|
||||||
{
|
|
||||||
"Interface": "${INTERFACE}",
|
|
||||||
"InterfaceVersion": "${INTERFACE_VERSION}",
|
|
||||||
"PluginName": "${TARGET}",
|
|
||||||
"Version": "${PLUGIN_VERSION}",
|
|
||||||
"git-describe": "${PLUGIN_GIT_DESCRIBE}",
|
|
||||||
}
|
|
||||||
)";
|
|
||||||
|
|
||||||
EOT
|
|
||||||
|
|
||||||
echo "" >> ${VERSION_H}
|
|
||||||
echo "" >> ${VERSION_H}
|
|
||||||
if [ ${DEVDIRTY} == "true" ] ; then
|
|
||||||
echo "#define DEVDIRTY" >> ${VERSION_H}
|
|
||||||
echo "" >> ${VERSION_H}
|
|
||||||
echo "" >> ${VERSION_H}
|
|
||||||
fi
|
|
||||||
echo "#define SYSTEM_ARCH \"${ARCH}\"" >> ${VERSION_H}
|
|
||||||
echo "#define ARCH_${ARCH}" >> ${VERSION_H}
|
|
||||||
echo "" >> ${VERSION_H}
|
|
||||||
echo "" >> ${VERSION_H}
|
|
||||||
echo "#endif //VERSION_H" >> ${VERSION_H}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -324,7 +324,6 @@ public:
|
|||||||
// Sende Schreibbefehle die bereits vorher asynchron gespeichert wurden
|
// Sende Schreibbefehle die bereits vorher asynchron gespeichert wurden
|
||||||
void send_requests(uint16_t nextWrCmd);
|
void send_requests(uint16_t nextWrCmd);
|
||||||
void sendHighLevel(uint16_t nxtHLCmd);
|
void sendHighLevel(uint16_t nxtHLCmd);
|
||||||
bool areDataValid(void);
|
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void ResponseRecieved();
|
void ResponseRecieved();
|
||||||
|
|||||||
@ -1,35 +0,0 @@
|
|||||||
|
|
||||||
#ifndef hwchk_H
|
|
||||||
#define hwchk_H
|
|
||||||
|
|
||||||
#include <stdint.h>
|
|
||||||
#include <QTabWidget>
|
|
||||||
#include <QObject>
|
|
||||||
#include "interfaces.h"
|
|
||||||
//#include "datIf.h"
|
|
||||||
#include <QDebug>
|
|
||||||
#include <QSharedMemory>
|
|
||||||
#include "hwapi.h"
|
|
||||||
|
|
||||||
//class QSharedMemory;
|
|
||||||
class hwChk : public QObject,
|
|
||||||
public hwinf
|
|
||||||
{
|
|
||||||
Q_OBJECT
|
|
||||||
// Q_PLUGIN_METADATA(IID "Atb.Psa2020.software.HWapi/1.0" ) //FILE "HWapi.json")
|
|
||||||
// Q_INTERFACES(hwinf)
|
|
||||||
//private:
|
|
||||||
// QSharedMemory *m_sharedMem;
|
|
||||||
|
|
||||||
public:
|
|
||||||
explicit hwChk(QWidget *parent = nullptr);
|
|
||||||
virtual ~hwChk();
|
|
||||||
|
|
||||||
|
|
||||||
public:
|
|
||||||
hwinf *HWaccess;
|
|
||||||
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@ -1,8 +1,94 @@
|
|||||||
|
/*
|
||||||
|
matching interfaces.h:
|
||||||
|
|
||||||
|
// History
|
||||||
|
// 11.10.2021: V1.0 222 functions
|
||||||
|
// 23.12.2021: V1.1 added block-parameter to function "read mifare data"
|
||||||
|
// 30.12.2021: V1.2 added function: mif_clearDataBuffer(), mif_isBlockAvailable(uint8_t blkNr) and mif_getAvailableDataBlocks()
|
||||||
|
// 1.1.2022: V1.3 Mifare extended. ( background: read 16 x 48byte from card to DC, read 12 x 64byte from DC to CA)
|
||||||
|
// new: read full card with 768bytes from HWapi without block borders
|
||||||
|
// added: mif_getNrOfAvailableDataBytes mif_getCardData768byteDec(uint8_t *buf, uint16_t bufferSize)
|
||||||
|
// mif_getCardDataDec(uint16_t fromAddr, uint16_t toAddr, uint8_t *buf, uint16_t bufferSize)
|
||||||
|
// mif_getCardDataStr(bool useHexFormat, char seperator)
|
||||||
|
// 29.03.2023: V3.1 some extensions for PSA1256_ptu5,
|
||||||
|
// V3.2 Bootloader improvement
|
||||||
|
// 12.04.2023: V3.3 new features extended: loading and using Json-files, cash-collection, cash-data-logging
|
||||||
|
|
||||||
|
//#define HWINF_iid "Atb.Psa2020.software.HWapi/3.1"
|
||||||
|
//#define HWINF_iid "Atb.Psa1256ptu5.software.HWapi/3.1"
|
||||||
|
#define HWINF_iid "Atb.Psa1256ptu5.software.HWapi/3.3"
|
||||||
|
|
||||||
|
|
||||||
|
PSA1259 hardware control using the DeviceController DC2
|
||||||
|
|
||||||
|
covering enclosure (switches and doors) and money devices,
|
||||||
|
controls mifare card to access or program
|
||||||
|
optional it can control printer, modem, bar code reader and credit card
|
||||||
|
|
||||||
|
* API to the PSA1259 Hardware
|
||||||
|
* All data come in from device controller via serial interface and will be stored
|
||||||
|
* in "PI" = peripheral image
|
||||||
|
* PI is updated every 100ms (up to 30ms possible)
|
||||||
|
* This api uses stored pi data and returns them in the following functions
|
||||||
|
* created: Q1/2020 TS
|
||||||
|
*
|
||||||
|
|
||||||
|
The devices, connected to device controller2 (DC2) can be controlled in different access levels.
|
||||||
|
Level 1:
|
||||||
|
direct connection to DC2, check versions, state and parameters
|
||||||
|
control serial interfaces
|
||||||
|
digital/analog IO's
|
||||||
|
read and write to connected devices on lowest level, this is a kind of fall-back-level
|
||||||
|
in case higher levels fail or do not support the needed (new) function
|
||||||
|
Example: send a specific printer command, several bytes that need to be conform to
|
||||||
|
printer manual. This command is routed to the printer through the DC2 without
|
||||||
|
any action of the DC. You can write your own device driver that way.
|
||||||
|
Level 1 is flexible but complicated
|
||||||
|
|
||||||
|
Level 2:
|
||||||
|
The DC controls the connected devices containing a device driver. The DC offers
|
||||||
|
usage of the device by simple commands,
|
||||||
|
Example: "Printer on", "set Font size 3" "print "hello world"", "cut"
|
||||||
|
In opposite to level 1 where you had to send a set of numbers and letters.
|
||||||
|
In other words: you "talk" to the device controller, not to the device itself.
|
||||||
|
|
||||||
|
Level 3:
|
||||||
|
start/stop complete processes.
|
||||||
|
Example: 1) print (predefined) document nr 3 with Text, letter size, font set, cut.
|
||||||
|
Also power up/down the printer, check if paper ok and so on.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
Another access example: control the coin unit
|
||||||
|
|
||||||
|
Level 1): read digital inputs to detect coin,
|
||||||
|
switch digital output which opens coin slot
|
||||||
|
communicate with coin checker by certain mdb-commands (manual conform)
|
||||||
|
poll coin checker for inserted coins
|
||||||
|
close coin slot after 3seconds by setting DO to 0....
|
||||||
|
|
||||||
|
Level 2): get message of attached coin from DC
|
||||||
|
send command "initialize coin checker" to DC
|
||||||
|
send command "open slot for 3s"
|
||||||
|
poll DC for inserted coins, DC polls coin checker in right way, no need
|
||||||
|
to know the data sheet of the coin checker or mdb-bus
|
||||||
|
command to DC "open coin escrow's return flap for 1s"
|
||||||
|
|
||||||
|
Level 3): send command: "start payment process"
|
||||||
|
all coin devices are started up
|
||||||
|
coin blocker opens for 3s if a coin is attached
|
||||||
|
coin checker summarizes inserted value and reports sum
|
||||||
|
later send command "stop payment process" (puts coins to vault) or
|
||||||
|
send command "cancel payment process" (returns coins to user)
|
||||||
|
|
||||||
|
*/
|
||||||
|
|
||||||
#ifndef hwapi_H
|
#ifndef hwapi_H
|
||||||
#define hwapi_H
|
#define hwapi_H
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
#include <QTabWidget>
|
||||||
|
#include <QtPlugin>
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
#include "interfaces.h"
|
#include "interfaces.h"
|
||||||
#include "datIf.h"
|
#include "datIf.h"
|
||||||
@ -12,6 +98,7 @@ class hwapi : public QObject,
|
|||||||
public hwinf
|
public hwinf
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
Q_PLUGIN_METADATA(IID "Atb.Psa2020.software.HWapi/1.0" ) //FILE "HWapi.json")
|
||||||
Q_INTERFACES(hwinf)
|
Q_INTERFACES(hwinf)
|
||||||
private:
|
private:
|
||||||
void sub_storeSendingText(QByteArray *buf) const;
|
void sub_storeSendingText(QByteArray *buf) const;
|
||||||
@ -31,13 +118,13 @@ private:
|
|||||||
|
|
||||||
QSharedMemory *m_sharedMem;
|
QSharedMemory *m_sharedMem;
|
||||||
public:
|
public:
|
||||||
explicit hwapi(QObject *parent = nullptr);
|
explicit hwapi(QWidget *parent = nullptr);
|
||||||
virtual ~hwapi();
|
virtual ~hwapi();
|
||||||
|
|
||||||
T_datif *myDatif;
|
T_datif *myDatif;
|
||||||
|
|
||||||
|
|
||||||
virtual QStringList dc_getStatus() const override;
|
virtual QStringList dc_getStatus() const;
|
||||||
|
|
||||||
// ------------------------------------------------------------------------------
|
// ------------------------------------------------------------------------------
|
||||||
// Level 0 commands, interface
|
// Level 0 commands, interface
|
||||||
@ -996,16 +1083,6 @@ public:
|
|||||||
uint64_t sys_getWakeSource(void) const override;
|
uint64_t sys_getWakeSource(void) const override;
|
||||||
// retval: 6 bytes, bit coded, 1=event keeps DC awake
|
// retval: 6 bytes, bit coded, 1=event keeps DC awake
|
||||||
|
|
||||||
uint8_t sys_getWakeReason(void) const override;
|
|
||||||
// Master was woken by following reason:
|
|
||||||
// 1: MDB Event
|
|
||||||
// 2: Coin Event
|
|
||||||
// ( 3: Master Event) - will not set the wake line
|
|
||||||
// ( 4: 32s pulse) - will not set the wake line
|
|
||||||
// 5: Door Event
|
|
||||||
// ( 6: Diag Event) - will not set the wake line
|
|
||||||
// 7: 30min-Pulse for HB
|
|
||||||
|
|
||||||
void sys_getDeviceConditions(uint8_t *leng, uint8_t *data) const override;
|
void sys_getDeviceConditions(uint8_t *leng, uint8_t *data) const override;
|
||||||
|
|
||||||
void sys_getDeviceConditions(struct T_moduleCondition *devCond) const override;
|
void sys_getDeviceConditions(struct T_moduleCondition *devCond) const override;
|
||||||
@ -1028,50 +1105,6 @@ public:
|
|||||||
// bit6: no response bit7: serial rec. error
|
// bit6: no response bit7: serial rec. error
|
||||||
// bit5: printer not ready
|
// bit5: printer not ready
|
||||||
|
|
||||||
void sys_sendDeviceParameter(struct T_devices *deviceSettings) const override;
|
|
||||||
|
|
||||||
void sys_restoreDeviceParameter(struct T_devices *deviceSettings) const override;
|
|
||||||
|
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------------------------------
|
|
||||||
// ------------ supervise all hardware components
|
|
||||||
// ------------ assess the machine state
|
|
||||||
|
|
||||||
1. check if DC startup test is through, retrigger if not
|
|
||||||
2. get results and find errors
|
|
||||||
3. in case of error check if component is used (e.g. billreader is seldom used)
|
|
||||||
4: check doors
|
|
||||||
5. return value: 0: no response from DC
|
|
||||||
1: no Test results and Test not running. need retrigger!
|
|
||||||
2: state not clear by now, test ongoing, wait
|
|
||||||
3: Service or battery door is open, goto INTRUSION MODE
|
|
||||||
from here: after valid ID-card goto SERVICE MODE
|
|
||||||
4: vault door is open, goto INTRUSION MODE
|
|
||||||
from here: after valid ID-card and vault door closed goto TEST MODE
|
|
||||||
in TEST MODE: complete system check decides if vending mode allowed
|
|
||||||
5: All doors are closed but errors found,
|
|
||||||
goto OOO MODE (out-of-order)
|
|
||||||
from here: run system test until problem is fixed
|
|
||||||
6: All doors are closed, no error, maybe warnings,
|
|
||||||
goto VENDING MODE (normal operation)
|
|
||||||
(priority sinks from 0 to 6)
|
|
||||||
|
|
||||||
--------------------------------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
uint8_t sys_componentAssessment(void) const override;
|
|
||||||
// this function decides if vending mode is possible, independant from door
|
|
||||||
// return >0 in case of error
|
|
||||||
// is inncluded in sys_superviseSystem
|
|
||||||
|
|
||||||
uint8_t sys_superviseSystem(void) const override;
|
|
||||||
// this function proofs if vending is possible depending of doors state
|
|
||||||
|
|
||||||
|
|
||||||
uint8_t sys_getSystemErrors(void) const override;
|
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------------------------
|
|
||||||
// ---------------------------------------------------------------------------------------------
|
|
||||||
// ---------------------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void hwapi_templatePrintFinished_OK(void) const override;
|
void hwapi_templatePrintFinished_OK(void) const override;
|
||||||
|
|||||||
@ -182,25 +182,29 @@ struct T_moduleCondition {
|
|||||||
uint8_t ResetReason;
|
uint8_t ResetReason;
|
||||||
uint8_t allModulesChecked;
|
uint8_t allModulesChecked;
|
||||||
|
|
||||||
|
uint8_t alarmState;
|
||||||
|
uint8_t res11;
|
||||||
|
uint8_t res12;
|
||||||
|
uint8_t res13;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct T_dynamicCondition {
|
struct T_dynamicCondition {
|
||||||
char allDoorsDebounced; // 99: undefined, 0=all closed, bit1=upper door open 2=midlle door open 3=lower door open
|
char allDoorsDebounced;
|
||||||
char openedAuthorized;
|
char openedAuthorized;
|
||||||
uint8_t CBinDebounced;
|
uint8_t CBinDebounced;
|
||||||
char upperDoor; // 99: undefined 0:closed 1:open
|
char upperDoor; // 0:fehlt 1:drin
|
||||||
char middleDoor; // 99: undefined 0:closed 1:open
|
char middleDoor;
|
||||||
char lowerDoor; // 99: undefined 0:closed 1:open
|
char lowerDoor;
|
||||||
char reserve; // not used, always 0
|
char coinBox;
|
||||||
char billBox;
|
char billBox;
|
||||||
char modeAbrech;
|
char modeAbrech;
|
||||||
char onAlarm; // 0:alarm aus 1:alarm 2:alarm mit Sirene 3: Sirenentest
|
char onAlarm;
|
||||||
char nowCardTest;
|
char nowCardTest;
|
||||||
char nowPayment;
|
char nowPayment;
|
||||||
char lastMifCardType;
|
char lastMifCardType;
|
||||||
uint8_t lastSDoorState;
|
uint8_t lastSDoorState;
|
||||||
uint8_t lastVDoorState;
|
uint8_t lastVDoorState;
|
||||||
uint8_t lastCBstate; // 99: undefined 0:not there 1:insered
|
uint8_t lastCBstate;
|
||||||
char paymentInProgress;
|
char paymentInProgress;
|
||||||
char res1;
|
char res1;
|
||||||
uint16_t U_Batt;
|
uint16_t U_Batt;
|
||||||
@ -228,8 +232,7 @@ struct T_dynamicCondition {
|
|||||||
// bit4: paper jam in cutter
|
// bit4: paper jam in cutter
|
||||||
// bit6: no response bit7: serial rec. error
|
// bit6: no response bit7: serial rec. error
|
||||||
// bit5: printer not ready
|
// bit5: printer not ready
|
||||||
uint8_t startupTestIsRunning;
|
//54
|
||||||
//54
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct T_extTime {
|
struct T_extTime {
|
||||||
@ -260,39 +263,6 @@ struct T_extTime {
|
|||||||
uint32_t MinutesOfMillenium;
|
uint32_t MinutesOfMillenium;
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef uint8_t UCHAR;
|
|
||||||
typedef uint16_t UINT;
|
|
||||||
|
|
||||||
struct T_devices
|
|
||||||
{
|
|
||||||
// set by master, used(1) or notused (0) or type 2....20
|
|
||||||
|
|
||||||
UCHAR kindOfPrinter; // 0:off 1:Gebe
|
|
||||||
UCHAR kindOfCoinChecker; // 0: without 1=EMP820 2=EMP900 3=currenza c² (MW)
|
|
||||||
UCHAR kindOfMifareReader; // by now only stronglink SL025 =1
|
|
||||||
UCHAR suppressSleepMode; // 0:sleep allowed 1: no sleep
|
|
||||||
|
|
||||||
UCHAR kindOfModem; // 0:off 1:Sunlink
|
|
||||||
UCHAR kindOfCreditcard; // 0:off 1:Feig NFC
|
|
||||||
UCHAR CoinEscrow;
|
|
||||||
UCHAR CoinRejectUnit;
|
|
||||||
|
|
||||||
UCHAR CoinShutter;
|
|
||||||
UCHAR BillAcceptor;
|
|
||||||
UCHAR usevaultLock;
|
|
||||||
UCHAR autoAlarm; // 1: switch on siren for 1min in doors opened unauthorized
|
|
||||||
|
|
||||||
UCHAR autoOpen; // 1: open door covers after valid ATBcard
|
|
||||||
UCHAR printAccReceipt; // 0/1
|
|
||||||
UCHAR printDoorReceipt;
|
|
||||||
UCHAR printTokenTicket;
|
|
||||||
|
|
||||||
UINT VaultFullWarnLevel;
|
|
||||||
UINT VaultFullErrorLevel;
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
class hwinf {
|
class hwinf {
|
||||||
public:
|
public:
|
||||||
enum class DownloadResult {OK, ERROR, TIMEOUT, NOP};
|
enum class DownloadResult {OK, ERROR, TIMEOUT, NOP};
|
||||||
@ -1481,16 +1451,6 @@ public:
|
|||||||
virtual uint64_t sys_getWakeSource(void) const =0;
|
virtual uint64_t sys_getWakeSource(void) const =0;
|
||||||
// retval: 6 bytes, bit coded, 1=event keeps DC awake
|
// retval: 6 bytes, bit coded, 1=event keeps DC awake
|
||||||
|
|
||||||
virtual uint8_t sys_getWakeReason(void) const=0;
|
|
||||||
// Master was woken by following reason:
|
|
||||||
// 1: MDB Event
|
|
||||||
// 2: Coin Event
|
|
||||||
// ( 3: Master Event) - will not set the wake line
|
|
||||||
// ( 4: 32s pulse) - will not set the wake line
|
|
||||||
// 5: Door Event
|
|
||||||
// ( 6: Diag Event) - will not set the wake line
|
|
||||||
// 7: 30min-Pulse for HB
|
|
||||||
|
|
||||||
virtual void sys_getDeviceConditions(uint8_t *leng, uint8_t *data) const=0;
|
virtual void sys_getDeviceConditions(uint8_t *leng, uint8_t *data) const=0;
|
||||||
/*
|
/*
|
||||||
|
|
||||||
@ -1612,60 +1572,6 @@ public:
|
|||||||
// bit6: no response bit7: serial rec. error
|
// bit6: no response bit7: serial rec. error
|
||||||
// bit5: printer not ready
|
// bit5: printer not ready
|
||||||
|
|
||||||
virtual void sys_sendDeviceParameter(struct T_devices *deviceSettings) const=0;
|
|
||||||
|
|
||||||
virtual void sys_restoreDeviceParameter(struct T_devices *deviceSettings) const=0;
|
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------------------------------
|
|
||||||
// ------------ supervise all hardware components
|
|
||||||
// ------------ assess the machine state
|
|
||||||
|
|
||||||
1. check if DC startup test is through, retrigger if not
|
|
||||||
2. get results and find errors
|
|
||||||
3. in case of error check if component is used (e.g. billreader is seldom used)
|
|
||||||
4: check doors
|
|
||||||
5. return value: 0: no response from DC
|
|
||||||
1: no Test results and Test not running. need retrigger!
|
|
||||||
2: state not clear by now, test ongoing, wait
|
|
||||||
3: Service or battery door is open, goto INTRUSION MODE
|
|
||||||
from here: after valid ID-card goto SERVICE MODE
|
|
||||||
4: vault door is open, goto INTRUSION MODE
|
|
||||||
from here: after valid ID-card and vault door closed goto TEST MODE
|
|
||||||
in TEST MODE: complete system check decides if vending mode allowed
|
|
||||||
5: All doors are closed but errors found,
|
|
||||||
goto OOO MODE (out-of-order)
|
|
||||||
from here: run system test until problem is fixed
|
|
||||||
6: All doors are closed, no error, maybe warnings,
|
|
||||||
goto VENDING MODE (normal operation)
|
|
||||||
(priority sinks from 0 to 6)
|
|
||||||
|
|
||||||
--------------------------------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
virtual uint8_t sys_componentAssessment(void) const=0;
|
|
||||||
// this function decides if vending mode is possible, independant from door
|
|
||||||
// return >0 in case of error
|
|
||||||
// is inncluded in sys_superviseSystem
|
|
||||||
|
|
||||||
virtual uint8_t sys_superviseSystem(void) const=0;
|
|
||||||
// this function proofs if vending is possible depending of doors state
|
|
||||||
|
|
||||||
virtual uint8_t sys_getSystemErrors(void) const=0;
|
|
||||||
|
|
||||||
|
|
||||||
// retrigger System-Check with:
|
|
||||||
// bool hwapi::sys_runCompleteTest(void) const
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------------------------
|
|
||||||
// ---------------------------------------------------------------------------------------------
|
|
||||||
// ---------------------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
virtual void hwapi_templatePrintFinished_OK(void) const=0;
|
virtual void hwapi_templatePrintFinished_OK(void) const=0;
|
||||||
virtual void hwapi_templatePrintFinished_Err(void) const=0;
|
virtual void hwapi_templatePrintFinished_Err(void) const=0;
|
||||||
|
|||||||
@ -237,14 +237,6 @@ uint8_t check4freeFDlongCmd(void);
|
|||||||
// returns number of free places in long-command stack
|
// returns number of free places in long-command stack
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
uint8_t epi_store64BdevParameter(uint8_t length, uint8_t *buf);
|
|
||||||
// HWapi writes data to be stored
|
|
||||||
|
|
||||||
uint8_t epi_restore64BdevParameter(uint8_t *length, uint8_t *buf);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -225,9 +225,6 @@ struct SharedMemBuffer {
|
|||||||
uint8_t vaultrecord[360];
|
uint8_t vaultrecord[360];
|
||||||
uint32_t amount;
|
uint32_t amount;
|
||||||
uint16_t nrOfCoins;
|
uint16_t nrOfCoins;
|
||||||
bool dcDataValid;
|
|
||||||
uint8_t wakeReason;
|
|
||||||
|
|
||||||
} store;
|
} store;
|
||||||
|
|
||||||
struct T_globTime {
|
struct T_globTime {
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
#define STOREINDATA_H
|
#define STOREINDATA_H
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
//#include "tslib.h"
|
#include "tslib.h"
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
|
||||||
|
|
||||||
@ -384,7 +384,6 @@ bool epi_CurrentPaymentGetAllCoins(uint16_t *types, uint16_t *values);
|
|||||||
|
|
||||||
void gpi_storeWakeSources(uint8_t const *receivedData);
|
void gpi_storeWakeSources(uint8_t const *receivedData);
|
||||||
uint64_t epi_getWakeSources(void);
|
uint64_t epi_getWakeSources(void);
|
||||||
uint8_t epi_getWakeReason(void);
|
|
||||||
|
|
||||||
void gpi_storeExtendedTime(uint8_t leng, uint8_t const *data);
|
void gpi_storeExtendedTime(uint8_t leng, uint8_t const *data);
|
||||||
void epi_restoreExtendedTime(uint8_t *leng, uint8_t *data);
|
void epi_restoreExtendedTime(uint8_t *leng, uint8_t *data);
|
||||||
@ -416,11 +415,6 @@ uint8_t epi_mifGetCardType(uint8_t const *holder);
|
|||||||
//holder[8] = name of card holder
|
//holder[8] = name of card holder
|
||||||
// retval Type of MifareCard, 1=upper door, 2=lower door 3=test printer 4=test coins
|
// retval Type of MifareCard, 1=upper door, 2=lower door 3=test printer 4=test coins
|
||||||
|
|
||||||
void gpi_storeDcDataValid(bool isVal);
|
|
||||||
bool gpi_areDcDataValid();
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
1585
DCPlugin/plugins/interfaces.h
Normal file
1585
DCPlugin/plugins/interfaces.h
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,22 +0,0 @@
|
|||||||
#ifndef ATBAPPPLUGIN_H
|
|
||||||
#define ATBAPPPLUGIN_H
|
|
||||||
|
|
||||||
/***********************************************************
|
|
||||||
* a simple class with only one method for plugin info
|
|
||||||
*/
|
|
||||||
#include <QObject>
|
|
||||||
#include <QString>
|
|
||||||
|
|
||||||
class ATBAPPplugin
|
|
||||||
{
|
|
||||||
|
|
||||||
public:
|
|
||||||
virtual const QString & getPluginInfo() = 0;
|
|
||||||
};
|
|
||||||
|
|
||||||
Q_DECLARE_INTERFACE(ATBAPPplugin,
|
|
||||||
"eu.atb.ptu.plugin.ATBAPPplugin/0.9")
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#endif // ATBAPPPLUGIN_H
|
|
||||||
@ -1,293 +0,0 @@
|
|||||||
#include "src/ATBAPP/ATBDeviceControllerPlugin.h"
|
|
||||||
#include "src/ATBAPP/ATBHealthEvent.h"
|
|
||||||
|
|
||||||
#include <QTimer>
|
|
||||||
#include <QTextCodec>
|
|
||||||
|
|
||||||
|
|
||||||
ATBDeviceControllerPlugin::ATBDeviceControllerPlugin(QObject *parent) : QObject(parent),
|
|
||||||
pluginState(PLUGIN_STATE::NOT_INITIALIZED)
|
|
||||||
{
|
|
||||||
this->pluginInfo = QString::fromUtf8(pluginInfoString.c_str());
|
|
||||||
|
|
||||||
this->hw = new hwapi();
|
|
||||||
|
|
||||||
connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_templatePrintFinished_OK()), this, SLOT(onPrintFinishedOK()));
|
|
||||||
connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_templatePrintFinished_Err()), this, SLOT(onPrintFinishedERR()));
|
|
||||||
connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_gotNewCoin()), this, SLOT(onCashGotCoin()));
|
|
||||||
connect(dynamic_cast<QObject*>(hw), SIGNAL(hwapi_vendStopByMax()), this, SLOT(onCashVendStopByMax()));
|
|
||||||
}
|
|
||||||
|
|
||||||
ATBDeviceControllerPlugin::~ATBDeviceControllerPlugin() {}
|
|
||||||
|
|
||||||
PLUGIN_STATE ATBDeviceControllerPlugin::initDCPlugin(QObject *healthEventReceiver, const QSettings & settings)
|
|
||||||
{
|
|
||||||
this->healthEventReceiver = healthEventReceiver;
|
|
||||||
|
|
||||||
// read variables from setting
|
|
||||||
QString serialPort = settings.value("DEVICE_CONTROLLER/serialPort", "ttymxc2").toString();
|
|
||||||
QByteArray printerEncoding = settings.value("DEVICE_CONTROLLER/printerEnconding", "ISO 8859-2").toString().toLatin1();
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// open serial port
|
|
||||||
hw->dc_openSerial(5, "115200", serialPort, 1);
|
|
||||||
|
|
||||||
|
|
||||||
// text encoding for printer
|
|
||||||
this->codec = QTextCodec::codecForName(printerEncoding);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
this->pluginState = PLUGIN_STATE::INITIALIZED;
|
|
||||||
|
|
||||||
return pluginState;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// TASKS: Cash handling -------------------------------------------------------
|
|
||||||
void ATBDeviceControllerPlugin::requestStartCashInput(const QString & amount)
|
|
||||||
{
|
|
||||||
qCritical() << "Start Cash vending with amount = " << amount;
|
|
||||||
|
|
||||||
uint32_t amountInt = static_cast<uint32_t>(amount.toUInt());
|
|
||||||
hw->cash_startPayment(amountInt);
|
|
||||||
}
|
|
||||||
|
|
||||||
void ATBDeviceControllerPlugin::requestStopCashInput()
|
|
||||||
{
|
|
||||||
hw->cash_stopPayment();
|
|
||||||
}
|
|
||||||
|
|
||||||
void ATBDeviceControllerPlugin::cashCollect()
|
|
||||||
{
|
|
||||||
hw->vend_success();
|
|
||||||
}
|
|
||||||
|
|
||||||
void ATBDeviceControllerPlugin::cashAbort()
|
|
||||||
{
|
|
||||||
hw->vend_failed();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// TASKS: printing ------------------------------------------------------------
|
|
||||||
void ATBDeviceControllerPlugin::requestPrintTicket(const QHash<QString, QVariant> & printingData)
|
|
||||||
{
|
|
||||||
struct T_dynDat *dynTicketData = new T_dynDat;
|
|
||||||
memset(dynTicketData, 0, sizeof(*dynTicketData));
|
|
||||||
|
|
||||||
qCritical() << "ATBDeviceControllerPlugin::requestPrintTicket( " << endl
|
|
||||||
<< " licenseplate = " << printingData["licenseplate"] << endl
|
|
||||||
<< " amount = " << printingData["amount"] << endl
|
|
||||||
<< " parkingEnd = " << printingData["parkingEnd"] << endl
|
|
||||||
<< " currentTime = " << printingData["currentTime"] << endl
|
|
||||||
<< " currentDate = " << printingData["currentDate"] << endl;
|
|
||||||
|
|
||||||
|
|
||||||
// set dynamic printer data:
|
|
||||||
memcpy((char*)dynTicketData->licensePlate, codec->fromUnicode(printingData["licenseplate"].toString()).data(), 8);
|
|
||||||
memcpy((char*)dynTicketData->vendingPrice, codec->fromUnicode(printingData["amount"].toString()).data(), 8);
|
|
||||||
|
|
||||||
QDateTime parkingEndQDateTime = QDateTime::fromString(printingData["parkingEnd"].toString(), Qt::ISODate);
|
|
||||||
QDateTime currentDateTime = QDateTime::fromString(printingData["currentTime"].toString(), Qt::ISODate);
|
|
||||||
|
|
||||||
memcpy((char*)dynTicketData->parkingEnd, codec->fromUnicode(parkingEndQDateTime.toString("hh:mm")).data(), 8);
|
|
||||||
memcpy((char*)dynTicketData->currentTime, codec->fromUnicode(currentDateTime.toString("hh:mm")).data(), 8);
|
|
||||||
memcpy((char*)dynTicketData->currentDate, codec->fromUnicode(currentDateTime.toString("dd.MM.yy")).data(), 8);
|
|
||||||
|
|
||||||
// DEBUG
|
|
||||||
qCritical() << "ATBDeviceControllerPlugin::requestPrintTicket()";
|
|
||||||
|
|
||||||
if (!this->hw->dc_isPortOpen()) {
|
|
||||||
qCritical() << " ... serial port is not open!";
|
|
||||||
this->onPrintFinishedERR();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// TODO: wird hier nur 'licensePlate' gedruckt?
|
|
||||||
if (!this->hw->prn_sendDynamicPrnValues(dynTicketData->licensePlate)) {
|
|
||||||
this->errorCode = "hwapi::prn_sendDynamicPrnValues";
|
|
||||||
this->errorDescription = "hwapi method 'hwapi::prn_sendDynamicPrnValues' result is false";
|
|
||||||
|
|
||||||
qCritical() << "ERROR:";
|
|
||||||
qCritical() << "ATBDeviceControllerPlugin::requestPrintTicket( " << endl
|
|
||||||
<< " licenseplate = " << printingData["licenseplate"] << endl
|
|
||||||
<< " amount = " << printingData["amount"] << endl
|
|
||||||
<< " parkingEnd = " << printingData["parkingEnd"] << endl
|
|
||||||
<< " currentTime = " << printingData["currentTime"] << endl
|
|
||||||
<< " currentDate = " << printingData["currentDate"] << endl;
|
|
||||||
|
|
||||||
|
|
||||||
this->onPrintFinishedERR();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
QTimer::singleShot(1000, this, SLOT(onPrinterDataPrepared()));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void ATBDeviceControllerPlugin::onPrinterDataPrepared()
|
|
||||||
{
|
|
||||||
this->currentTemplate = 1;
|
|
||||||
this->onPrinterPrintNextTemplate();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void ATBDeviceControllerPlugin::onPrinterPrintNextTemplate()
|
|
||||||
{
|
|
||||||
qCritical() << " ... print template " << this->currentTemplate;
|
|
||||||
|
|
||||||
if (!this->hw->prn_printTemplate(this->currentTemplate)) {
|
|
||||||
this->errorCode = "hwapi::prn_printTemplate";
|
|
||||||
this->errorDescription = QString("hwapi method 'hwapi::onPrinterPrintNextTemplate(%1)' result is false").arg(this->currentTemplate);
|
|
||||||
this->onPrintFinishedERR();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this->currentTemplate >= 3) {
|
|
||||||
// all templates are printed
|
|
||||||
this->currentTemplate = 0;
|
|
||||||
|
|
||||||
// FAKE SIGNAL:
|
|
||||||
QTimer::singleShot(1000, this, SLOT(onPrintFinishedOK()));
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
// print next template
|
|
||||||
this->currentTemplate++;
|
|
||||||
QTimer::singleShot(3000, this, SLOT(onPrinterPrintNextTemplate()));
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/************************************************************************************************
|
|
||||||
* private slots, interface to low level hwapi
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
void ATBDeviceControllerPlugin::onPrintFinishedOK()
|
|
||||||
{
|
|
||||||
// DEBUG
|
|
||||||
qCritical() << "ATBDeviceControllerPlugin::onPrintFinishedOK()";
|
|
||||||
|
|
||||||
emit this->printTicketFinished(nsDeviceControllerInterface::RESULT_STATE::SUCCESS,
|
|
||||||
"",
|
|
||||||
"");
|
|
||||||
}
|
|
||||||
void ATBDeviceControllerPlugin::onPrintFinishedERR()
|
|
||||||
{
|
|
||||||
// DEBUG
|
|
||||||
qCritical() << "ATBDeviceControllerPlugin::onPrintFinishedERR()";
|
|
||||||
|
|
||||||
|
|
||||||
this->errorCode = "PRINTER"; // TODO: get more detailed error code from low level API
|
|
||||||
this->errorDescription = "Printer error"; // TODO: get more detailed error description from low level API
|
|
||||||
|
|
||||||
emit this->printTicketFinished(nsDeviceControllerInterface::RESULT_STATE::ERROR_BACKEND,
|
|
||||||
this->errorCode,
|
|
||||||
this->errorDescription);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/************************************************************************************************
|
|
||||||
* cash payment
|
|
||||||
*/
|
|
||||||
void ATBDeviceControllerPlugin::onCashGotCoin()
|
|
||||||
{
|
|
||||||
// DEBUG
|
|
||||||
qCritical() << "ATBDeviceControllerPlugin::onGotCoin()";
|
|
||||||
|
|
||||||
uint32_t amountInt = this->hw->getInsertedAmount();
|
|
||||||
|
|
||||||
QString amountString = QString::number(amountInt);
|
|
||||||
|
|
||||||
|
|
||||||
emit this->cashInputEvent(nsDeviceControllerInterface::RESULT_STATE::SUCCESS,
|
|
||||||
nsDeviceControllerInterface::CASH_STATE::CACHE_INPUT,
|
|
||||||
amountString,
|
|
||||||
"",
|
|
||||||
"");
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void ATBDeviceControllerPlugin::onCashVendStopByMax()
|
|
||||||
{
|
|
||||||
// DEBUG
|
|
||||||
qCritical() << "ATBDeviceControllerPlugin::onCashVendStopByMax()";
|
|
||||||
|
|
||||||
uint32_t amountInt = this->hw->getInsertedAmount();
|
|
||||||
|
|
||||||
QString amountString = QString::number(amountInt);
|
|
||||||
|
|
||||||
emit this->cashInputFinished(nsDeviceControllerInterface::RESULT_STATE::SUCCESS,
|
|
||||||
amountString,
|
|
||||||
"",
|
|
||||||
"");
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/************************************************************************************************
|
|
||||||
* Mandatory plugin methods
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
PLUGIN_STATE ATBDeviceControllerPlugin::getState()
|
|
||||||
{
|
|
||||||
return this->pluginState;
|
|
||||||
}
|
|
||||||
|
|
||||||
QString & ATBDeviceControllerPlugin::getLastError()
|
|
||||||
{
|
|
||||||
return this->errorCode;
|
|
||||||
}
|
|
||||||
|
|
||||||
const QString & ATBDeviceControllerPlugin::getLastErrorDescription()
|
|
||||||
{
|
|
||||||
return this->errorDescription;
|
|
||||||
}
|
|
||||||
|
|
||||||
const QString & ATBDeviceControllerPlugin::getPluginInfo()
|
|
||||||
{
|
|
||||||
return this->pluginInfo;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
const QString ATBDeviceControllerPlugin::getString(nsDeviceControllerInterface::RESULT_STATE resultState)
|
|
||||||
{
|
|
||||||
QString str;
|
|
||||||
|
|
||||||
switch (resultState) {
|
|
||||||
case nsDeviceControllerInterface::RESULT_STATE::SUCCESS:
|
|
||||||
str = QString("RESULT_STATE::SUCCESS");
|
|
||||||
break;
|
|
||||||
case nsDeviceControllerInterface::RESULT_STATE::ERROR_BACKEND:
|
|
||||||
str = QString("RESULT_STATE::ERROR_BACKEND");
|
|
||||||
break;
|
|
||||||
case nsDeviceControllerInterface::RESULT_STATE::ERROR_TIMEOUT:
|
|
||||||
str = QString("RESULT_STATE::ERROR_TIMEOUT");
|
|
||||||
break;
|
|
||||||
case nsDeviceControllerInterface::RESULT_STATE::ERROR_PROCESS:
|
|
||||||
str = QString("RESULT_STATE::ERROR_PROCESS");
|
|
||||||
break;
|
|
||||||
case nsDeviceControllerInterface::RESULT_STATE::ERROR_RETRY:
|
|
||||||
str = QString("RESULT_STATE::ERROR_RETRY");
|
|
||||||
break;
|
|
||||||
case nsDeviceControllerInterface::RESULT_STATE::INFO:
|
|
||||||
str = QString("RESULT_STATE::INFO");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
return str;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/************************************************************************************************
|
|
||||||
* ... end
|
|
||||||
*/
|
|
||||||
|
|
||||||
#if QT_VERSION < 0x050000
|
|
||||||
Q_EXPORT_PLUGIN2( ATBDeviceControllerPlugin, ATBDeviceControllerPlugin )
|
|
||||||
#endif
|
|
||||||
@ -1,125 +0,0 @@
|
|||||||
#ifndef ATBDEVICECONTROLLERPLUGIN_H
|
|
||||||
#define ATBDEVICECONTROLLERPLUGIN_H
|
|
||||||
|
|
||||||
#include <QObject>
|
|
||||||
|
|
||||||
#include "src/ATBAPP/DeviceControllerInterface.h"
|
|
||||||
#include "src/ATBAPP/ATBAPPplugin.h"
|
|
||||||
#include "version.h"
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#include "hwapi.h"
|
|
||||||
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <thread>
|
|
||||||
#include <memory>
|
|
||||||
#include <QSharedMemory>
|
|
||||||
|
|
||||||
|
|
||||||
class QTextCodec;
|
|
||||||
|
|
||||||
|
|
||||||
using namespace nsDeviceControllerInterface;
|
|
||||||
|
|
||||||
class QSettings;
|
|
||||||
|
|
||||||
class ATBDeviceControllerPlugin : public QObject,
|
|
||||||
public DeviceControllerInterface
|
|
||||||
{
|
|
||||||
Q_OBJECT
|
|
||||||
Q_INTERFACES(ATBAPPplugin)
|
|
||||||
Q_INTERFACES(DeviceControllerInterface)
|
|
||||||
#if QT_VERSION >= 0x050000
|
|
||||||
Q_PLUGIN_METADATA( IID "ATBDeviceControllerPlugin" )
|
|
||||||
#endif
|
|
||||||
|
|
||||||
public:
|
|
||||||
explicit ATBDeviceControllerPlugin(QObject *parent = nullptr);
|
|
||||||
~ATBDeviceControllerPlugin();
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
|
||||||
// interface:
|
|
||||||
PLUGIN_STATE initDCPlugin(QObject *healthEventReceiver, const QSettings & settings);
|
|
||||||
|
|
||||||
// TASKS: Cash handling -------------------------------------------------------
|
|
||||||
void requestStartCashInput(const QString & amount);
|
|
||||||
void requestStopCashInput();
|
|
||||||
void cashCollect();
|
|
||||||
void cashAbort();
|
|
||||||
|
|
||||||
// TASKS: printing ------------------------------------------------------------
|
|
||||||
void requestPrintTicket(const QHash<QString, QVariant> & printingData);
|
|
||||||
|
|
||||||
// mandantory ATBAPP plugin methods: ------------------------------------------
|
|
||||||
nsDeviceControllerInterface::PLUGIN_STATE getState();
|
|
||||||
QString & getLastError();
|
|
||||||
const QString & getLastErrorDescription();
|
|
||||||
|
|
||||||
const QString & getPluginInfo();
|
|
||||||
|
|
||||||
// helpers e.g. for debug / log
|
|
||||||
const QString getString(nsDeviceControllerInterface::RESULT_STATE resultState);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
signals:
|
|
||||||
void printTicketFinished(nsDeviceControllerInterface::RESULT_STATE resultState,
|
|
||||||
const QString & errorCode,
|
|
||||||
const QString & errorDescription);
|
|
||||||
|
|
||||||
void cashInputEvent(nsDeviceControllerInterface::RESULT_STATE resultState,
|
|
||||||
nsDeviceControllerInterface::CASH_STATE cashState,
|
|
||||||
const QString & newCashValue,
|
|
||||||
const QString & errorCode,
|
|
||||||
const QString & errorDescription);
|
|
||||||
|
|
||||||
void cashInputFinished(nsDeviceControllerInterface::RESULT_STATE resultState,
|
|
||||||
const QString & newCashValue,
|
|
||||||
const QString & errorCode,
|
|
||||||
const QString & errorDescription);
|
|
||||||
|
|
||||||
void requestServiceMode();
|
|
||||||
|
|
||||||
void Error(
|
|
||||||
const QString & errorCode,
|
|
||||||
const QString & errorDescription);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private:
|
|
||||||
QString errorCode;
|
|
||||||
QString errorDescription;
|
|
||||||
QString pluginInfo;
|
|
||||||
|
|
||||||
int currentTemplate;
|
|
||||||
|
|
||||||
|
|
||||||
bool useDebug;
|
|
||||||
|
|
||||||
PLUGIN_STATE pluginState;
|
|
||||||
|
|
||||||
QObject* healthEventReceiver;
|
|
||||||
|
|
||||||
hwinf* hw;
|
|
||||||
|
|
||||||
QTextCodec *codec;
|
|
||||||
|
|
||||||
private slots:
|
|
||||||
// printer
|
|
||||||
|
|
||||||
void onPrinterDataPrepared();
|
|
||||||
void onPrinterPrintNextTemplate();
|
|
||||||
|
|
||||||
void onPrintFinishedOK();
|
|
||||||
void onPrintFinishedERR();
|
|
||||||
|
|
||||||
// cash payment
|
|
||||||
void onCashGotCoin();
|
|
||||||
void onCashVendStopByMax();
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif // ATBDEVICECONTROLLERPLUGIN_H
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
#include "src/ATBAPP/ATBHealthEvent.h"
|
|
||||||
|
|
||||||
ATBHealthEvent::ATBHealthEvent(ATB_HEALTH_MODE mode, const QString & errorNumber, const QString & errorDescription) :
|
|
||||||
QEvent(ATB_HEALTH_EVENT),
|
|
||||||
healthMode(mode),
|
|
||||||
errorNumber(errorNumber),
|
|
||||||
errorDescription(errorDescription)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
QString ATBHealthEvent::getErrorNumber()
|
|
||||||
{
|
|
||||||
return this->errorNumber;
|
|
||||||
}
|
|
||||||
|
|
||||||
QString ATBHealthEvent::getErrorDescription()
|
|
||||||
{
|
|
||||||
return this->errorDescription;
|
|
||||||
}
|
|
||||||
|
|
||||||
ATB_HEALTH_MODE ATBHealthEvent::getMode()
|
|
||||||
{
|
|
||||||
return this->healthMode;
|
|
||||||
}
|
|
||||||
@ -1,44 +0,0 @@
|
|||||||
#ifndef ATBHEALTHEVENT_H
|
|
||||||
#define ATBHEALTHEVENT_H
|
|
||||||
|
|
||||||
#include <QEvent>
|
|
||||||
#include <QString>
|
|
||||||
|
|
||||||
enum class ATB_HEALTH_MODE : quint8;
|
|
||||||
|
|
||||||
const QEvent::Type ATB_HEALTH_EVENT = static_cast<QEvent::Type>(QEvent::User + 1);
|
|
||||||
|
|
||||||
|
|
||||||
class ATBHealthEvent : public QEvent
|
|
||||||
{
|
|
||||||
|
|
||||||
public:
|
|
||||||
ATBHealthEvent(ATB_HEALTH_MODE mode, const QString & errorNumber, const QString & errorDescription);
|
|
||||||
|
|
||||||
QString getErrorNumber();
|
|
||||||
QString getErrorDescription();
|
|
||||||
ATB_HEALTH_MODE getMode();
|
|
||||||
|
|
||||||
signals:
|
|
||||||
|
|
||||||
public slots:
|
|
||||||
|
|
||||||
|
|
||||||
private:
|
|
||||||
ATB_HEALTH_MODE healthMode;
|
|
||||||
QString errorNumber;
|
|
||||||
QString errorDescription;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
enum class ATB_HEALTH_MODE : quint8 {
|
|
||||||
WARNING,
|
|
||||||
ERROR,
|
|
||||||
WARNING_CORRECTION,
|
|
||||||
ERROR_CORRECTION,
|
|
||||||
DEBUG,
|
|
||||||
STATE,
|
|
||||||
UNSPECIFIED
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif // ATBHEALTHEVENT_H
|
|
||||||
@ -1,142 +0,0 @@
|
|||||||
#ifndef DEVICECONTROLLERINTERFACE_H
|
|
||||||
#define DEVICECONTROLLERINTERFACE_H
|
|
||||||
|
|
||||||
#include <QtPlugin>
|
|
||||||
|
|
||||||
#include <QSettings>
|
|
||||||
#include <QString>
|
|
||||||
|
|
||||||
#include "ATBAPPplugin.h"
|
|
||||||
|
|
||||||
namespace nsDeviceControllerInterface {
|
|
||||||
enum class PLUGIN_STATE : quint8;
|
|
||||||
enum class RESULT_STATE : quint8;
|
|
||||||
enum class CASH_STATE : quint8;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
class DeviceControllerInterface : public ATBAPPplugin
|
|
||||||
{
|
|
||||||
Q_INTERFACES(ATBAPPplugin)
|
|
||||||
|
|
||||||
public:
|
|
||||||
virtual ~DeviceControllerInterface() {}
|
|
||||||
|
|
||||||
virtual nsDeviceControllerInterface::PLUGIN_STATE initDCPlugin(QObject *healthEventReceiver,
|
|
||||||
const QSettings & settings) = 0;
|
|
||||||
|
|
||||||
// TASKS: Cash handling -------------------------------------------------------
|
|
||||||
/**
|
|
||||||
* enables coin input
|
|
||||||
* amount = "0": pay-up
|
|
||||||
* amount > "0": pay-down
|
|
||||||
*/
|
|
||||||
virtual void requestStartCashInput(const QString & amount) = 0;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* called e.g. on Button "NEXT" in pay-up (direct coin input)
|
|
||||||
*/
|
|
||||||
virtual void requestStopCashInput() = 0;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* called e.g. on Button "NEXT" in pay-up (direct coin input)
|
|
||||||
*/
|
|
||||||
virtual void cashCollect() = 0;
|
|
||||||
virtual void cashAbort() = 0;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// TASKS: printing ------------------------------------------------------------
|
|
||||||
virtual void requestPrintTicket(const QHash<QString, QVariant> & printingData) = 0;
|
|
||||||
|
|
||||||
|
|
||||||
// mandantory ATBAPP plugin methods:
|
|
||||||
virtual nsDeviceControllerInterface::PLUGIN_STATE getState() = 0;
|
|
||||||
virtual const QString & getLastError() = 0;
|
|
||||||
virtual const QString & getLastErrorDescription() = 0;
|
|
||||||
|
|
||||||
// return a plugin description in JSON or XML
|
|
||||||
// -> ATBAPPplugin::getPluginInfo()
|
|
||||||
|
|
||||||
// helpers e.g. for debug / log
|
|
||||||
virtual const QString getString(nsDeviceControllerInterface::RESULT_STATE resultState) = 0;
|
|
||||||
|
|
||||||
|
|
||||||
signals:
|
|
||||||
virtual void printTicketFinished(nsDeviceControllerInterface::RESULT_STATE resultState,
|
|
||||||
const QString & errorCode,
|
|
||||||
const QString & errorDescription) = 0;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* emitted on e.g. a coin input
|
|
||||||
*/
|
|
||||||
virtual void cashInputEvent(nsDeviceControllerInterface::RESULT_STATE resultState,
|
|
||||||
nsDeviceControllerInterface::CASH_STATE cashState,
|
|
||||||
const QString & newCashValue,
|
|
||||||
/* additional variables? */
|
|
||||||
const QString & errorCode,
|
|
||||||
const QString & errorDescription) = 0;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* emitted if cashInput has been stopped, e.g. in result to task requestStopCashInput():
|
|
||||||
* -> shutter is blocked
|
|
||||||
* -> no cash input is possible
|
|
||||||
* -> coins are in cache
|
|
||||||
*/
|
|
||||||
virtual void cashInputFinished(nsDeviceControllerInterface::RESULT_STATE resultState,
|
|
||||||
const QString & newCashValue,
|
|
||||||
/* additional variables? */
|
|
||||||
const QString & errorCode,
|
|
||||||
const QString & errorDescription) = 0;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* emitted e.g. if service door is opened
|
|
||||||
*/
|
|
||||||
virtual void requestServiceMode() = 0;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* emitted on error
|
|
||||||
* depending on errorCode:
|
|
||||||
* -> interrupt selling process
|
|
||||||
* -> machine can go to state OOO
|
|
||||||
* -> send error event to ISMAS
|
|
||||||
* -> ...
|
|
||||||
*/
|
|
||||||
virtual void Error(
|
|
||||||
/* additional variables? */
|
|
||||||
const QString & errorCode,
|
|
||||||
const QString & errorDescription) = 0;
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
Q_DECLARE_INTERFACE(DeviceControllerInterface,
|
|
||||||
"eu.atb.ptu.plugin.DeviceControllerInterface/1.0")
|
|
||||||
|
|
||||||
|
|
||||||
namespace nsDeviceControllerInterface {
|
|
||||||
|
|
||||||
enum class PLUGIN_STATE : quint8 {
|
|
||||||
NOT_INITIALIZED = 0,
|
|
||||||
INITIALIZED = 1
|
|
||||||
};
|
|
||||||
|
|
||||||
enum class RESULT_STATE : quint8 {
|
|
||||||
SUCCESS = 1, // operation was successfull
|
|
||||||
ERROR_BACKEND, // error from backend (e.g. backend replies with error)
|
|
||||||
ERROR_TIMEOUT, // the operation timed out
|
|
||||||
ERROR_PROCESS, // internal plugin error, should not occur (this is a bug in implementation)
|
|
||||||
ERROR_RETRY, // retry operation
|
|
||||||
INFO // informational (e.g. display a message, log something etc.)
|
|
||||||
};
|
|
||||||
|
|
||||||
enum class CASH_STATE : quint8 {
|
|
||||||
CACHE_EMPTY, // Cache still empty, default state
|
|
||||||
CACHE_INPUT, // Coins are in Cache
|
|
||||||
OVERPAYED,
|
|
||||||
/* t.b.d. */
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif // DEVICECONTROLLERINTERFACE_H
|
|
||||||
@ -17,8 +17,6 @@ static uint16_t datif_OutCmdpara5;
|
|||||||
static uint32_t datif_OutCmdpara6;
|
static uint32_t datif_OutCmdpara6;
|
||||||
static uint8_t cycl_running;
|
static uint8_t cycl_running;
|
||||||
|
|
||||||
//static bool datif_DCdataValid;
|
|
||||||
|
|
||||||
T_datif::T_datif(QWidget *parent) : QMainWindow(parent)
|
T_datif::T_datif(QWidget *parent) : QMainWindow(parent)
|
||||||
{
|
{
|
||||||
|
|
||||||
@ -48,8 +46,6 @@ T_datif::T_datif(QWidget *parent) : QMainWindow(parent)
|
|||||||
dif_scanStep=0;
|
dif_scanStep=0;
|
||||||
selectedSlaveAddr=FIX_SLAVE_ADDR;
|
selectedSlaveAddr=FIX_SLAVE_ADDR;
|
||||||
cycl_running=0;
|
cycl_running=0;
|
||||||
//datif_DCdataValid=0;
|
|
||||||
gpi_storeDcDataValid(0);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void T_datif::resetChain(void)
|
void T_datif::resetChain(void)
|
||||||
@ -1482,10 +1478,6 @@ char T_datif::loadRecDataFromFrame()
|
|||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (RdDleng>40)
|
|
||||||
//datif_DCdataValid=1; // das hier sind die wichtigsten Daten, deshalb hierrein!
|
|
||||||
gpi_storeDcDataValid(1);
|
|
||||||
|
|
||||||
gpi_storeDynMachineConditions(RdDleng, receivedData);
|
gpi_storeDynMachineConditions(RdDleng, receivedData);
|
||||||
|
|
||||||
prnResult=receivedData[52];
|
prnResult=receivedData[52];
|
||||||
|
|||||||
@ -1,25 +0,0 @@
|
|||||||
|
|
||||||
#include <stdint.h>
|
|
||||||
#include "hwChk.h"
|
|
||||||
|
|
||||||
|
|
||||||
hwChk::hwChk(QWidget *parent) : QObject(parent)
|
|
||||||
{
|
|
||||||
|
|
||||||
// myDCIF = new T_prot();
|
|
||||||
// h: T_prot *myDCIF;
|
|
||||||
|
|
||||||
//myDatif = new T_datif();
|
|
||||||
HWaccess = new hwinf();
|
|
||||||
|
|
||||||
struct T_moduleCondition dcModCond;
|
|
||||||
sys_getDeviceConditions(dcModCond);
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
hwChk::~hwChk()
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -24,6 +24,7 @@
|
|||||||
#include "shared_mem_buffer.h"
|
#include "shared_mem_buffer.h"
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
#include <QSharedMemory>
|
#include <QSharedMemory>
|
||||||
|
|
||||||
#include "interfaces.h"
|
#include "interfaces.h"
|
||||||
|
|
||||||
static uint32_t hwapi_lastStartAmount;
|
static uint32_t hwapi_lastStartAmount;
|
||||||
@ -33,7 +34,7 @@ static const QMap<QString, int> baudrateMap = {
|
|||||||
{"57600" , 4}, {"115200" , 5}
|
{"57600" , 4}, {"115200" , 5}
|
||||||
};
|
};
|
||||||
|
|
||||||
hwapi::hwapi(QObject *parent) : QObject(parent) {
|
hwapi::hwapi(QWidget *parent) : QObject(parent) {
|
||||||
// create or attach shared memory segment
|
// create or attach shared memory segment
|
||||||
// !!! The compoment creating the shared memory MUST be ATBQT !!!
|
// !!! The compoment creating the shared memory MUST be ATBQT !!!
|
||||||
m_sharedMem = SharedMemBuffer::getShm(sizeof(SharedMemBuffer));
|
m_sharedMem = SharedMemBuffer::getShm(sizeof(SharedMemBuffer));
|
||||||
@ -1651,6 +1652,20 @@ uint8_t hwapi::coin_escrowFlapOpened(void) const
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// ------------------------------------------------------------------------------
|
||||||
|
// Level4 devices are operated by DC
|
||||||
|
// processes with more then one devices
|
||||||
|
// timer controlled or long term processes
|
||||||
|
// ------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void hwapi::sendDeviceSettings(uint8_t kindOfPrinter, uint8_t kindOfCoinChecker,
|
void hwapi::sendDeviceSettings(uint8_t kindOfPrinter, uint8_t kindOfCoinChecker,
|
||||||
uint8_t kindOfMifareReader, uint8_t suppressSleep,
|
uint8_t kindOfMifareReader, uint8_t suppressSleep,
|
||||||
uint8_t kindOfModem, uint8_t kindOfCredit) const
|
uint8_t kindOfModem, uint8_t kindOfCredit) const
|
||||||
@ -3516,17 +3531,12 @@ bool hwapi::prn_sendDynamicPrnValues(uint8_t *dynPrnVal ) const
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool hwapi::prn_printTemplate(uint8_t nrOftemplate) const
|
bool hwapi::prn_printTemplate(uint8_t nrOftemplate) const
|
||||||
// print one of the templates loaded by Json prior
|
// print one of the templates loaded by Json prior
|
||||||
// nr = 1..32
|
// nr = 1..32
|
||||||
{
|
{
|
||||||
// return true if sending, false if cmd-stack is full
|
// return true if sending, false if cmd-stack is full
|
||||||
|
return sendFDcmd_set(152, 0,0, nrOftemplate,0,0,0);
|
||||||
// 3.5.23: die dynVals und alle templates sollen am stück gesendet
|
|
||||||
uint8_t data[64];
|
|
||||||
data[0]=nrOftemplate;
|
|
||||||
return longFDcmd_set(152, 0,0, 1, data);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void hwapi::log_getHoldAccountNumbers(uint8_t *nrOfVals, uint16_t *accNr ) const
|
void hwapi::log_getHoldAccountNumbers(uint8_t *nrOfVals, uint16_t *accNr ) const
|
||||||
@ -3707,20 +3717,6 @@ uint64_t hwapi::sys_getWakeSource(void) const
|
|||||||
return epi_getWakeSources();
|
return epi_getWakeSources();
|
||||||
}
|
}
|
||||||
|
|
||||||
uint8_t hwapi::sys_getWakeReason(void) const
|
|
||||||
{
|
|
||||||
// Master was woken by following reason:
|
|
||||||
// 1: MDB Event
|
|
||||||
// 2: Coin Event
|
|
||||||
// ( 3: Master Event) - will not set the wake line
|
|
||||||
// ( 4: 32s pulse) - will not set the wake line
|
|
||||||
// 5: Door Event
|
|
||||||
// ( 6: Diag Event) - will not set the wake line
|
|
||||||
// 7: 30min-Pulse for HB
|
|
||||||
|
|
||||||
return epi_getWakeReason();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void hwapi::sys_getDeviceConditions(uint8_t *leng, uint8_t *data) const
|
void hwapi::sys_getDeviceConditions(uint8_t *leng, uint8_t *data) const
|
||||||
{
|
{
|
||||||
@ -3856,209 +3852,3 @@ uint8_t hwapi::prn_getCurrentPrinterState() const
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// 21.4.23TS: change function "sendDeviceSettings()" to use this struct: "struct T_devices"
|
|
||||||
void hwapi::sys_sendDeviceParameter(struct T_devices *deviceSettings) const
|
|
||||||
{
|
|
||||||
// same as "sendDeviceSettings()" but with much more data
|
|
||||||
uint8_t buf[64];
|
|
||||||
uint16_t LL, nn;
|
|
||||||
tslib_strclr(buf,0,64);
|
|
||||||
uint8_t *start;
|
|
||||||
|
|
||||||
// den gesamten struct in einen Puffer kopieren
|
|
||||||
LL=sizeof(struct T_devices);
|
|
||||||
start = &deviceSettings->kindOfPrinter;
|
|
||||||
nn=0;
|
|
||||||
do
|
|
||||||
{
|
|
||||||
buf[nn] = *start;
|
|
||||||
start++;
|
|
||||||
} while(++nn<LL);
|
|
||||||
|
|
||||||
epi_store64BdevParameter(LL,buf); // this buffer holds the device settings to be used here in hwapi
|
|
||||||
epi_store64ByteSendData(LL, buf); // this buffer holds sending data temporarely
|
|
||||||
sendWRcmd_setSendCommand0(SENDDIRCMD_DEVICE_PARA);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
void hwapi::sys_restoreDeviceParameter(struct T_devices *deviceSettings) const
|
|
||||||
{
|
|
||||||
uint8_t buf[64];
|
|
||||||
uint8_t LL, nn;
|
|
||||||
tslib_strclr(buf,0,64);
|
|
||||||
uint8_t *start;
|
|
||||||
|
|
||||||
epi_restore64BdevParameter(&LL, buf);
|
|
||||||
|
|
||||||
// Puffer in struct eintragen:
|
|
||||||
start = &deviceSettings->kindOfPrinter;
|
|
||||||
nn=0;
|
|
||||||
do
|
|
||||||
{
|
|
||||||
*start = buf[nn];
|
|
||||||
start++;
|
|
||||||
} while(++nn<LL);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------------------------------
|
|
||||||
// ------------ supervise all hardware components
|
|
||||||
// ------------ assess the machine state
|
|
||||||
|
|
||||||
1. check if DC startup test is through, retrigger if not
|
|
||||||
2. get results and find errors
|
|
||||||
3. in case of error check if component is used (e.g. billreader is seldom used)
|
|
||||||
4: check doors
|
|
||||||
5. return value: 0: no response from DC
|
|
||||||
1: no Test results and Test not running. need retrigger!
|
|
||||||
2: state not clear by now, test ongoing, wait
|
|
||||||
3: Service or battery door is open, goto INTRUSION MODE
|
|
||||||
from here: after valid ID-card goto SERVICE MODE
|
|
||||||
4: vault door is open, goto INTRUSION MODE
|
|
||||||
from here: after valid ID-card and vault door closed goto TEST MODE
|
|
||||||
in TEST MODE: complete system check decides if vending mode allowed
|
|
||||||
5: All doors are closed but errors found,
|
|
||||||
goto OOO MODE (out-of-order)
|
|
||||||
from here: run system test until problem is fixed
|
|
||||||
6: All doors are closed, no error, maybe warnings,
|
|
||||||
goto VENDING MODE (normal operation)
|
|
||||||
(priority sinks from 0 to 6)
|
|
||||||
|
|
||||||
--------------------------------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
uint8_t hwapi::sys_componentAssessment(void) const
|
|
||||||
{
|
|
||||||
// this function decides if vending mode is possible, independant from door
|
|
||||||
// return >0 in case of error
|
|
||||||
// is inncluded in sys_superviseSystem
|
|
||||||
|
|
||||||
struct T_moduleCondition *modCond=0;
|
|
||||||
sys_getDeviceConditions(modCond);
|
|
||||||
|
|
||||||
struct T_dynamicCondition *dynMaCond=0;
|
|
||||||
sys_getDynMachineConditions(dynMaCond);
|
|
||||||
|
|
||||||
struct T_devices *devPara=0;
|
|
||||||
sys_restoreDeviceParameter(devPara);
|
|
||||||
|
|
||||||
if (modCond->rtc>=200)
|
|
||||||
return 1;
|
|
||||||
if (modCond->printer==200 || modCond->printer==201) // 200: not connected 201: printer-HW-error 202: no paper
|
|
||||||
return 2;
|
|
||||||
if (modCond->printer==202)
|
|
||||||
return 3;
|
|
||||||
|
|
||||||
if (modCond->coinBlocker>=200)
|
|
||||||
return 4;
|
|
||||||
if (modCond->mdbBus>=200)
|
|
||||||
return 5;
|
|
||||||
if (modCond->intEe>=200)
|
|
||||||
return 6;
|
|
||||||
|
|
||||||
if (devPara->kindOfCoinChecker==1 || devPara->kindOfCoinChecker==2) // 0: without 1=EMP820 2=EMP900 3=currenza c² (MW)
|
|
||||||
{
|
|
||||||
if (modCond->coinChecker>=200 || modCond->coinEscrow>=200)
|
|
||||||
{
|
|
||||||
// Fehler Münzver.
|
|
||||||
return 7;
|
|
||||||
}
|
|
||||||
if (modCond->coinSafe>200) // 200: kasse fehlt 201: voll 100:fast voll 1:ok
|
|
||||||
{
|
|
||||||
return 8;
|
|
||||||
}
|
|
||||||
} else
|
|
||||||
if (devPara->kindOfCoinChecker==3)
|
|
||||||
{
|
|
||||||
if (modCond->changer>=200)
|
|
||||||
{
|
|
||||||
// Fehler Münzver.
|
|
||||||
return 7;
|
|
||||||
}
|
|
||||||
if (modCond->coinSafe>200) // 200: kasse fehlt 201: voll 100:fast voll 1:ok
|
|
||||||
{
|
|
||||||
return 8;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( modCond->billReader>=200 && devPara->BillAcceptor>0)
|
|
||||||
{
|
|
||||||
// Fehler BNA
|
|
||||||
return 9;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (dynMaCond->onAlarm>0)
|
|
||||||
return 10;
|
|
||||||
|
|
||||||
if (dynMaCond->modeAbrech>0)
|
|
||||||
return 11;
|
|
||||||
|
|
||||||
if (dynMaCond->nowCardTest>0)
|
|
||||||
return 12;
|
|
||||||
|
|
||||||
if (dynMaCond->startupTestIsRunning>0)
|
|
||||||
return 13;
|
|
||||||
|
|
||||||
if (modCond->voltage>=200)
|
|
||||||
return 14;
|
|
||||||
if (modCond->temper>=200)
|
|
||||||
return 15;
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// retrigger System-Check with:
|
|
||||||
// bool hwapi::sys_runCompleteTest(void) const
|
|
||||||
|
|
||||||
|
|
||||||
uint8_t hwapi::sys_superviseSystem(void) const
|
|
||||||
{
|
|
||||||
// this function proofs if vending is possible depending of doors state
|
|
||||||
|
|
||||||
struct T_dynamicCondition *dynMaCond=0;
|
|
||||||
struct T_moduleCondition *modCond=0;
|
|
||||||
|
|
||||||
if (!gpi_areDcDataValid())
|
|
||||||
{
|
|
||||||
// es gibt keinerlei gültige Daten vom DC
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
// jetzt sind die DC-Daten aktuell, also reinholen:
|
|
||||||
sys_getDynMachineConditions(dynMaCond);
|
|
||||||
sys_getDeviceConditions(modCond);
|
|
||||||
|
|
||||||
if (!modCond->allModulesChecked)
|
|
||||||
{
|
|
||||||
// noch keine Testergebnisse
|
|
||||||
if (dynMaCond->startupTestIsRunning)
|
|
||||||
return 2; // Starttest läuft gerade
|
|
||||||
else
|
|
||||||
return 1; // Starttest ist noch nicht gelaufen
|
|
||||||
}
|
|
||||||
|
|
||||||
// all doors: 99: undefined 0:closed 1:open
|
|
||||||
if (dynMaCond->lowerDoor || dynMaCond->upperDoor)
|
|
||||||
return 3;
|
|
||||||
if (dynMaCond->middleDoor)
|
|
||||||
return 4;
|
|
||||||
|
|
||||||
if (sys_componentAssessment() >0)
|
|
||||||
return 5; // errors found
|
|
||||||
|
|
||||||
return 6; // everything fine
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
uint8_t hwapi::sys_getSystemErrors(void) const
|
|
||||||
{
|
|
||||||
|
|
||||||
return sys_componentAssessment();
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -671,34 +671,3 @@ uint8_t check4freeFDlongCmd(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
static uint8_t Sdata_DeviceParameter[64];
|
|
||||||
static uint8_t Sdata_DevParaLen;
|
|
||||||
|
|
||||||
uint8_t epi_store64BdevParameter(uint8_t length, uint8_t *buf)
|
|
||||||
{
|
|
||||||
// HWapi writes data to be stored
|
|
||||||
uint8_t nn;
|
|
||||||
for (nn=0; nn<length; nn++)
|
|
||||||
Sdata_DeviceParameter[nn]=buf[nn];
|
|
||||||
for (nn=length; nn<64; nn++)
|
|
||||||
Sdata_DeviceParameter[nn]=0;
|
|
||||||
|
|
||||||
Sdata_DevParaLen=length;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
uint8_t epi_restore64BdevParameter(uint8_t *length, uint8_t *buf)
|
|
||||||
{
|
|
||||||
|
|
||||||
for (uint8_t nn=0; nn<Sdata_DevParaLen; nn++)
|
|
||||||
buf[nn]=Sdata_DeviceParameter[nn];
|
|
||||||
*length=Sdata_DevParaLen;
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1172,26 +1172,17 @@ bool epi_CurrentPaymentGetAllCoins(uint16_t *types, uint16_t *values) {
|
|||||||
|
|
||||||
void gpi_storeWakeSources(uint8_t const *receivedData) {
|
void gpi_storeWakeSources(uint8_t const *receivedData) {
|
||||||
SharedMemBuffer::getData()->store.wakeSrc = 0;
|
SharedMemBuffer::getData()->store.wakeSrc = 0;
|
||||||
for (int nn=5; nn>=0; nn--) {
|
for (int nn=7; nn>=0; nn--) {
|
||||||
uint8_t const uctmp = receivedData[nn];
|
uint8_t const uctmp = receivedData[nn];
|
||||||
SharedMemBuffer::getData()->store.wakeSrc |= uctmp;
|
SharedMemBuffer::getData()->store.wakeSrc |= uctmp;
|
||||||
SharedMemBuffer::getData()->store.wakeSrc <<= 8;
|
SharedMemBuffer::getData()->store.wakeSrc <<= 8;
|
||||||
}
|
}
|
||||||
SharedMemBuffer::getData()->store.wakeReason = receivedData[6];
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
uint64_t epi_getWakeSources(void) {
|
uint64_t epi_getWakeSources(void) {
|
||||||
return SharedMemBuffer::getDataConst()->store.wakeSrc;
|
return SharedMemBuffer::getDataConst()->store.wakeSrc;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint8_t epi_getWakeReason(void)
|
|
||||||
{
|
|
||||||
return SharedMemBuffer::getDataConst()->store.wakeReason;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void gpi_storeExtendedTime(uint8_t leng, uint8_t const *data) {
|
void gpi_storeExtendedTime(uint8_t leng, uint8_t const *data) {
|
||||||
leng = std::min(leng, (uint8_t)(64));
|
leng = std::min(leng, (uint8_t)(64));
|
||||||
SharedMemBuffer::getData()->store.rbDevParamLen = leng;
|
SharedMemBuffer::getData()->store.rbDevParamLen = leng;
|
||||||
@ -1312,25 +1303,3 @@ uint32_t epi_getCashBoxContent(void) {
|
|||||||
uint16_t epi_getNrOfCoinsInCashBox(void) {
|
uint16_t epi_getNrOfCoinsInCashBox(void) {
|
||||||
return SharedMemBuffer::getDataConst()->store.nrOfCoins;
|
return SharedMemBuffer::getDataConst()->store.nrOfCoins;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void gpi_storeDcDataValid(bool isVal)
|
|
||||||
{
|
|
||||||
SharedMemBuffer::getData()->store.dcDataValid = isVal;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
bool gpi_areDcDataValid()
|
|
||||||
{
|
|
||||||
return SharedMemBuffer::getDataConst()->store.dcDataValid;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
46
main.cpp
46
main.cpp
@ -25,9 +25,6 @@ static void updateBinary(std::unique_ptr<hwinf> hw, // update d2dc*.bin
|
|||||||
char const *baudrate,
|
char const *baudrate,
|
||||||
char const *serialInterface) {
|
char const *serialInterface) {
|
||||||
for (int i=0; i < 1;++i) {
|
for (int i=0; i < 1;++i) {
|
||||||
qDebug() << "file to send to DC ..." << fileToSendToDC;
|
|
||||||
qDebug() << "baudrate ............." << baudrate;
|
|
||||||
qDebug() << "serial interface ....." << serialInterface;
|
|
||||||
hw->dc_updateDC(fileToSendToDC, baudrate, serialInterface);
|
hw->dc_updateDC(fileToSendToDC, baudrate, serialInterface);
|
||||||
std::this_thread::sleep_for(std::chrono::milliseconds(3000));
|
std::this_thread::sleep_for(std::chrono::milliseconds(3000));
|
||||||
}
|
}
|
||||||
@ -38,14 +35,13 @@ static void updatePrinterConf(std::unique_ptr<hwinf> hw, // update printer-file
|
|||||||
QVector<int> nrOfTemplate,
|
QVector<int> nrOfTemplate,
|
||||||
QVector<QString> fileToSendToDC,
|
QVector<QString> fileToSendToDC,
|
||||||
QString br, QString serial) {
|
QString br, QString serial) {
|
||||||
// for (int i = 0; i < 1; ++i) {
|
for (int i=0; i < 1;++i) {
|
||||||
if (nrOfTemplate.size() == 1 && fileToSendToDC.size() == 1) {
|
//hw->dc_updatePrinterTemplate(hwapi::FileTypeJson::PRINTER,
|
||||||
hw->dc_updatePrinterTemplate(hwapi::FileTypeJson::PRINTER,
|
// nrOfTemplate, fileToSendToDC,
|
||||||
nrOfTemplate, fileToSendToDC,
|
// br, serial);
|
||||||
br, serial);
|
|
||||||
|
|
||||||
// hw->dc_printTemplate(hwapi::FileTypeJson::PRINTER,
|
hw->dc_printTemplate(hwapi::FileTypeJson::PRINTER,
|
||||||
// nrOfTemplate, br, serial);
|
nrOfTemplate, br, serial);
|
||||||
}
|
}
|
||||||
QCoreApplication::quit();
|
QCoreApplication::quit();
|
||||||
}
|
}
|
||||||
@ -60,7 +56,7 @@ int main(int argc, char *argv[]) {
|
|||||||
//setDebugLevel(QtMsgType::QtDebugMsg);
|
//setDebugLevel(QtMsgType::QtDebugMsg);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (argc != 2) {
|
if (argc > 2) {
|
||||||
qCritical() << "Usage: " << argv[0] << "<file to send to dc>";
|
qCritical() << "Usage: " << argv[0] << "<file to send to dc>";
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
@ -76,29 +72,17 @@ int main(int argc, char *argv[]) {
|
|||||||
ret = a.exec();
|
ret = a.exec();
|
||||||
t.join();
|
t.join();
|
||||||
} else {
|
} else {
|
||||||
if (fname.startsWith("DC2C_print") && fname.endsWith(".json")) {
|
QVector<QString> fnames{"DC2C_print01.json",
|
||||||
qDebug() << "downloading" << fname << "to dc...";
|
"DC2C_print02.json",
|
||||||
|
"DC2C_print03.json"};
|
||||||
QVector<QString> fnames;
|
QVector<int> templateIdx{1,2,3};
|
||||||
QVector<int> templateIdx;
|
//if (fname.startsWith("DC2C_print") && fname.endsWith(".json")) {
|
||||||
|
//int const nrOfTemplate = fname.midRef(10, 2).toInt();
|
||||||
int const nrOfTemplate = fname.midRef(10, 2).toInt();
|
std::thread t(updatePrinterConf, std::move(hw), templateIdx, fnames,
|
||||||
if (nrOfTemplate <= 0 && nrOfTemplate > 32) {
|
|
||||||
qCritical() << "wrong template number" << nrOfTemplate;
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
fnames.append(fname);
|
|
||||||
templateIdx.append(nrOfTemplate);
|
|
||||||
|
|
||||||
std::thread t(updatePrinterConf, std::move(hw),
|
|
||||||
templateIdx,
|
|
||||||
fnames,
|
|
||||||
"115200", SERIAL_PORT);
|
"115200", SERIAL_PORT);
|
||||||
|
|
||||||
ret = a.exec();
|
ret = a.exec();
|
||||||
t.join();
|
t.join();
|
||||||
}
|
//}
|
||||||
}
|
}
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user