Compare commits
80 Commits
75acd1e3ec
...
pu/coinInt
Author | SHA1 | Date | |
---|---|---|---|
ca5e43e0d7
|
|||
3ac91305d4
|
|||
d0445949d2
|
|||
91d9280a4a
|
|||
48d6a34b16
|
|||
e32142cd62
|
|||
f611e07dcf
|
|||
6478eda581
|
|||
1663d09d3a
|
|||
080c00eda1
|
|||
bbce2b02e3
|
|||
8ff17a2e00
|
|||
c6574280ac
|
|||
f0f0493d19
|
|||
9bf99c5515
|
|||
8ff8faf007
|
|||
09a80498e4
|
|||
21fb07b81c
|
|||
01f8c1e49c
|
|||
3029b8da04
|
|||
2143801900
|
|||
6f6d3b7491
|
|||
4cfb8f1804
|
|||
d992ee3fad | |||
b7d8fabfd0 | |||
7129805f4e | |||
01140c523b | |||
c99d0730ce | |||
81c610c48b | |||
6ae7c06d42 | |||
1eb2ac3a1d | |||
f3adba2f0f | |||
652ad9b43d | |||
c85b090306 | |||
87a6ed0795 | |||
99c88c7825 | |||
712ea0fc6e | |||
86311de486 | |||
cb4412779f | |||
a95e174356 | |||
c724b5b9fb | |||
ef7932102f | |||
a7aa75ae5f | |||
dc00c69b82 | |||
eeb35190e1 | |||
30338e24cc | |||
58fdea45f0 | |||
df760f1a52 | |||
3e3e1efe7d | |||
e5a8cfd1cd | |||
5e6e6017b3 | |||
f3d9c690b7 | |||
3f10469b8f | |||
d92bdbfb3e | |||
60c48588b0 | |||
ef48301dad | |||
5f7d34ef12 | |||
863e4b23a9 | |||
37f0012ce9 | |||
82accc4b1a | |||
c1b945225b | |||
debade9942 | |||
ffbe0dfc2e | |||
8f7d4a203d | |||
defe492ec6 | |||
002d58ba7b | |||
76f54cdc0c | |||
591fd89cb5 | |||
e7723f669f | |||
d0e1be11b6 | |||
f63798727f | |||
898f0a4af8 | |||
ed037b99c9 | |||
e4a2f8fce3 | |||
19befc2c58 | |||
7f23e3ea46 | |||
49396c22ee | |||
0b87f44e64 | |||
66b22a4233 | |||
ba5d23d8be |
41
.gitignore
vendored
Normal file
41
.gitignore
vendored
Normal file
@@ -0,0 +1,41 @@
|
||||
# C++ objects and libs
|
||||
|
||||
*.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
|
@@ -10,7 +10,8 @@ HEADERS += $${PWD}/include/com.h \
|
||||
$${PWD}/include/prot.h \
|
||||
$${PWD}/include/sendWRcmd.h \
|
||||
$${PWD}/include/storeINdata.h \
|
||||
$${PWD}/include/tslib.h
|
||||
$${PWD}/include/tslib.h \
|
||||
$${PWD}/include/shared_mem_buffer.h
|
||||
|
||||
SOURCES += $${PWD}/src/com.cpp \
|
||||
$${PWD}/src/controlBus.cpp \
|
||||
@@ -20,4 +21,5 @@ SOURCES += $${PWD}/src/com.cpp \
|
||||
$${PWD}/src/prot.cpp \
|
||||
$${PWD}/src/sendWRcmd.cpp \
|
||||
$${PWD}/src/storeINdata.cpp \
|
||||
$${PWD}/src/tslib.cpp
|
||||
$${PWD}/src/tslib.cpp \
|
||||
$${PWD}/src/shared_mem_buffer.cpp
|
||||
|
94
DCPlugin.pro
Normal file
94
DCPlugin.pro
Normal file
@@ -0,0 +1,94 @@
|
||||
TEMPLATE = lib
|
||||
CONFIG += plugin
|
||||
#CONFIG += c++11 console
|
||||
#CONFIG -= app_bundle
|
||||
#QT += widgets
|
||||
QT -= gui
|
||||
QT += widgets serialport
|
||||
|
||||
INCLUDEPATH += $${PWD}/plugins
|
||||
INCLUDEPATH += $${PWD}/include
|
||||
|
||||
QMAKE_CXXFLAGS += -Wno-deprecated-copy
|
||||
|
||||
# default
|
||||
ARCH = PTU5
|
||||
|
||||
include(DCPlugin.pri)
|
||||
|
||||
contains( CONFIG, DesktopLinux ) {
|
||||
QMAKE_CC = ccache $$QMAKE_CC
|
||||
QMAKE_CXX = ccache $$QMAKE_CXX
|
||||
QMAKE_CXXFLAGS += -std=c++11
|
||||
# QMAKE_CXXFLAGS += -Wno-deprecated-ctor
|
||||
linux-clang { QMAKE_CXXFLAGS += -Qunused-arguments }
|
||||
ARCH = DesktopLinux
|
||||
}
|
||||
|
||||
contains( CONFIG, PTU5 ) {
|
||||
# QMAKE_CC = ccache $$QMAKE_CC
|
||||
# QMAKE_CXX = ccache $$QMAKE_CXX
|
||||
QMAKE_CXXFLAGS += -std=c++11
|
||||
linux-clang { QMAKE_CXXFLAGS += -Qunused-arguments }
|
||||
CONFIG += link_pkgconfig
|
||||
ARCH = PTU5
|
||||
}
|
||||
|
||||
contains( CONFIG, PTU5_YOCTO ) {
|
||||
greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
|
||||
PTU5BASEPATH = /opt/devel/ptu5
|
||||
ARCH = PTU5
|
||||
|
||||
# add qmqtt lib
|
||||
#LIBS += -lQt5Qmqtt
|
||||
}
|
||||
|
||||
TARGET = ATBDeviceControllerPlugin
|
||||
#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
|
||||
# any Qt feature that has been marked deprecated (the exact warnings
|
||||
# depend on your compiler). Please consult the documentation of the
|
||||
# deprecated API in order to know how to port your code away from it.
|
||||
DEFINES += QT_DEPRECATED_WARNINGS
|
||||
|
||||
# You can also make your code fail to compile if it uses deprecated APIs.
|
||||
# In order to do so, uncomment the following line.
|
||||
# You can also select to disable deprecated APIs only up to a certain version of Qt.
|
||||
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
|
||||
|
||||
|
||||
|
||||
# Default rules for deployment.
|
||||
#qnx: target.path = /tmp/$${TARGET}/bin
|
||||
#else: unix:!android: target.path = /opt/$${TARGET}/bin
|
||||
#!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
|
155
generate-version.sh
Executable file
155
generate-version.sh
Executable file
@@ -0,0 +1,155 @@
|
||||
#!/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}
|
||||
|
||||
|
||||
|
||||
|
||||
|
@@ -33,7 +33,7 @@ class T_com : public QMainWindow //, public QPlainTextEdit
|
||||
//char oeffneSerialPort();
|
||||
char open_Serial_Port();
|
||||
void closeSerialPort();
|
||||
|
||||
void receiveByLength(void);
|
||||
|
||||
private slots:
|
||||
void readSomeBytes(void);
|
||||
@@ -54,6 +54,8 @@ public:
|
||||
|
||||
void writeToSerial(const QByteArray &data, uint16_t sendLength);
|
||||
|
||||
void receiveFixLen(int64_t nrOfbytesToReceive);
|
||||
|
||||
bool readFromSerial(QByteArray &data, uint16_t &sendLength);
|
||||
// retval: true: data available
|
||||
|
||||
|
@@ -170,7 +170,7 @@ uint8_t epi_getResultOfLastRequest();
|
||||
// retval: 0: in progress 1: OK 2: error
|
||||
|
||||
|
||||
void gpi_storeRecPayLoad(uint8_t RdDlen, uint8_t *receivedData);
|
||||
void gpi_storeRecPayLoad(uint8_t RdDlen, uint8_t const *receivedData);
|
||||
// stored by Datif
|
||||
|
||||
uint16_t epi_getLastPayLoad(uint16_t plBufSiz, uint8_t *payLoad);
|
||||
|
126
include/datIf.h
126
include/datIf.h
@@ -21,6 +21,115 @@
|
||||
#include <QTime>
|
||||
|
||||
|
||||
|
||||
#define CMD2DC_sendTime 20
|
||||
#define CMD2DC_setWakeFrequ 112
|
||||
#define CMD2DC_MOV_UPLOCK 113
|
||||
#define CMD2DC_MOV_DNLOCK 114
|
||||
#define CMD2DC_UPPER_DOOR 115
|
||||
#define CMD2DC_LOWER_DOOR 116
|
||||
#define CMD2DC_VAULT_DOOR 117
|
||||
#define CMD2DC_REJMOT_ON 118
|
||||
#define CMD2DC_REJMOT_RUN 119
|
||||
#define CMD2DC_LED_COIN 100
|
||||
#define CMD2DC_LED_ILLU 101
|
||||
#define CMD2DC_LED_TICKET 102
|
||||
#define CMD2DC_LED_START 104
|
||||
#define CMD2DC_LED_PIN 103
|
||||
#define CMD2DC_LED_IN 105
|
||||
#define CMD2DC_FAN 106
|
||||
#define CMD2DC_SIREN 107
|
||||
#define CMD2DC_BARRIER 108
|
||||
#define CMD2DC_WAKEPTU 109
|
||||
#define CMD2DC_SWITCHAUXPWR 110
|
||||
#define CMD2DC_SWITCHAUXDDR 18
|
||||
#define CMD2DC_SWITCHAUXOUT 19
|
||||
#define CMD2DC_UCONTACTON 111
|
||||
#define CMD2DC_DEVICE_PARAM 23
|
||||
#define CMD2DC_SEND_MACH_ID 11
|
||||
#define CMD2DC_RDBK_DEV_PARA 14
|
||||
|
||||
#define CMD2DC_RDBK_MACH_ID 15
|
||||
|
||||
#define CMD2DC_MDB_ON 120
|
||||
#define CMD2DC_MDB_GET_STATE 107 // REQ
|
||||
#define CMD2DC_MDB_DORESET 121
|
||||
#define CMD2DC_MDB_SETWAK 122
|
||||
//#define CMD2DC_MDB_GETWAK 0x2812 // REQ not nec.
|
||||
#define CMD2DC_MDB_SENDCMD 123
|
||||
#define CMD2DC_MDB_SENDMSG 12
|
||||
#define CMD2DC_MDB_GETRESP 22 // REQ
|
||||
|
||||
#define CMD2DC_EMP_SET 24
|
||||
#define CMD2DC_EMP_GET_ALL 23 // REQ
|
||||
#define CMD2DC_EMP_STARTPOLL 124
|
||||
#define CMD2DC_EMP_STARTPAY 125
|
||||
#define CMD2DC_EMP_STOPPAY 126
|
||||
#define CMD2DC_EMP_GOTCOIN 108 // REQ
|
||||
#define CMD2DC_SHUTTER_OPEN 129
|
||||
#define CMD2DC_ESCR_OPEN 132
|
||||
#define CMD2DC_ESCR_TAKE 133
|
||||
#define CMD2DC_ESCR_RETURN 134
|
||||
#define CMD2DC_MOD_ON 135
|
||||
#define CMD2DC_MOD_WAK 136
|
||||
#define CMD2DC_CRED_ON 137
|
||||
#define CMD2DC_CRED_WAK 138
|
||||
|
||||
// READ Commands ((e.g. get input)
|
||||
#define CMD2DC_TestSerial 10
|
||||
#define CMD2DC_GetSerialConfig 105
|
||||
#define CMD2DC_RdBkHWversion 11
|
||||
#define CMD2DC_RdBkSWversion 12
|
||||
#define CMD2DC_RdBkDCstate 101
|
||||
#define CMD2DC_RdBkUID 18
|
||||
#define CMD2DC_RdBkTime 104
|
||||
#define CMD2DC_RdBkAnalog 106
|
||||
#define CMD2DC_GetAllInputs 102
|
||||
#define CMD2DC_RdBkAllOutputs 103
|
||||
#define CMD2DC_MIFREADERON 127
|
||||
#define CMD2DC_ATB_CREATE 128
|
||||
|
||||
|
||||
|
||||
|
||||
// Mif read data:
|
||||
#define CMD2DC_RdBk_MifState 109
|
||||
#define CMD2DC_RdBk_MifData 24
|
||||
|
||||
|
||||
|
||||
|
||||
#define CMD2DC_RdBk_AtbCardType 25
|
||||
#define CMD2DC_SHUTTER_COIN 131
|
||||
#define CMD2DC_SHUTTER_OPEN3S 130
|
||||
#define CMD2DC_SEND_SHUT_TIME 0x2915
|
||||
#define CMD2DC_ESCR_TAKE 133
|
||||
#define CMD2DC_ESCR_RETURN 134
|
||||
#define CMD2DC_PRINTERON 139
|
||||
#define CMD2DC_RdBk_PrnState 110
|
||||
#define CMD2DC_RdBk_PrnFonts 26
|
||||
#define CMD2DC_RdBk_AllPrnData 27
|
||||
// nr of params:
|
||||
#define CMD2DC_PRI_SYS_CMD 25 // 3
|
||||
#define CMD2DC_PRI_ESC_CMD 26 // 4
|
||||
#define CMD2DC_PRI_SETUP 27 // 5
|
||||
#define CMD2DC_PRI_MOVE 140 // 2
|
||||
#define CMD2DC_PRI_SETFONT 141 // 4
|
||||
#define CMD2DC_PRI_SETLETTER 142 // 3
|
||||
#define CMD2DC_PRI_CUT 143 // 1
|
||||
#define CMD2DC_PRI_PRINT_TXT 13 // 64
|
||||
#define CMD2DC_PRI_LF 144 // 1
|
||||
#define CMD2DC_PRI_PRIFONTTABLE 145
|
||||
#define CMD2DC_PRI_BARCODE 14 // ca 15...25
|
||||
#define CMD2DC_STOR_QR_DATA 15 // 150
|
||||
#define CMD2DC_PRI_QR_CODE 146 // 0
|
||||
#define CMD2DC_PRI_LOGOFROMFLASH 147 // 2
|
||||
#define CMD2DC_PRI_STORE_DOC 16 // 1
|
||||
#define CMD2DC_PRI_DOCUMENT_NR 17 // 1 + 64
|
||||
#define CMD2DC_PRI_CLEAR_DOC 148 // 1
|
||||
|
||||
|
||||
/*
|
||||
// WRITE Commands (e.g. switch relay)
|
||||
#define CMD2DC_sendTime 0x1310
|
||||
#define CMD2DC_setWakeFrequ 0x1320
|
||||
@@ -110,8 +219,8 @@
|
||||
#define CMD2DC_MIFREADERON 0x2900
|
||||
#define CMD2DC_ATB_CREATE 0x2907
|
||||
// Mif read data:
|
||||
#define CMD2DC_RdBk_MifReader 0x2902
|
||||
#define CMD2DC_RdBk_Mifcard 0x2903
|
||||
#define CMD2DC_RdBk_MifState 0x2902
|
||||
#define CMD2DC_RdBk_MifData 0x2903
|
||||
#define CMD2DC_RdBk_AtbCardType 0x2905
|
||||
//#define CMD2DC_RdBk_CardData 0x2906
|
||||
|
||||
@@ -157,7 +266,7 @@
|
||||
#define CMD2DC_PRI_DOCUMENT_NR 0x2A42 // 1 + 64
|
||||
#define CMD2DC_PRI_CLEAR_DOC 0x2A43 // 1
|
||||
|
||||
|
||||
*/
|
||||
|
||||
|
||||
|
||||
@@ -199,6 +308,8 @@ class T_datif : public QMainWindow
|
||||
QTimer *datif_trigger;
|
||||
uint8_t selectedSlaveAddr;
|
||||
|
||||
int datif_noResponseCtr;
|
||||
|
||||
private slots:
|
||||
char datif_cycleSend();
|
||||
void StoredRecData();
|
||||
@@ -206,18 +317,27 @@ private slots:
|
||||
public:
|
||||
T_datif(QWidget *parent = nullptr);
|
||||
|
||||
T_prot *getProt() { return myDCIF; }
|
||||
T_prot const *getProt() const { return myDCIF; }
|
||||
|
||||
void resetChain(void);
|
||||
char isPortOpen(void);
|
||||
void sendWRcommand(uint16_t nxtAsCmd);
|
||||
// Sende Schreibbefehle die bereits vorher asynchron gespeichert wurden
|
||||
void send_requests(uint16_t nextWrCmd);
|
||||
void sendHighLevel(uint16_t nxtHLCmd);
|
||||
bool areDataValid(void);
|
||||
|
||||
signals:
|
||||
void ResponseRecieved();
|
||||
//the requested data are stored in peripheral image
|
||||
// can be loaded with epi
|
||||
|
||||
void datif_templatePrintFinished_OK();
|
||||
void datif_templatePrintFinished_Err();
|
||||
|
||||
void datif_gotNewCoin();
|
||||
|
||||
};
|
||||
|
||||
#endif // CI_H
|
||||
|
@@ -62,6 +62,12 @@ uint8_t dcBL_startChain(void);
|
||||
|
||||
uint8_t dcBL_runChain(void);
|
||||
|
||||
void dcBL_iniLoading(void);
|
||||
|
||||
void dcBL_startLoading(void);
|
||||
|
||||
uint8_t dcBL_sendHexfile(void);
|
||||
|
||||
|
||||
uint8_t dcBL_getResult(void);
|
||||
// call after every step to what's going on....
|
||||
@@ -85,8 +91,11 @@ QString epi_getRawReceivedString();
|
||||
void epi_clrRawReceivedString();
|
||||
|
||||
|
||||
uint8_t dcBL_sendSuccess(uint8_t lastCommand);
|
||||
// return val: 0: no response by now 1:error 10: OK
|
||||
// lastCommand=0x21 for sendAddr or 0x22 for send data
|
||||
|
||||
|
||||
char dcBL_loadBinary(char withDisplay);
|
||||
|
||||
|
||||
|
||||
|
35
include/hwChk.h
Executable file
35
include/hwChk.h
Executable file
@@ -0,0 +1,35 @@
|
||||
|
||||
#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
|
2467
include/hwapi.h
2467
include/hwapi.h
File diff suppressed because it is too large
Load Diff
2575
include/interfaces.h
2575
include/interfaces.h
File diff suppressed because it is too large
Load Diff
@@ -26,6 +26,23 @@
|
||||
#define FRAME_MAXLEN FRAME_DATALEN+20
|
||||
#define BL_DATA_LEN 150
|
||||
|
||||
#define DATALEN_SEND_FAST 4
|
||||
#define DATALEN_SEND_LONG 64
|
||||
#define HEADERLEN_SEND 4
|
||||
#define TELEGRAMLEN_SEND_FAST 12
|
||||
#define TELEGRAMLEN_SEND_LONG 70
|
||||
#define STARTSIGN_SEND_FAST 0x3F
|
||||
#define STARTSIGN_SEND_LONG 0x3D
|
||||
|
||||
#define DATALEN_RECEIVE_FAST 8
|
||||
#define DATALEN_RECEIVE_LONG 64
|
||||
#define HEADERLEN_RECEIVE 2
|
||||
#define TELEGRAMLEN_RECEIVE_FAST 12
|
||||
#define TELEGRAMLEN_RECEIVE_LONG 68
|
||||
#define STARTSIGN_RECEIVE_FAST 0x5F
|
||||
#define STARTSIGN_RECEIVE_LONG 0x5D
|
||||
|
||||
|
||||
class T_prot : public QMainWindow
|
||||
{
|
||||
Q_OBJECT
|
||||
@@ -62,14 +79,23 @@ class T_prot : public QMainWindow
|
||||
T_com *mySerialPort;
|
||||
|
||||
void startPacking(void);
|
||||
void startFastPacking(void);
|
||||
uint8_t FramecheckInData(uint8_t *Inbuf, uint16_t LL);
|
||||
uint8_t FastCheckInData(uint8_t *Inbuf, uint16_t LL);
|
||||
|
||||
uint8_t CheckInResult(uint8_t *Inbuf);
|
||||
uint8_t CheckInData(uint8_t *recBuffer);
|
||||
|
||||
uint8_t ShowFastInData(uint8_t *recBuffer);
|
||||
uint8_t ShowInData(uint8_t *recBuffer); // was CheckInData
|
||||
void setRecLen(uint16_t WriteCmd);
|
||||
|
||||
private slots:
|
||||
void analyseRecData(void);
|
||||
|
||||
public:
|
||||
T_com *getSerialPort() { return mySerialPort; }
|
||||
T_com const *getSerialPort() const { return mySerialPort; }
|
||||
|
||||
T_prot();
|
||||
bool isPortOpen(void);
|
||||
bool isSerialFree(void);
|
||||
@@ -87,6 +113,8 @@ public:
|
||||
|
||||
void setBLsendData( uint8_t len, uint8_t *buf);
|
||||
|
||||
void receiveFixLen(int64_t nrOfbytesToReceive);
|
||||
|
||||
void sendUserData(uint16_t slaveAdr);
|
||||
bool ifDataReceived();
|
||||
bool getReceivedInData(uint8_t *SlavAddr, uint16_t *readSrc, uint16_t *readAddr,
|
||||
|
@@ -73,10 +73,10 @@
|
||||
#define SEND_REQU_PRN_FONTS 121
|
||||
#define SEND_REQU_PRN_ALL 122
|
||||
|
||||
#define SEND_REQU_MIFREADER 123
|
||||
#define SEND_REQU_MIFSTATE 123
|
||||
// Type and state of reader
|
||||
|
||||
#define SEND_REQU_MIFCARD 124
|
||||
#define SEND_REQU_MIFDATA 124
|
||||
// Type, UID, Header of card
|
||||
// read one card sector
|
||||
// sectors must be addressed by RD_ADD
|
||||
@@ -211,6 +211,39 @@ uint8_t gpi_getUserOfSendingTextBuffer(uint8_t *para1, uint8_t *para2, uint8_t *
|
||||
// user=1: Text-Print is using this buffer
|
||||
// 2: QR-code-Printer is using this buffer
|
||||
|
||||
#define FDCMD_STACKDEPTH 16
|
||||
void sendFDcmd_clrStack(void);
|
||||
bool sendFDcmd_set(uint8_t nextWrCmd, uint8_t nextRdCmd, uint8_t blockNum, uint8_t dat1, uint8_t dat2, uint8_t dat3, uint8_t dat4);
|
||||
// write Command to memory, wait for transport
|
||||
bool sendFDcmd_get(uint8_t *nextWrCmd, uint8_t *nextRdCmd, uint8_t *blockNum, uint8_t *dat1, uint8_t *dat2, uint8_t *dat3, uint8_t *dat4);
|
||||
|
||||
uint8_t check4FDshortCmd(void);
|
||||
// returns number of waiting command, maxFDCMD_STACKDEPTH
|
||||
|
||||
uint8_t check4freeFDshortCmd(void);
|
||||
// returns number of free places in short-command stack
|
||||
|
||||
#define FDLONG_STACKDEPTH 16
|
||||
void longFDcmd_clrStack(void);
|
||||
bool longFDcmd_set(uint8_t nextWrCmd, uint8_t nextRdCmd, uint8_t blockNum, uint8_t length, uint8_t *data);
|
||||
// write Command to memory, wait for transport
|
||||
// data buffer size always 64! data[64], padded with 0
|
||||
bool longFDcmd_get(uint8_t *nextWrCmd, uint8_t *nextRdCmd, uint8_t *blockNum, uint8_t *length, uint8_t *data);
|
||||
|
||||
uint8_t check4FDlongCmd(void);
|
||||
// returns number of waiting command
|
||||
|
||||
uint8_t check4freeFDlongCmd(void);
|
||||
// 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
|
||||
|
||||
|
296
include/shared_mem_buffer.h
Normal file
296
include/shared_mem_buffer.h
Normal file
@@ -0,0 +1,296 @@
|
||||
#ifndef SHARED_MEM_BUFFER_INCLUDED_H
|
||||
#define SHARED_MEM_BUFFER_INCLUDED_H
|
||||
|
||||
#include <cinttypes>
|
||||
#include <atomic>
|
||||
|
||||
#include <QSharedMemory>
|
||||
|
||||
struct SharedMemBuffer {
|
||||
struct rs {
|
||||
char comportName[16]; // z.B. "COM48"
|
||||
char baudStr[16]; // z.B. "19200"
|
||||
int baudNr; // 0...5 oder -1
|
||||
uint8_t connect; // 0,1
|
||||
bool portIsOpen;
|
||||
} rs;
|
||||
|
||||
char AutoEmissionOn; // 1: zyklisch Anfragen zum Slave senden
|
||||
|
||||
struct datif {
|
||||
uint16_t sendingPeriod;
|
||||
bool sendingPer_changed;
|
||||
} datif;
|
||||
|
||||
#if 0
|
||||
// controlBus.cpp
|
||||
char txt4comStateLine[32];
|
||||
char txt4HsStateLine[32];
|
||||
char txt4masterStateLine[32];
|
||||
char txt4resultStateLine[32];
|
||||
char txt4dataLine[32];
|
||||
char txt4datifReceive[32];
|
||||
char txt4diagWindow[32];
|
||||
char sndTxt4diagWindow[32];
|
||||
bool Sdata_serialTestResult[32];
|
||||
uint8_t Sdata_pProtResultOk[32];
|
||||
uint16_t Sdata_receivedDataLength[32];
|
||||
uint8_t Sdata_receivedDataBlock[64];
|
||||
|
||||
// datif.cpp
|
||||
uint8_t dif_dataStep;
|
||||
uint8_t dif_scanStep;
|
||||
uint8_t RDBLKNR;
|
||||
uint8_t datif_OutCmdpara1;
|
||||
uint8_t datif_OutCmdpara2;
|
||||
uint8_t datif_OutCmdpara3;
|
||||
uint8_t datif_OutCmdpara4;
|
||||
|
||||
uint16_t datif_OutCmdpara5;
|
||||
uint32_t datif_OutCmdpara6;
|
||||
uint8_t cycl_running;
|
||||
|
||||
// dcBL.cpp
|
||||
uint8_t dcBL_LastBLcmd; // stored the last sent cmd in order to analys response
|
||||
uint8_t dcBL_AtbBinFile[300000];
|
||||
uint32_t dcBL_fileSize;
|
||||
uint16_t dcBL_nrOfBlocks;
|
||||
uint16_t dcBL_fileCrc;
|
||||
uint8_t dcBL_myBuf[300000]; // same content like "dcBL_AtbBinFile" but bytewise
|
||||
|
||||
char BlResp[50][32];
|
||||
uint8_t dcBL_step;
|
||||
uint8_t dcBL_state;
|
||||
uint16_t dcBL_BlkCtr;
|
||||
uint16_t dcBL_cyclCtr;
|
||||
uint16_t repeatCtr;
|
||||
uint8_t Sdata_rawData[150];
|
||||
uint8_t Sdata_LengthRawData;
|
||||
|
||||
// hwapi.cpp
|
||||
uint16_t hwapi_shutterTime;
|
||||
char ticketTemplate[1024];
|
||||
|
||||
// sendWRcmd.cpp
|
||||
uint16_t nextAsynchsendCmd0[16];
|
||||
uint8_t nrOfCmdsInQueue;
|
||||
uint16_t nextAsynchsendCmd4[8];
|
||||
uint8_t nextCmd4para1[8];
|
||||
uint8_t nextCmd4para2[8];
|
||||
uint8_t nextCmd4para3[8];
|
||||
uint8_t nextCmd4para4[8];
|
||||
uint8_t nrOfCmds4InQueue;
|
||||
uint16_t nextAsynchsendCmd8[4];
|
||||
uint8_t nextCmd8para1[4];
|
||||
uint8_t nextCmd8para2[4];
|
||||
uint16_t nextCmd8para3[4];
|
||||
uint32_t nextCmd8para4[4];
|
||||
uint8_t nrOfCmds8InQueue;
|
||||
uint8_t sendAsynchDataBuf[160]; // no stack, only ONE buffer
|
||||
uint8_t sendAsyDatLen;
|
||||
uint8_t Sdata_mdbSendBuffer[64];
|
||||
uint8_t Sdata_mdbSendLen;
|
||||
uint8_t prnDataParameters[4];
|
||||
uint8_t prnDataBufferUser;
|
||||
char Sdata_PRN_TEXT[20][64];
|
||||
uint8_t pPrnDataBuff; // points to next PRINTER_BLOCK
|
||||
uint8_t nextFDwrCmd[16];
|
||||
uint8_t nextFDrdCmd[16];
|
||||
uint8_t nextFDblkNr[16];
|
||||
|
||||
uint8_t nextFDpara1[16];
|
||||
uint8_t nextFDpara2[16];
|
||||
uint8_t nextFDpara3[16];
|
||||
uint8_t nextFDpara4[16];
|
||||
uint8_t p_nextFDcmdsInQueue;
|
||||
uint8_t longFDwrCmd[16];
|
||||
uint8_t longFDrdCmd[16];
|
||||
uint8_t longFDblkNr[16];
|
||||
uint8_t longFDlength[16];
|
||||
|
||||
uint8_t longFDpara[16][64];
|
||||
uint8_t p_longFDcmdsInQueue;
|
||||
|
||||
// storeInData.cpp
|
||||
bool indat_savePrnPwr;
|
||||
bool indat_saveMifPwr;
|
||||
bool indat_MdbIsOn;
|
||||
#endif
|
||||
|
||||
uint8_t ndbs;
|
||||
uint8_t pari;
|
||||
uint8_t nsb;
|
||||
uint8_t br;
|
||||
|
||||
#define MAXNROF_GENSTR 16
|
||||
char genStrings[MAXNROF_GENSTR][64];
|
||||
|
||||
#define MAXNROF_AI 4
|
||||
uint16_t AI_val[MAXNROF_AI];
|
||||
|
||||
struct DigitalInputs {
|
||||
uint8_t doorSwitch;
|
||||
uint8_t vaultSwitch;
|
||||
uint8_t lockSwitch;
|
||||
uint8_t opto;
|
||||
uint8_t aux;
|
||||
bool wakeFromPtu;
|
||||
bool wakeFromMdb;
|
||||
bool wakeFromModem;
|
||||
bool PrnReady;
|
||||
bool CoinAttach;
|
||||
bool CoinEscrowOpen;
|
||||
bool mifCardTap;
|
||||
bool contactPwrOn;
|
||||
bool mifarePwrOn;
|
||||
bool rdbk_mdbTxd;
|
||||
bool AuxPwrOn;
|
||||
bool gsmPwrOn;
|
||||
bool creditPwrOn;
|
||||
bool printerPwrOn;
|
||||
bool mdbPwrOn;
|
||||
bool rejMot_home;
|
||||
uint8_t npe_sensor;
|
||||
} din;
|
||||
|
||||
struct DigitalOutputs {
|
||||
uint8_t mbdRxTst;
|
||||
uint8_t motorBits;
|
||||
uint8_t serialSwitch; // serial drv on/off, Serial mux1, Serial mux2
|
||||
uint8_t ledsAndFan;
|
||||
uint8_t laermUndRelay;
|
||||
uint8_t ptuWake;
|
||||
uint8_t auxPower;
|
||||
uint8_t coinShutter;
|
||||
uint8_t coinEscrow;
|
||||
uint8_t printerPower;
|
||||
} dout;
|
||||
|
||||
struct Sdata {
|
||||
#define NROFMIFSTATEBYTES 40
|
||||
#define PRN_STATE_ARRAY_SIZE 20
|
||||
#define PRN_STATE_FONT_SIZE 20
|
||||
uint8_t MIF_STATE[NROFMIFSTATEBYTES];
|
||||
uint8_t MIF_DATA[12][64];
|
||||
uint8_t PRN_STATE[PRN_STATE_ARRAY_SIZE];
|
||||
uint8_t PRN_FONTS[PRN_STATE_FONT_SIZE];
|
||||
bool mdb_busRdy;
|
||||
bool mdb_V12on;
|
||||
bool mdb_V5on;
|
||||
uint8_t mdbNrOfRecData;
|
||||
uint8_t RecBuff[40];
|
||||
uint8_t empNrOfsettings;
|
||||
uint8_t emp_settingsBuff[66];
|
||||
uint8_t NrOfDeviceSetting;
|
||||
uint8_t DeviceSettingBuff[66];
|
||||
uint8_t NrOfMachineIDSetting;
|
||||
uint8_t NrOfMachineIDBuff[66];
|
||||
uint64_t slaveUID;
|
||||
uint8_t UIDstr[8];
|
||||
#define MAXNROF_MEASURE 4
|
||||
uint32_t measurement[MAXNROF_MEASURE];
|
||||
bool serialTestResult;
|
||||
uint8_t pProtResultOk;
|
||||
uint16_t receivedDataLength;
|
||||
uint8_t receivedDataBlock[64];
|
||||
} Sdata;
|
||||
|
||||
uint8_t mif_cardType;
|
||||
uint8_t mif_cardHolder[8];
|
||||
|
||||
#define MEMDEPTH_GOTCOINS (16)
|
||||
struct T_coin {
|
||||
uint8_t valid;
|
||||
uint8_t signal;
|
||||
uint8_t error;
|
||||
uint8_t pad;
|
||||
uint16_t value;
|
||||
} gotCoin[MEMDEPTH_GOTCOINS];
|
||||
uint8_t ctr_gotCoin;
|
||||
|
||||
struct store {
|
||||
uint32_t insertedAmount;
|
||||
uint16_t lastCoinType[64];
|
||||
uint16_t lastCoinValue[64];
|
||||
uint64_t wakeSrc;
|
||||
uint8_t rbDevParamLen;
|
||||
uint8_t rbDevParams[66];
|
||||
uint8_t deviceCondLen;
|
||||
uint8_t deviceCond[66];
|
||||
uint8_t machCondLen;
|
||||
uint8_t machCond[66];
|
||||
uint8_t DcBackupNrOfAccNr;
|
||||
uint16_t DcBackupAccNr[16]; // z.Z. nur 8
|
||||
uint8_t gotNrBlocksOfVaultRec;
|
||||
uint8_t vaultrecord[360];
|
||||
uint32_t amount;
|
||||
uint16_t nrOfCoins;
|
||||
bool dcDataValid;
|
||||
uint8_t wakeReason;
|
||||
char curPayNewCoin;
|
||||
} store;
|
||||
|
||||
struct T_globTime {
|
||||
// Reihenfolge nicht vertauschen!!!!!
|
||||
uint8_t hour;
|
||||
uint8_t minute;
|
||||
uint8_t second;
|
||||
uint8_t Year;
|
||||
uint8_t Month;
|
||||
uint8_t DayOfMonth;
|
||||
uint8_t DayOfWeek; // 1=monday...7
|
||||
uint8_t reserve1;
|
||||
|
||||
uint16_t MinutesOfToday;
|
||||
uint16_t reserve2;
|
||||
|
||||
uint32_t SecondsOfToday;
|
||||
|
||||
uint8_t IsLeapyear;
|
||||
uint8_t nextLeap;
|
||||
uint8_t lastLeap;
|
||||
uint8_t hoursOfWeek;
|
||||
|
||||
uint16_t minOfWeek;
|
||||
uint16_t hoursOfMonth;
|
||||
uint16_t minOfMonth;
|
||||
uint16_t dayOfYear;
|
||||
uint16_t hoursOfYear;
|
||||
uint16_t reserve3;
|
||||
|
||||
uint32_t minOfYear;
|
||||
|
||||
uint8_t squareOutMode;
|
||||
uint8_t free1;
|
||||
uint16_t reserve4;
|
||||
uint32_t minOfMillenium;
|
||||
// bis hierher 44byts
|
||||
uint32_t free2;
|
||||
uint32_t free3;
|
||||
uint32_t free4;
|
||||
} getGlobalTime;
|
||||
|
||||
static QSharedMemory *getShm(std::size_t s = 0);
|
||||
static SharedMemBuffer *getData() {
|
||||
return (SharedMemBuffer *)getShm()->data();
|
||||
}
|
||||
static SharedMemBuffer const *getDataConst() {
|
||||
return (SharedMemBuffer const *)getShm()->data();
|
||||
}
|
||||
|
||||
#if 0
|
||||
static std::atomic<bool> __sharedMemLocked;
|
||||
|
||||
static bool sharedMemLocked() {
|
||||
return __sharedMemLocked;
|
||||
}
|
||||
static void setSharedMemLocked() {
|
||||
__sharedMemLocked = true;
|
||||
}
|
||||
static void setSharedMemUnlocked() {
|
||||
__sharedMemLocked = false;
|
||||
}
|
||||
#endif
|
||||
};
|
||||
|
||||
#endif // SHARED_MEM_BUFFER_INCLUDED_H
|
@@ -3,12 +3,12 @@
|
||||
#define STOREINDATA_H
|
||||
|
||||
#include <stdint.h>
|
||||
#include "tslib.h"
|
||||
//#include "tslib.h"
|
||||
#include <QString>
|
||||
|
||||
|
||||
#define MAXNROF_AO 3
|
||||
#define MAXNROF_GENSTR 16
|
||||
//#define MAXNROF_GENSTR 16
|
||||
#define MAXNROF_CONTR_PORTS 11
|
||||
#define MAXNROF_DIports 2
|
||||
#define MAXNROF_DOports 2
|
||||
@@ -32,9 +32,6 @@ bool indat_isMifareOn();
|
||||
void indat_storeMDBisOn(bool isOn);
|
||||
bool indat_isMdbOn();
|
||||
|
||||
|
||||
|
||||
|
||||
void gpi_storeSlaveSerParams(uint8_t slaveBaudRate, uint8_t NrDataBits,
|
||||
uint8_t parity, uint8_t NrStopBits);
|
||||
|
||||
@@ -43,23 +40,16 @@ void epi_getSlaveSerParams(uint8_t *slaveBaudRate, uint8_t *NrDataBits,
|
||||
|
||||
QString epi_getSlaveParamSTR();
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
void gpi_storeGenerals(uint8_t genNr, QString text);
|
||||
// 0=HW 1=SW 2=State
|
||||
|
||||
QString epi_loadGenerals(uint8_t genNr);
|
||||
// genNr=0=HW 1=SW 2=State
|
||||
|
||||
|
||||
void gpi_storeUID(uint8_t *buf8byteUid);
|
||||
void gpi_storeUID(uint8_t const *buf8byteUid);
|
||||
// buffer size: 8 byte
|
||||
|
||||
void epi_getUIDdec(uint8_t *buf8byteUid);
|
||||
// buffer size: 8 byte
|
||||
|
||||
QString epi_getUIDstr();
|
||||
|
||||
|
||||
@@ -73,7 +63,7 @@ QString epi_getUIDstr();
|
||||
uint8_t epi_getSquareMode();
|
||||
void gpi_backupSquareMode(uint8_t squMode);
|
||||
|
||||
void gpi_backupTime(uint8_t *timeBuffer, uint8_t Leng);
|
||||
void gpi_backupTime(uint8_t *timeBuffer, uint8_t Leng); // 104, <=8byte
|
||||
void epi_getTime(uint8_t *hh, uint8_t *mm, uint8_t *ss);
|
||||
void epi_getDate(uint8_t *yy, uint8_t *mm, uint8_t *dd);
|
||||
void epi_getToday(uint8_t *dow, uint16_t *minOfToday, uint32_t *secOfToday);
|
||||
@@ -89,7 +79,7 @@ void epi_getSpecialYearTimeDate(uint16_t *DayOfYear, uint16_t *HoursOfYear, uint
|
||||
// ///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
#define MAXNROF_AI 4
|
||||
// #define MAXNROF_AI 4
|
||||
|
||||
void gpi_storeAIs(uint8_t aiNr, uint16_t val); // rs -> Sdata
|
||||
|
||||
@@ -138,185 +128,119 @@ void gpi_storeDI_optos(uint8_t indatOpto);
|
||||
uint8_t epi_getDI_optos(void);
|
||||
// bit0: opto in 1 1: opto in 2
|
||||
|
||||
void gpi_storeDI_auxIn(uint8_t indatAuxIn);
|
||||
// Aux0...5
|
||||
|
||||
uint8_t epi_getDI_auxIn(void);
|
||||
// bit0: auxin 1 ... 5: auxin 6
|
||||
|
||||
void gpi_storeDI_ptuWake(uint8_t indat);
|
||||
uint8_t gpi_storeDI_auxIn(uint8_t indatAuxIn); // Aux0...5
|
||||
uint8_t epi_getDI_auxIn(void); // bit0: auxin 1 ... 5: auxin 6
|
||||
|
||||
bool gpi_storeDI_ptuWake(bool w);
|
||||
bool epi_getDI_ptuWake(void);
|
||||
|
||||
void gpi_storeDI_mbdWake(uint8_t indat);
|
||||
|
||||
bool gpi_storeDI_mbdWake(bool w);
|
||||
bool epi_getDI_mdbWake(void);
|
||||
|
||||
void gpi_storeDI_prnReady(uint8_t indat);
|
||||
|
||||
bool gpi_storeDI_prnReady(bool ready);
|
||||
bool epi_getDI_prnReady(void);
|
||||
|
||||
void gpi_storeDI_CoinAttach(uint8_t indat);
|
||||
|
||||
bool gpi_storeDI_CoinAttach(bool attach);
|
||||
bool epi_getDI_CoinAttach(void);
|
||||
|
||||
void gpi_storeDI_CoinEscrow(uint8_t indat);
|
||||
|
||||
bool gpi_storeDI_CoinEscrow(bool ce);
|
||||
bool epi_getDI_CoinEscrow(void);
|
||||
|
||||
void gpi_storeDI_mifareCardTapped(uint8_t indat);
|
||||
|
||||
bool gpi_storeDI_mifareCardTapped(bool tapped);
|
||||
bool epi_getDI_mifareCardTapped(void);
|
||||
|
||||
void gpi_storeDI_modemWake(uint8_t indat);
|
||||
|
||||
bool gpi_storeDI_modemWake(bool w);
|
||||
bool epi_getDI_modemWake(void);
|
||||
|
||||
|
||||
void gpi_storeDI_contactPowerIsOn(bool di_contact_PwrOn);
|
||||
|
||||
bool gpi_storeDI_contactPowerIsOn(bool on);
|
||||
bool epi_getDI_contactPwr(void);
|
||||
|
||||
void gpi_storeDI_MifarePowerIsOn(bool di_mifare_PwrOn);
|
||||
|
||||
bool gpi_storeDI_MifarePowerIsOn(bool on);
|
||||
bool epi_getDI_mifarePwr(void);
|
||||
|
||||
void gpi_storeDI_readbackMdbTxD(bool di_rdbkMdbTxd);
|
||||
|
||||
bool gpi_storeDI_readbackMdbTxD(bool rdbkMdbTxd);
|
||||
bool epi_getDI_mdbTxd(void);
|
||||
|
||||
void gpi_storeDI_AuxPowerIsOn(bool di_Aux_PwrOn);
|
||||
|
||||
bool gpi_storeDI_AuxPowerIsOn(bool on);
|
||||
bool epi_getDI_auxPwr(void);
|
||||
|
||||
void gpi_storeDI_GsmPowerIsOn(bool di_gsm_PwrOn);
|
||||
|
||||
bool gpi_storeDI_GsmPowerIsOn(bool on);
|
||||
bool epi_getDI_gsmPwr(void);
|
||||
|
||||
void gpi_storeDI_CreditPowerIsOn(bool di_credit_PwrOn);
|
||||
|
||||
bool gpi_storeDI_CreditPowerIsOn(bool on);
|
||||
bool epi_getDI_creditPwr(void);
|
||||
|
||||
void gpi_storeDI_PrinterPowerIsOn(bool di_printer_PwrOn);
|
||||
|
||||
bool gpi_storeDI_PrinterPowerIsOn(bool on);
|
||||
bool epi_getDI_printerPwr(void);
|
||||
|
||||
void gpi_storeDI_MdbPowerIsOn(bool di_mdb_PwrOn);
|
||||
|
||||
bool gpi_storeDI_MdbPowerIsOn(bool on);
|
||||
bool epi_getDI_mdbPwr(void);
|
||||
|
||||
|
||||
void gpi_storeDI_rejMot_home(bool di);
|
||||
|
||||
bool gpi_storeDI_rejMot_home(bool reject);
|
||||
bool epi_getDI_rejectMotor_homepos(void);
|
||||
|
||||
void gpi_storeDI_paperLow(bool di);
|
||||
|
||||
bool epi_getDI_npe_sensor(void);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
uint8_t gpi_storeDI_paperLow(uint8_t di);
|
||||
uint8_t epi_getDI_npe_sensor(void);
|
||||
// 0: Sensor sees paper 1: no paper 99: off
|
||||
|
||||
// ///////////////////////////////////////////////////////////////////////////////////
|
||||
// readback digital outputs
|
||||
// ///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
void gpi_storeDO_mdbRxTst(uint8_t do_mbdRxTst);
|
||||
|
||||
uint8_t gpi_storeDO_mdbRxTst(uint8_t do_mbdRxTst);
|
||||
bool epi_getDO_mdbRxTestOut(void);
|
||||
|
||||
|
||||
void gpi_storeDO_motorOutputs(uint8_t Pwr);
|
||||
|
||||
uint8_t gpi_storeDO_motorOutputs(uint8_t Pwr);
|
||||
uint8_t epi_getDO_motorOuts(void);
|
||||
// bit0: upper lock forward bit 1 backward
|
||||
// bit2: lower lock forward bit 3 backward
|
||||
|
||||
|
||||
void gpi_storeDO_serialSwitch(uint8_t state);
|
||||
uint8_t gpi_storeDO_serialSwitch(uint8_t state);
|
||||
// serial drv on/off, Serial mux1, Serial mux2
|
||||
|
||||
uint8_t epi_getDO_serialSwitch(void);
|
||||
// serial drv on/off, Serial mux1, Serial mux2
|
||||
|
||||
bool epi_getDO_serialDriverIsOn(void);
|
||||
|
||||
bool epi_getDO_serialMux1isSetToPrinter(void);
|
||||
// mux1 off: serial is switched to printer
|
||||
|
||||
bool epi_getDO_serialMux1isSetToModem(void);
|
||||
// mux1 on: serial is switched to modem
|
||||
|
||||
bool epi_getDO_serialMux2isSetToCredit(void);
|
||||
// mux2 off: serial is switched to credit card terminal
|
||||
|
||||
bool epi_getDO_serialMux2isSetToMifare(void);
|
||||
// mux2 on: serial is switched to mifare reader
|
||||
|
||||
|
||||
void gpi_storeDO_ledsAndFan(uint8_t ledState);
|
||||
|
||||
uint8_t gpi_storeDO_ledsAndFan(uint8_t ledState);
|
||||
bool epi_getDO_led_coin(void);
|
||||
|
||||
bool epi_getDO_led_front(void);
|
||||
|
||||
bool epi_getDO_led_ticket(void);
|
||||
|
||||
bool epi_getDO_led_pin(void);
|
||||
|
||||
bool epi_getDO_led_start(void);
|
||||
|
||||
bool epi_getDO_led_inside(void);
|
||||
|
||||
bool epi_getDO_fan(void);
|
||||
|
||||
void gpi_storeDO_sirenAndRelay(uint8_t sirenRelay);
|
||||
|
||||
uint8_t gpi_storeDO_sirenAndRelay(uint8_t sirenRelay);
|
||||
bool epi_getDO_sirene(void);
|
||||
|
||||
bool epi_getDO_relay(void);
|
||||
|
||||
void gpi_storeDO_ptuWake(uint8_t state);
|
||||
|
||||
uint8_t gpi_storeDO_ptuWake(uint8_t state);
|
||||
bool epi_getDO_ptuWake(void);
|
||||
|
||||
void gpi_storeDO_auxPower(uint8_t pwr);
|
||||
|
||||
uint8_t gpi_storeDO_auxPower(uint8_t pwr);
|
||||
bool epi_getDO_auxPower(void);
|
||||
|
||||
|
||||
void gpi_storeDO_coinShutter(uint8_t state);
|
||||
|
||||
uint8_t gpi_storeDO_coinShutter(uint8_t state);
|
||||
bool epi_getDO_coinShutterOpen(void);
|
||||
|
||||
bool epi_getDO_coinShutterTest(void);
|
||||
|
||||
|
||||
void gpi_storeDO_coinEscrow(uint8_t state);
|
||||
|
||||
uint8_t gpi_storeDO_coinEscrow(uint8_t state);
|
||||
uint8_t epi_getDO_coinEscrow(void);
|
||||
// retval: 1:return flap is open 2:take flap is open 0:closed
|
||||
|
||||
|
||||
void gpi_storeDO_printerPwrOn(uint8_t state);
|
||||
|
||||
uint8_t gpi_storeDO_printerPwrOn(uint8_t state);
|
||||
uint8_t epi_getDO_printerPwr(void);
|
||||
|
||||
|
||||
|
||||
// ---------------------------------------------------------------------------------------------
|
||||
// counterchecks, make sure that DC-outputs are correct
|
||||
|
||||
@@ -363,21 +287,14 @@ bool epi_cntchk_Mot2Fon(void);
|
||||
|
||||
uint8_t gpi_storeMdbRecData(uint8_t length, uint8_t *buf);
|
||||
// datif store received mdb data
|
||||
|
||||
uint8_t epi_getMdbResponse(void);
|
||||
// 0=no response 1=ACK 2=NAK 3=ACK with data
|
||||
|
||||
uint8_t epi_getMdbRecLength(void);
|
||||
// 0...31
|
||||
|
||||
uint8_t epi_restoreMdbRecData(uint8_t *buf);
|
||||
// hwapi reads received mdb data from PI
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
uint8_t gpi_storeMifReaderStateAndCardType(uint8_t *buf);
|
||||
uint8_t gpi_storeMifReaderStateAndCardType(uint8_t const *buf);
|
||||
|
||||
/* data description:
|
||||
byte 0: current read state: 0=power off 1=reader-fault 2=ready
|
||||
@@ -401,41 +318,24 @@ byte 32: result, always 0
|
||||
|
||||
uint8_t epi_restoreMifState(uint8_t *buf, uint8_t maxBufferSize);
|
||||
// retval 0=OK 1=error host buffer too small
|
||||
|
||||
void gpi_storeMifCardData(uint8_t blkNr, uint8_t *receivedData);
|
||||
bool gpi_storeMifCardData(uint8_t blkNr, uint8_t const *receivedData);
|
||||
// blkNr=0...11 receivedData[64]
|
||||
|
||||
uint8_t epi_restoreMifData(uint8_t blkNr, uint8_t *buf, uint8_t maxBufferSize);
|
||||
// blkNr=0...11 return buf[64]
|
||||
|
||||
|
||||
|
||||
|
||||
#define pi_prnStateArraySize 20
|
||||
#define pi_prnFontArraySize 20
|
||||
// retval: 1=error 0=OK
|
||||
|
||||
void epi_restorePrinterState(uint8_t *buf);
|
||||
|
||||
void gpi_storePrinterState(uint8_t *buf);
|
||||
void gpi_storePrinterState(uint8_t const *buf);
|
||||
|
||||
void epi_restorePrinterFonts(uint8_t *buf);
|
||||
void gpi_storePrinterFonts(uint8_t const *buf);
|
||||
|
||||
void gpi_storePrinterFonts(uint8_t *buf);
|
||||
|
||||
|
||||
|
||||
|
||||
void gpi_storeMdbState(uint8_t busReady, uint8_t V12on, uint8_t V5on );
|
||||
|
||||
bool gpi_storeMdbState(bool busReady, bool V12on, bool V5on);
|
||||
bool epi_restoreMdbBusReady(void);
|
||||
|
||||
bool epi_restoreMdbV12Ready(void);
|
||||
|
||||
bool epi_restoreMdbV5Ready(void);
|
||||
|
||||
|
||||
void gpi_storeMdbResponse(uint8_t leng, uint8_t *data);
|
||||
|
||||
void gpi_storeMdbResponse(uint8_t leng, uint8_t const *data);
|
||||
void epi_restoreMdbResponse(uint8_t *leng, uint8_t *data);
|
||||
// last received mdb answer (from mdb device)
|
||||
// only needed if a special command was sent directly
|
||||
@@ -444,12 +344,9 @@ void epi_restoreMdbResponse(uint8_t *leng, uint8_t *data);
|
||||
// DB2: nr of received (payload) data bytes (apart from ACK, can be 0....34)
|
||||
// DB3...DB38: rec.data (payload)
|
||||
|
||||
|
||||
void gpi_storeEmpSettings(uint8_t leng, uint8_t *data);
|
||||
|
||||
void gpi_storeEmpSettings(uint8_t leng, uint8_t const *data);
|
||||
void epi_restoreEmpSettings(uint8_t *leng, uint8_t *data);
|
||||
|
||||
|
||||
/*
|
||||
void gpi_storeEmpCoinSignal(uint8_t leng, uint8_t *data);
|
||||
|
||||
@@ -463,25 +360,67 @@ void epi_restoreEmpCoinSignal(uint8_t *leng, uint8_t *data);
|
||||
void epi_clearEmpCoinSignal();
|
||||
*/
|
||||
|
||||
#define MEMDEPTH_GOTCOINS 16
|
||||
|
||||
void gpi_storeEmpCoinSignal(uint8_t leng, uint8_t *data);
|
||||
void gpi_storeEmpCoinSignal(uint8_t leng, uint8_t const *data);
|
||||
|
||||
uint8_t epi_isNewCoinLeft(void);
|
||||
// retval: 0...16 coins left in FIFO
|
||||
|
||||
void epi_restoreEmpCoinSignal(uint8_t *valid, uint8_t *signal, uint8_t *error, uint16_t *value);
|
||||
|
||||
void gpi_storeRbDeviceSettings(uint8_t leng, uint8_t const *data);
|
||||
void epi_restoreRbDeviceSettings(uint8_t *leng, uint8_t *data);
|
||||
|
||||
|
||||
void gpi_storeDeviceSettings(uint8_t leng, uint8_t *data);
|
||||
|
||||
void epi_restoreDeviceSettings(uint8_t *leng, uint8_t *data);
|
||||
|
||||
void gpi_storeMachineIDsettings(uint8_t leng, uint8_t *data);
|
||||
|
||||
void gpi_storeMachineIDsettings(uint8_t leng, uint8_t const *data);
|
||||
void epi_restoreMachineIDsettings(uint8_t *leng, uint8_t *data);
|
||||
|
||||
void epi_clearCurrentPayment(void);
|
||||
void gpi_storeCurrentPayment(uint32_t insertedAmount, uint16_t lastCoinType, uint16_t lastCoinValue);
|
||||
|
||||
uint32_t epi_CurrentPaymentGetAmount(void);
|
||||
uint16_t epi_CurrentPaymentGetLastCoin(void);
|
||||
|
||||
bool epi_CurrentPaymentGetAllCoins(uint16_t *types, uint16_t *values);
|
||||
// alle bei diesem Verkauf eingeworfenen Münzen sind gespeichert falls die jmd. braucht
|
||||
|
||||
void gpi_storeWakeSources(uint8_t const *receivedData);
|
||||
uint64_t epi_getWakeSources(void);
|
||||
uint8_t epi_getWakeReason(void);
|
||||
|
||||
void gpi_storeExtendedTime(uint8_t leng, uint8_t const *data);
|
||||
void epi_restoreExtendedTime(uint8_t *leng, uint8_t *data);
|
||||
|
||||
void gpi_storeDeviceConditions(uint8_t leng, uint8_t const *data);
|
||||
void epi_restoreDeviceConditions(uint8_t *leng, uint8_t *data);
|
||||
|
||||
void gpi_storeDynMachineConditions(uint8_t leng, uint8_t const *data);
|
||||
void epi_restoreDynMachineConditions(uint8_t *leng, uint8_t *data);
|
||||
|
||||
void gpi_storeDCbackupAccNr(uint8_t leng, uint8_t const *data);
|
||||
void epi_restoreDCbackupAccNr(uint8_t *leng, uint16_t *accNrs);
|
||||
// return accNrs[0..7]
|
||||
|
||||
void epi_iniVRstorage(void);
|
||||
void gpi_storeVaultRecord(uint8_t blkNr, uint8_t const *data);
|
||||
bool epi_checkIfVaultRecordAvailable(void);
|
||||
bool epi_restoreVaultRecord(uint16_t *length, uint8_t *buf);
|
||||
// true if completly received
|
||||
|
||||
void gpi_storeCBlevel(uint32_t amount, uint16_t nrOfCoins);
|
||||
|
||||
uint32_t epi_getCashBoxContent(void);
|
||||
uint16_t epi_getNrOfCoinsInCashBox(void);
|
||||
|
||||
void gpi_storeNewMifareCard(uint8_t typ, uint8_t const *holder);
|
||||
|
||||
uint8_t epi_mifGetCardType(uint8_t const *holder);
|
||||
//holder[8] = name of card holder
|
||||
// retval Type of MifareCard, 1=upper door, 2=lower door 3=test printer 4=test coins
|
||||
|
||||
void gpi_storeDcDataValid(bool isVal);
|
||||
bool gpi_areDcDataValid();
|
||||
bool epi_areDcDataValid();
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
|
@@ -13,6 +13,9 @@ uint32_t uchar2ulong(uint8_t Highbyte, uint8_t MHbyte, uint8_t MLbyte, uint8_t L
|
||||
|
||||
uint8_t uint2uchar(uint16_t uival, bool getHighB);
|
||||
|
||||
uint8_t ulong2uchar(uint32_t ulval, uint8_t getBytNr);
|
||||
// getBytNr: 0=LSB 3=MSB
|
||||
|
||||
|
||||
void delay(uint16_t MilliSec);
|
||||
|
||||
@@ -59,6 +62,7 @@ void GetShortDateString(uint8_t day, uint8_t month, uint8_t yearlow, uint8_t for
|
||||
|
||||
|
||||
uint16_t tslib_strlen(char *buf);
|
||||
uint16_t tslib_strlen(uint8_t *buf);
|
||||
|
||||
void tslib_strclr(char *buf, char clrsign, uint16_t len);
|
||||
void tslib_strclr(uint8_t *buf, char clrsign, uint16_t len);
|
||||
@@ -79,6 +83,8 @@ int tslib_getMinimum(int val1, int val2);
|
||||
void tslib_text2array(QByteArray text, char *aray, uint16_t maxArayLen);
|
||||
// usage: tslib_text2array("my text", ctmp, 50);
|
||||
|
||||
void biox_CopyBlock(uint8_t *src, uint16_t srcPos, uint8_t *dest, uint16_t destPos, uint16_t len);
|
||||
// both buffers starting from pos 0
|
||||
|
||||
|
||||
#endif // TSLIB_H
|
||||
|
22
src/ATBAPP/ATBAPPplugin.h
Normal file
22
src/ATBAPP/ATBAPPplugin.h
Normal file
@@ -0,0 +1,22 @@
|
||||
#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
|
316
src/ATBAPP/ATBDeviceControllerPlugin.cpp
Normal file
316
src/ATBAPP/ATBDeviceControllerPlugin.cpp
Normal file
@@ -0,0 +1,316 @@
|
||||
#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
|
||||
<< " currentDateTime = " << printingData["currentDateTime"] << endl;
|
||||
|
||||
QDateTime parkingEndDateTime = QDateTime::fromString(printingData["parkingEnd"].toString(), Qt::ISODate);
|
||||
QDateTime currentDateTime = QDateTime::fromString(printingData["currentDateTime"].toString(), Qt::ISODate);
|
||||
|
||||
/* -----------------------------------------------------------------------------------------
|
||||
* note: the following highly depends on printer template files!
|
||||
* -----------------------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
// set dynamic printer data:
|
||||
QByteArray ba_licenseplate = codec->fromUnicode(printingData["licenseplate"].toString());
|
||||
memcpy((char*)dynTicketData->licensePlate, ba_licenseplate.data(), std::min(ba_licenseplate.size(),8));
|
||||
|
||||
QByteArray ba_amount = codec->fromUnicode(printingData["amount"].toString());
|
||||
memcpy((char*)dynTicketData->vendingPrice, ba_amount.data(), std::min(ba_amount.size(),8));
|
||||
|
||||
QByteArray ba_parkingEndTime = codec->fromUnicode(parkingEndDateTime.toString("hh:mm"));
|
||||
memcpy((char*)dynTicketData->parkingEndTime, ba_parkingEndTime.data(), std::min(ba_parkingEndTime.size(),8));
|
||||
|
||||
QByteArray ba_parkingEndDate = codec->fromUnicode(parkingEndDateTime.toString("dd.MM.yy"));
|
||||
memcpy((char*)dynTicketData->parkingEndDate, ba_parkingEndDate.data(), std::min(ba_parkingEndDate.size(),8));
|
||||
|
||||
QByteArray ba_currentDate = codec->fromUnicode(currentDateTime.toString("dd.MM.yy"));
|
||||
memcpy((char*)dynTicketData->currentDate, ba_currentDate.data(), std::min(ba_currentDate.size(),8));
|
||||
|
||||
|
||||
// DEBUG
|
||||
/*
|
||||
uint8_t* buf = dynTicketData->licensePlate;
|
||||
int length = 64;
|
||||
for (int i = 0; i < length; ++i) {
|
||||
fprintf(stderr, "%d %02x %c\n", i, buf[i], buf[i]);
|
||||
}
|
||||
fprintf(stderr, "\n");
|
||||
*/
|
||||
|
||||
// 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(500, 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(500, this, SLOT(onPrintFinishedOK()));
|
||||
}
|
||||
else {
|
||||
// print next template
|
||||
this->currentTemplate++;
|
||||
QTimer::singleShot(1000, 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
|
125
src/ATBAPP/ATBDeviceControllerPlugin.h
Normal file
125
src/ATBAPP/ATBDeviceControllerPlugin.h
Normal file
@@ -0,0 +1,125 @@
|
||||
#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
|
25
src/ATBAPP/ATBHealthEvent.cpp
Normal file
25
src/ATBAPP/ATBHealthEvent.cpp
Normal file
@@ -0,0 +1,25 @@
|
||||
#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;
|
||||
}
|
44
src/ATBAPP/ATBHealthEvent.h
Normal file
44
src/ATBAPP/ATBHealthEvent.h
Normal file
@@ -0,0 +1,44 @@
|
||||
#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
|
142
src/ATBAPP/DeviceControllerInterface.h
Normal file
142
src/ATBAPP/DeviceControllerInterface.h
Normal file
@@ -0,0 +1,142 @@
|
||||
#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
|
84
src/com.cpp
84
src/com.cpp
@@ -8,7 +8,7 @@
|
||||
///
|
||||
//////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
static int64_t com_want2read;
|
||||
// -------------------------------------------------------------------------------------------------------------
|
||||
// --------- PUBLIC --------------------------------------------------------------------------------------------
|
||||
// -------------------------------------------------------------------------------------------------------------
|
||||
@@ -19,7 +19,7 @@ void T_com::writeToSerial(const QByteArray &data, uint16_t sendLength)
|
||||
sendLen=sendLength;
|
||||
if (CatSerial->isOpen())
|
||||
{
|
||||
//qDebug() << "sending..." << sendBuffer;
|
||||
qCritical() << "sending..." << sendBuffer;
|
||||
CatSerial->write(sendBuffer);
|
||||
} else
|
||||
qDebug() << "error sending, port is not open";
|
||||
@@ -78,7 +78,7 @@ T_com::T_com(QWidget *parent) : QMainWindow(parent)
|
||||
connect(ChkConnectTimer, SIGNAL(timeout()), this, SLOT(ser_ISR100ms()));
|
||||
ChkConnectTimer->setSingleShot(false);
|
||||
ChkConnectTimer->start(100); // in ms
|
||||
|
||||
com_want2read=0;
|
||||
}
|
||||
|
||||
|
||||
@@ -93,29 +93,34 @@ T_com::~T_com()
|
||||
|
||||
void T_com::ser_ISR100ms()
|
||||
{
|
||||
//qDebug() << "~~>LIB" << "ENTER...";
|
||||
// call every 100ms to check if user(HMI) wants to connect or disconnect
|
||||
|
||||
//qDebug() << "~~>LIB" << "checking connect button... " ;
|
||||
|
||||
uint8_t chkConn = gpi_getSerialConn(); // from global GUI buffer (Sdata)
|
||||
|
||||
//qDebug() << "~~>LIB" << "checking connect button... " << chkConn;
|
||||
|
||||
switch (chkConn)
|
||||
{
|
||||
case 0: // 0 button "connect" was just released
|
||||
//qDebug() << "close serial port" << chkConn;
|
||||
closeSerialPort();
|
||||
gpi_serialChanged(); // set chkConn to 2, thus getting edge
|
||||
break;
|
||||
case 1: // 1 button "connect" was just pressed
|
||||
//qDebug() << "open serial port" << chkConn;
|
||||
open_Serial_Port();
|
||||
gpi_serialChanged(); // set chkConn to 2, thus getting edge
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
if (CatSerial->isOpen())
|
||||
if (CatSerial->isOpen()) {
|
||||
gpi_serialIsOpen(true);
|
||||
else
|
||||
} else {
|
||||
gpi_serialIsOpen(false);
|
||||
}
|
||||
|
||||
//qDebug() << "LEAVE " << chkConn;
|
||||
}
|
||||
|
||||
// -------------------------------------------------------------------------------------------------------------
|
||||
@@ -124,17 +129,24 @@ void T_com::ser_ISR100ms()
|
||||
|
||||
char T_com::open_Serial_Port()
|
||||
{
|
||||
//qDebug() << "ENTER";
|
||||
|
||||
bool ret;
|
||||
QString myString=nullptr, myPortName=nullptr, myBaudStr=nullptr;
|
||||
int myBaudNr;
|
||||
|
||||
if (CatSerial->isOpen())
|
||||
if (CatSerial->isOpen()) {
|
||||
qDebug() << "!!!IS OPEN!!!";
|
||||
return 0; // opening twice is not allowed
|
||||
}
|
||||
|
||||
//qDebug() << "connecting..." << myPortName;
|
||||
myPortName=gpi_getComPortName(); // was selected and stored from GUI
|
||||
CatSerial->setPortName(myPortName);
|
||||
myBaudNr=gpi_getBaudNr(); // was selected and stored from GUI
|
||||
|
||||
//qDebug() << "myPortName" << myPortName << ", myBaudNr" << myBaudNr;
|
||||
|
||||
switch (myBaudNr)
|
||||
{
|
||||
// 0:1200 1:9600 2:19200 3:38400 4:57600 5:115200
|
||||
@@ -167,6 +179,9 @@ char T_com::open_Serial_Port()
|
||||
myString.append(CatSerial->errorString());
|
||||
qDebug() << myString;
|
||||
gpi_setTxt4comStateLine(myString);
|
||||
|
||||
//qDebug() << "LEAVE";
|
||||
|
||||
return 0;
|
||||
} else
|
||||
{
|
||||
@@ -182,11 +197,14 @@ char T_com::open_Serial_Port()
|
||||
|
||||
}
|
||||
|
||||
return 0;
|
||||
//qDebug() << "LEAVE";
|
||||
return 0;
|
||||
}
|
||||
|
||||
void T_com::closeSerialPort()
|
||||
{
|
||||
//qDebug() << "ENTER";
|
||||
|
||||
if (CatSerial->isOpen())
|
||||
{
|
||||
qDebug() << "closing connection";
|
||||
@@ -195,6 +213,8 @@ void T_com::closeSerialPort()
|
||||
gpi_setTxt4RsDiagWin("closed");
|
||||
|
||||
}
|
||||
|
||||
//qDebug() << "LEAVE";
|
||||
}
|
||||
|
||||
|
||||
@@ -202,9 +222,48 @@ void T_com::readSomeBytes(void)
|
||||
{
|
||||
// called by serial-read-detection
|
||||
// restart off-time as input flow is ongoing
|
||||
serRecTime->stop();
|
||||
serRecTime->start(20); // in ms
|
||||
|
||||
// timer for slow receive
|
||||
// and serves as timeout for fast receive is msg is shorter as expected
|
||||
serRecTime->stop();
|
||||
serRecTime->start(20); // in ms
|
||||
|
||||
//qDebug()<< "com-rec read some bytes";
|
||||
|
||||
this->receiveByLength(); // since 14.12.21: fast receive
|
||||
}
|
||||
|
||||
void T_com::receiveFixLen(int64_t nrOfbytesToReceive)
|
||||
{
|
||||
// call this before sending a request to slave
|
||||
// then we know exactly when reception is complete -> much faster
|
||||
com_want2read=nrOfbytesToReceive;
|
||||
// since 14.12.21: FastDevice Protocol has two lengthen:
|
||||
// fast: 12byte reception long: 68byte
|
||||
}
|
||||
|
||||
void T_com::receiveByLength(void)
|
||||
{
|
||||
|
||||
if (CatSerial->isOpen())
|
||||
{
|
||||
QString myString=nullptr, tmpStr=nullptr;
|
||||
int64_t nrOfBytesreceived = CatSerial->bytesAvailable(); // nr of received bytes
|
||||
|
||||
//qDebug()<< "com-rec current Len: "<< nrOfBytesreceived;
|
||||
|
||||
if (nrOfBytesreceived >= com_want2read)
|
||||
{
|
||||
QByteArray data = CatSerial->readAll(); // erst auslesen wenn alles da! löscht den Empfangspuffer
|
||||
serRecTime->stop(); // stop timeout to avoid 2nd emit
|
||||
rawInLen=uint16_t (nrOfBytesreceived);
|
||||
rawInput.clear();
|
||||
rawInput.append(data);
|
||||
// report "new data received" to other objects
|
||||
//qDebug()<< "com-recFinished by Len "<< rawInLen;
|
||||
emit receivingFinished();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void T_com::receiveTO(void)
|
||||
@@ -252,6 +311,7 @@ void T_com::receiveTO(void)
|
||||
//gpi_set2ndTxt4RsDiagWin(myString);
|
||||
|
||||
// report "new data received" to other objects
|
||||
//qDebug()<< "com-recFinished by TO";
|
||||
emit receivingFinished();
|
||||
}
|
||||
}
|
||||
|
@@ -1,134 +1,110 @@
|
||||
#include <stdint.h>
|
||||
#include <algorithm>
|
||||
|
||||
#include <QString>
|
||||
#include <QDebug>
|
||||
#include "tslib.h"
|
||||
//#include "controlBus.h"
|
||||
#include "shared_mem_buffer.h"
|
||||
|
||||
// ///////////////////////////////////////////////////////////////////////////////////
|
||||
// control serial interface gui <--> serial
|
||||
// ///////////////////////////////////////////////////////////////////////////////////
|
||||
void epi_setSerial(int BaudNr,
|
||||
QString BaudStr,
|
||||
QString ComName,
|
||||
uint8_t connect) {
|
||||
memset(&SharedMemBuffer::getData()->rs.comportName[0], 0x00,
|
||||
sizeof(SharedMemBuffer::getData()->rs.comportName));
|
||||
strncpy(SharedMemBuffer::getData()->rs.comportName,
|
||||
ComName.toStdString().c_str(),
|
||||
sizeof(SharedMemBuffer::getData()->rs.comportName)-1);
|
||||
|
||||
static QString rs_comportName; // z.B. "COM48"
|
||||
static QString rs_baudStr; // z.B. "19200"
|
||||
static int rs_baudNr; //0...5 oder -1
|
||||
static uint8_t rs_connect; // 0,1
|
||||
|
||||
void epi_setSerial(int BaudNr, QString BaudStr, QString ComName, uint8_t connect)
|
||||
{
|
||||
rs_comportName = ComName;
|
||||
rs_baudStr = BaudStr;
|
||||
rs_baudNr = BaudNr; // 0=1200 1=9600 2=19200 3=38400 4=57600 5=115200 oder -1
|
||||
rs_connect = connect; // 0/1
|
||||
memset(&SharedMemBuffer::getData()->rs.baudStr[0], 0x00,
|
||||
sizeof(SharedMemBuffer::getData()->rs.baudStr));
|
||||
strncpy(SharedMemBuffer::getData()->rs.baudStr,
|
||||
BaudStr.toStdString().c_str(),
|
||||
sizeof(SharedMemBuffer::getData()->rs.baudStr)-1);
|
||||
|
||||
SharedMemBuffer::getData()->rs.baudNr = BaudNr;
|
||||
SharedMemBuffer::getData()->rs.connect = connect;
|
||||
}
|
||||
|
||||
void epi_closeSerial(void)
|
||||
{
|
||||
rs_connect=0;
|
||||
void epi_closeSerial(void) {
|
||||
SharedMemBuffer::getData()->rs.connect = 0;
|
||||
}
|
||||
|
||||
|
||||
void gpi_serialChanged(void)
|
||||
{
|
||||
void gpi_serialChanged(void) {
|
||||
// serial confirms that port was closed or opened
|
||||
rs_connect=2; // Flanke, nur 1x öffnen/schließen
|
||||
// rs_connect=2; // Flanke, nur 1x öffnen/schließen
|
||||
SharedMemBuffer::getData()->rs.connect = 2;
|
||||
}
|
||||
|
||||
uint8_t gpi_getSerialConn(void)
|
||||
{
|
||||
return rs_connect;
|
||||
uint8_t gpi_getSerialConn(void) {
|
||||
return SharedMemBuffer::getDataConst()->rs.connect;
|
||||
}
|
||||
|
||||
|
||||
int gpi_getBaudNr(void)
|
||||
{
|
||||
return rs_baudNr;
|
||||
int gpi_getBaudNr(void) {
|
||||
return SharedMemBuffer::getDataConst()->rs.baudNr;
|
||||
}
|
||||
|
||||
QString gpi_getComPortName(void)
|
||||
{
|
||||
return rs_comportName;
|
||||
QString gpi_getComPortName(void) {
|
||||
return SharedMemBuffer::getDataConst()->rs.comportName;
|
||||
}
|
||||
|
||||
static bool rs_portIsOpen;
|
||||
|
||||
void gpi_serialIsOpen(bool offen)
|
||||
{
|
||||
rs_portIsOpen=offen;
|
||||
void gpi_serialIsOpen(bool offen) {
|
||||
SharedMemBuffer::getData()->rs.portIsOpen = offen;
|
||||
}
|
||||
|
||||
bool epi_isSerialPortOpen()
|
||||
{
|
||||
bool epi_isSerialPortOpen() {
|
||||
// true: port is open false: port is closed
|
||||
return rs_portIsOpen;
|
||||
return SharedMemBuffer::getDataConst()->rs.portIsOpen;
|
||||
}
|
||||
|
||||
// ///////////////////////////////////////////////////////////////////////////////////
|
||||
// Control transfer gui <--> serial
|
||||
// ///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
static char AutoEmissionOn; // 1: zyklisch Anfragen zum Slave senden
|
||||
|
||||
void epi_startEmmision(char start)
|
||||
{
|
||||
AutoEmissionOn=start;
|
||||
void epi_startEmmision(char start) {
|
||||
SharedMemBuffer::getData()->AutoEmissionOn = start;
|
||||
}
|
||||
|
||||
bool gpi_isEmmisionOn(void)
|
||||
{
|
||||
return AutoEmissionOn;
|
||||
bool gpi_isEmmisionOn(void) {
|
||||
return SharedMemBuffer::getDataConst()->AutoEmissionOn;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------
|
||||
|
||||
static uint16_t datif_sendingPeriod;
|
||||
static bool datif_sendingPer_changed;
|
||||
|
||||
uint16_t gpi_getPeriodicSendTimeVal()
|
||||
{
|
||||
datif_sendingPer_changed=0;
|
||||
if (datif_sendingPeriod<3 || datif_sendingPeriod>10000)
|
||||
uint16_t gpi_getPeriodicSendTimeVal() {
|
||||
SharedMemBuffer::getData()->datif.sendingPer_changed = 0;
|
||||
if ((SharedMemBuffer::getDataConst()->datif.sendingPeriod < 3) ||
|
||||
(SharedMemBuffer::getDataConst()->datif.sendingPeriod > 10000)) {
|
||||
return 130; // ms, default
|
||||
else
|
||||
return datif_sendingPeriod;
|
||||
}
|
||||
return SharedMemBuffer::getDataConst()->datif.sendingPeriod;
|
||||
}
|
||||
|
||||
void epi_setPeriodicSendTimeVal(uint16_t val)
|
||||
{
|
||||
if (val>=3 && val<10000)
|
||||
{
|
||||
datif_sendingPer_changed=1;
|
||||
datif_sendingPeriod=val;
|
||||
void epi_setPeriodicSendTimeVal(uint16_t val) {
|
||||
if (val>=3 && val<10000) {
|
||||
SharedMemBuffer::getData()->datif.sendingPer_changed = 1;
|
||||
SharedMemBuffer::getData()->datif.sendingPeriod = val;
|
||||
}
|
||||
}
|
||||
|
||||
bool gpi_PeriodicSendTimeHasChanged()
|
||||
{
|
||||
return datif_sendingPer_changed;
|
||||
bool gpi_PeriodicSendTimeHasChanged() {
|
||||
return SharedMemBuffer::getDataConst()->datif.sendingPer_changed;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------
|
||||
|
||||
|
||||
//-----------------------------------------------------
|
||||
|
||||
// ///////////////////////////////////////////////////////////////////////////////////
|
||||
// Status Display gui <--> serial
|
||||
// ///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
// linke Spalte, über Connect Button
|
||||
static QString txt4comStateLine;
|
||||
|
||||
QString epi_getTxt4comStateLine(void)
|
||||
{
|
||||
QString epi_getTxt4comStateLine(void) {
|
||||
// GUI: get Text for serial Comport-State Line
|
||||
return txt4comStateLine;
|
||||
}
|
||||
|
||||
void gpi_setTxt4comStateLine(QString txtline) // gpi
|
||||
{
|
||||
void gpi_setTxt4comStateLine(QString txtline) {
|
||||
// serial: write Text to be displayed in serial Comport-State line (like "connected")
|
||||
txt4comStateLine.clear();
|
||||
if (txtline=="")
|
||||
@@ -137,26 +113,20 @@ void gpi_setTxt4comStateLine(QString txtline) // gpi
|
||||
txt4comStateLine=txtline;
|
||||
}
|
||||
|
||||
void epi_clrTxt4comStateLine()
|
||||
{
|
||||
void epi_clrTxt4comStateLine() {
|
||||
txt4comStateLine.clear();
|
||||
}
|
||||
|
||||
|
||||
//---------------------------------------------------------------------------------------------
|
||||
|
||||
// rechte Spalte, oberste Statuszeile
|
||||
// I) "Handshakes" (serial Control) flow.cpp
|
||||
// geht überhaupt was raus? kommt überhaupt was zurück?
|
||||
static QString txt4HsStateLine;
|
||||
|
||||
QString epi_getTxt4HsStateLine(void)
|
||||
{
|
||||
QString epi_getTxt4HsStateLine(void) {
|
||||
return txt4HsStateLine;
|
||||
}
|
||||
|
||||
void gpi_setTxt4HsStateLine(QString txtline)
|
||||
{
|
||||
void gpi_setTxt4HsStateLine(QString txtline) {
|
||||
txt4HsStateLine.clear();
|
||||
if (txtline=="")
|
||||
txt4HsStateLine.clear();
|
||||
@@ -164,26 +134,19 @@ void gpi_setTxt4HsStateLine(QString txtline)
|
||||
txt4HsStateLine=txtline;
|
||||
}
|
||||
|
||||
void epi_clrTxt4HsStateLine()
|
||||
{
|
||||
void epi_clrTxt4HsStateLine() {
|
||||
txt4HsStateLine.clear();
|
||||
}
|
||||
|
||||
|
||||
|
||||
//---------------------------------------------------------------------------------------------
|
||||
|
||||
// II) Master receive state (empfangenes Telgramm OK? crc? length? )
|
||||
// Statuszeile Auswertung der SlaveResponse (serial Frame, CRC usw) (prot.cpp)
|
||||
static QString txt4masterStateLine;
|
||||
|
||||
QString epi_getTxt4masterStateLine(void)
|
||||
{
|
||||
QString epi_getTxt4masterStateLine(void) {
|
||||
return txt4masterStateLine;
|
||||
}
|
||||
|
||||
void gpi_setTxt4masterStateLine(QString txtline)
|
||||
{
|
||||
void gpi_setTxt4masterStateLine(QString txtline) {
|
||||
txt4masterStateLine.clear();
|
||||
if (txtline=="")
|
||||
txt4masterStateLine.clear();
|
||||
@@ -191,13 +154,10 @@ void gpi_setTxt4masterStateLine(QString txtline)
|
||||
txt4masterStateLine=txtline;
|
||||
}
|
||||
|
||||
void epi_clrTxt4masterStateLine()
|
||||
{
|
||||
void epi_clrTxt4masterStateLine() {
|
||||
txt4masterStateLine.clear();
|
||||
}
|
||||
|
||||
|
||||
|
||||
//---------------------------------------------------------------------------------------------
|
||||
|
||||
// III Slave receive (from Master) OK? if then show results, if not then show errors
|
||||
@@ -207,13 +167,11 @@ void epi_clrTxt4masterStateLine()
|
||||
|
||||
static QString txt4resultStateLine;
|
||||
|
||||
QString epi_getTxt4resultStateLine(void)
|
||||
{
|
||||
QString epi_getTxt4resultStateLine(void) {
|
||||
return txt4resultStateLine;
|
||||
}
|
||||
|
||||
void gpi_setTxt4resultStateLine(QString txtline)
|
||||
{
|
||||
void gpi_setTxt4resultStateLine(QString txtline) {
|
||||
txt4resultStateLine.clear();
|
||||
if (txtline=="")
|
||||
txt4resultStateLine.clear();
|
||||
@@ -221,26 +179,22 @@ void gpi_setTxt4resultStateLine(QString txtline)
|
||||
txt4resultStateLine=txtline;
|
||||
}
|
||||
|
||||
void epi_clrTxt4resultStateLine()
|
||||
{
|
||||
void epi_clrTxt4resultStateLine() {
|
||||
txt4resultStateLine.clear();
|
||||
}
|
||||
|
||||
|
||||
//---------------------------------------------------------------------------------------------
|
||||
|
||||
// IV Statuszeile Empfangsdaten
|
||||
static QString txt4dataLine;
|
||||
|
||||
QString epi_getTxt4dataStateLine(void)
|
||||
{
|
||||
QString epi_getTxt4dataStateLine(void) {
|
||||
// GUI: get Text for serial Comport-State Line
|
||||
return txt4dataLine;
|
||||
|
||||
}
|
||||
|
||||
void gpi_setTxt4dataStateLine(QString txtline)
|
||||
{
|
||||
void gpi_setTxt4dataStateLine(QString txtline) {
|
||||
// serial: write Text to be displayed in serial Comport-State line (like "connected")
|
||||
txt4dataLine.clear();
|
||||
if (txtline=="")
|
||||
@@ -249,8 +203,7 @@ void gpi_setTxt4dataStateLine(QString txtline)
|
||||
txt4dataLine=txtline;
|
||||
}
|
||||
|
||||
void epi_clrTxt4dataStateLine()
|
||||
{
|
||||
void epi_clrTxt4dataStateLine() {
|
||||
txt4dataLine.clear();
|
||||
}
|
||||
|
||||
@@ -260,16 +213,11 @@ void epi_clrTxt4dataStateLine()
|
||||
|
||||
static QString txt4datifReceive;
|
||||
|
||||
QString epi_getTxt4datifLine(void)
|
||||
{
|
||||
|
||||
QString epi_getTxt4datifLine(void) {
|
||||
return txt4datifReceive;
|
||||
|
||||
}
|
||||
|
||||
void gpi_setTxt4datifLine(QString txtline)
|
||||
{
|
||||
|
||||
void gpi_setTxt4datifLine(QString txtline) {
|
||||
txt4datifReceive.clear();
|
||||
if (txtline=="")
|
||||
txt4datifReceive.clear();
|
||||
@@ -277,8 +225,7 @@ void gpi_setTxt4datifLine(QString txtline)
|
||||
txt4datifReceive=txtline;
|
||||
}
|
||||
|
||||
void epi_clrTxt4datifLine()
|
||||
{
|
||||
void epi_clrTxt4datifLine() {
|
||||
txt4datifReceive.clear();
|
||||
}
|
||||
|
||||
@@ -287,14 +234,11 @@ void epi_clrTxt4datifLine()
|
||||
|
||||
static QString txt4diagWindow;
|
||||
|
||||
QString epi_getTxt4RsDiagWin(void)
|
||||
{
|
||||
QString epi_getTxt4RsDiagWin(void) {
|
||||
return txt4diagWindow;
|
||||
|
||||
}
|
||||
|
||||
void gpi_setTxt4RsDiagWin(QString txtline)
|
||||
{
|
||||
void gpi_setTxt4RsDiagWin(QString txtline) {
|
||||
txt4diagWindow.clear();
|
||||
if (txtline=="")
|
||||
txt4diagWindow.clear();
|
||||
@@ -302,8 +246,7 @@ void gpi_setTxt4RsDiagWin(QString txtline)
|
||||
txt4diagWindow=txtline;
|
||||
}
|
||||
|
||||
void epi_clrTxt4RsDiagWin()
|
||||
{
|
||||
void epi_clrTxt4RsDiagWin() {
|
||||
txt4diagWindow.clear();
|
||||
}
|
||||
|
||||
@@ -311,14 +254,11 @@ void epi_clrTxt4RsDiagWin()
|
||||
|
||||
static QString sndTxt4diagWindow;
|
||||
|
||||
QString epi_get2ndTxt4RsDiagWin(void)
|
||||
{
|
||||
QString epi_get2ndTxt4RsDiagWin(void) {
|
||||
return sndTxt4diagWindow;
|
||||
|
||||
}
|
||||
|
||||
void gpi_set2ndTxt4RsDiagWin(QString txtline)
|
||||
{
|
||||
void gpi_set2ndTxt4RsDiagWin(QString txtline) {
|
||||
sndTxt4diagWindow.clear();
|
||||
if (txtline=="")
|
||||
sndTxt4diagWindow.clear();
|
||||
@@ -326,90 +266,61 @@ void gpi_set2ndTxt4RsDiagWin(QString txtline)
|
||||
sndTxt4diagWindow=txtline;
|
||||
}
|
||||
|
||||
void epi_clr2ndTxt4RsDiagWin()
|
||||
{
|
||||
void epi_clr2ndTxt4RsDiagWin() {
|
||||
sndTxt4diagWindow.clear();
|
||||
}
|
||||
|
||||
// ///////////////////////////////////////////////////////////////////////////////////
|
||||
// Memory for Slave responses, common data
|
||||
// ///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
static bool Sdata_serialTestResult;
|
||||
|
||||
void gpi_storeResult_serialTestOK(bool wasOk)
|
||||
{
|
||||
Sdata_serialTestResult=wasOk;
|
||||
void gpi_storeResult_serialTestOK(bool wasOk) {
|
||||
SharedMemBuffer::getData()->Sdata.serialTestResult = wasOk;
|
||||
}
|
||||
|
||||
bool epi_getResult_serialTestOK()
|
||||
{
|
||||
bool epi_getResult_serialTestOK() {
|
||||
// retval: true: test was successful, got right response
|
||||
return Sdata_serialTestResult;
|
||||
return SharedMemBuffer::getDataConst()->Sdata.serialTestResult;
|
||||
}
|
||||
|
||||
|
||||
|
||||
// ///////////////////////////////////////////////////////////////////////////////////
|
||||
// Store received data for hwapi
|
||||
// ///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
|
||||
static uint8_t Sdata_pProtResultOk;
|
||||
|
||||
void gpi_startNewRequest()
|
||||
{
|
||||
Sdata_pProtResultOk=0;
|
||||
void gpi_startNewRequest() {
|
||||
SharedMemBuffer::getData()->Sdata.pProtResultOk = 0;
|
||||
}
|
||||
|
||||
void gpi_storeResultOfLastRequest(bool answisok)
|
||||
{
|
||||
if (answisok)
|
||||
Sdata_pProtResultOk=1;
|
||||
else
|
||||
Sdata_pProtResultOk=2;
|
||||
void gpi_storeResultOfLastRequest(bool answisok) {
|
||||
SharedMemBuffer::getData()->Sdata.pProtResultOk = answisok ? 1 : 2;
|
||||
}
|
||||
|
||||
uint8_t epi_getResultOfLastRequest()
|
||||
{
|
||||
uint8_t epi_getResultOfLastRequest() {
|
||||
// retval: 0: in progress 1: OK 2: error
|
||||
return Sdata_pProtResultOk;
|
||||
return SharedMemBuffer::getDataConst()->Sdata.pProtResultOk;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
static uint16_t Sdata_receivedDataLength;
|
||||
static uint8_t Sdata_receivedDataBlock[64];
|
||||
|
||||
void gpi_storeRecPayLoad(uint8_t RdDlen, uint8_t *receivedData)
|
||||
{
|
||||
Sdata_receivedDataLength=uint16_t(RdDlen);
|
||||
if (Sdata_receivedDataLength>64)
|
||||
Sdata_receivedDataLength=64;
|
||||
tslib_strclr(Sdata_receivedDataBlock,0,64);
|
||||
tslib_strcpy(receivedData, Sdata_receivedDataBlock, Sdata_receivedDataLength);
|
||||
|
||||
void gpi_storeRecPayLoad(uint8_t RdDlen, uint8_t const *receivedData) {
|
||||
SharedMemBuffer::getData()->Sdata.receivedDataLength
|
||||
= std::min(RdDlen, (uint8_t)(64));
|
||||
memset((char *)(&SharedMemBuffer::getData()->Sdata.receivedDataBlock[0]),
|
||||
0x00, sizeof(SharedMemBuffer::getData()->Sdata.receivedDataBlock));
|
||||
strncpy((char *)(&SharedMemBuffer::getData()->Sdata.receivedDataBlock[0]),
|
||||
(char const *)receivedData,
|
||||
sizeof(SharedMemBuffer::getData()->Sdata.receivedDataBlock)-1);
|
||||
}
|
||||
|
||||
uint16_t epi_getLastPayLoad(uint16_t plBufSiz, uint8_t *payLoad)
|
||||
{
|
||||
uint16_t epi_getLastPayLoad(uint16_t plBufSiz, uint8_t *payLoad) {
|
||||
// get data back in *pl, max 64 byte
|
||||
// retval = nr of bytes received. If host buffer too small then
|
||||
// only plBufSíz bytes are copied to pl
|
||||
// plBufSíz=size of host buffer
|
||||
|
||||
uint16_t ml=plBufSiz;
|
||||
if (ml>64) ml=64;
|
||||
if (Sdata_receivedDataLength<ml)
|
||||
ml=Sdata_receivedDataLength;
|
||||
tslib_strcpy(Sdata_receivedDataBlock, payLoad, ml);
|
||||
return Sdata_receivedDataLength;
|
||||
uint16_t ml = std::min(plBufSiz, (uint16_t)(64));
|
||||
if (SharedMemBuffer::getDataConst()->Sdata.receivedDataLength < ml) {
|
||||
ml = SharedMemBuffer::getDataConst()->Sdata.receivedDataLength;
|
||||
}
|
||||
strncpy((char *)payLoad,
|
||||
(char const *)(&SharedMemBuffer::getData()->Sdata.receivedDataBlock[0]),
|
||||
ml);
|
||||
|
||||
return SharedMemBuffer::getDataConst()->Sdata.receivedDataLength;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
968
src/datIf.cpp
968
src/datIf.cpp
File diff suppressed because it is too large
Load Diff
322
src/dcBL.cpp
322
src/dcBL.cpp
@@ -283,24 +283,28 @@ uint8_t dcBL_restartDC(uint8_t *sendData)
|
||||
uint8_t dcBL_activatBootloader(uint8_t *sendData)
|
||||
{
|
||||
// minimum size of sendData-buffer: 20 byte retval: length
|
||||
|
||||
uint8_t nn=0;
|
||||
|
||||
//sendData[nn++]='U'; nötig??
|
||||
sendData[nn++]='U';
|
||||
sendData[nn++]='U';
|
||||
sendData[nn++]='U';
|
||||
sendData[nn++]='U';
|
||||
sendData[nn++]='U';
|
||||
|
||||
sendData[nn++]=2;
|
||||
sendData[nn++]='c';
|
||||
sendData[nn++]='4';
|
||||
sendData[nn++]='5';
|
||||
sendData[nn++]='b';
|
||||
sendData[nn++]='3';
|
||||
sendData[nn++]=3;
|
||||
|
||||
sendData[nn++]='U';
|
||||
sendData[nn++]='U';
|
||||
sendData[nn++]='U';
|
||||
sendData[nn++]='U';
|
||||
sendData[nn++]='U';
|
||||
sendData[nn++]='U';
|
||||
sendData[nn++]='U';
|
||||
sendData[nn++]='U';
|
||||
sendData[nn++]='U';
|
||||
sendData[nn++]='U';
|
||||
sendData[nn++]=0;
|
||||
sendData[nn++]=0;
|
||||
return nn;
|
||||
}
|
||||
@@ -315,9 +319,11 @@ uint8_t dcBL_getResponse(uint8_t *respBuff, bool display)
|
||||
{
|
||||
epi_getRawReceivedData(respBuff);
|
||||
epi_clrRawReceivedString();
|
||||
dcBL_writeText("dcBL gotResponse");
|
||||
|
||||
if (display)
|
||||
{
|
||||
/*
|
||||
// Antwort ins Fenster schreiben:
|
||||
QString tmpStr="", myStr="~~> ";
|
||||
|
||||
@@ -332,8 +338,8 @@ uint8_t dcBL_getResponse(uint8_t *respBuff, bool display)
|
||||
myStr.append(" ");
|
||||
}
|
||||
dcBL_writeText(myStr);
|
||||
*/
|
||||
}
|
||||
|
||||
}
|
||||
return recLen;
|
||||
}
|
||||
@@ -355,6 +361,10 @@ uint8_t dcBL_ChkResponse()
|
||||
recLen=dcBL_getResponse(buf,0);
|
||||
if (recLen==0)
|
||||
return 0; // no response by now
|
||||
|
||||
//qDebug()<<" DCBL_chkResp got answer " << recLen ;
|
||||
//dcBL_writeText("DCBL_chkResp got answer");
|
||||
|
||||
if (buf[0]==2 && buf[1]==(dcBL_LastBLcmd | 0x80) )
|
||||
return 10; // OK
|
||||
|
||||
@@ -365,24 +375,28 @@ uint8_t dcBL_ChkResponse()
|
||||
{
|
||||
dcBL_writeText("error wrong length");
|
||||
//exactError=1;
|
||||
qDebug()<<" DCBL_chkResp wrong length ";
|
||||
return 10; // OK
|
||||
}
|
||||
if (buf[0] !=2)
|
||||
{
|
||||
dcBL_writeText("error wrong start");
|
||||
//exactError=2;
|
||||
qDebug()<<" DCBL_chkResp wrong start ";
|
||||
return 10; // OK
|
||||
}
|
||||
if (buf[0]==2 && buf[1]=='e' && buf[2]=='0' )
|
||||
{
|
||||
dcBL_writeText("error wrong crc");
|
||||
//exactError=3; // DC reports wrong crc
|
||||
qDebug()<<" DCBL_chkResp wrong crc";
|
||||
return 1; // error
|
||||
}
|
||||
if (buf[0]==2 && buf[1]==dcBL_LastBLcmd )
|
||||
{
|
||||
dcBL_writeText("error wrong cmd");
|
||||
//exactError=4; // wrong cmd
|
||||
qDebug()<<" DCBL_chkResp wrong cmd";
|
||||
return 10; // OK
|
||||
}
|
||||
//tmpStr.clear();
|
||||
@@ -393,6 +407,21 @@ uint8_t dcBL_ChkResponse()
|
||||
|
||||
|
||||
|
||||
uint8_t dcBL_sendSuccess(uint8_t lastCommand)
|
||||
{
|
||||
// return val: 0: no response by now 1:error 10: OK
|
||||
|
||||
uint8_t buf[152], recLen;
|
||||
|
||||
recLen=dcBL_getResponse(buf,0);
|
||||
if (recLen==0)
|
||||
return 0; // no response by now
|
||||
|
||||
if (buf[0]==2 && buf[1]==(lastCommand | 0x80) )
|
||||
return 10; // OK
|
||||
return 1;
|
||||
}
|
||||
|
||||
// -----------------------------------------------------------------------------------------------
|
||||
// --- ATB Bin-File Handling ---------------------------------------------------------------------
|
||||
// -----------------------------------------------------------------------------------------------
|
||||
@@ -445,9 +474,8 @@ char dcBL_loadBinary(char withDisplay)
|
||||
uint32_t ultmp, fileLen;
|
||||
QString tmpStr="", s2tmp="";
|
||||
|
||||
//QFile file("/own/H2B/dc2.hex"); // laesst sich genauso oeffnen
|
||||
QFile file("/own/H2B/dc2.bin");
|
||||
|
||||
qDebug()<<"dcBL loading DC2c binary...";
|
||||
QFile file("../dc2c4.bin");
|
||||
if (!file.exists())
|
||||
{
|
||||
//qDebug()<<"file _own_H2B_dc2.bin does not exist";
|
||||
@@ -502,7 +530,8 @@ static QByteArray dcBL_AtbBinFile;
|
||||
static uint32_t dcBL_fileSize;
|
||||
static uint16_t dcBL_nrOfBlocks;
|
||||
static uint16_t dcBL_fileCrc;
|
||||
static uint8_t dcBL_myBuf[257000]; // same content like "dcBL_AtbBinFile" but bytewise
|
||||
//static uint8_t dcBL_myBuf[2570000]; // same content like "dcBL_AtbBinFile" but bytewise
|
||||
static uint8_t dcBL_myBuf[300000]; // same content like "dcBL_AtbBinFile" but bytewise
|
||||
|
||||
bool dcBL_importBinFile(QByteArray readBinFile, uint32_t fileSize, char withDispl)
|
||||
{
|
||||
@@ -514,7 +543,10 @@ bool dcBL_importBinFile(QByteArray readBinFile, uint32_t fileSize, char withDisp
|
||||
dcBL_AtbBinFile=readBinFile;
|
||||
dcBL_fileSize=fileSize;
|
||||
|
||||
if (dcBL_fileSize>258048)
|
||||
//if (dcBL_fileSize>258048) // 27.3.23TS woher kommt die Zahl???
|
||||
// das hex file hat 278kB
|
||||
// hex file nicht erlaubt???
|
||||
if (dcBL_fileSize>=300000)
|
||||
return false; // keep last file
|
||||
ultmp=dcBL_fileSize;
|
||||
ultmp %=64;
|
||||
@@ -718,7 +750,7 @@ uint8_t dcBL_getFileBlock(uint16_t blockPointer, uint8_t *buf)
|
||||
|
||||
/*
|
||||
// Kontrolle:
|
||||
qDebug()<<"dcBL_getFileBlock myBuf: ";
|
||||
qDebug()<<"dcBL getFileBlock myBuf: ";
|
||||
int ii=0;
|
||||
do
|
||||
{
|
||||
@@ -729,7 +761,7 @@ uint8_t dcBL_getFileBlock(uint16_t blockPointer, uint8_t *buf)
|
||||
|
||||
} while (ii<64);
|
||||
|
||||
qDebug()<<"dcBL_getFileBlock myBuf: ";
|
||||
qDebug()<<"dcBL getFileBlock myBuf: ";
|
||||
ii=0;
|
||||
do
|
||||
{
|
||||
@@ -809,7 +841,6 @@ QString dcBL_readText(void)
|
||||
// -------------------------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
static uint8_t dcBL_step, dcBL_state;
|
||||
static uint16_t dcBL_BlkCtr, dcBL_cyclCtr, repeatCtr;
|
||||
|
||||
@@ -826,8 +857,8 @@ void dcBL_iniChain(void)
|
||||
pBlResp=0;
|
||||
for (nn=0;nn<SIZEBLRESP; nn++)
|
||||
BlResp[nn]="";
|
||||
dcBL_writeText("**CLEAR**");
|
||||
|
||||
//dcBL_writeText("**CLEAR**");
|
||||
dcBL_writeText("bl chain ini");
|
||||
}
|
||||
|
||||
uint8_t dcBL_startChain(void)
|
||||
@@ -836,13 +867,15 @@ uint8_t dcBL_startChain(void)
|
||||
{
|
||||
dcBL_iniChain();
|
||||
dcBL_step=1;
|
||||
epi_clrRawReceivedString();
|
||||
//epi_clrRawReceivedString();
|
||||
qDebug()<<"starting chain...";
|
||||
//qDebug()<<pBlResp;
|
||||
dcBL_writeText("bl chain start");
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
uint8_t dcBL_runChain(void)
|
||||
{
|
||||
// starting BL
|
||||
@@ -857,17 +890,14 @@ uint8_t dcBL_runChain(void)
|
||||
|
||||
QString tmpStr="";
|
||||
|
||||
uint8_t buf[70], sendBuf[160], len, sendLen, gotResp; //, uit8tmp; //, recLen; recBuff[160], ii,
|
||||
uint8_t buf[70], sendBuf[160], len, sendLen, gotResp, ii, uit8tmp;
|
||||
//static uint8_t lastBlkLength;
|
||||
QString stemp=" ";
|
||||
uint32_t ultmp;
|
||||
bool ret;
|
||||
//uint8_t recLen, recBuff[160], ;
|
||||
|
||||
//recLen=dcBL_getResponse(recBuff, (dcBL_step<=11)?1:0); // reads all responses
|
||||
// Antwort nur bis step 11 anzeigen
|
||||
// wird schon in dcBL_responseOK() gelesen
|
||||
|
||||
gotResp=dcBL_ChkResponse();
|
||||
gotResp=dcBL_ChkResponse(); //zum test hier raus, unten gehts nicht, darf nur 1x
|
||||
|
||||
switch (dcBL_step)
|
||||
{
|
||||
@@ -904,6 +934,7 @@ uint8_t dcBL_runChain(void)
|
||||
|
||||
case 5: // wait for answer: 2 99 52 53 98 51 3
|
||||
// Problem: kommt von app, nicht vom BL. Also wenn BL schon aktiv ist dann gehts nicht
|
||||
|
||||
/*
|
||||
dcBL_cyclCtr++;
|
||||
if (recLen>6 && recBuff[0]==2 && recBuff[1]==99 && recBuff[2]==52)
|
||||
@@ -922,7 +953,7 @@ uint8_t dcBL_runChain(void)
|
||||
dcBL_state=3;
|
||||
dcBL_step=0; // stop chain
|
||||
return 0;
|
||||
}*/
|
||||
} */
|
||||
|
||||
dcBL_step++;
|
||||
repeatCtr=0;
|
||||
@@ -1002,49 +1033,15 @@ uint8_t dcBL_runChain(void)
|
||||
dcBL_step=0; // stop chain
|
||||
}
|
||||
break;
|
||||
/*
|
||||
case 10: // send length and crc
|
||||
len=dcBL_getAtbFileHeader(buf);
|
||||
sendWRcmd_setSendBlock160(len, buf);
|
||||
dcBL_writeText("sending header");
|
||||
|
||||
dcBL_BlkCtr=0; // normal 0
|
||||
|
||||
dcBL_cyclCtr=0;
|
||||
dcBL_step++;
|
||||
break;
|
||||
|
||||
case 11: // wait for answer 2 178 102 105 3
|
||||
|
||||
if (gotResp==ISOK)
|
||||
{
|
||||
dcBL_step++;
|
||||
repeatCtr=0;
|
||||
return 0;
|
||||
} else
|
||||
if (gotResp==ISWRONG)
|
||||
{
|
||||
if (++repeatCtr<3)
|
||||
{
|
||||
dcBL_step--;
|
||||
} else
|
||||
{
|
||||
dcBL_step=0; // stop chain
|
||||
}
|
||||
}
|
||||
if (++dcBL_cyclCtr>10)
|
||||
{
|
||||
dcBL_writeText("cancel");
|
||||
dcBL_step=0; // stop chain
|
||||
}
|
||||
break;
|
||||
*/
|
||||
case 12: // send binary 64 byte wise
|
||||
|
||||
len=dcBL_getFileBlock(dcBL_BlkCtr, buf); // read from file, len = 0...64
|
||||
//lastBlkLength=len; // recognize last block or end
|
||||
sendLen=dcBL_prepareDC_BLcmd(0x22, len, buf, sendBuf); // pack into protocol frame
|
||||
/*
|
||||
|
||||
|
||||
// Kontrolle:
|
||||
qDebug()<<"dcBL sending: ";
|
||||
ii=0;
|
||||
@@ -1056,7 +1053,7 @@ uint8_t dcBL_runChain(void)
|
||||
qDebug() << stemp << " "; // Anzeige in hex
|
||||
|
||||
} while (ii<100);
|
||||
*/
|
||||
|
||||
|
||||
sendWRcmd_setSendBlock160(sendLen, sendBuf); // send 140 bytes
|
||||
delay(100);
|
||||
@@ -1174,12 +1171,202 @@ uint8_t dcBL_runChain(void)
|
||||
case 18:
|
||||
dcBL_step=0;
|
||||
break;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
void dcBL_iniLoading(void)
|
||||
{
|
||||
dcBL_iniChain();
|
||||
}
|
||||
|
||||
|
||||
// nicht verwendet
|
||||
void dcBL_startLoading(void)
|
||||
{
|
||||
if (dcBL_step==0 || dcBL_step>17)
|
||||
{
|
||||
//dcBL_iniChain();
|
||||
dcBL_step=1;
|
||||
//epi_clrRawReceivedString();
|
||||
qDebug()<<"DCBL start sending hexfile...";
|
||||
dcBL_writeText("DCBL start sending hexfile...");
|
||||
dcBL_BlkCtr=0;
|
||||
dcBL_cyclCtr=0;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
// nicht verwendet
|
||||
uint8_t dcBL_sendHexfile(void)
|
||||
{
|
||||
QString tmpStr="";
|
||||
uint8_t buf[70], sendBuf[160], len, sendLen, gotResp; //, recLen; recBuff[160], ii,
|
||||
QString stemp=" ";
|
||||
uint32_t ultmp;
|
||||
//uint8_t uit8tmp, ii;
|
||||
|
||||
|
||||
gotResp=dcBL_ChkResponse();
|
||||
|
||||
switch (dcBL_step)
|
||||
{
|
||||
case 1: // send start address
|
||||
if (dcBL_BlkCtr==0 || dcBL_BlkCtr==1024 || dcBL_BlkCtr==2048 || dcBL_BlkCtr==3072 || dcBL_BlkCtr==4096)
|
||||
{
|
||||
ultmp=uint32_t(dcBL_BlkCtr);
|
||||
ultmp*=64;
|
||||
len=dcBL_sendFlashStartAddr2BL(ultmp, buf);
|
||||
sendWRcmd_setSendBlock160(len, buf);
|
||||
qDebug()<<" DCBL_CYCL_sending HexFile address ";
|
||||
dcBL_writeText("sending addr");
|
||||
dcBL_step++;
|
||||
return 0;
|
||||
} else
|
||||
dcBL_step=12;
|
||||
break;
|
||||
|
||||
case 2: // wait for answer 2 161 68 59 3
|
||||
if (gotResp==ISOK)
|
||||
{
|
||||
dcBL_step=12; // Header nicht senden, unnötig
|
||||
dcBL_BlkCtr=0; // 0
|
||||
repeatCtr=0;
|
||||
return 0;
|
||||
} else
|
||||
if (gotResp==ISWRONG)
|
||||
{
|
||||
if (++repeatCtr<3)
|
||||
{
|
||||
dcBL_step--;
|
||||
} else
|
||||
{
|
||||
dcBL_step=0; // stop chain
|
||||
qDebug()<<" DCBL_CYCL_got wrong resp to addr";
|
||||
dcBL_writeText("wrong resp");
|
||||
}
|
||||
}
|
||||
if (++dcBL_cyclCtr>100)
|
||||
{
|
||||
dcBL_writeText("cancel");
|
||||
qDebug()<<" DCBL_CYCL_step 2 got NO resp to addr";
|
||||
dcBL_step=0; // stop chain
|
||||
}
|
||||
break;
|
||||
|
||||
case 12: // send binary 64 byte wise
|
||||
|
||||
len=dcBL_getFileBlock(dcBL_BlkCtr, buf); // read from file, len = 0...64
|
||||
//lastBlkLength=len; // recognize last block or end
|
||||
sendLen=dcBL_prepareDC_BLcmd(0x22, len, buf, sendBuf); // pack into protocol frame
|
||||
/*
|
||||
// Kontrolle:
|
||||
qDebug()<<"dcBL sending: ";
|
||||
ii=0;
|
||||
do
|
||||
{
|
||||
uit8tmp=(uint8_t)sendBuf[ii++];
|
||||
//qDebug() << uit8tmp << " "; // Anzeige in dez
|
||||
stemp.setNum(uit8tmp,16);
|
||||
qDebug() << stemp << " "; // Anzeige in hex
|
||||
|
||||
} while (ii<100);
|
||||
*/
|
||||
sendWRcmd_setSendBlock160(sendLen, sendBuf); // send 140 bytes
|
||||
delay(100);
|
||||
dcBL_writeText("blk nr: ");
|
||||
tmpStr.setNum(dcBL_BlkCtr);
|
||||
dcBL_writeText(tmpStr);
|
||||
delay(100);
|
||||
qDebug()<<"DCBL sending blk nr: " << dcBL_BlkCtr;
|
||||
dcBL_cyclCtr=0;
|
||||
dcBL_BlkCtr++;
|
||||
dcBL_step++;
|
||||
break;
|
||||
|
||||
case 13: // wait for answer 2 162 116 88 3
|
||||
|
||||
if (gotResp==ISOK)
|
||||
{
|
||||
// check if next address is needed (every 1024Blocks = 65536bytes)
|
||||
if (dcBL_BlkCtr==1024 || dcBL_BlkCtr==2048 || dcBL_BlkCtr==3072 || dcBL_BlkCtr==4096)
|
||||
{
|
||||
dcBL_step=8;
|
||||
return 0;
|
||||
}
|
||||
|
||||
// check for EOF:
|
||||
if (dcBL_BlkCtr >= dcBL_nrOfBlocks)
|
||||
{
|
||||
dcBL_writeText("last block successful sent...");
|
||||
dcBL_step++; // stop chain
|
||||
dcBL_state=3; // transmission SUCCESSFUL
|
||||
return 0;
|
||||
}
|
||||
dcBL_state=2; // transmission started
|
||||
dcBL_step--; // send next data block
|
||||
repeatCtr=0;
|
||||
return 0;
|
||||
}
|
||||
if (gotResp==ISWRONG)
|
||||
{
|
||||
if (++repeatCtr<3)
|
||||
{
|
||||
dcBL_writeText("error");
|
||||
dcBL_BlkCtr--;
|
||||
dcBL_step--; // send same block again
|
||||
} else
|
||||
{
|
||||
dcBL_step=0; // stop chain
|
||||
}
|
||||
}
|
||||
if (++dcBL_cyclCtr>30) // longer TO due to flashing
|
||||
{
|
||||
dcBL_writeText("cancel");
|
||||
dcBL_step=0; // stop chain
|
||||
}
|
||||
break;
|
||||
|
||||
case 14: //
|
||||
dcBL_writeText("finish writing flash");
|
||||
len=dcBL_writeLastPage(buf); // nur zur Sicherheit
|
||||
sendWRcmd_setSendBlock160(len, buf);
|
||||
dcBL_step++;
|
||||
break;
|
||||
|
||||
case 15: // wait for answer
|
||||
if (gotResp==ISOK)
|
||||
{
|
||||
dcBL_step++;
|
||||
repeatCtr=0;
|
||||
return 0;
|
||||
} else
|
||||
if (gotResp==ISWRONG)
|
||||
{
|
||||
if (++repeatCtr>3)
|
||||
{
|
||||
dcBL_step--;
|
||||
}
|
||||
}
|
||||
if (++dcBL_cyclCtr>10)
|
||||
{
|
||||
dcBL_writeText("cancel");
|
||||
dcBL_step=0; // stop chain
|
||||
}
|
||||
break;
|
||||
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
uint8_t dcBL_getResult(void)
|
||||
{
|
||||
// call after every step to what's going on....
|
||||
@@ -1190,6 +1377,9 @@ uint8_t dcBL_getResult(void)
|
||||
return dcBL_state;
|
||||
}
|
||||
|
||||
// -------------------------------------------------------------------------
|
||||
// -------------------------------------------------------------------------
|
||||
// -------------------------------------------------------------------------
|
||||
|
||||
|
||||
static uint8_t Sdata_rawData[RAW_BL_DATALEN];
|
||||
@@ -1204,6 +1394,8 @@ void gpi_storeRawReceivedData(uint8_t RdDlen, uint8_t *receivedData)
|
||||
Sdata_LengthRawData=RAW_BL_DATALEN;
|
||||
for (nn=0; nn<Sdata_LengthRawData; nn++)
|
||||
Sdata_rawData[nn]=receivedData[nn];
|
||||
//qDebug()<<"dcBL got data"<< Sdata_LengthRawData << "bytes :)";
|
||||
|
||||
}
|
||||
|
||||
uint8_t epi_getRawReceivedData(uint8_t *receivedData)
|
||||
@@ -1230,8 +1422,8 @@ QString epi_getRawReceivedString()
|
||||
QString myString=nullptr, tmpStr=nullptr;
|
||||
|
||||
myString.clear();
|
||||
//if (Sdata_LengthRawData==0)
|
||||
// return myString;
|
||||
if (Sdata_LengthRawData==0)
|
||||
return myString;
|
||||
|
||||
for (nn=0; nn<Sdata_LengthRawData; nn++)
|
||||
{
|
||||
|
25
src/hwChk.cpp
Executable file
25
src/hwChk.cpp
Executable file
@@ -0,0 +1,25 @@
|
||||
|
||||
#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()
|
||||
{
|
||||
|
||||
}
|
||||
|
6769
src/hwapi.cpp
6769
src/hwapi.cpp
File diff suppressed because it is too large
Load Diff
289
src/prot.cpp
289
src/prot.cpp
@@ -9,9 +9,33 @@ T_prot::T_prot()
|
||||
|
||||
mySerialPort = new T_com();
|
||||
connect(mySerialPort, SIGNAL(receivingFinished()), this, SLOT( analyseRecData() ));
|
||||
//connect(mySerialPort, SIGNAL(receivingFinished()), this, SLOT( receivFin() ));
|
||||
//connect(mySerialPort, SIGNAL(sendingFinished()), this, SLOT(sendeFin()));
|
||||
kindOfData=0; // 0: binaries, 1:text
|
||||
|
||||
for (int nn=0; nn<FRAME_DATALEN; nn++)
|
||||
{
|
||||
chOut_Data[nn]=0;
|
||||
ui8OutputData[nn]=0;
|
||||
InputData[nn]=0;
|
||||
}
|
||||
for (int nn=0; nn<BL_DATA_LEN; nn++)
|
||||
{
|
||||
ui8BLsendData[nn]=0;
|
||||
}
|
||||
WriteCommand=0;
|
||||
WriteAddr=0;
|
||||
WrDataLength=0;
|
||||
SendDataValid=0;
|
||||
kindOfData=0;
|
||||
slaveAddr=0;
|
||||
ReadCommand=0;
|
||||
ReadAddr=0;
|
||||
reserve =0;
|
||||
RecSlaveAddr =0;
|
||||
INdataValid=0;
|
||||
readSource =0;
|
||||
readAddress=0;
|
||||
RdDataLength=0;
|
||||
BLsendDataLength=0;
|
||||
|
||||
}
|
||||
|
||||
@@ -30,6 +54,19 @@ bool T_prot::isSerialFree(void)
|
||||
return true; // ohne HS's kann er nicht blockiert sein
|
||||
}
|
||||
|
||||
void T_prot::setRecLen(uint16_t WriteCmd)
|
||||
{
|
||||
if (WriteCmd<100)
|
||||
{
|
||||
RdDataLength=DATALEN_RECEIVE_LONG; // store here already because it's no longer
|
||||
// returned from slave
|
||||
mySerialPort->receiveFixLen(TELEGRAMLEN_RECEIVE_LONG);
|
||||
} else
|
||||
{
|
||||
RdDataLength=DATALEN_RECEIVE_FAST;
|
||||
mySerialPort->receiveFixLen(TELEGRAMLEN_RECEIVE_FAST);
|
||||
}
|
||||
}
|
||||
|
||||
void T_prot::setUserWriteData(uint16_t WriteCmd, uint16_t WrAddr, uint8_t WrDatLen, uint8_t *data)
|
||||
{
|
||||
@@ -43,6 +80,8 @@ void T_prot::setUserWriteData(uint16_t WriteCmd, uint16_t WrAddr, uint8_t WrDat
|
||||
ui8OutputData[nn]=data[nn];
|
||||
SendDataValid=1; // always set WR first
|
||||
kindOfData=0; // 0: binaries, 1:text
|
||||
this->setRecLen(WriteCmd);
|
||||
|
||||
}
|
||||
|
||||
void T_prot::setUserWriteData(uint16_t WriteCmd, uint16_t WrAddr)
|
||||
@@ -54,6 +93,8 @@ void T_prot::setUserWriteData(uint16_t WriteCmd, uint16_t WrAddr)
|
||||
ui8OutputData[nn]=0;
|
||||
SendDataValid=1; // always set WR first
|
||||
kindOfData=0; // 0: binaries, 1:text
|
||||
this->setRecLen(WriteCmd);
|
||||
|
||||
}
|
||||
|
||||
void T_prot::setUserWriteData(uint16_t WriteCmd)
|
||||
@@ -65,6 +106,8 @@ void T_prot::setUserWriteData(uint16_t WriteCmd)
|
||||
ui8OutputData[nn]=0;
|
||||
SendDataValid=1; // always set WR first
|
||||
kindOfData=0; // 0: binaries, 1:text
|
||||
this->setRecLen(WriteCmd);
|
||||
|
||||
}
|
||||
|
||||
void T_prot::setUserWrite1DB(uint16_t WriteCmd, uint16_t WrAddr, uint8_t val)
|
||||
@@ -76,6 +119,8 @@ void T_prot::setUserWrite1DB(uint16_t WriteCmd, uint16_t WrAddr, uint8_t val)
|
||||
ui8OutputData[0]=val;
|
||||
SendDataValid=1; // always set WR first
|
||||
kindOfData=0; // 0: binaries, 1:text
|
||||
this->setRecLen(WriteCmd);
|
||||
|
||||
}
|
||||
|
||||
void T_prot::setUserWrite2DB(uint16_t WriteCmd, uint16_t WrAddr, uint8_t val0, uint8_t val1)
|
||||
@@ -87,6 +132,8 @@ void T_prot::setUserWrite2DB(uint16_t WriteCmd, uint16_t WrAddr, uint8_t val0, u
|
||||
ui8OutputData[1]=val1;
|
||||
SendDataValid=1; // always set WR first
|
||||
kindOfData=0; // 0: binaries, 1:text
|
||||
this->setRecLen(WriteCmd);
|
||||
|
||||
}
|
||||
|
||||
void T_prot::setUserWriteText(uint16_t WriteCmd, uint16_t WrAddr, uint8_t WrDatLen, char *data)
|
||||
@@ -101,6 +148,8 @@ void T_prot::setUserWriteText(uint16_t WriteCmd, uint16_t WrAddr, uint8_t WrDat
|
||||
chOut_Data[nn]=data[nn];
|
||||
SendDataValid=1; // always set WR first
|
||||
kindOfData=1; // 0: binaries, 1:text
|
||||
this->setRecLen(WriteCmd);
|
||||
|
||||
}
|
||||
|
||||
void T_prot::setUserReadData( uint16_t ReadCmd, uint16_t RdAddr, uint16_t reserv)
|
||||
@@ -109,6 +158,8 @@ void T_prot::setUserReadData( uint16_t ReadCmd, uint16_t RdAddr, uint16_t reser
|
||||
ReadAddr=RdAddr;
|
||||
reserve=reserv;
|
||||
SendDataValid |=2;
|
||||
readAddress=RdAddr; // store here already because it's no longer returned from slave
|
||||
readSource=ReadCmd;
|
||||
}
|
||||
|
||||
void T_prot::setUserReadData( uint16_t ReadCmd, uint16_t RdAddr)
|
||||
@@ -117,6 +168,8 @@ void T_prot::setUserReadData( uint16_t ReadCmd, uint16_t RdAddr)
|
||||
ReadAddr=RdAddr;
|
||||
reserve=0;
|
||||
SendDataValid |=2;
|
||||
readAddress=RdAddr; // store here already because it's no longer returned from slave
|
||||
readSource=ReadCmd;
|
||||
}
|
||||
|
||||
void T_prot::setUserReadData( uint16_t ReadCmd)
|
||||
@@ -125,6 +178,8 @@ void T_prot::setUserReadData( uint16_t ReadCmd)
|
||||
ReadAddr=0;
|
||||
reserve=0;
|
||||
SendDataValid |=2;
|
||||
readAddress=0; // store here already because it's no longer returned from slave
|
||||
readSource=ReadCmd;
|
||||
}
|
||||
|
||||
void T_prot::setBLsendData( uint8_t len, uint8_t *buf)
|
||||
@@ -137,8 +192,14 @@ void T_prot::setBLsendData( uint8_t len, uint8_t *buf)
|
||||
for (int nn=0; nn<BLsendDataLength; nn++)
|
||||
ui8BLsendData[nn]=buf[nn];
|
||||
WriteCommand=0xFFFF;
|
||||
this->setRecLen(100); // how many??
|
||||
//readAddress= // needed??
|
||||
|
||||
//qDebug()<<"prot: got BL data " << len << "bytes, ";
|
||||
//for (int i=0; i<len; ++i) {
|
||||
// printf("%02x ", (unsigned char)buf[i]);
|
||||
//} printf("\n");
|
||||
|
||||
qDebug()<<"prot: got BL data " << len << "bytes, ";
|
||||
/*
|
||||
qDebug()<<buf[0] <<buf[1] <<buf[2] <<buf[3] <<buf[4] <<buf[5] <<buf[6] <<buf[7];
|
||||
qDebug() <<buf[8] <<buf[9] <<buf[10] <<buf[11] <<buf[12] <<buf[13]<<buf[14]<<buf[15];
|
||||
@@ -153,6 +214,11 @@ qDebug() <<buf[72] <<buf[73] <<buf[74] <<buf[75] <<buf[76] <<buf[77] <<buf[78]<<
|
||||
*/
|
||||
}
|
||||
|
||||
void T_prot::receiveFixLen(int64_t nrOfbytesToReceive)
|
||||
{
|
||||
mySerialPort->receiveFixLen(nrOfbytesToReceive);
|
||||
}
|
||||
|
||||
void T_prot::sendUserData(uint16_t slaveAdr)
|
||||
{
|
||||
// man könnte hier noch "SendDataValid" abfragen,
|
||||
@@ -167,14 +233,90 @@ void T_prot::sendUserData(uint16_t slaveAdr)
|
||||
// Bypass for bootloader, no protocol frame but send as is...
|
||||
packBuf_2.clear();
|
||||
for (int nn=0; nn<BLsendDataLength; nn++)
|
||||
packBuf_2[nn]=char(ui8BLsendData[nn]);
|
||||
packBuf_2[nn]=char(ui8BLsendData[nn]);
|
||||
mySerialPort->writeToSerial(packBuf_2, BLsendDataLength);
|
||||
|
||||
|
||||
} else
|
||||
startPacking();
|
||||
startFastPacking(); // quicker since 15.12.21TS
|
||||
//startPacking();
|
||||
}
|
||||
|
||||
void T_prot::startFastPacking(void)
|
||||
{
|
||||
uint16_t mycrc;
|
||||
uint16_t sendLen;
|
||||
uint8_t uctmp, nn, pp, CrcLp;
|
||||
char sendBuffer[FRAME_MAXLEN], ctmp;
|
||||
|
||||
//qDebug() << "prot start fast packing "<<slaveAddr;
|
||||
|
||||
for (int nn=0; nn<FRAME_MAXLEN; nn++)
|
||||
sendBuffer[nn]=0;
|
||||
|
||||
if (WriteCommand>9 && WriteCommand<100)
|
||||
{
|
||||
// long command 10...99
|
||||
// WriteCommand==0 if only read request, then use short sending
|
||||
sendBuffer[0]=STARTSIGN_SEND_LONG;
|
||||
WrDataLength=DATALEN_SEND_LONG; // immer
|
||||
//qDebug() << "send long cmd, len: " << WrDataLength;
|
||||
} else
|
||||
{
|
||||
// fast command
|
||||
sendBuffer[0]=STARTSIGN_SEND_FAST;
|
||||
WrDataLength=DATALEN_SEND_FAST; // immer
|
||||
//qDebug() << "send fast cmd, len: " << WrDataLength;
|
||||
}
|
||||
sendBuffer[1]= uint8_t(WriteCommand);
|
||||
sendBuffer[2]= uint8_t(ReadCommand);
|
||||
if (WriteAddr>0)
|
||||
sendBuffer[3]= char(WriteAddr); // bei fast nur EINE adresse, wr hat Vorrang
|
||||
else
|
||||
sendBuffer[3]= char(ReadAddr);
|
||||
// beim Fast prot. ist das reserve dann ists egal was drin steht
|
||||
|
||||
if (kindOfData) // 0: binaries, 1:text
|
||||
{
|
||||
for (nn=0; nn<WrDataLength; nn++)
|
||||
{
|
||||
pp=HEADERLEN_SEND+nn;
|
||||
ctmp=(chOut_Data[nn]); // text
|
||||
sendBuffer[pp]= char(ctmp);
|
||||
}
|
||||
|
||||
} else
|
||||
{
|
||||
for (nn=0; nn<WrDataLength; nn++)
|
||||
{
|
||||
pp=HEADERLEN_SEND+nn;
|
||||
uctmp=(ui8OutputData[nn]); // bin
|
||||
sendBuffer[pp]= char(uctmp);
|
||||
}
|
||||
}
|
||||
|
||||
CrcLp= HEADERLEN_SEND + WrDataLength;
|
||||
mycrc=0;
|
||||
for (nn=0; nn<CrcLp; nn++)
|
||||
{
|
||||
uctmp=sendBuffer[nn];
|
||||
mycrc+=uint16_t(uctmp);
|
||||
//qDebug() << mycrc;
|
||||
}
|
||||
sendBuffer[CrcLp]=char(mycrc);
|
||||
mycrc>>=8;
|
||||
sendBuffer[CrcLp+1]=char(mycrc);
|
||||
sendLen=CrcLp+2;
|
||||
|
||||
// send to VCP:
|
||||
QByteArray packBuff;
|
||||
packBuff.clear();
|
||||
packBuff.append(sendBuffer, sendLen); // ohne sendLen wird beim ersten \0 abgeschnitten!!!
|
||||
mySerialPort->writeToSerial(packBuff, sendLen);
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
void T_prot::startPacking(void)
|
||||
{
|
||||
uint16_t mycrc;
|
||||
@@ -262,10 +404,8 @@ void T_prot::startPacking(void)
|
||||
packBuff.append(sendBuffer, sendLen); // ohne sendLen wird beim ersten \0 abgeschnitten!!!
|
||||
mySerialPort->writeToSerial(packBuff, sendLen);
|
||||
// void T_com::writeToSerial(const QByteArray &data, uint16_t sendLength)
|
||||
|
||||
}
|
||||
|
||||
|
||||
*/
|
||||
|
||||
// ---------------------------------------------------------------------------------------------------------
|
||||
// receiving.....
|
||||
@@ -293,7 +433,8 @@ uint8_t recBuffer[FRAME_MAXLEN];
|
||||
|
||||
// read from "VCP":
|
||||
mySerialPort->readFromSerial(Indata, recLength);
|
||||
|
||||
qCritical()<<"prot: got data " << recLength;
|
||||
qCritical()<<" Indata: " << Indata;
|
||||
if (recLength>FRAME_MAXLEN)
|
||||
recLength=FRAME_MAXLEN;
|
||||
for (int nn=0; nn<recLength; nn++)
|
||||
@@ -301,10 +442,14 @@ uint8_t recBuffer[FRAME_MAXLEN];
|
||||
|
||||
myString.clear();
|
||||
tempStr.clear();
|
||||
uint8_t result=FramecheckInData(recBuffer, recLength); // check input data (response from slave)
|
||||
//uint8_t result=FramecheckInData(recBuffer, recLength); // check input data (response from slave)
|
||||
uint8_t result=FastCheckInData(recBuffer, recLength); // check input data (response from slave)
|
||||
|
||||
qCritical()<<" FastCheckInData() result = " << result;
|
||||
|
||||
if (result>0)
|
||||
{
|
||||
// dann anzeigen und ende
|
||||
// dann anzeige
|
||||
switch (result)
|
||||
{
|
||||
case 1: gpi_setTxt4masterStateLine("wrong length received"); break;
|
||||
@@ -316,6 +461,7 @@ uint8_t recBuffer[FRAME_MAXLEN];
|
||||
}
|
||||
myString.setNum(result);
|
||||
|
||||
// Daten abspeichern, könnten vom BL sein:
|
||||
gpi_storeRawReceivedData(uint8_t(recLength), recBuffer);
|
||||
emit rawDataRecieved();
|
||||
|
||||
@@ -328,16 +474,59 @@ uint8_t recBuffer[FRAME_MAXLEN];
|
||||
// konnte der Slave die geforderten Daten ausgeben (DOs, AOs)?
|
||||
// konnte der Slave die geforderten Daten einlesen (AIs, DIs)?
|
||||
|
||||
CheckInResult(recBuffer); // Ergebnisse des Slaves anzeigen
|
||||
//CheckInResult(recBuffer); // Ergebnisse des Slaves anzeigen
|
||||
// stimmt nicht mehr bei FastProt
|
||||
|
||||
CheckInData(recBuffer); // Eingangs-Daten des Slaves anzeigen
|
||||
ShowFastInData(recBuffer); // Eingangs-Daten des Slaves anzeigen
|
||||
}
|
||||
emit framerecieved();
|
||||
//qDebug() << "framereceived emitted";
|
||||
}
|
||||
|
||||
|
||||
uint8_t T_prot::FastCheckInData(uint8_t *Inbuf, uint16_t LL)
|
||||
{
|
||||
|
||||
uint16_t rawInLen=LL, crcL_Addr, recCrc, myCrc, nn, datalen, nxt;
|
||||
|
||||
if (Inbuf[0]!=STARTSIGN_RECEIVE_FAST && Inbuf[0]!=STARTSIGN_RECEIVE_LONG)
|
||||
{
|
||||
//qDebug() << "prot: got wrong start sign: " << Inbuf[0];
|
||||
return 2; // wrong start sign
|
||||
}
|
||||
if ( (rawInLen<TELEGRAMLEN_RECEIVE_FAST && Inbuf[0]==STARTSIGN_RECEIVE_FAST) ||
|
||||
(rawInLen<TELEGRAMLEN_RECEIVE_LONG && Inbuf[0]==STARTSIGN_RECEIVE_LONG) )
|
||||
{
|
||||
//qDebug("prot: got %d bytes only", rawInLen);
|
||||
return 1; // wrong length
|
||||
}
|
||||
if (Inbuf[0]==0x5F)
|
||||
datalen=DATALEN_RECEIVE_FAST;
|
||||
else
|
||||
datalen=DATALEN_RECEIVE_LONG;
|
||||
|
||||
crcL_Addr=datalen+HEADERLEN_RECEIVE; // weil im definierten protocol 2 bytes vor den Daten stehen
|
||||
recCrc=0;
|
||||
recCrc=uchar2uint(uint8_t(Inbuf[crcL_Addr+1]), uint8_t(Inbuf[crcL_Addr]));
|
||||
myCrc=0;
|
||||
for (nn=0; nn<crcL_Addr; nn++)
|
||||
{
|
||||
nxt=uint16_t (Inbuf[nn]);
|
||||
nxt &=0x00FF; // the casting makes 0xFFFF out of 0xFF !!!!!!!!!
|
||||
myCrc+=nxt;
|
||||
//qDebug("CRC: nxt: %d sum: %d", nxt, myCrc);
|
||||
}
|
||||
|
||||
if (myCrc != recCrc)
|
||||
{
|
||||
//qDebug() << "crc does not match: mycrc=" << myCrc<< " receivedCRC=" << recCrc;
|
||||
//qDebug("calculated over %d bytes", crcL_Addr);
|
||||
return 5; // crc wrong
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
uint8_t T_prot::FramecheckInData(uint8_t *Inbuf, uint16_t LL)
|
||||
{
|
||||
|
||||
@@ -385,7 +574,7 @@ uint8_t T_prot::FramecheckInData(uint8_t *Inbuf, uint16_t LL)
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
*/
|
||||
|
||||
uint8_t T_prot::CheckInResult(uint8_t *Inbuf)
|
||||
{
|
||||
@@ -438,24 +627,27 @@ uint8_t T_prot::CheckInResult(uint8_t *Inbuf)
|
||||
|
||||
|
||||
|
||||
uint8_t T_prot::CheckInData(uint8_t *recBuffer)
|
||||
uint8_t T_prot::ShowFastInData(uint8_t *recBuffer)
|
||||
{
|
||||
QString myString=nullptr, tempStr=nullptr;
|
||||
uint8_t result;
|
||||
|
||||
RecSlaveAddr=recBuffer[1];
|
||||
if (recBuffer[2]==0 && recBuffer[4]==0) // comand result=OK und read result =OK,
|
||||
// dann sind die Eingangsdaten gültig
|
||||
RecSlaveAddr=0;
|
||||
result=recBuffer[1]; // total result
|
||||
result &=0x60; // only read result (bit 5,6)
|
||||
|
||||
if (result==0) // read result =OK,
|
||||
// dann sind die Eingangsdaten gültig
|
||||
{
|
||||
myString.append("valid INdata: ");
|
||||
INdataValid=true;
|
||||
readSource=uchar2uint(recBuffer[6],recBuffer[5]);
|
||||
readAddress=uchar2uint(recBuffer[8],recBuffer[7]);
|
||||
//lastWakeSrc=uint8_t(recBuffer[4]);
|
||||
RdDataLength=uint8_t(recBuffer[9]);
|
||||
//readSource already set with sending
|
||||
readAddress=0;
|
||||
// RdDataLength already set with sending
|
||||
if (RdDataLength>FRAME_DATALEN)
|
||||
RdDataLength=FRAME_DATALEN;
|
||||
for (int ii=0; ii<RdDataLength; ii++)
|
||||
InputData[ii]=uint8_t(recBuffer[ii+10]);
|
||||
InputData[ii]=uint8_t(recBuffer[ii+HEADERLEN_RECEIVE]);
|
||||
|
||||
tempStr.setNum(readSource,16);
|
||||
myString.append(tempStr);
|
||||
@@ -486,6 +678,57 @@ uint8_t T_prot::CheckInData(uint8_t *recBuffer)
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
uint8_t T_prot::ShowInData(uint8_t *recBuffer)
|
||||
{
|
||||
QString myString=nullptr, tempStr=nullptr;
|
||||
|
||||
RecSlaveAddr=recBuffer[1];
|
||||
if (recBuffer[2]==0 && recBuffer[4]==0) // comand result=OK und read result =OK,
|
||||
// dann sind die Eingangsdaten gültig
|
||||
{
|
||||
myString.append("valid INdata: ");
|
||||
INdataValid=true;
|
||||
readSource=uchar2uint(recBuffer[6],recBuffer[5]);
|
||||
readAddress=uchar2uint(recBuffer[8],recBuffer[7]);
|
||||
//lastWakeSrc=uint8_t(recBuffer[4]);
|
||||
RdDataLength=uint8_t(recBuffer[9]);
|
||||
if (RdDataLength>FRAME_DATALEN)
|
||||
RdDataLength=FRAME_DATALEN;
|
||||
for (int ii=0; ii<RdDataLength; ii++)
|
||||
InputData[ii]=uint8_t(recBuffer[ii+10]);
|
||||
|
||||
tempStr.setNum(readSource,16);
|
||||
myString.append(tempStr);
|
||||
myString.append(" add:");
|
||||
|
||||
tempStr.setNum(readAddress);
|
||||
myString.append(tempStr);
|
||||
//myString.append(" wakeSrc:");
|
||||
//tempStr.setNum(lastWakeSrc);
|
||||
//myString.append(tempStr);
|
||||
myString.append(" Dlen:");
|
||||
tempStr.setNum(RdDataLength);
|
||||
myString.append(tempStr);
|
||||
|
||||
} else
|
||||
{
|
||||
myString=" "; // Eingangsdaten nicht gültig, sieht man aber weiter oben schon
|
||||
|
||||
}
|
||||
|
||||
gpi_setTxt4dataStateLine(myString);
|
||||
//qDebug() << myString;
|
||||
//qDebug("prot_checkInData_bindata: %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d ",
|
||||
// InputData[0], InputData[1], InputData[2], InputData[3],
|
||||
// InputData[4], InputData[5], InputData[6], InputData[7],
|
||||
// InputData[8], InputData[9], InputData[10], InputData[11],
|
||||
// InputData[12], InputData[13], InputData[14], InputData[15]);
|
||||
return 0;
|
||||
}
|
||||
|
||||
*/
|
||||
|
||||
bool T_prot::ifDataReceived()
|
||||
{
|
||||
|
@@ -13,7 +13,8 @@ void sendWRcmd_INI(void)
|
||||
|
||||
sendWRcmd_clrCmdStack();
|
||||
sendWRcmd_clrCmd4Stack();
|
||||
|
||||
sendFDcmd_clrStack();
|
||||
longFDcmd_clrStack();
|
||||
}
|
||||
|
||||
// Command Stack for commands without parameters
|
||||
@@ -53,23 +54,29 @@ bool sendWRcmd_setSendCommand0(uint16_t nextCmd)
|
||||
return false; // not possible
|
||||
}
|
||||
nextAsynchsendCmd0[nrOfCmdsInQueue++]=nextCmd;
|
||||
qDebug() << "PI cmd queued:"<< nextCmd << ", saved, pp=" << nrOfCmdsInQueue;
|
||||
//qDebug() << "PI cmd queued:"<< nextCmd << ", saved, pp=" << nrOfCmdsInQueue;
|
||||
return true; // ok, will be sent
|
||||
}
|
||||
|
||||
uint16_t sendWRcmd_getSendCommand0(void)
|
||||
{
|
||||
uint16_t nxtAsynchCmd;
|
||||
uint8_t nn;
|
||||
uint8_t nn, ll;
|
||||
if (nrOfCmdsInQueue==0 || nrOfCmdsInQueue>CMDSTACKDEPTH)
|
||||
return 0; // error
|
||||
nxtAsynchCmd=nextAsynchsendCmd0[0];
|
||||
|
||||
// move Puffer down by one element
|
||||
for (nn=0; nn<CMDSTACKDEPTH; nn++)
|
||||
if (CMDSTACKDEPTH>0)
|
||||
ll=CMDSTACKDEPTH-1;
|
||||
else
|
||||
ll=0;
|
||||
for (nn=0; nn<ll; nn++)
|
||||
nextAsynchsendCmd0[nn]=nextAsynchsendCmd0[nn+1];
|
||||
|
||||
if (nrOfCmdsInQueue>0)
|
||||
nrOfCmdsInQueue--;
|
||||
qDebug() << "PI cmd queued:"<< nxtAsynchCmd << ", restored, pp now =" << nrOfCmdsInQueue;
|
||||
//qDebug() << "PI cmd queued:"<< nxtAsynchCmd << ", restored, pp now =" << nrOfCmdsInQueue;
|
||||
return nxtAsynchCmd;
|
||||
}
|
||||
|
||||
@@ -138,7 +145,7 @@ bool sendWRcmd_setSendCommand4(uint16_t nextCmd, uint8_t dat1, uint8_t dat2, uin
|
||||
uint16_t sendWRcmd_getSendCommand4(uint8_t *dat1, uint8_t *dat2, uint8_t *dat3, uint8_t *dat4)
|
||||
{
|
||||
uint16_t nxtAsynchCmd;
|
||||
uint8_t nn;
|
||||
uint8_t nn, ll;
|
||||
|
||||
if (nrOfCmds4InQueue==0 || nrOfCmds4InQueue>CMD4STACKDEPTH)
|
||||
return 0; // error
|
||||
@@ -152,7 +159,11 @@ uint16_t sendWRcmd_getSendCommand4(uint8_t *dat1, uint8_t *dat2, uint8_t *dat3,
|
||||
// " data3: " << nextCmd4para3[0] << " data4: " << nextCmd4para4[0];
|
||||
|
||||
// move Puffer down by one element
|
||||
for (nn=0; nn<CMD4STACKDEPTH; nn++)
|
||||
if (CMD4STACKDEPTH>0)
|
||||
ll=CMD4STACKDEPTH-1;
|
||||
else
|
||||
ll=0;
|
||||
for (nn=0; nn<ll; nn++)
|
||||
{
|
||||
nextAsynchsendCmd4[nn]=nextAsynchsendCmd4[nn+1];
|
||||
nextCmd4para1[nn]=nextCmd4para1[nn+1];
|
||||
@@ -211,9 +222,9 @@ bool sendWRcmd_setSendCommand8(uint16_t nextCmd, uint8_t dat1, uint8_t dat2, uin
|
||||
uint16_t sendWRcmd_getSendCommand8(uint8_t *dat1, uint8_t *dat2, uint16_t *dat3, uint32_t *dat4)
|
||||
{
|
||||
uint16_t nxtAsynchCmd;
|
||||
uint8_t nn;
|
||||
uint8_t nn, ll;
|
||||
|
||||
if (nrOfCmds8InQueue==0 || nrOfCmds8InQueue>CMD4STACKDEPTH)
|
||||
if (nrOfCmds8InQueue==0 || nrOfCmds8InQueue>CMD8STACKDEPTH)
|
||||
return 0; // error
|
||||
nxtAsynchCmd=nextAsynchsendCmd8[0];
|
||||
*dat1=nextCmd8para1[0];
|
||||
@@ -222,7 +233,11 @@ uint16_t sendWRcmd_getSendCommand8(uint8_t *dat1, uint8_t *dat2, uint16_t *dat3,
|
||||
*dat4=nextCmd8para4[0];
|
||||
|
||||
// move buffer down by one element
|
||||
for (nn=0; nn<CMD8STACKDEPTH; nn++)
|
||||
if (CMD8STACKDEPTH>0)
|
||||
ll=CMD8STACKDEPTH-1;
|
||||
else
|
||||
ll=0;
|
||||
for (nn=0; nn<ll; nn++)
|
||||
{
|
||||
nextAsynchsendCmd8[nn]=nextAsynchsendCmd8[nn+1];
|
||||
nextCmd8para1[nn]=nextCmd8para1[nn+1];
|
||||
@@ -433,3 +448,257 @@ uint8_t gpi_chk4remainingText(void)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// ---------------------------------------------------------------------------------
|
||||
// 11.4.23 neu, Kommando direkt an "FastDevice"-protokoll senden, nicht mehr umsetzen
|
||||
// ---------------------------------------------------------------------------------
|
||||
|
||||
|
||||
// short command, 4 data bytes
|
||||
static uint8_t nextFDwrCmd[FDCMD_STACKDEPTH];
|
||||
static uint8_t nextFDrdCmd[FDCMD_STACKDEPTH];
|
||||
static uint8_t nextFDblkNr[FDCMD_STACKDEPTH];
|
||||
|
||||
static uint8_t nextFDpara1[FDCMD_STACKDEPTH];
|
||||
static uint8_t nextFDpara2[FDCMD_STACKDEPTH];
|
||||
static uint8_t nextFDpara3[FDCMD_STACKDEPTH];
|
||||
static uint8_t nextFDpara4[FDCMD_STACKDEPTH];
|
||||
static uint8_t p_nextFDcmdsInQueue;
|
||||
/* convention: use simple (not rotating) FIFO Stack:
|
||||
Example: nrOfCmdsInQueue=4 then
|
||||
nextAsynchsendCmd0[0]=cmd1 // was stored as first
|
||||
nextAsynchsendCmd0[1]=cmd2
|
||||
nextAsynchsendCmd0[2]=cmd3
|
||||
nextAsynchsendCmd0[3]=cmd4 // came in as last
|
||||
|
||||
Send: [0] first, then move buffer 1 down:
|
||||
nextAsynchsendCmd0[0]=cmd2
|
||||
nextAsynchsendCmd0[1]=cmd3
|
||||
nextAsynchsendCmd0[2]=cmd4
|
||||
nextAsynchsendCmd0[3]=0;
|
||||
nrOfCmdsInQueue=3 now
|
||||
*/
|
||||
|
||||
|
||||
void sendFDcmd_clrStack(void)
|
||||
{
|
||||
uint8_t nn;
|
||||
for (nn=0; nn<FDCMD_STACKDEPTH; nn++)
|
||||
{
|
||||
nextFDwrCmd[nn]=0;
|
||||
nextFDrdCmd[nn]=0;
|
||||
nextFDblkNr[nn]=0;
|
||||
nextFDpara1[nn]=0;
|
||||
nextFDpara2[nn]=0;
|
||||
nextFDpara3[nn]=0;
|
||||
nextFDpara4[nn]=0;
|
||||
}
|
||||
p_nextFDcmdsInQueue=0;
|
||||
}
|
||||
|
||||
bool sendFDcmd_set(uint8_t nextWrCmd, uint8_t nextRdCmd, uint8_t blockNum, uint8_t dat1, uint8_t dat2, uint8_t dat3, uint8_t dat4)
|
||||
{
|
||||
// write Command to memory, wait for transport
|
||||
if (p_nextFDcmdsInQueue>=FDCMD_STACKDEPTH)
|
||||
{
|
||||
qDebug() << "cannot save cmd because stack is full";
|
||||
return false; // not possible
|
||||
}
|
||||
nextFDwrCmd[p_nextFDcmdsInQueue]=nextWrCmd;
|
||||
nextFDrdCmd[p_nextFDcmdsInQueue]=nextRdCmd;
|
||||
nextFDblkNr[p_nextFDcmdsInQueue]=blockNum;
|
||||
nextFDpara1[p_nextFDcmdsInQueue]=dat1;
|
||||
nextFDpara2[p_nextFDcmdsInQueue]=dat2;
|
||||
nextFDpara3[p_nextFDcmdsInQueue]=dat3;
|
||||
nextFDpara4[p_nextFDcmdsInQueue]=dat4;
|
||||
//qDebug() << "data with 4 data byte saved, pp=" << nrOfCmds4InQueue;
|
||||
//qDebug() << " dat1=" << nextCmd4para1[nrOfCmds4InQueue] << " dat2=" << nextCmd4para2[nrOfCmds4InQueue]
|
||||
// << " dat3=" << nextCmd4para3[nrOfCmds4InQueue] << " dat4=" << nextCmd4para4[nrOfCmds4InQueue];
|
||||
p_nextFDcmdsInQueue++;
|
||||
return true; // ok, will be sent
|
||||
}
|
||||
|
||||
bool sendFDcmd_get(uint8_t *nextWrCmd, uint8_t *nextRdCmd, uint8_t *blockNum, uint8_t *dat1, uint8_t *dat2, uint8_t *dat3, uint8_t *dat4)
|
||||
{
|
||||
uint8_t nn, ll;
|
||||
|
||||
if (p_nextFDcmdsInQueue==0 || p_nextFDcmdsInQueue>FDCMD_STACKDEPTH)
|
||||
return false; // not possible
|
||||
|
||||
*nextWrCmd=nextFDwrCmd[0];
|
||||
*nextRdCmd=nextFDrdCmd[0];
|
||||
*blockNum=nextFDblkNr[0];
|
||||
*dat1=nextFDpara1[0];
|
||||
*dat2=nextFDpara2[0];
|
||||
*dat3=nextFDpara3[0];
|
||||
*dat4=nextFDpara4[0];
|
||||
//qDebug() << "cmd4 restored to send from [0]; pp=" << nrOfCmds4InQueue;
|
||||
//qDebug() << " data1: " << nextCmd4para1[0] << " data2: " << nextCmd4para2[0] <<
|
||||
// " data3: " << nextCmd4para3[0] << " data4: " << nextCmd4para4[0];
|
||||
|
||||
// move Puffer down by one element
|
||||
if (FDCMD_STACKDEPTH>0)
|
||||
ll=FDCMD_STACKDEPTH-1;
|
||||
else
|
||||
ll=0;
|
||||
for (nn=0; nn<ll; nn++)
|
||||
{
|
||||
nextFDwrCmd[nn]=nextFDwrCmd[nn+1];
|
||||
nextFDrdCmd[nn]=nextFDrdCmd[nn+1];
|
||||
nextFDblkNr[nn]=nextFDblkNr[nn+1];
|
||||
nextFDpara1[nn]=nextFDpara1[nn+1];
|
||||
nextFDpara2[nn]=nextFDpara2[nn+1];
|
||||
nextFDpara3[nn]=nextFDpara3[nn+1];
|
||||
nextFDpara4[nn]=nextFDpara4[nn+1];
|
||||
}
|
||||
if (p_nextFDcmdsInQueue>0)
|
||||
p_nextFDcmdsInQueue--;
|
||||
//qDebug() << "cmd4 after push down: pp=" << nrOfCmds4InQueue;
|
||||
return true; // ok, will be sent
|
||||
}
|
||||
|
||||
uint8_t check4FDshortCmd(void)
|
||||
{
|
||||
// returns number of waiting command, max FDCMD_STACKDEPTH
|
||||
return p_nextFDcmdsInQueue;
|
||||
}
|
||||
|
||||
|
||||
uint8_t check4freeFDshortCmd(void)
|
||||
{
|
||||
// returns number of free places in short-command stack
|
||||
return FDCMD_STACKDEPTH - p_nextFDcmdsInQueue;
|
||||
}
|
||||
|
||||
|
||||
// long command, 64 data bytes
|
||||
static uint8_t longFDwrCmd[FDLONG_STACKDEPTH];
|
||||
static uint8_t longFDrdCmd[FDLONG_STACKDEPTH];
|
||||
static uint8_t longFDblkNr[FDLONG_STACKDEPTH];
|
||||
static uint8_t longFDlength[FDLONG_STACKDEPTH];
|
||||
|
||||
static uint8_t longFDpara[FDLONG_STACKDEPTH][64];
|
||||
static uint8_t p_longFDcmdsInQueue;
|
||||
|
||||
|
||||
void longFDcmd_clrStack(void)
|
||||
{
|
||||
uint8_t nn, mm;
|
||||
for (nn=0; nn<FDLONG_STACKDEPTH; nn++)
|
||||
{
|
||||
longFDwrCmd[nn]=0;
|
||||
longFDrdCmd[nn]=0;
|
||||
longFDblkNr[nn]=0;
|
||||
longFDlength[nn]=0;
|
||||
for (mm=0; mm<64; mm++)
|
||||
longFDpara[nn][mm]=0;
|
||||
}
|
||||
p_longFDcmdsInQueue=0;
|
||||
}
|
||||
|
||||
|
||||
bool longFDcmd_set(uint8_t nextWrCmd, uint8_t nextRdCmd, uint8_t blockNum, uint8_t length, uint8_t *data)
|
||||
{
|
||||
// write Command to memory, wait for transport
|
||||
// data buffer size always 64! data[64], padded with 0
|
||||
uint8_t nn;
|
||||
if (p_longFDcmdsInQueue>=FDLONG_STACKDEPTH)
|
||||
{
|
||||
qDebug() << "cannot save cmd because stack is full";
|
||||
return false; // not possible
|
||||
}
|
||||
longFDwrCmd[p_longFDcmdsInQueue]=nextWrCmd;
|
||||
longFDrdCmd[p_longFDcmdsInQueue]=nextRdCmd;
|
||||
longFDblkNr[p_longFDcmdsInQueue]=blockNum;
|
||||
longFDlength[p_longFDcmdsInQueue]=length;
|
||||
for (nn=0; nn<64; nn++)
|
||||
longFDpara[p_longFDcmdsInQueue][nn]=data[nn];
|
||||
|
||||
p_longFDcmdsInQueue++;
|
||||
return true; // ok, will be sent
|
||||
}
|
||||
|
||||
bool longFDcmd_get(uint8_t *nextWrCmd, uint8_t *nextRdCmd, uint8_t *blockNum, uint8_t *length, uint8_t *data)
|
||||
{
|
||||
uint8_t nn, mm, ll;
|
||||
|
||||
if (p_longFDcmdsInQueue==0 || p_longFDcmdsInQueue>FDLONG_STACKDEPTH)
|
||||
return false; // not possible
|
||||
|
||||
*nextWrCmd= longFDwrCmd[0];
|
||||
*nextRdCmd= longFDrdCmd[0];
|
||||
*blockNum = longFDblkNr[0];
|
||||
*length = longFDlength[0];
|
||||
for (mm=0; mm<64; mm++)
|
||||
data[mm] = longFDpara[0][mm];
|
||||
|
||||
// move Puffer down by one element
|
||||
if (FDLONG_STACKDEPTH>0)
|
||||
ll=FDLONG_STACKDEPTH-1;
|
||||
else
|
||||
ll=0;
|
||||
for (nn=0; nn<ll; nn++)
|
||||
{
|
||||
longFDwrCmd[nn] = longFDwrCmd[nn+1];
|
||||
longFDrdCmd[nn] = longFDrdCmd[nn+1];
|
||||
longFDblkNr[nn] = longFDblkNr[nn+1];
|
||||
longFDlength[nn] = longFDlength[nn+1];
|
||||
|
||||
for (mm=0; mm<64; mm++)
|
||||
longFDpara[nn][mm] = longFDpara[nn+1][mm];
|
||||
|
||||
}
|
||||
if (p_longFDcmdsInQueue>0)
|
||||
p_longFDcmdsInQueue--;
|
||||
|
||||
return true; // ok, will be sent
|
||||
}
|
||||
|
||||
uint8_t check4FDlongCmd(void)
|
||||
{
|
||||
// returns number of waiting command
|
||||
return p_longFDcmdsInQueue;
|
||||
}
|
||||
|
||||
uint8_t check4freeFDlongCmd(void)
|
||||
{
|
||||
// returns number of free places in command stack
|
||||
return FDLONG_STACKDEPTH - p_longFDcmdsInQueue;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
39
src/shared_mem_buffer.cpp
Normal file
39
src/shared_mem_buffer.cpp
Normal file
@@ -0,0 +1,39 @@
|
||||
#include "shared_mem_buffer.h"
|
||||
|
||||
#include <QDebug>
|
||||
#include <atomic>
|
||||
|
||||
#ifdef QT_POSIX_IPC
|
||||
// The POSIX backend can be explicitly selected using the -feature-ipc_posix
|
||||
// option to the Qt configure script. If it is enabled, the QT_POSIX_IPC
|
||||
// macro will be defined. -> we use SystemV shared memory
|
||||
#error "QT_POSIX_IPC defined"
|
||||
#else
|
||||
#include <sys/ipc.h> // ftok
|
||||
#endif
|
||||
|
||||
// std::atomic_bool SharedMemBuffer::__sharedMemLocked{false};
|
||||
|
||||
QSharedMemory *SharedMemBuffer::getShm(std::size_t size) {
|
||||
static QSharedMemory shMem;
|
||||
if (size > 0) {
|
||||
static const long nativeKey = ftok("/etc/os-release", 'H');
|
||||
static const QString fkey = std::to_string(nativeKey).c_str();
|
||||
shMem.setKey(fkey);
|
||||
if (!shMem.isAttached()) {
|
||||
if (shMem.create(size)) {
|
||||
return &shMem;
|
||||
} else {
|
||||
if (shMem.error() == QSharedMemory::AlreadyExists) {
|
||||
if (shMem.attach()) {
|
||||
return &shMem;
|
||||
}
|
||||
}
|
||||
}
|
||||
qCritical() << shMem.nativeKey() << shMem.key() << shMem.data()
|
||||
<< shMem.error() << shMem.errorString();
|
||||
return nullptr;
|
||||
}
|
||||
}
|
||||
return &shMem;
|
||||
}
|
1476
src/storeINdata.cpp
1476
src/storeINdata.cpp
File diff suppressed because it is too large
Load Diff
@@ -76,6 +76,23 @@ uint8_t uint2uchar(uint16_t uival, bool getHighB)
|
||||
}
|
||||
|
||||
|
||||
uint8_t ulong2uchar(uint32_t ulval, uint8_t getBytNr)
|
||||
{
|
||||
// getBytNr: 0=LSB 3=MSB
|
||||
uint32_t ultmp=ulval;
|
||||
if (getBytNr==0)
|
||||
return uint8_t(ultmp);
|
||||
ultmp>>=8;
|
||||
if (getBytNr==1)
|
||||
return uint8_t(ultmp);
|
||||
ultmp>>=8;
|
||||
if (getBytNr==2)
|
||||
return uint8_t(ultmp);
|
||||
ultmp>>=8;
|
||||
return uint8_t(ultmp);
|
||||
|
||||
}
|
||||
|
||||
void delay(uint16_t MilliSec)
|
||||
{
|
||||
QThread::msleep(uint32_t(MilliSec));
|
||||
@@ -344,6 +361,15 @@ uint16_t tslib_strlen(char *buf)
|
||||
return 0;
|
||||
}
|
||||
|
||||
uint16_t tslib_strlen(uint8_t *buf)
|
||||
{
|
||||
uint16_t nn;
|
||||
|
||||
for (nn=0; nn<0xFFF0; nn++)
|
||||
if (buf[nn]==0)
|
||||
return nn;
|
||||
return 0;
|
||||
}
|
||||
|
||||
void tslib_strclr(char *buf, char clrsign, uint16_t len)
|
||||
{
|
||||
@@ -555,3 +581,18 @@ uint8_t tslib_sendFlashStartAddr2BL(uint32_t startAddr, uint8_t *sendData)
|
||||
|
||||
// -----------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
void biox_CopyBlock(uint8_t *src, uint16_t srcPos, uint8_t *dest, uint16_t destPos, uint16_t len)
|
||||
{
|
||||
// both buffers starting from pos 0
|
||||
uint16_t xx,yy,zz,ii;
|
||||
|
||||
xx = srcPos;
|
||||
yy = destPos;
|
||||
zz = len;
|
||||
|
||||
for (ii = 0; ii < zz; ++ii)
|
||||
{
|
||||
dest[yy + ii] = src[xx + ii];
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user