346 Commits

Author SHA1 Message Date
be84634d62 Update ATBQT.ini SysetemControl.ini for Szeged Test 2023-05-05 10:59:31 +02:00
64937d6fb4 Add tariff-file for zone 4 2023-05-04 10:55:28 +02:00
6acc53275d Update as for branch zg1/zone1 2023-04-25 11:53:41 +02:00
87af143cbd Removed *.ini-Files. 2023-03-31 11:46:54 +02:00
e46c1f272b Add .gitignore 2023-03-31 09:51:38 +02:00
73fbc3d5ad Add handling for binary dc-files 2023-03-30 12:48:33 +02:00
17abc2e768 fixed regex 2023-03-27 16:41:10 +02:00
d4934b1f07 10001 2023-03-27 16:38:07 +02:00
83a5649e37 10000 2023-03-27 16:33:57 +02:00
b2de949187 0000 2023-03-27 16:30:35 +02:00
3e394ee48f add dc file 2023-03-27 16:24:08 +02:00
c38e94d289 recreate repo 2023-03-27 16:10:41 +02:00
65efe0c9a9 recreateing whole repository 2023-03-27 15:57:41 +02:00
8648da0488 test 2022-06-05 14:40:21 +02:00
35115ff21c testing 2022-06-05 14:38:20 +02:00
2a73c1807d test 2022-06-04 21:04:06 +02:00
c43da07747 test 2022-06-04 20:34:46 +02:00
f5693d6473 test 2022-06-04 20:29:33 +02:00
6f1e694e65 testing 2022-06-04 19:45:28 +02:00
b283635670 testing 2022-06-04 19:41:45 +02:00
51dc153f6d testing 2022-06-04 19:40:34 +02:00
a5898b6347 testing 2022-06-04 19:38:55 +02:00
8f98a6f5f4 testing 2022-06-04 19:34:44 +02:00
f40e764439 testing 2022-06-04 19:33:13 +02:00
c47b0fec23 testing 2022-06-04 19:29:43 +02:00
da6c0e5c68 testing 2022-06-04 19:24:38 +02:00
b8eeb7c0b9 testing 2022-06-04 19:22:32 +02:00
dfda3999fb testing 2022-06-04 19:21:02 +02:00
a611b2b698 testing 2022-06-03 22:11:57 +02:00
d90112eafd testing 2022-06-03 22:11:23 +02:00
0266ec873d testing 2022-06-03 21:58:06 +02:00
ae65a8a420 testing 2022-06-03 21:57:29 +02:00
ab2631f88d testing 2022-06-03 21:57:05 +02:00
76f470f947 testing 2022-06-03 21:55:26 +02:00
f328d184a7 testing 2022-06-03 21:54:11 +02:00
a314bf2248 testing 2022-06-03 16:35:59 +02:00
cc86c29eec testing 2022-06-03 16:35:12 +02:00
35a2cb83c8 testing 2022-06-03 16:31:53 +02:00
becedb9726 testing 2022-06-03 16:30:54 +02:00
b98f28344d testing 2022-06-03 16:23:49 +02:00
422159a783 testing 2022-06-03 16:22:25 +02:00
12a2715304 testing 2022-06-03 16:02:18 +02:00
66566225d8 copied from summer_tariff.json 2022-06-03 16:00:54 +02:00
9df963ff64 added up tp 32 tariff-files 2022-06-03 15:54:29 +02:00
2cb79fc5d4 renamed 2022-06-03 15:36:15 +02:00
ab8bd20466 renamed 2022-06-03 15:35:32 +02:00
e4ac4b0cc8 renamed 2022-06-03 15:34:45 +02:00
2af6b1e344 adding tariff as for json-confs 2022-06-03 15:15:10 +02:00
49a5858077 adding tariff as for json-confs 2022-06-03 15:14:46 +02:00
be1c4417dd adding tariff as for json-confs 2022-06-03 15:14:10 +02:00
311b86336c remove top-level 2022-06-03 14:43:33 +02:00
7103bdafb5 remove top-level 2022-06-03 14:43:11 +02:00
86ca411cde add dc-file 2022-06-03 14:41:18 +02:00
d528a97e14 removed top-level-sections 2022-06-03 14:40:13 +02:00
10d39ed760 removed top-level section 2022-06-03 14:39:27 +02:00
fc95aca792 removed top-level sections 2022-06-03 14:38:03 +02:00
7e55d61d71 testing 2022-06-03 14:36:41 +02:00
e7c47e7931 renamed 2022-06-03 14:35:26 +02:00
6570cf3419 renamed 2022-06-03 14:34:07 +02:00
27be755fbd renamed 2022-06-03 14:33:07 +02:00
cff8c52027 adding tariff files 2022-06-03 14:25:53 +02:00
4091fd4227 adding tariff files 2022-06-03 14:25:49 +02:00
dab82b220d adding tariff files 2022-06-03 14:25:34 +02:00
0dbedbe198 testing 2022-06-03 14:08:59 +02:00
10b1620813 testing 2022-06-03 14:07:32 +02:00
d0fd7dfc4f Removed top-level-dc-section 2022-06-03 14:05:10 +02:00
abfc409500 renamed conf to json section 2022-06-02 22:04:54 +02:00
32ece9da7b testing 2022-06-02 21:46:39 +02:00
43da9e0437 testing 2022-06-02 21:45:47 +02:00
ec76845dd4 testing 2022-06-02 21:45:32 +02:00
ed3033659a testing 2022-06-02 21:43:08 +02:00
e3d97bf8df testing 2022-06-02 21:42:36 +02:00
fc0e466753 testing 2022-06-02 21:38:47 +02:00
0fe582259d testing 2022-06-02 21:37:52 +02:00
2f0350a69e testing 2022-06-02 21:34:17 +02:00
16f1250eb7 testing 2022-06-02 21:34:03 +02:00
cd6a9020fa testing 2022-06-02 20:54:36 +02:00
e828452190 testing 2022-06-02 20:54:03 +02:00
aedbc2032c testing 2022-06-02 20:51:40 +02:00
a5974acfa2 testing 2022-06-02 20:23:15 +02:00
25437ef752 testing 2022-06-02 20:22:48 +02:00
256a7ede1d testing 2022-06-02 20:18:57 +02:00
9b807dcd8a testing 2022-06-02 20:18:28 +02:00
27cb47491d testing 2022-06-02 20:13:58 +02:00
33f662756d testing 2022-06-02 20:13:31 +02:00
73f24f21c6 testing 2022-06-02 20:10:16 +02:00
d5a8653d34 testing 2022-06-02 20:09:50 +02:00
2ffee1988a testing 2022-06-02 20:08:20 +02:00
241f63e2fd testing 2022-06-02 20:07:43 +02:00
43785f085e testing 2022-06-02 20:02:15 +02:00
9379c26454 testing 2022-06-02 20:01:44 +02:00
83cdaf6da9 testing 2022-06-02 19:53:50 +02:00
83d2986460 testing 2022-06-02 19:53:16 +02:00
8b030f49c6 testing 2022-06-02 19:47:22 +02:00
eb4c1ab8eb testing 2022-06-02 19:45:45 +02:00
e26268cb3c testing 2022-06-02 19:35:15 +02:00
688945700c testing 2022-06-02 19:34:31 +02:00
47685bbbdf testing 2022-06-02 18:38:31 +02:00
46d4ed2c39 testing 2022-06-02 18:37:59 +02:00
2b0f276440 testing 2022-06-02 18:35:31 +02:00
2b035a1032 testing 2022-06-02 18:34:49 +02:00
d6251eddfb testing 2022-06-02 18:30:48 +02:00
e031e5d9b0 testing 2022-06-02 18:30:11 +02:00
31c993f9fc testing 2022-06-02 18:21:09 +02:00
f6216105d4 testing 2022-06-02 18:19:35 +02:00
40cbae43b6 testing 2022-06-02 17:43:07 +02:00
2c3f85acda testing 2022-06-02 17:42:14 +02:00
a998f27618 testing 2022-06-02 17:40:44 +02:00
4a279cb080 testing 2022-06-02 17:37:23 +02:00
27ffaccb7c testing 2022-06-02 17:32:00 +02:00
26946b4e18 testing 2022-06-02 17:31:24 +02:00
312f8d5dda testing 2022-06-02 17:20:00 +02:00
25fecc68a4 testing 2022-06-02 17:19:23 +02:00
dd3e3754be testing 2022-06-02 17:14:43 +02:00
8ae7a78691 testing 2022-06-02 17:13:49 +02:00
fad1d54135 testing 2022-06-02 17:08:52 +02:00
76b86aba17 testing 2022-06-02 17:07:55 +02:00
5f856d0303 testing 2022-06-02 17:04:47 +02:00
16f3a37cb8 testing 2022-06-02 17:04:23 +02:00
ec4b7f4b73 testing 2022-06-02 17:03:01 +02:00
9a7e456fb8 testing 2022-06-02 17:02:36 +02:00
bb2bdd8288 testing 2022-06-02 17:00:42 +02:00
e3fccc2e61 testing 2022-06-02 16:59:41 +02:00
e3d280cef1 testing 2022-06-02 16:55:33 +02:00
15c5acfd90 testing 2022-06-02 16:55:07 +02:00
9001a120b7 testing 2022-06-02 16:53:57 +02:00
db0fe4675d testing 2022-06-02 16:53:17 +02:00
6b13486bb9 testing 2022-06-02 16:46:39 +02:00
b0890a0062 testing 2022-06-02 16:46:03 +02:00
6bd4ba58f4 testing 2022-06-02 16:42:20 +02:00
4c0a19522e testing 2022-06-02 16:41:17 +02:00
241012961a testing 2022-06-02 16:34:04 +02:00
d3a61f7b51 testing 2022-06-02 16:33:09 +02:00
15d4f6bd63 testing 2022-06-02 15:59:01 +02:00
076c08ffa2 testing 2022-06-02 15:57:19 +02:00
c89b7de884 add files refecting system files 2022-06-07 21:47:09 +02:00
31b6dec11d add ini-files 2022-06-07 18:10:43 +02:00
bf4611e638 add ini-files 2022-06-07 18:10:05 +02:00
541dd48e4e add dummy file 2022-06-07 18:08:15 +02:00
0e756d6974 add tariff files 2022-06-07 18:07:29 +02:00
7688685669 add tariff-files 2022-06-07 18:05:57 +02:00
8b211d26ec add directories as for zone ../1 2022-06-07 18:03:13 +02:00
0c27dd3a22 add directories as for zone ../1 2022-06-07 18:02:36 +02:00
d9ec4cd7fd add tariff files 2022-06-07 18:00:27 +02:00
ea6434d5ca remove backup files 2022-06-07 17:45:40 +02:00
f2c064b434 add ini files 2022-06-07 17:42:31 +02:00
bfaededa72 adding ini-files 2022-06-07 17:40:37 +02:00
e4609d31c2 Add app init file 2022-06-07 15:41:36 +02:00
46cca6410b Add *.ini file directly under /etc 2022-06-06 20:24:43 +02:00
2cc00cb741 Add standard system files 2022-06-06 20:17:44 +02:00
3acc34d986 updated for zone1/3 in szeged 2023-03-16 14:53:22 +01:00
4577ab46dd Added Saturday 2023-03-16 14:51:26 +01:00
097c1fec6d set price to 220 2023-03-16 14:51:26 +01:00
70bc231534 Added tariff-section 2022-06-05 17:45:47 +02:00
839d1a6966 updated dc2c.hex to version 0.4.9 2023-03-16 08:17:26 +01:00
6f01cb07b0 Add new version: dc2c.4.9 2023-03-16 08:14:03 +01:00
5fbb8f0d54 testing 2022-06-05 15:18:13 +02:00
e92dc42b81 testing 2022-06-05 15:17:36 +02:00
28f024e568 testing 2022-06-05 15:15:57 +02:00
450ba9667c testing 2022-06-05 15:15:20 +02:00
ec10ef3ec1 testing 2022-06-05 15:06:05 +02:00
1c7bdde589 testing 2022-06-05 15:04:06 +02:00
8ce7d17045 testing 2022-06-04 23:19:41 +02:00
d64343a92e testing 2022-06-04 23:19:10 +02:00
b358439574 testing 2022-06-04 23:17:36 +02:00
dd9232dfb3 testing 2022-06-04 23:17:08 +02:00
72abbc7c7c testing 2022-06-04 23:14:08 +02:00
14a8094cd6 testing 2022-06-04 23:13:35 +02:00
daa851f861 testing 2022-06-04 23:10:49 +02:00
6f7b77fa0f testing 2022-06-04 23:10:21 +02:00
70e55e601a testing 2022-06-04 23:05:38 +02:00
818b8d3941 testing 2022-06-04 23:05:08 +02:00
c3975d736d testing 2022-06-04 23:00:04 +02:00
3d8e671d98 testing 2022-06-04 22:59:38 +02:00
c9a3848103 testing 2022-06-04 22:55:22 +02:00
d26abf157f testing 2022-06-04 22:54:50 +02:00
452039f337 testing 2022-06-04 22:50:30 +02:00
ba46621c60 testing 2022-06-04 22:50:01 +02:00
c7c765a263 testing 2022-06-04 22:41:01 +02:00
7296deee30 testing 2022-06-04 22:40:23 +02:00
209ce4652d testing 2022-06-04 22:35:59 +02:00
44ae96ac98 testing 2022-06-04 22:35:26 +02:00
c71ab77a0f testing 2022-06-04 22:27:00 +02:00
2b5ccd1376 testing 2022-06-04 22:26:23 +02:00
9d71a409ff testing 2022-06-04 22:22:07 +02:00
14cca78e35 testing 2022-06-04 22:21:38 +02:00
c85d4249d2 testing 2022-06-04 22:19:02 +02:00
a18ae8193b testing 2022-06-04 22:18:29 +02:00
50f4f5b303 testing 2022-06-04 22:13:17 +02:00
620e92217a testing 2022-06-04 22:12:38 +02:00
fa73e2155e testing 2022-06-04 22:09:53 +02:00
f58579367e testing 2022-06-04 22:09:13 +02:00
114d038f41 testing 2022-06-04 22:05:05 +02:00
836cb1cbcb testing 2022-06-04 22:04:25 +02:00
c446ae0322 testing 2022-06-04 21:57:42 +02:00
ac88d453d1 testing 2022-06-04 21:56:47 +02:00
a58b3da2ca testing 2022-06-04 19:54:59 +02:00
91a219b63a testing 2022-06-04 19:54:16 +02:00
3a53b28f4e testing 2022-06-04 19:49:07 +02:00
1017fc2bbd testing 2022-06-04 19:48:37 +02:00
2043a302ba testing 2022-06-04 19:42:45 +02:00
fb7bcdd881 testing 2022-06-04 19:42:13 +02:00
622a34e849 testing 2022-06-04 19:36:08 +02:00
742eb4845f testing 2022-06-04 19:35:34 +02:00
55f8e3fe30 testing 2022-06-04 19:31:34 +02:00
eb49671d7e testing 2022-06-04 19:31:03 +02:00
7c68fa8918 testing 2022-06-04 19:27:52 +02:00
0224691612 testing 2022-06-04 19:26:51 +02:00
9e9460310c testing 2022-06-04 19:20:23 +02:00
ad167d76db testing 2022-06-04 19:18:47 +02:00
c9ccab0dad Add customer-specific ATBQT.ini file 2022-06-04 18:05:37 +02:00
c2577dc743 replaced by atb-directory 2022-06-04 17:55:13 +02:00
d6ae1aa4ad initialized ini-files 2022-06-04 17:53:15 +02:00
49237d528c initialized ini-files 2022-06-04 17:52:32 +02:00
11c0b305f8 initialized ini-files 2022-06-04 17:51:40 +02:00
709cd02675 added ATBQT entry for /etc/atb 2022-06-04 17:47:53 +02:00
d9451649a2 added json-comments 2022-06-04 17:42:20 +02:00
686d849fe5 Added atb-directory and included ini-files 2022-06-04 16:49:11 +02:00
de89b4834e Add init-files for zone=3 2022-06-04 16:45:44 +02:00
6fbcb00b99 Add init-files for zone=2 2022-06-04 16:44:43 +02:00
0b1ff2b96f renamed psa_ini to atb 2022-06-04 16:36:56 +02:00
941de85dc3 Add current date 2022-06-02 21:58:09 +02:00
9b4a89d246 extended version for DC 2022-06-02 21:54:57 +02:00
341fb34bba test version 2022-06-02 17:32:31 +02:00
3c88679f51 Adding file for current tariff setting 2022-06-02 16:49:43 +02:00
f2573049e7 Adding tariff for winter time 2022-06-02 15:51:32 +02:00
1f0bb050ad Adding tariff for winter time 2022-06-02 15:50:39 +02:00
c14f7a5f8d renamed 2022-06-02 15:49:41 +02:00
b74830f8fa renamed 2022-06-02 15:49:32 +02:00
296257cb07 Adding info key 2022-06-02 15:48:01 +02:00
fe57d474e2 Adding project and zone keys 2022-06-02 15:43:32 +02:00
5d5c76a2d5 Adding tariff config files for szeged 2022-06-02 15:35:15 +02:00
8983a8c4a0 delete 2022-06-06 18:39:43 +02:00
794f484abc renamed to unique name 2022-06-06 18:39:19 +02:00
1f3e6ab5f8 Added md5 for device-controller-binary 2022-06-06 18:38:25 +02:00
1fb3ded23a add device-controller-binary 2022-06-06 18:28:24 +02:00
a486aee3dd Add entries for zone2 and zone3 in szeged. 2022-06-05 21:56:44 +02:00
04a0d9f1a4 Add necessay files for zone 3. 2022-06-05 21:24:20 +02:00
050c0faad5 Merge branch 'master' of https://git.mimbach49.de/GerhardHoffmann/customer_281
Fetch data before push.
2022-06-05 21:22:07 +02:00
edfba776e2 Fixed the json-file. Use empty comments in update.conf. 2022-06-05 21:21:15 +02:00
bf0e1c5d0f Added DC2C_print-files.
Fixed "../../../1/etc/psa_config/DC2C_print02.json"
Use empty comments in ../../../../update.conf
2022-06-05 21:19:02 +02:00
a9452b8a89 fixed # 2022-06-04 21:12:02 +02:00
8881ec8abb testing 2022-06-04 18:03:33 +02:00
8f0dc4c459 testing 2022-06-04 18:03:00 +02:00
87453f92f4 testing 2022-06-04 17:59:44 +02:00
c7d0f4774e testing 2022-06-04 17:58:58 +02:00
54aff079e7 testing 2022-06-04 17:56:41 +02:00
ac4082e1a9 testing 2022-06-04 17:56:02 +02:00
9d4da5d962 testing 2022-06-04 17:53:51 +02:00
809e48f539 testing 2022-06-04 17:53:22 +02:00
579b6a1d9f testing 2022-06-04 17:49:25 +02:00
282274694e testing 2022-06-04 17:48:51 +02:00
9606e5ffc1 testing 2022-06-04 17:36:27 +02:00
262882f79d testing 2022-06-04 17:35:51 +02:00
125fcd05d5 testing 2022-06-04 17:31:19 +02:00
5079d95246 testing 2022-06-04 17:30:48 +02:00
f4b7e35433 testing 2022-06-04 17:26:49 +02:00
3d5efd31fd testing 2022-06-04 17:26:09 +02:00
14d943513e testing 2022-06-04 17:22:55 +02:00
1ccf403e23 testing 2022-06-04 17:19:53 +02:00
db6b6a37a3 testing 2022-06-02 22:10:31 +02:00
1f2ac5ee21 testing 2022-06-02 22:09:11 +02:00
fd4cd064f9 testing 2022-06-02 21:43:40 +02:00
2b27c782a2 testing 2022-06-02 21:43:04 +02:00
30516350f5 testing 2022-06-02 21:41:54 +02:00
e69967bf87 testing 2022-06-02 21:41:24 +02:00
1556af19b2 testing 2022-06-02 21:38:45 +02:00
ee7d502e82 testing 2022-06-02 21:38:11 +02:00
624ecd4cd3 testing 2022-06-02 21:35:40 +02:00
e05144752e testing 2022-06-02 21:35:07 +02:00
f2ff055a7e testing 2022-06-02 21:32:07 +02:00
4e4088ba75 testing 2022-06-02 21:31:31 +02:00
85efadadc9 testing 2022-06-02 21:29:01 +02:00
2c27e76a6a testing 2022-06-02 21:28:14 +02:00
0bbaabea5e add conf-files as json-files 2022-06-02 20:42:07 +02:00
547e2c62d7 Removed unneeded file 2022-06-02 18:53:40 +02:00
35d570274e removed 2022-06-02 18:39:53 +02:00
e09737fdb0 renamed from .conf to .json 2022-06-02 18:38:35 +02:00
1e07d78987 Remove obsolete files 2022-06-02 18:27:52 +02:00
6347409f22 Add real files 2023-02-27 11:32:59 +01:00
96897cd972 Adding more real config files 2023-02-27 11:09:32 +01:00
240202e507 testing 2022-06-05 19:53:56 +02:00
8ec07ed041 testing 2022-06-05 19:43:49 +02:00
8b2dfa838b testing 2022-06-05 19:29:00 +02:00
9467492959 testing 2022-06-05 19:27:22 +02:00
ab3b0e1b85 testing 2022-06-05 19:26:26 +02:00
e7d8064ba4 testing 2022-06-05 19:21:02 +02:00
95373a678b testing 2022-06-05 19:20:15 +02:00
bd791ca190 testing 2022-06-05 19:18:38 +02:00
e84aeb07d2 testing 2022-06-05 19:18:08 +02:00
baa5301b4f testing 2022-06-05 19:15:38 +02:00
5a41d7b350 testing 2022-06-05 19:15:05 +02:00
6cb238c885 testing 2022-06-05 18:58:56 +02:00
7feac1c99a testing 2022-06-05 18:58:10 +02:00
ed985bd9be testing 2022-06-05 18:28:40 +02:00
77ed8c2df8 testing 2022-06-05 18:27:51 +02:00
3e82b36e6b testing 2022-06-05 18:10:58 +02:00
11221f5373 testing 2022-06-05 18:10:26 +02:00
bf9bed6f4a testing 2022-06-05 18:08:43 +02:00
e584acc552 testing 2022-06-05 18:07:57 +02:00
d5f8373b81 testing 2022-06-05 17:16:33 +02:00
5e8e086ca6 testing 2022-06-05 17:15:44 +02:00
93efbafd0f testing 2022-06-05 17:06:29 +02:00
ee8e20e202 testing 2022-06-05 17:05:52 +02:00
88e11d40b0 testing 2022-06-05 17:00:41 +02:00
e17386ca8b testing 2022-06-05 17:00:11 +02:00
98f41f6f27 testing 2022-06-05 16:53:04 +02:00
a7ae5ef768 testing 2022-06-05 16:52:29 +02:00
bfc70d7228 testing 2022-06-05 16:45:58 +02:00
902c035747 testing 2022-06-05 16:45:27 +02:00
30cf4abab3 testing 2022-06-05 16:40:16 +02:00
5d8c3d1f2a testing 2022-06-05 16:39:42 +02:00
d4a70807bb testing 2022-06-05 16:33:09 +02:00
0054570966 testing 2022-06-05 16:32:15 +02:00
eff93f30d1 testing 2022-06-05 15:20:14 +02:00
c40eb482f0 testing 2022-06-05 15:19:44 +02:00
edcdb43f59 testing 2022-06-05 15:12:14 +02:00
77799a4d5b testing 2022-06-05 15:11:43 +02:00
2d769aa459 testing 2022-06-05 15:08:28 +02:00
394f1448a4 testing 2022-06-05 15:07:57 +02:00
572a8a542e testing 2022-06-05 15:06:00 +02:00
0d712e8548 testing 2022-06-05 15:05:15 +02:00
8b71490b14 testing 2022-06-05 15:03:10 +02:00
580556d743 testing 2022-06-05 14:53:44 +02:00
dd1136658e testing 2022-06-05 14:51:48 +02:00
04b477579a testing 2022-06-05 14:51:11 +02:00
e6531725fe testing 2022-06-05 14:44:49 +02:00
46ffcbb531 testing 2022-06-05 14:43:31 +02:00
cb4facc2b3 testing 2022-06-04 21:01:02 +02:00
faf1d8f9dd testing 2022-06-04 21:00:13 +02:00
4a369d16b1 testing 2022-06-04 20:49:17 +02:00
fdf69f146c testing 2022-06-04 20:48:24 +02:00
9ed92fb592 testing 2022-06-04 20:43:25 +02:00
2c92ea04aa testing 2022-06-04 20:42:52 +02:00
91bc02d7b6 testing 2022-06-04 20:22:41 +02:00
7b722433e4 testing 2022-06-04 20:22:11 +02:00
d781a3e766 testing 2022-06-04 20:16:17 +02:00
046dafb8b3 testing 2022-06-04 20:15:47 +02:00
950f95601a testing 2022-06-04 20:12:14 +02:00
26a8761efb testing 2022-06-04 20:11:39 +02:00
10d4402a40 testing 2022-06-04 20:08:22 +02:00
d9f35a68cc testing 2022-06-04 20:07:49 +02:00
e4ce24cad9 testing 2022-06-04 19:58:05 +02:00
6581640388 testing 2022-06-04 19:57:32 +02:00
ae7203c50a testing 2022-06-04 19:28:09 +02:00
6ba4c9099f testing 2022-06-04 19:27:40 +02:00
92 changed files with 6519 additions and 2965 deletions

