Commit Graph

616 Commits

Author SHA1 Message Date
c8487a7541 fixed handling of debug levels 2023-06-16 16:49:20 +02:00
dc90705f24 re-implement to use dc-plugin as shsred onject 2023-06-16 16:48:58 +02:00
c4c503080e Do not use DCPlugin subtree anymore 2023-06-16 16:47:56 +02:00
e2d9c5aa90 Comit helper-classes for now 2023-06-16 16:47:13 +02:00
60f845aa8d generated from tex file 2023-06-16 16:45:03 +02:00
fa0c31d9e4 save for the weekend 2023-06-02 14:17:48 +02:00
57b82094c8 removed handling of tariff, as this is not downloaded to dc 2023-05-30 16:49:48 +02:00
af337874a6 removed handling of tariff, as this is not downloaded to dc 2023-05-30 16:47:00 +02:00
f016e9777e Added default parameter to split() 2023-05-30 16:44:55 +02:00
85bec3364f deleted obsolete file 2023-05-26 13:04:43 +02:00
35d40e3b3c Add handling of update-script 2023-05-26 13:03:38 +02:00
71a6b82d58 Add env-var XDG_RUNTIME_DIR 2023-05-26 13:02:45 +02:00
de75ef32d9 start docu for update_ptu 2023-05-26 13:01:44 +02:00
3bac92c711 Add subtree add command to make sure DCPlugin is included 2023-05-25 10:21:42 +02:00
2b5fca73a2 removed c++-headers. 2023-05-22 16:06:52 +02:00
6d4c247de7 Using update.h/.cpp and thread pool 2023-05-22 16:04:50 +02:00
892fae92ad Using Utils-class and QRunnable.w 2023-05-19 15:33:40 +02:00
3938051c32 Add Utils-class to provide most of the previous functionality. 2023-05-19 15:32:52 +02:00
18e4811d57 Added some debug output.
Send only one DC_print-template.
Tested again downloading dc-firmware and printer-templates.
2023-05-18 14:26:23 +02:00
8d325c20eb Merge commit '6099d07650acb28df1a5c9659479351daa7c2d27' 2023-05-17 16:08:57 +02:00
6099d07650 Squashed 'DCPlugin/' changes from d992ee3..e32142c
e32142c Implement cash input interface
f611e07 Implement printing ticket
6478eda TS: pr_printTemplate(): send 'longFDcmd_set()'
1663d09 Merge with TS 21.04.23
080c00e Set serialPort name from config
bbce2b0 Test printing ticket
8ff17a2 DeviceControllerInterface: erroCode is a string
c657428 Project: including DCPlugin.pri globally
f0f0493 hwapi: remove unused dependency to QWidget
9bf99c5 Fix: make plugin compile
8ff8faf Fix: warning
09a8049 Merge branch 'master' into pu/integration
21fb07b Merge branch 'master' of git.mimbach49.de:GerhardHoffmann/DCPlugin
01f8c1e First compiling version for high level vending interface
3029b8d Rename TARGET name
2143801 Configure project for PTU5-YOCTO
6f6d3b7 Add atb/qt gitignore
4cfb8f1 Add auto version generation script

git-subtree-dir: DCPlugin
git-subtree-split: e32142cd6277cf647d27a9c0a2e9e4d7c6ca4269
2023-05-17 16:08:57 +02:00
0c14002f7f remove update printer template 2023-05-03 09:00:02 +02:00
6765bb13e5 Fixed printing od ticket: dc_printTemplate(). First send dynamic data, then use prn_sendDynamicPrnValues() 2023-05-03 08:59:17 +02:00
ceedf72b34 iAdd some test data. 2023-04-19 14:22:28 +02:00
8a216c43c0 Squashed 'DCPlugin/' changes from 01140c5..d992ee3
d992ee3 Added dc_getStatus() to send info to ISMAS
b7d8fab Added dc_getStatus() to send info to ISMAS
7129805 Added dc_getStatus() to send info to ISMAS

git-subtree-dir: DCPlugin
git-subtree-split: d992ee3fad831f8bc159b87e687390a233b41afb
2023-04-18 15:07:55 +02:00
9620d58373 Merge commit '8a216c43c05db28340cf5e4272bf2e66c6a868e9' 2023-04-18 15:07:55 +02:00
2c6fa31cff Squashed 'DCPlugin/' changes from 1eb2ac3..01140c5
01140c5 Using std::min from algorithm-header
c99d073 Added additional variables into shared memory. Cleaned source.
81c610c Included additional variables into shared memory
6ae7c06 Changed to const-pointer

git-subtree-dir: DCPlugin
git-subtree-split: 01140c523b600912e83302c988059c1cfd0a5488
2023-04-18 14:44:24 +02:00
073482d1a9 Merge commit '2c6fa31cff30e193dc542183b8a5aec022100d79' 2023-04-18 14:44:24 +02:00
ee902898c4 Squashed 'DCPlugin/' changes from f3adba2..1eb2ac3
1eb2ac3 Use const-pointer

git-subtree-dir: DCPlugin
git-subtree-split: 1eb2ac3a1df01a7af3244f6fe495a8b143d946bf
2023-04-18 13:56:04 +02:00
4c21c439a2 Merge commit 'ee902898c4bed3a7ecdc4954094e535cf1af1e67' 2023-04-18 13:56:04 +02:00
acde999b9d Squashed 'DCPlugin/' changes from 652ad9b..f3adba2
f3adba2 Change parameter type from uint8_t to bool

