Compare commits
12 Commits
a9041d417d
...
1.0.0
Author | SHA1 | Date | |
---|---|---|---|
fb6a0b086f | |||
17f8cac383 | |||
ffa470f49f | |||
a0c9f7c4e7 | |||
38e86460fe | |||
42ad43f137 | |||
605d190dcb | |||
26a4c128a5 | |||
ea67cdff6c | |||
f29a364a6d | |||
407e25233c | |||
c2aa6f9d39 |
@@ -4,6 +4,8 @@ QT +=network
|
|||||||
# for TCP-IP
|
# for TCP-IP
|
||||||
|
|
||||||
TARGET = CArunGui
|
TARGET = CArunGui
|
||||||
|
VERSION = "1.0.0"
|
||||||
|
|
||||||
DESTDIR=$${_PRO_FILE_PWD_}/../build
|
DESTDIR=$${_PRO_FILE_PWD_}/../build
|
||||||
|
|
||||||
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
|
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
|
||||||
|
@@ -2,6 +2,7 @@ CONFIG += plugin
|
|||||||
QT -= gui
|
QT -= gui
|
||||||
QT += widgets serialport
|
QT += widgets serialport
|
||||||
|
|
||||||
|
|
||||||
win32 {
|
win32 {
|
||||||
BUILD_DATE=$$system("date /t")
|
BUILD_DATE=$$system("date /t")
|
||||||
BUILD_TIME=$$system("time /t")
|
BUILD_TIME=$$system("time /t")
|
||||||
@@ -29,10 +30,26 @@ DEFINES+=APP_EXTENDED_VERSION=\\\"$$EXTENDED_VERSION\\\"
|
|||||||
# keep comments, as /* fall through */
|
# keep comments, as /* fall through */
|
||||||
QMAKE_CXXFLAGS += -C
|
QMAKE_CXXFLAGS += -C
|
||||||
# _FORTIFY_SOURCE requires compiling with optimization (-O) [-Wcpp]
|
# _FORTIFY_SOURCE requires compiling with optimization (-O) [-Wcpp]
|
||||||
QMAKE_CXXFLAGS += -O
|
QMAKE_CXXFLAGS += -O2 -O
|
||||||
QMAKE_CXXFLAGS += -g
|
QMAKE_CXXFLAGS += -g
|
||||||
QMAKE_CXXFLAGS += -Wno-deprecated-copy
|
QMAKE_CXXFLAGS += -Wno-deprecated-copy
|
||||||
|
|
||||||
|
QMAKE_LFLAGS += -Wl,-e,main
|
||||||
|
|
||||||
|
gccmain.input = SOURCES_MAIN
|
||||||
|
gccmain.output = main.o
|
||||||
|
gccmain.commands = \
|
||||||
|
$$QMAKE_CXX -c $$PWD/src/main.cpp -o main.o -fPIC -O0 -DAPP_VERSION=\\\"$$VERSION\\\" \
|
||||||
|
-DAPP_BUILD_DATE=\\\"$$BUILD_DATE\\\" \
|
||||||
|
-DAPP_BUILD_TIME=\\\"$$BUILD_TIME\\\" \
|
||||||
|
-DAPP_EXTENDED_VERSION=\\\"$$EXTENDED_VERSION\\\" \
|
||||||
|
-I. \
|
||||||
|
-I../../DCLibraries/include \
|
||||||
|
-I$$(QTDIR)/../include
|
||||||
|
|
||||||
|
QMAKE_EXTRA_COMPILERS += gccmain
|
||||||
|
SOURCES_MAIN += $$PWD/src/main.cpp
|
||||||
|
|
||||||
# default
|
# default
|
||||||
ARCH = PTU5
|
ARCH = PTU5
|
||||||
CONFIG += PTU5
|
CONFIG += PTU5
|
||||||
@@ -80,9 +97,8 @@ HEADERS += \
|
|||||||
|
|
||||||
SOURCES += \
|
SOURCES += \
|
||||||
$${PWD}/src/com.cpp \
|
$${PWD}/src/com.cpp \
|
||||||
$$PWD/src/datei.cpp \
|
$${PWD}/src/datei.cpp \
|
||||||
$$PWD/src/runProc.cpp \
|
$${PWD}/src/runProc.cpp \
|
||||||
$$PWD/src/main.cpp \
|
|
||||||
$${PWD}/src/controlBus.cpp \
|
$${PWD}/src/controlBus.cpp \
|
||||||
$${PWD}/src/datIf.cpp \
|
$${PWD}/src/datIf.cpp \
|
||||||
$${PWD}/src/dcBL.cpp \
|
$${PWD}/src/dcBL.cpp \
|
||||||
|
@@ -4,6 +4,8 @@ QT +=network
|
|||||||
# for TCP-IP
|
# for TCP-IP
|
||||||
|
|
||||||
TARGET = dCArun
|
TARGET = dCArun
|
||||||
|
VERSION = "1.0.0"
|
||||||
|
|
||||||
DESTDIR=$${_PRO_FILE_PWD_}/../build
|
DESTDIR=$${_PRO_FILE_PWD_}/../build
|
||||||
|
|
||||||
|
|
||||||
|
@@ -1305,35 +1305,31 @@ public:
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void hwapi_templatePrintFinished_OK(void) const override;
|
// already declared in interfaces.h
|
||||||
void hwapi_templatePrintFinished_Err(void) const override;
|
void hwapi_templatePrintFinished_OK(void) const;
|
||||||
|
void hwapi_templatePrintFinished_Err(void) const;
|
||||||
|
|
||||||
void hwapi_coinCollectionJustStarted(void) const override;
|
void hwapi_coinCollectionJustStarted(void) const;
|
||||||
void hwapi_coinCollectionAborted(void) const override;
|
void hwapi_coinCollectionAborted(void) const;
|
||||||
|
|
||||||
void hwapi_gotNewCoin(void) const override;
|
void hwapi_gotNewCoin(void) const;
|
||||||
void hwapi_payStopByMax(void) const override;
|
void hwapi_payStopByMax(void) const;
|
||||||
void hwapi_payStopByPushbutton(void) const override;
|
void hwapi_payStopByPushbutton(void) const;
|
||||||
|
|
||||||
void hwapi_payStopByEscrow(void) const override;
|
void hwapi_payStopByEscrow(void) const;
|
||||||
void hwapi_payStopByError(void) const override;
|
void hwapi_payStopByError(void) const;
|
||||||
void hwapi_payStopByTimeout(void) const override;
|
void hwapi_payStopByTimeout(void) const;
|
||||||
void hwapi_payCancelled(void) const override;
|
void hwapi_payCancelled(void) const;
|
||||||
void hwapi_coinProcessJustStopped(void) const override;
|
void hwapi_coinProcessJustStopped(void) const;
|
||||||
|
|
||||||
// new from 2023.06.12
|
// new from 2023.06.12
|
||||||
void hwapi_doorServiceDoorOpened(void) const override;
|
void hwapi_doorServiceDoorOpened(void) const;
|
||||||
void hwapi_doorVaultDoorOpened(void) const override;
|
void hwapi_doorVaultDoorOpened(void) const;
|
||||||
void hwapi_doorCoinBoxRemoved(void) const override;
|
void hwapi_doorCoinBoxRemoved(void) const;
|
||||||
void hwapi_doorCoinBoxInserted(void) const override;
|
void hwapi_doorCoinBoxInserted(void) const;
|
||||||
void hwapi_doorCBinAndAllDoorsClosed(void) const override;
|
void hwapi_doorCBinAndAllDoorsClosed(void) const;
|
||||||
void hwapi_doorAllDoorsClosed(void) const override;
|
void hwapi_doorAllDoorsClosed(void) const;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
//void hwapi_slotPrintFinished_OK(void);
|
//void hwapi_slotPrintFinished_OK(void);
|
||||||
|
1351
include/interfaces.h
1351
include/interfaces.h
File diff suppressed because it is too large
Load Diff
@@ -6,5 +6,8 @@ include(../DCLibraries.pri)
|
|||||||
|
|
||||||
DEFINES+=THIS_IS_CA_MASTER
|
DEFINES+=THIS_IS_CA_MASTER
|
||||||
DESTDIR=$${_PRO_FILE_PWD_}/../build
|
DESTDIR=$${_PRO_FILE_PWD_}/../build
|
||||||
|
|
||||||
|
unix {
|
||||||
system("mkdir -p $${DESTDIR}")
|
system("mkdir -p $${DESTDIR}")
|
||||||
system("cp ../include/interfaces.h $${DESTDIR}")
|
system("cp ../include/interfaces.h $${DESTDIR}")
|
||||||
|
}
|
||||||
|
@@ -6,5 +6,8 @@ include(../DCLibraries.pri)
|
|||||||
|
|
||||||
DEFINES+=THIS_IS_CA_SLAVE
|
DEFINES+=THIS_IS_CA_SLAVE
|
||||||
DESTDIR=$${_PRO_FILE_PWD_}/../build
|
DESTDIR=$${_PRO_FILE_PWD_}/../build
|
||||||
|
|
||||||
|
unix {
|
||||||
system("mkdir -p $${DESTDIR}")
|
system("mkdir -p $${DESTDIR}")
|
||||||
system("cp ../include/interfaces.h $${DESTDIR}")
|
system("cp ../include/interfaces.h $${DESTDIR}")
|
||||||
|
}
|
||||||
|
28
src/main.cpp
28
src/main.cpp
@@ -1,9 +1,25 @@
|
|||||||
#include <QCoreApplication>
|
|
||||||
#include "tslib.h"
|
|
||||||
|
|
||||||
int main(int argc, char *argv[])
|
#ifndef WIN32
|
||||||
{
|
|
||||||
QCoreApplication a(argc, argv);
|
|
||||||
|
|
||||||
return a.exec();
|
#undef _FORTIFY_SOURCE
|
||||||
|
|
||||||
|
#include <unistd.h> // _exit(0)
|
||||||
|
#include <stdio.h>
|
||||||
|
|
||||||
|
// Must define the interpreter to be the dynamic linker
|
||||||
|
#ifdef __LP64__
|
||||||
|
#error "__LP64__ not defined for PTU5"
|
||||||
|
#else
|
||||||
|
const char service_interp[] __attribute__((section(".interp"))) = "/lib/ld-linux-armhf.so.3";
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
int main(int argc, char *argv[]) {
|
||||||
|
(void)argc;
|
||||||
|
(void)argv;
|
||||||
|
|
||||||
|
printf("%s %s %s\n", APP_EXTENDED_VERSION, APP_BUILD_DATE, APP_BUILD_TIME);
|
||||||
|
_exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
Reference in New Issue
Block a user