54
.githooks/post-merge Executable file
View File

@@ -0,0 +1,54 @@
#!/bin/bash -
# FILE="/tmp/post-merge$(date +%FT%H-%M-%S)"
# commit=$(git rev-parse --verify HEAD)
# echo "$commit $(git cat-file commit $commit)" >> /tmp/post-merge
# Redirect output to stderr.
exec 1>&2
if [ -z $IFS ]; then
IFS=$'\n'
fi
GIT_PULL_TMP=/tmp/git_changed_files_for_last_pull
OPKG_CMDS_TMP=/tmp/opkg_commands
rm -f $GIT_PULL_TMP
rm -f $OPKG_CMDS_TMP
get_blob () { # get the blob of the file(name) passed as $1
# note: this can be used for any file in the filesystem
echo $(git hash-object $1)
}
get_commit_for_blob () {
# search for the blob in all commits for the file(name) $1
echo $(git log --all --pretty=format:%H -- $2 |
xargs -I{} bash -c "git ls-tree {} -- $2 |
grep -q $1 && echo -n {} && head -n 1")
}
for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do
if grep -E -q "(DC.*json|dc.*hex|dc.*bin|tariff.*json)" <<< $fn; then
# called in repository: $fn is e.g. etc/psa_tariff/tariff01.json
# add '/' prefix
fn=$(echo $fn | awk '{ printf "/"$0 }')
if [[ -f "$fn" ]]; then
blob=$(get_blob "$fn")
commit=$(get_commit_for_blob $blob "$fn")
fsize=$(ls -l "$fn" | awk '{ print $5 }')
echo "$fn $fsize $blob $commit" >> $GIT_PULL_TMP
fi
fi
if grep -E -q ".*opkg_commands" <<< $fn; then
readarray opkg_commands < <(cat $fn)
for opkg_c in "${opkg_commands[@]}"; do
test -z $opkg_c && continue;
test ! -z $(grep -E "^\s*[#]+.*$" <<< $opkg_c) && continue
echo -n "$opkg_c" | tr -d '\n\r' >> $OPKG_CMDS_TMP 2>&1
echo "" >> $OPKG_CMDS_TMP 2>&1
done
source "$fn"
fi
done

16
.gitignore vendored Normal file
View File

@@ -0,0 +1,16 @@
*
## Except
!**/.gitignore
!**/.githooks/post-merge
!/etc/*.ini
!/etc/atb/*.ini
!/etc/psa_config/*
!/etc/psa_update/*
!/etc/psa_tariff/*
!/etc/dc/dc2c.hex
!/opt/app/ATBAPP/*.ini
!/opt/app/sysconfig/*.ini
!/opt/app/ISMASMgr/*.ini

100
etc/atb/ATBAPP.ini Normal file
View File

@@ -0,0 +1,100 @@
[COMMON]
com_port_name=/dev/ttyS1
com_baud_rate=9600
lang1=hu_HU
lang2=en_GB
lang3=de_DE
lang4=sr
lang5=ro_RO
defaultLanguage=1
showInfoButton=false
showHelpButton=false
CharacterSet="ISO 8859-2"
#useLanguage=[128+][64+][32+][16]
useLanguage=248
#usePayment=[128+][64+][32+][16]
usePayment=96
#useVehicle=[128+][64+][32+][16+][8]
useVehicle=240
#useProduct=[128+][64+][32+][16+][8]
useProduct=240
textfile=/opt/app/ATBAPP/text/HMI_Texte.xml
logfile=/var/log/atbqt.log
alternativeLogoFile=
feature_Log=off
feature_TouchFeedback=off
feature_DisplayControl=off
feature_SystemSuspend=off
feature_StartButton=on
feature_selfOOO=off
feature_DBusDisplayControl=on
feature_DBusSuspendControl=on
feature_ShowParkingTime=off
suspend_methode=sysfs
suspend_program=
suspend_time=8
touch_feedback_gpio=121
touch_feedback_on_value=1
touch_feedback_off_value=0
#ooo_mode={useDisk|otherMachine}
ooo_mode=otherMachine
sellTimeout_time=60
showInfoButton=false
showHelpButton=false
useAppStates=1
statefile=/opt/app/ATBAPP/states/APP_States.xml
[SCREENCONFIG]
sc_31="1,1,0"
sc_33="1,0,1"
sc_3F="1,0,0"
sc_40="1,0,1"
sc_41="1,0,1"
sc_35="0,0,0"
sc_51="1,0,1"
sc_52="1,0,0"
sc_53="1,0,0"
[PLUGINS]
CCPlugin=IngenicoISelf_CCPlugin
CalculatePricePlugin=MOBILISIS_CalculatePricePlugin
DeviceControllerPlugin=ATBDeviceControllerPlugin
[IngenicoISelf_CCPlugin]
debug=1
PortName=/dev/ttymxc0
ZVT=DE
sleep=1
sleepExtended=1
Currency=HUF
[TCP_CONTROL]
enable=1
[PAYMENT]
currencySymbol=
cashVariant=CoinsOnly
paymentPointInTime=poa
[MOBILISIS_CalculatePricePlugin]
useDebug=1
[ATBDeviceControllerPlugin]
serialPort=ttymxc2

51
etc/atb/SystemControl.ini Normal file
View File

@@ -0,0 +1,51 @@
[COMMON]
startBacklightController=1
startSuspendController=1
startMonitoringController=0
startMQTTController=0
[BACKLIGHT]
inputBrightness=80
curve=1
dimLowValue=1
SensorMax=3500
SensorMin=0
dimMin=20
dimMax=100
[SUSPEND]
program=/home/root/system_powerdown_wakeup.sh
[MONITORING]
protocol=mqtt
useDeviceId=on
monitoring_heartbeatInterval=60
[MQTT]
mqtt_host=mqtt2.atb-comm.de
mqtt_port=8883
mqtt_username=testuser
mqtt_password=xyz123
mqtt_useSsl=on
mqtt_debug=on
mqtt_QoS=0
mqtt_TopicScheme=ATB_ISMAS
mqtt_TopicDeviceType=MP
mqtt_TopicPrefix=ATB
[NETWORKCHECK]
useNetworkCheck=on
setOOO=off
PingHost=google.com
networkRestart="/sbin/ifup -a"
[AT_TASKS]
size=1
1\id=PTU5UPDATE
1\program="/opt/app/tools/atbupdate/PTUGitInstaller"
1\arguments=-q,--platform,wayland
1\envs=QT_QPA_EGLFS_KMS_ATOMIC=1,QT_QPA_EGLFS_ALWAYS_SET_MODE=1,XDG_RUNTIME_DIR=/var/run/user/0
1\hourOfDay=1

6030
etc/dc/dc2c.hex Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,16 @@
{
"title":"DC2C_cash ",
"project":"DBM Szeged",
"version":"13.02.2023 12:20 00001",
"localCoinAccept(7..0)":[0,0,0,1,1,1,1,1],
"Name of Currency":"Huf",
"local tax rate":20,
"foreignCoinAccept(15..8)":[0,0,0,0,0,1,1,1],
"CurrencyName":"EUR",
"foreign tax rate":19,
"TokenChannel":3,
"Bills(7..0)":[0,0,0,0,0,0,0,0],
"surcharge":0,
"discount":0,
"":""
}

View File

@@ -0,0 +1,13 @@
{
"title":"DC2C_config",
"project":"DBM Szeged",
"version":"13.02.2023 12:20 00001",
"custNum":281,
"machNum":999,
"borough":1,
"zone":1,
"alias":1357,
"location":"92637Weiden/Opf_Bahnhofstraße 65",
"":""
}

View File

@@ -0,0 +1,28 @@
{
"title":"DC2C_pri01",
"project":"DBM Szeged",
"version":"13.02.2023 12:20 00001",
"styl":"bold on",
"text":"Parkingticket ",
"styl":"bold off",
"feed":"nl",
"text":"Parkingticket ",
"styl":"under on",
"text":"Parkingticket ",
"styl":"under off",
"feed":"nl",
"text":"Parkingticket ",
"styl":"latin on",
"text":"Parkingticket ",
"styl":"latin off",
"feed":"nl",
"text":"Parkingticket ",
"styl":"font 09",
"text":"Park ",
"styl":"font 16",
"text":"Park ",
"feed":"nl",
"":""
}

View File

@@ -0,0 +1,5 @@
{
"title":"DC2C_pri02",
"version":"27.02.2023 12:20 00001",
"":""
}

View File

@@ -0,0 +1,5 @@
{
"title":"DC2C_pri03",
"version":"27.02.2023 12:20 00001",
"":""
}

View File

@@ -0,0 +1,5 @@
{
"title":"DC2C_pri04",
"version":"27.02.2023 12:20 00001",
"":""
}

View File

@@ -0,0 +1,5 @@
{
"title":"DC2C_pri05",
"version":"27.02.2023 12:20 00001",
"":""
}

View File

@@ -0,0 +1,5 @@
{
"title":"DC2C_pri06",
"version":"27.02.2023 12:20 00001",
"":""
}

View File

@@ -0,0 +1,5 @@
{
"title":"DC2C_pri07",
"version":"27.02.2023 12:20 00001",
"":""
}

View File

@@ -0,0 +1,5 @@
{
"title":"DC2C_pri08",
"version":"27.02.2023 12:20 00001",
"":""
}

View File

@@ -0,0 +1,5 @@
{
"title":"DC2C_pri09",
"version":"27.02.2023 12:20 00001",
"":""
}

View File

@@ -0,0 +1,5 @@
{
"title":"DC2C_pri10",
"version":"27.02.2023 12:20 00001",
"":""
}

View File

@@ -0,0 +1,5 @@
{
"title":"DC2C_pri11",
"version":"27.02.2023 12:20 00001",
"":""
}

View File

@@ -0,0 +1,5 @@
{
"title":"DC2C_pri12",
"version":"27.02.2023 12:20 00001",
"":""
}

View File

@@ -0,0 +1,5 @@
{
"title":"DC2C_pri13",
"version":"27.02.2023 12:20 00001",
"":""
}

View File

@@ -0,0 +1,5 @@
{
"title":"DC2C_pri14",
"version":"27.02.2023 12:20 00001",
"":""
}

View File

@@ -0,0 +1,5 @@
{
"title":"DC2C_pri15",
"version":"27.02.2023 12:20 00001",
"":""
}

View File

@@ -0,0 +1,5 @@
{
"title":"DC2C_pri16",
"version":"27.02.2023 12:20 00001",
"":""
}

View File

@@ -0,0 +1,5 @@
{
"title":"DC2C_pri17",
"version":"27.02.2023 12:20 00001",
"":""
}

View File

@@ -0,0 +1,5 @@
{
"title":"DC2C_pri18",
"version":"27.02.2023 12:20 00001",
"":""
}

View File

@@ -0,0 +1,5 @@
{
"title":"DC2C_pri19",
"version":"27.02.2023 12:20 00001",
"":""
}

View File

@@ -0,0 +1,5 @@
{
"title":"DC2C_pri20",
"version":"27.02.2023 12:20 00001",
"":""
}

View File

@@ -0,0 +1,5 @@
{
"title":"DC2C_pri21",
"version":"27.02.2023 12:20 00001",
"":""
}

View File

@@ -0,0 +1,5 @@
{
"title":"DC2C_pri22",
"version":"27.02.2023 12:20 00001",
"":""
}

View File

@@ -0,0 +1,5 @@
{
"title":"DC2C_pri23",
"version":"27.02.2023 12:20 00001",
"":""
}

View File

@@ -0,0 +1,5 @@
{
"title":"DC2C_pri24",
"version":"27.02.2023 12:20 00001",
"":""
}

View File

@@ -0,0 +1,5 @@
{
"title":"DC2C_pri25",
"version":"27.02.2023 12:20 00001",
"":""
}

View File

@@ -0,0 +1,5 @@
{
"title":"DC2C_pri26",
"version":"27.02.2023 12:20 00001",
"":""
}

View File

@@ -0,0 +1,5 @@
{
"title":"DC2C_pri27",
"version":"27.02.2023 12:20 00001",
"":""
}

View File

@@ -0,0 +1,5 @@
{
"title":"DC2C_pri28",
"version":"27.02.2023 12:20 00001",
"":""
}

View File

@@ -0,0 +1,5 @@
{
"title":"DC2C_pri29",
"version":"27.02.2023 12:20 00001",
"":""
}

View File

@@ -0,0 +1,5 @@
{
"title":"DC2C_pri30",
"version":"27.02.2023 12:20 00001",
"":""
}

View File

@@ -0,0 +1,5 @@
{
"title":"DC2C_pri31",
"version":"27.02.2023 12:20 00001",
"":"iiii"
}

View File

@@ -0,0 +1,6 @@
{
"title":"DC2C_pri32",
"version":"27.02.2023 12:20 00001",
"":"",
"":"10001"
}

View File

@@ -0,0 +1,13 @@
{
"title":"DC2C_serial",
"setup_master_interface":"",
"project":"DBM Szeged",
"version":"13.02.2023 12:20 00001",
"crcChk":1,
"baudRate":9600,
"data":8,
"parity":"no",
"stop":1,
"":""
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -0,0 +1,4 @@
{
}

File diff suppressed because one or more lines are too long

View File

View File

View File

View File

View File

View File

View File

View File

View File

View File

View File

View File

View File

View File

View File

View File

View File

View File

View File

View File

View File

View File

View File

View File

View File

File diff suppressed because one or more lines are too long

28
etc/psa_update/opkg_commands Executable file
View File

@@ -0,0 +1,28 @@
# opkg prefix will be added inside evaluating script
#
# package manipulation commands without package:
# update, upgrade, clean
#
# informational commands without package:
# list, list-installed, list-upgradable
#
# ptu5-atb-apinfo
# ptu5-scripts
# ptu5-atb-apinfo
# atb-plugin-calculateprice-prm
# atb-plugin-cc-tcpzvt
# atbqt
# list-installed
# --force-reinstall install ptu5-atb-apinfo
# --force-reinstall install atbqt
# update
opkg update
opkg --noaction install atbqt
opkg install atbqt
#
#
#

View File

@@ -0,0 +1 @@
"VERSION":"0.1.0","PROJECT":"szeged","ZONE":1,"INFO":"summer sale","LOADED":"2022-06-02T21:57:29"

View File

@@ -1 +0,0 @@
szeged

View File

@@ -1 +0,0 @@
contained zones in group 1

View File

@@ -1 +0,0 @@
1

View File

@@ -1,17 +0,0 @@
{
"project_number" : "",
"device_number" : "",
"atb_serial_id" : "",
"ismas_broker" : {},
"backbone_broker" : {}
}
\n\n
\n\n
\n\n
\n\n
\n\n
\n\n
\n\n
\n\n
\n\n

View File

@@ -1,13 +0,0 @@
{
}
\n\n
\n\n
\n\n
\n\n
\n\n
\n\n
\n\n
\n\n
\n\n

View File

@@ -1,11 +0,0 @@
{
"name1" : "wert1",
"name2" : "wert2",
"name3" : "wert3",
"name4" : "wert4",
"name5" : "wert5",
"name6" : "wert6",
"name7" : "wert7",
"name8" : "wert8",
"name100" : "wert100"
}

View File

@@ -1,9 +0,0 @@
# opkg prefix will be added inside evaluating script
#
# package manipulation commands without package:
# update, upgrade, clean
#
# informational commands without package:
# list, list-installed, list-upgradable
#
--force-reinstall install atbqt

View File

@@ -1,110 +0,0 @@
[COMMON]
com_port_name=/dev/ttyS1
com_baud_rate=9600
lang1=de_DE
lang2=en_GB
lang3=fr_FR
lang4=tr_TR
#lang3=fr_FR
#lang4=ja_JP
defaultLanguage=1
#useLanguage=[128+][64+][32+][16]
useLanguage=224
usePayment=192
textfile=/opt/app/ATBQT/text/HMI_Texte.xml
logfile=/var/log/atbqt.log
alternativeLogoFile=/opt/app/ATBQT/logo/logo_betterPark.png
feature_Log=off
feature_TouchFeedback=off
feature_SystemSuspend=off
feature_StartButton=on
feature_selfOOO=off
feature_DBusDisplayControl=on
feature_DBusSuspendControl=off
feature_ShowParkingTime=off
touch_feedback_gpio=121
touch_feedback_on_value=1
touch_feedback_off_value=0
#ooo_mode={useDisk|otherMachine}
ooo_mode=otherMachine
sellTimeout_time=120
LicencePlateExampleString=HOAB123
showInfoButton=false
showHelpButton=false
[PLUGINS]
CalculatePricePlugin=ATB_Soap_CalculatePricePlugin
SimulationPlugin=TouchSimulationPlugin
CCPlugin=TCP_ZVT_CCPlugin
[TCP_ZVT_CCPlugin]
CurrencyCode=EUR
debug=1
IP=192.168.5.242
Port=22000
SSL=0
ZVT=DE
sleep=1
printIntermediateStatus=1
Password=277296
preAuthReservation=2500
[ATB_Soap_CalculatePricePlugin]
#useRFID=yes
#useBarcode=yes
useDebug=true
ignoreSslErrors=true
protocol=https
host=atb-api.nexobility.de
port=443
service=
areaId=1
deviceId=1
Password=12335
UserName=user
useSystemSetting=1
fallbackThreshold=1
connectionTimeout=7
maxOfflineTransactions=1000
[SCREENCONFIG]
sc_31="1,1,0"
sc_33="1,0,1"
sc_3F="1,0,0"
sc_40="1,1,1"
sc_41="1,0,0"
sc_35="0,0,0"
sc_51="1,0,1"
sc_52="1,0,0"
sc_55="1,0,0"
sc_82="1,0,0"
[ERRORCODE_MAPPING]
VOUCHER:PROCESS=0xFA30
VOUCHER:SOAP=0xFA31
VOUCHER:TYPE=FA32
VOUCHER:SERVICE=FA33
VOUCHER:VALIDITY=FA34
120103004=FA35

View File

@@ -1,3 +0,0 @@
{
"" : ""
}

View File

@@ -1,3 +0,0 @@
{
"xxx" : "yyyy"
}

View File

@@ -1,3 +0,0 @@
{
"wwwww" : "zzzzzz"
}

View File

@@ -1,8 +0,0 @@
{
"aaaaaa" : "bbbbb"
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,50 +0,0 @@
Idee fuer pre-authorization:
Es gibt bei der Pre-Auth. zwei Schritte.
1. Schritt: hier wird ueberprueft, ob die Karte den Preis bezahlen kann.
2. Schritt: (notification) hier wird die Karte dann mit dem Endpreis belastet.
Kann von einem anderen PSA durchgefuehrt werden.
PSA1 macht Schritt 1, PSA2 Schritt 2.
Woher weiss jetzt PSA1, dass PSA2 Schritt 2 gemacht hat?
Jeder Kunde hat ein Repository (schon wegen dem PSA-Update).
Hier koennte man ein weiteres Verzeichnis unterbringen namens 'preauth'.
In diesem Verzeichnis werden pro Vorgang zwei Dateien angelegt.
Schritt 1:
Datei "open_preauth_<psa_serien_nummer>_<psa_zaehler>" wird angelegt.
Hier kann man dann alle moeglichen Daten eintragen.
Die Datei wird im Repository eingecheckt.
Schritt 2:
PSA2 macht zunaechst ein 'git pull'.
Damit sieht er, dass (mindestens) eine Pre-Auth. offen ist.
Sie ist nicht von ihm, da seine Seriennummer eine andere ist.
(Eventuell koennte man es so machen, dass in der Datei eine Kennung fuer
die Kreditkarte enthalten ist, so dass der Kunde nichts eingeben muss.)
Die Transaktion wird abgeschlossen, und PSA2 erzeugt die
Datei "close_preauth_<psa_serien_nummer>_<psa_zaehler>" und checkt sie ein.
Beim neachsten Bezahlvorgang oder Tagesschnitt macht PSA1 ein 'git pull'
und sieht dass die Pre-Auth abgeschlossen wurde.
PSA1 kann nun die beiden Dateien aus dem Repository entfernen.
Der Punkt ist wichtig: *nur* PSA1 kann das, also immer der PSA, der die
Sache angefangen hat, kann Daten loeschen.
Frage: Kann man 2 Bezahlvorgaenge mit derselben Kreditkarten haben?
Im Prinzip offenbar ja, aber falls man das macht, dann kann der erste Vorgang
nicht mehr rueckgaengig gemacht werden. Nur fuer den jeweils letzten Vorgang
ist das moeglich.
Hier muesste man den Kunden dann fragen, was er tun will: erst den ersten
Vorgang bezahlen (Schritt 2), oder was Neues auf PSA2 anfangen.

View File

@@ -1,76 +0,0 @@
{
"c0" : "config-file for update process",
"c1" : "ini-files section",
"ini" : {
"c2" : "location",
"szeged" : {
"c3" : "each location can have multiple",
"c4" : "zone-groups and/or zones",
"c5" : "0-index used as size of following array",
"c6" : ".zg[0]: #n of zones_groups",
"c7" : ".zg[1].z[0]: #n of zones in zg[1]",
"c8" : ".zg[1].z[1]: zone 1 in zone_group 1",
"c9" : "-> .zg[1].z[1].opt.app.sysconfig.ISMASMgr ",
"zg" : [ 1, {
"z" : [ 1, {
"opt" : {
"app" : {
"sysconfig" : {
"ISMASMgr" : "1d6f64df2d18929401599d6e9640dd21",
"sysconfig" : "ad449893e4f921d22b6275aecec41dcb",
"SystemControl" : "8fd827b61d482b589076c1e91d9c3cb1"
},
"ISMASMgr" : {
"ISMASMgr" : "88ef404d9e994fd6266014ca823b73bd"
},
"ATBAPP" : {
"ATBQT" : "c30e90c795bb1a4508668995f9f3014b"
}
}
}}
]
}]
}
},
"c10" : "conf-files section",
"conf" : {
"c11" : "location",
"szeged" : {
"c12" : "each location can have multiple",
"c13" : "zone-groups and/or zones",
"c14" : "0-index used as size of following array",
"c15" : ".zg[0]: #n of zones_groups",
"c16" : ".zg[1].z[0]: #n of zones in zg[1]",
"c17" : ".zg[1].z[1]: zone 1 in zone_group 1",
"c18" : "-> .zg[1].z[1].etc.psa_config.emp ",
"zg" : [ 1, {
"z" : [ 1, {
"etc" : {
"psa_config" : {
"emp" : "cc9e98e2d10ac55c121079f99c673661",
"printer": "b4a2a8bc5657ef6904b25afb8ba716e4",
"device" : "05cc52f8c4690efc0c833f5f196c74f9"
}
}}
]
}]
}
},
"c19" : "opkg-files section",
"opkg" : {
"atbqt" : {
"Version" : "1.0.0-r1",
"MD5Sum" : "642eda2b3637291b024ef152479218bc",
"Architecture" : "cortexa9t2hf-neon"
}
}
}