git-subtree-dir: DCPlugin
git-subtree-split: f3adba2f0ff7a574039c23b44cee9872d0f25d34
2023-04-18 13:53:23 +02:00
928e7de9ac Merge commit 'acde999b9db601dcb93e86639da5127cfc10ac79'. 2023-04-18 13:53:23 +02:00
8b301a91dc Squashed 'DCPlugin/' changes from 3e3e1ef..652ad9b
652ad9b Included changes of TS for version 3.5.
c85b090 Added ulong2uchar (version 3.5).
87a6ed0 Include changes of Thomas for version 3.5.
99c88c7 Included changes of Thomas for version 3.5. prn_getPrintResult(),
712ea0f Included changes of Thomas for version 3.5 of library: datif_templatePrintFinished_OK(), datif_templatePrintFinished_Err(), datif_gotNewCoin().
86311de Add use of shared memory. Add changes for version 3.4. of library.
cb44127 Added check4freeFDshortCmd.
a95e174 Included some changes of Thomas.
c724b5b Shift several device controller related variables to shared memory.
ef79321 Massive change: using shared memory containing most device controller realted variables.
a7aa75a Massive change: using shared memory containing devcie controller variables.
dc00c69 Added check4freeFDlongCmd.
eeb3519 Adding shared memory containing all variables necessary to check device controller related variables.
30338e2 Changed struct T_moduleCondition. Changed struct T_dynamicCondition. Added struct T_extTime. Added log_chkIfVaultRecordAvailable(). Added sys_getDeviceConditions(). set version to 3.4.
58fdea4 Added m_sharedMem. Added cash_getAmountInVault. Added cash_getNrCoinsInVault. Added sys_getDynMachineConditions() with new interface. Added sys_getDeviceConditions() with new interface. Added log_chkIfVaultRecordAvailable().
df760f1 Added shared_mem_buffer.h/.cpp.

git-subtree-dir: DCPlugin
git-subtree-split: 652ad9b43d24bddbc3c2636c4ff4b5d74e081e46
2023-04-18 13:43:37 +02:00
981d9706e2 Merge commit '8b301a91dc0d4ae7a4ddd5f470016b4cd68b85c4'. 2023-04-18 13:43:37 +02:00
ff5e3f15a4 Squashed 'DCPlugin/' changes from e5a8cfd..3e3e1ef
3e3e1ef Make sure the printer functions can be called without explicitly openeing the serial device.

git-subtree-dir: DCPlugin
git-subtree-split: 3e3e1efe7d77c71f0101f35c8b38419e877f5636
2023-04-14 09:06:56 +02:00
04dfc407c0 Merge commit 'ff5e3f15a47f165005e691a88cbe1fa44a84fe0d'
Use a defualt parameter for printer functions to decide if serial device has to be
opened or not.
2023-04-14 09:06:56 +02:00
39f5e2af10 Use PTU5 define. 2023-04-14 09:06:45 +02:00
b15ad441f8 Merge commit 'a9e69cd0c4ad3477a99becaf87b84e0d9b23538f' 2023-04-13 16:28:43 +02:00
a9e69cd0c4 Squashed 'DCPlugin/' changes from 60c4858..e5a8cfd
e5a8cfd copy of include/interfaces.h
5e6e601 Minor change
f3d9c69 Added dc_printTemplate. Fixed implementation of dc_updatePrinterTemplate
3f10469 Added dc_printTemplate. Changed interface for updating printer templates.
d92bdbf Added dc_printTemplate. Changed interface for updating printer templates.

git-subtree-dir: DCPlugin
git-subtree-split: e5a8cfd1cd6a0ece3db295669c801b8e2ea9332b
2023-04-13 16:24:43 +02:00
ead91eaba0 test implementation 2023-04-13 16:22:46 +02:00
84729f90fc Squashed 'DCPlugin/' changes from ef48301..60c4858
60c4858 Fixed template number: cannot be 0

git-subtree-dir: DCPlugin
git-subtree-split: 60c48588b09dd680d6d92ab6944904dc6a28ca90
2023-04-13 14:03:52 +02:00
f114570a8c Merge commit '84729f90fc46ef46dc26eeab2843dbc6d5266787'
Merged in fix for template number.
2023-04-13 14:03:52 +02:00
649f8ce0d0 Added draft version for updating json-files 2023-04-13 14:03:25 +02:00
1f0f7da128 Squashed 'DCPlugin/' changes from 37f0012..ef48301
ef48301 Added dc_updatePrinterTemplate
5f7d34e implemented dc_updatePrinterTemplate
863e4b2 Added dc_updatePrinterTemplate

git-subtree-dir: DCPlugin
git-subtree-split: ef48301dad80ebce3db4764613bb7f183ef69485
2023-04-13 13:39:17 +02:00
eaa6df0da7 Merge commit '1f0f7da128687daf09d065e60e254fbd24f2545d'
Added dc_updatePrinterTemplate.
2023-04-13 13:39:17 +02:00
db8415cd3e Squashed 'DCPlugin/' changes from 82accc4..37f0012
37f0012 converted to utf-8

git-subtree-dir: DCPlugin
git-subtree-split: 37f0012ce9092b4152481264747500d91f5c160e
2023-04-13 11:35:31 +02:00
0139e3dde7 Merge commit 'db8415cd3edd8b7484f2842cd0d8bffd2f759597'
Use interface.h converted to UTF-8.
2023-04-13 11:35:31 +02:00
91c907ba50 Squashed 'DCPlugin/' changes from c1b9452..82accc4
82accc4 Added file types for JSON as enum

git-subtree-dir: DCPlugin
git-subtree-split: 82accc4b1a46c29b5d93a897a09fcd208cfb6cc2
2023-04-13 11:28:18 +02:00
622237afeb Merge commit '91c907ba506fc03e4f9e2a02bca17c312e184462'
Synchronize with DCPlugin.
2023-04-13 11:28:18 +02:00
b741d89ceb Use interfaces from DCPlugin 2023-04-13 11:28:00 +02:00