426 Commits

Author SHA1 Message Date
DennisSchwarzer 35a5d527c1 change exchange rate to 336 HUF/EUR 2026-05-05 10:23:08 +02:00
DennisSchwarzer 559c1dbb20 fix tariff info used for backend 2026-04-15 14:06:04 +02:00
DennisSchwarzer ed9336ec8c update holidays 2026 2026-03-31 15:01:33 +02:00
SiegfriedSiegert 35535a96bf Install apism 1.7.0-r1 (restart always) 2026-03-05 14:58:52 +01:00
SiegfriedSiegert 0a154ed595 Install atbqt 4.99.11 (Backport ApismClient) 2026-03-05 13:08:03 +01:00
DennisSchwarzer 7bb275b2f1 Updated Holidays for all zones and set Saturday as holiday for zone 1 to
4
2025-12-09 08:58:55 +01:00
DennisSchwarzer 41e7dcaa2e added missing comma 2025-10-23 18:09:00 +02:00
DennisSchwarzer 16b3a656bb fixed saints_day 2025-11-01 2025-10-23 18:02:53 +02:00
DennisSchwarzer ff2868e405 updated holidays 2025-10-23 10:20:06 +02:00
DennisSchwarzer ba041c79dc quick hack for saturday workday, revert in KW 43!!! 2025-10-17 13:14:53 +02:00
DennisSchwarzer 2b1933d810 etc/psa_config/DC2C_print23.json gelöscht 2025-08-19 09:29:33 +02:00
DennisSchwarzer a85381cf81 DC2C_print23.json provided by customer 2025-08-19 08:20:01 +02:00
DennisSchwarzer 6bcdfdfb30 DC 2025-08-19 08:19:39 +02:00
GerhardHoffmann 6f3a997762 Remove Sat 08:00-12:00 for Zone 3 (Yellow) -> slipped in Dec 2024. 2025-05-22 11:06:44 +02:00
GerhardHoffmann d54b6da3c5 restore tariff files after special day at 17th of May 2025-05-20 10:09:18 +02:00
GerhardHoffmann 27fdf1c51c comment all opkg lines 2025-05-12 09:48:36 +02:00
GerhardHoffmann 43e81f7d37 special saturday 2025/05/17 2025-05-12 08:54:33 +02:00
GerhardHoffmann da069ba4ea set service fridays: 8-18 2025-01-07 10:46:48 +01:00
GerhardHoffmann 1fc3c49288 Add holiday 2024-12-28. Switch back to normal handling of Saturdays. 2024-12-16 15:50:08 +01:00
GerhardHoffmann 3f9bb85be9 additional holidays 2024/2025 2024-12-03 13:49:08 +01:00
GerhardHoffmann 951c42123d Adapt for Saturday 07/12 2024-12-02 17:12:18 +01:00
GerhardHoffmann 7abf1ddefe Remove Sat 08:00-12:00 from Zone 3 (Yellow) 2024-10-29 15:32:42 +01:00
GerhardHoffmann 8888fcd395 Revert to original versions 2024-08-08 12:24:01 +02:00
GerhardHoffmann a481f892b6 set 8:00-18:00 for 03.08 2024-08-01 12:39:15 +02:00
GerhardHoffmann db5e5f9ecc Activate opkg_commands 2024-07-15 08:55:18 +02:00
GerhardHoffmann 215863270c opkg: none 2024-07-08 13:38:30 +02:00
GerhardHoffmann cfc571f591 Set ex.rate to 365. 2024-07-05 10:01:02 +02:00
gnemeth 1953ead089 euro exchange rate update 2024-06-30 19:10:15 +02:00
GerhardHoffmann 4a9818c0fb re-commit: change of ISMAS settings 2024-06-25 08:37:22 +02:00
GerhardHoffmann 904024453f ZoneId in tariff-files 2024-06-24 11:33:17 +02:00
SiegfriedSiegert fa2a3e336e Tariff: add tariff-info aka "TARIFF_ID" 2024-06-07 08:12:12 +02:00
GerhardHoffmann 0cd48239af Remove all files except DC2C_cash/print22/print25/print28.json 2024-04-30 14:33:54 +02:00
GerhardHoffmann 41e59fceb0 Repeat update procedure in Szeged for 145-148,171,172,159-161 2024-04-30 08:51:28 +02:00
GerhardHoffmann 12e266fbdf Set exchange rate to 350. Add all other json-files from at-dat as provided by Thomas 2024-04-26 12:11:20 +02:00
GerhardHoffmann 1ebe2a16b9 Use empty file. 2024-04-18 16:10:31 +02:00
GerhardHoffmann d6d86bd5f1 readd empty lines (just to be sure that files have been changed) 2024-03-28 12:10:06 +01:00
GerhardHoffmann d9b5661a0f added empty lines to restart download 2024-03-28 11:57:38 +01:00
GerhardHoffmann baf0dba915 even remove opkg update 2024-03-26 10:06:38 +01:00
GerhardHoffmann 2e0e69d3ec only install prepare-update script 2024-03-26 09:52:01 +01:00
GerhardHoffmann 79564c1eff Removed all holidays except thos for 2024 2024-03-26 09:40:36 +01:00
GerhardHoffmann d25dda1187 tariff01 -> exact prize: 42
tarif 04/06 -> exact price: 163
2024-02-19 17:30:48 +01:00
GerhardHoffmann b926387993 tariff01.json: set min-price: 165 / 4 -> 45
tariff02.json: set min-price: 260 / 4 -> 65
tariff03.json: set min-price: 360 / 4 -> 90
tariff04.json: set min-price: 650 / 4 -> 165
tariff05.json: set min-price: 360 / 4 -> 90
tariff06.json: set min-price: 650 / 4 -> 165
2024-02-15 14:27:14 +01:00
GerhardHoffmann 9034218e2d add libmobilisis-calc2 and activate upgrade step 2024-01-09 11:45:36 +01:00
GerhardHoffmann 8b8ba69a92 Set max. parking time: 360; tartiff04/06: daily ticket price (unused): 2600 2024-01-08 15:43:58 +01:00
GerhardHoffmann c2206fdb49 Set zone 'green mars' as 'green', 'yellow mars' as 'yello' 2024-01-08 10:59:41 +01:00
GerhardHoffmann 0f5fbb497c Update exchange rate to 352. 2023-12-31 08:17:33 +01:00
GerhardHoffmann 4377307430 turn on new tariffs for szeged, valid from 01.01.2014, containing updated exceptional days. 2023-12-31 08:08:30 +01:00
GerhardHoffmann 4f660ee640 switch back to previous prices until 01.01.2024 2023-12-23 08:34:00 +01:00
GerhardHoffmann 57dd5a5364 set new prices: purple: 165, 990; blue: 260, 1560; yellow: 360, 2160; green: 650 2023-12-21 15:25:18 +01:00
GerhardHoffmann d806c84f95 Remove dc-files (to be used later) 2023-12-20 13:56:20 +01:00
GerhardHoffmann 520daa4d0c Change for szeged: do not install atbupdatetool and do not upgrade the machine 2023-12-20 12:51:39 +01:00
GerhardHoffmann d8ec03f03f Reset to previous prices keeping current holidays 2023-12-20 12:51:29 +01:00
GerhardHoffmann 34d3201a29 Updated to use new prices. 2023-12-19 16:49:38 +01:00
GerhardHoffmann 242de9080f Replace year period id from 8 to 2 as the special days refer to it 2023-12-19 14:57:41 +01:00
GerhardHoffmann 4c219d4aad delete all json files 2023-12-19 13:54:39 +01:00
GerhardHoffmann 020e8eb32b use opkg_commands file as used in schoenau (00332) 2023-12-19 11:57:04 +01:00
GerhardHoffmann 717239b1e6 switch back to previous prices, but keeping current holidays 2023-12-19 11:17:56 +01:00
GerhardHoffmann 4cf3a97576 tariff01:
new price: 165
    new daily price: 990
tariff02:
    new price: 260
    new daily price: 1560
tariff03:
    new price: 360
    new daily price: 2160
tariff04:
    new price: 650

Set new holidays starting from Dec. 2023.
2023-12-18 14:43:41 +01:00
GerhardHoffmann fc69c5259f Fixed wrong comma after exchange rate 2023-10-11 14:14:22 +02:00
GerhardHoffmann 08a7586026 set exchange rate to 360 2023-10-10 16:30:17 +02:00
GerhardHoffmann 98a1322722 Install ptu5-gitinstaller, atbupdatetool and atbqt.# Bitte geben Sie eine Commit-Beschreibung für Ihre Änderungen ein. Zeilen, 2023-08-11 12:41:50 +02:00
GerhardHoffmann 32720ad250 remove absolete file 2023-08-11 12:41:23 +02:00
GerhardHoffmann 77045d85c0 set daily cardprice to 2400 2023-08-03 15:44:26 +02:00
GerhardHoffmann 4384d17c80 add json files for zones 5 and 6 2023-08-03 15:31:46 +02:00
GerhardHoffmann 467cdeee18 use same tariff-file as branch for zone4 2023-07-26 14:48:38 +02:00
GerhardHoffmann 503a8a5f19 Set max_time to 240 2023-07-25 10:15:36 +02:00
GerhardHoffmann b82c876ece Do not download anything. Only execute opkg-commands 2023-07-06 15:44:31 +02:00
GerhardHoffmann 5257ec6b2b Update json-printer-files (provided by Dennis) 2023-07-06 15:11:43 +02:00
GerhardHoffmann 4fe11fae51 remove handling og checkout_history file 2023-07-04 14:01:10 +02:00
GerhardHoffmann 0133e505a1 populate opkg_commands-file with valid opkg instructions 2023-07-04 12:17:36 +02:00
GerhardHoffmann 52b5e76257 use opgk_commands-file in repository rather than in global file-system 2023-07-04 12:14:50 +02:00
SiegfriedSiegert 90e66b5be6 prevent any opkg command 2023-07-02 16:30:11 +02:00
GerhardHoffmann 0a16863267 return to normal workflow after testing 2023-06-30 10:51:49 +02:00
GerhardHoffmann 62b617e136 Provide opkg commands for zone3 2023-06-29 14:31:34 +02:00
GerhardHoffmann 835cbeae0b dc2c.bin -> dc2c.4.35.bin 2023-06-27 16:23:52 +02:00
GerhardHoffmann 423c0bec8a Adding device-controller firmware version 4.35 2023-06-27 16:23:16 +02:00
GerhardHoffmann a6cec85e46 remove obsolete file 2023-06-27 16:22:42 +02:00
GerhardHoffmann 8592f044d8 sync tariff-files with zg1/zone1 2023-06-27 14:42:01 +02:00
GerhardHoffmann 36894ae00b remove unued tariff-files 2023-06-27 14:40:27 +02:00
GerhardHoffmann 9519a6555e install same post-merge-hook as in branch zg1/zone1 2023-06-27 14:36:36 +02:00
GerhardHoffmann 28f597898e install same post-checkout-hook as in branch zg1/zone1 2023-06-27 14:35:27 +02:00
GerhardHoffmann 3643c06c19 Set daily_card_price to 2400 for zone4 2023-06-27 14:20:58 +02:00
GerhardHoffmann 98a69bc779 check for existence of opkg_commands-file (2) 2023-06-05 15:58:27 +02:00
GerhardHoffmann 14b49b4b21 check for existence of opkg_commands-file 2023-06-05 15:52:45 +02:00
GerhardHoffmann a08d654c26 adding post-checkout hook ad for zone1 2023-06-05 15:46:58 +02:00
GerhardHoffmann 101d6b8071 Add device controller version 4.22 2023-05-31 08:59:01 +02:00
GerhardHoffmann 4371fdd8f1 Adding new print-templates because of printing-problems on DC-side 2023-05-24 16:21:30 +02:00
GerhardHoffmann f821294816 Add DC-version 4.21 2023-05-24 16:21:24 +02:00
GerhardHoffmann a06c333894 Updating print templates as of May 11, 2023. 2023-05-18 12:16:32 +02:00
GerhardHoffmann bddb6a1a84 Add tariff-file for zone 4 2023-05-04 10:56:09 +02:00
GerhardHoffmann 8dea72e22b Update as for branch zg1/zone1 2023-04-25 11:54:03 +02:00
GerhardHoffmann 10f95e328a Removed *.ini-Files. 2023-03-31 11:47:16 +02:00
GerhardHoffmann fcd6301141 Add .gitignore 2023-03-31 09:51:54 +02:00
GerhardHoffmann bfff914e1d Add handling for binary dc-files 2023-03-30 12:49:45 +02:00
GerhardHoffmann 17abc2e768 fixed regex 2023-03-27 16:41:10 +02:00
GerhardHoffmann d4934b1f07 10001 2023-03-27 16:38:07 +02:00
GerhardHoffmann 83a5649e37 10000 2023-03-27 16:33:57 +02:00
GerhardHoffmann b2de949187 0000 2023-03-27 16:30:35 +02:00
GerhardHoffmann 3e394ee48f add dc file 2023-03-27 16:24:08 +02:00
GerhardHoffmann c38e94d289 recreate repo 2023-03-27 16:10:41 +02:00
GerhardHoffmann 65efe0c9a9 recreateing whole repository 2023-03-27 15:57:41 +02:00
GerhardHoffmann 8648da0488 test 2022-06-05 14:40:21 +02:00
GerhardHoffmann 35115ff21c testing 2022-06-05 14:38:20 +02:00
GerhardHoffmann 2a73c1807d test 2022-06-04 21:04:06 +02:00
GerhardHoffmann c43da07747 test 2022-06-04 20:34:46 +02:00
GerhardHoffmann f5693d6473 test 2022-06-04 20:29:33 +02:00
GerhardHoffmann 6f1e694e65 testing 2022-06-04 19:45:28 +02:00
GerhardHoffmann b283635670 testing 2022-06-04 19:41:45 +02:00
GerhardHoffmann 51dc153f6d testing 2022-06-04 19:40:34 +02:00
GerhardHoffmann a5898b6347 testing 2022-06-04 19:38:55 +02:00
GerhardHoffmann 8f98a6f5f4 testing 2022-06-04 19:34:44 +02:00
GerhardHoffmann f40e764439 testing 2022-06-04 19:33:13 +02:00
GerhardHoffmann c47b0fec23 testing 2022-06-04 19:29:43 +02:00
GerhardHoffmann da6c0e5c68 testing 2022-06-04 19:24:38 +02:00
GerhardHoffmann b8eeb7c0b9 testing 2022-06-04 19:22:32 +02:00
GerhardHoffmann dfda3999fb testing 2022-06-04 19:21:02 +02:00
GerhardHoffmann a611b2b698 testing 2022-06-03 22:11:57 +02:00
GerhardHoffmann d90112eafd testing 2022-06-03 22:11:23 +02:00
GerhardHoffmann 0266ec873d testing 2022-06-03 21:58:06 +02:00
GerhardHoffmann ae65a8a420 testing 2022-06-03 21:57:29 +02:00
GerhardHoffmann ab2631f88d testing 2022-06-03 21:57:05 +02:00
GerhardHoffmann 76f470f947 testing 2022-06-03 21:55:26 +02:00
GerhardHoffmann f328d184a7 testing 2022-06-03 21:54:11 +02:00
GerhardHoffmann a314bf2248 testing 2022-06-03 16:35:59 +02:00
GerhardHoffmann cc86c29eec testing 2022-06-03 16:35:12 +02:00
GerhardHoffmann 35a2cb83c8 testing 2022-06-03 16:31:53 +02:00
GerhardHoffmann becedb9726 testing 2022-06-03 16:30:54 +02:00
GerhardHoffmann b98f28344d testing 2022-06-03 16:23:49 +02:00
GerhardHoffmann 422159a783 testing 2022-06-03 16:22:25 +02:00
GerhardHoffmann 12a2715304 testing 2022-06-03 16:02:18 +02:00
GerhardHoffmann 66566225d8 copied from summer_tariff.json 2022-06-03 16:00:54 +02:00
GerhardHoffmann 9df963ff64 added up tp 32 tariff-files 2022-06-03 15:54:29 +02:00
GerhardHoffmann 2cb79fc5d4 renamed 2022-06-03 15:36:15 +02:00
GerhardHoffmann ab8bd20466 renamed 2022-06-03 15:35:32 +02:00
GerhardHoffmann e4ac4b0cc8 renamed 2022-06-03 15:34:45 +02:00
GerhardHoffmann 2af6b1e344 adding tariff as for json-confs 2022-06-03 15:15:10 +02:00
GerhardHoffmann 49a5858077 adding tariff as for json-confs 2022-06-03 15:14:46 +02:00
GerhardHoffmann be1c4417dd adding tariff as for json-confs 2022-06-03 15:14:10 +02:00
GerhardHoffmann 311b86336c remove top-level 2022-06-03 14:43:33 +02:00
GerhardHoffmann 7103bdafb5 remove top-level 2022-06-03 14:43:11 +02:00
GerhardHoffmann 86ca411cde add dc-file 2022-06-03 14:41:18 +02:00
GerhardHoffmann d528a97e14 removed top-level-sections 2022-06-03 14:40:13 +02:00
GerhardHoffmann 10d39ed760 removed top-level section 2022-06-03 14:39:27 +02:00
GerhardHoffmann fc95aca792 removed top-level sections 2022-06-03 14:38:03 +02:00
GerhardHoffmann 7e55d61d71 testing 2022-06-03 14:36:41 +02:00
GerhardHoffmann e7c47e7931 renamed 2022-06-03 14:35:26 +02:00
GerhardHoffmann 6570cf3419 renamed 2022-06-03 14:34:07 +02:00
GerhardHoffmann 27be755fbd renamed 2022-06-03 14:33:07 +02:00
GerhardHoffmann cff8c52027 adding tariff files 2022-06-03 14:25:53 +02:00
GerhardHoffmann 4091fd4227 adding tariff files 2022-06-03 14:25:49 +02:00
GerhardHoffmann dab82b220d adding tariff files 2022-06-03 14:25:34 +02:00
GerhardHoffmann 0dbedbe198 testing 2022-06-03 14:08:59 +02:00
GerhardHoffmann 10b1620813 testing 2022-06-03 14:07:32 +02:00
GerhardHoffmann d0fd7dfc4f Removed top-level-dc-section 2022-06-03 14:05:10 +02:00
GerhardHoffmann abfc409500 renamed conf to json section 2022-06-02 22:04:54 +02:00
GerhardHoffmann 32ece9da7b testing 2022-06-02 21:46:39 +02:00
GerhardHoffmann 43da9e0437 testing 2022-06-02 21:45:47 +02:00
GerhardHoffmann ec76845dd4 testing 2022-06-02 21:45:32 +02:00
GerhardHoffmann ed3033659a testing 2022-06-02 21:43:08 +02:00
GerhardHoffmann e3d97bf8df testing 2022-06-02 21:42:36 +02:00
GerhardHoffmann fc0e466753 testing 2022-06-02 21:38:47 +02:00
GerhardHoffmann 0fe582259d testing 2022-06-02 21:37:52 +02:00
GerhardHoffmann 2f0350a69e testing 2022-06-02 21:34:17 +02:00
GerhardHoffmann 16f1250eb7 testing 2022-06-02 21:34:03 +02:00
GerhardHoffmann cd6a9020fa testing 2022-06-02 20:54:36 +02:00
GerhardHoffmann e828452190 testing 2022-06-02 20:54:03 +02:00
GerhardHoffmann aedbc2032c testing 2022-06-02 20:51:40 +02:00
GerhardHoffmann a5974acfa2 testing 2022-06-02 20:23:15 +02:00
GerhardHoffmann 25437ef752 testing 2022-06-02 20:22:48 +02:00
GerhardHoffmann 256a7ede1d testing 2022-06-02 20:18:57 +02:00
GerhardHoffmann 9b807dcd8a testing 2022-06-02 20:18:28 +02:00
GerhardHoffmann 27cb47491d testing 2022-06-02 20:13:58 +02:00
GerhardHoffmann 33f662756d testing 2022-06-02 20:13:31 +02:00
GerhardHoffmann 73f24f21c6 testing 2022-06-02 20:10:16 +02:00
GerhardHoffmann d5a8653d34 testing 2022-06-02 20:09:50 +02:00
GerhardHoffmann 2ffee1988a testing 2022-06-02 20:08:20 +02:00
GerhardHoffmann 241f63e2fd testing 2022-06-02 20:07:43 +02:00
GerhardHoffmann 43785f085e testing 2022-06-02 20:02:15 +02:00
GerhardHoffmann 9379c26454 testing 2022-06-02 20:01:44 +02:00
GerhardHoffmann 83cdaf6da9 testing 2022-06-02 19:53:50 +02:00
GerhardHoffmann 83d2986460 testing 2022-06-02 19:53:16 +02:00
GerhardHoffmann 8b030f49c6 testing 2022-06-02 19:47:22 +02:00
GerhardHoffmann eb4c1ab8eb testing 2022-06-02 19:45:45 +02:00
GerhardHoffmann e26268cb3c testing 2022-06-02 19:35:15 +02:00
GerhardHoffmann 688945700c testing 2022-06-02 19:34:31 +02:00
GerhardHoffmann 47685bbbdf testing 2022-06-02 18:38:31 +02:00
GerhardHoffmann 46d4ed2c39 testing 2022-06-02 18:37:59 +02:00
GerhardHoffmann 2b0f276440 testing 2022-06-02 18:35:31 +02:00
GerhardHoffmann 2b035a1032 testing 2022-06-02 18:34:49 +02:00
GerhardHoffmann d6251eddfb testing 2022-06-02 18:30:48 +02:00
GerhardHoffmann e031e5d9b0 testing 2022-06-02 18:30:11 +02:00
GerhardHoffmann 31c993f9fc testing 2022-06-02 18:21:09 +02:00
GerhardHoffmann f6216105d4 testing 2022-06-02 18:19:35 +02:00
GerhardHoffmann 40cbae43b6 testing 2022-06-02 17:43:07 +02:00
GerhardHoffmann 2c3f85acda testing 2022-06-02 17:42:14 +02:00
GerhardHoffmann a998f27618 testing 2022-06-02 17:40:44 +02:00
GerhardHoffmann 4a279cb080 testing 2022-06-02 17:37:23 +02:00
GerhardHoffmann 27ffaccb7c testing 2022-06-02 17:32:00 +02:00
GerhardHoffmann 26946b4e18 testing 2022-06-02 17:31:24 +02:00
GerhardHoffmann 312f8d5dda testing 2022-06-02 17:20:00 +02:00
GerhardHoffmann 25fecc68a4 testing 2022-06-02 17:19:23 +02:00
GerhardHoffmann dd3e3754be testing 2022-06-02 17:14:43 +02:00
GerhardHoffmann 8ae7a78691 testing 2022-06-02 17:13:49 +02:00
GerhardHoffmann fad1d54135 testing 2022-06-02 17:08:52 +02:00
GerhardHoffmann 76b86aba17 testing 2022-06-02 17:07:55 +02:00
GerhardHoffmann 5f856d0303 testing 2022-06-02 17:04:47 +02:00
GerhardHoffmann 16f3a37cb8 testing 2022-06-02 17:04:23 +02:00
GerhardHoffmann ec4b7f4b73 testing 2022-06-02 17:03:01 +02:00
GerhardHoffmann 9a7e456fb8 testing 2022-06-02 17:02:36 +02:00
GerhardHoffmann bb2bdd8288 testing 2022-06-02 17:00:42 +02:00
GerhardHoffmann e3fccc2e61 testing 2022-06-02 16:59:41 +02:00
GerhardHoffmann e3d280cef1 testing 2022-06-02 16:55:33 +02:00
GerhardHoffmann 15c5acfd90 testing 2022-06-02 16:55:07 +02:00
GerhardHoffmann 9001a120b7 testing 2022-06-02 16:53:57 +02:00
GerhardHoffmann db0fe4675d testing 2022-06-02 16:53:17 +02:00
GerhardHoffmann 6b13486bb9 testing 2022-06-02 16:46:39 +02:00
GerhardHoffmann b0890a0062 testing 2022-06-02 16:46:03 +02:00
GerhardHoffmann 6bd4ba58f4 testing 2022-06-02 16:42:20 +02:00
GerhardHoffmann 4c0a19522e testing 2022-06-02 16:41:17 +02:00
GerhardHoffmann 241012961a testing 2022-06-02 16:34:04 +02:00
GerhardHoffmann d3a61f7b51 testing 2022-06-02 16:33:09 +02:00
GerhardHoffmann 15d4f6bd63 testing 2022-06-02 15:59:01 +02:00
GerhardHoffmann 076c08ffa2 testing 2022-06-02 15:57:19 +02:00
GerhardHoffmann c89b7de884 add files refecting system files 2022-06-07 21:47:09 +02:00
GerhardHoffmann 31b6dec11d add ini-files 2022-06-07 18:10:43 +02:00
GerhardHoffmann bf4611e638 add ini-files 2022-06-07 18:10:05 +02:00
GerhardHoffmann 541dd48e4e add dummy file 2022-06-07 18:08:15 +02:00
GerhardHoffmann 0e756d6974 add tariff files 2022-06-07 18:07:29 +02:00
GerhardHoffmann 7688685669 add tariff-files 2022-06-07 18:05:57 +02:00
GerhardHoffmann 8b211d26ec add directories as for zone ../1 2022-06-07 18:03:13 +02:00
GerhardHoffmann 0c27dd3a22 add directories as for zone ../1 2022-06-07 18:02:36 +02:00
GerhardHoffmann d9ec4cd7fd add tariff files 2022-06-07 18:00:27 +02:00
GerhardHoffmann ea6434d5ca remove backup files 2022-06-07 17:45:40 +02:00
GerhardHoffmann f2c064b434 add ini files 2022-06-07 17:42:31 +02:00
GerhardHoffmann bfaededa72 adding ini-files 2022-06-07 17:40:37 +02:00
GerhardHoffmann e4609d31c2 Add app init file 2022-06-07 15:41:36 +02:00
GerhardHoffmann 46cca6410b Add *.ini file directly under /etc 2022-06-06 20:24:43 +02:00
GerhardHoffmann 2cc00cb741 Add standard system files 2022-06-06 20:17:44 +02:00
GerhardHoffmann 3acc34d986 updated for zone1/3 in szeged 2023-03-16 14:53:22 +01:00
GerhardHoffmann 4577ab46dd Added Saturday 2023-03-16 14:51:26 +01:00
GerhardHoffmann 097c1fec6d set price to 220 2023-03-16 14:51:26 +01:00
GerhardHoffmann 70bc231534 Added tariff-section 2022-06-05 17:45:47 +02:00
GerhardHoffmann 839d1a6966 updated dc2c.hex to version 0.4.9 2023-03-16 08:17:26 +01:00
GerhardHoffmann 6f01cb07b0 Add new version: dc2c.4.9 2023-03-16 08:14:03 +01:00
GerhardHoffmann 5fbb8f0d54 testing 2022-06-05 15:18:13 +02:00
GerhardHoffmann e92dc42b81 testing 2022-06-05 15:17:36 +02:00
GerhardHoffmann 28f024e568 testing 2022-06-05 15:15:57 +02:00
GerhardHoffmann 450ba9667c testing 2022-06-05 15:15:20 +02:00
GerhardHoffmann ec10ef3ec1 testing 2022-06-05 15:06:05 +02:00
GerhardHoffmann 1c7bdde589 testing 2022-06-05 15:04:06 +02:00
GerhardHoffmann 8ce7d17045 testing 2022-06-04 23:19:41 +02:00
GerhardHoffmann d64343a92e testing 2022-06-04 23:19:10 +02:00
GerhardHoffmann b358439574 testing 2022-06-04 23:17:36 +02:00
GerhardHoffmann dd9232dfb3 testing 2022-06-04 23:17:08 +02:00
GerhardHoffmann 72abbc7c7c testing 2022-06-04 23:14:08 +02:00
GerhardHoffmann 14a8094cd6 testing 2022-06-04 23:13:35 +02:00
GerhardHoffmann daa851f861 testing 2022-06-04 23:10:49 +02:00
GerhardHoffmann 6f7b77fa0f testing 2022-06-04 23:10:21 +02:00
GerhardHoffmann 70e55e601a testing 2022-06-04 23:05:38 +02:00
GerhardHoffmann 818b8d3941 testing 2022-06-04 23:05:08 +02:00
GerhardHoffmann c3975d736d testing 2022-06-04 23:00:04 +02:00
GerhardHoffmann 3d8e671d98 testing 2022-06-04 22:59:38 +02:00
GerhardHoffmann c9a3848103 testing 2022-06-04 22:55:22 +02:00
GerhardHoffmann d26abf157f testing 2022-06-04 22:54:50 +02:00
GerhardHoffmann 452039f337 testing 2022-06-04 22:50:30 +02:00
GerhardHoffmann ba46621c60 testing 2022-06-04 22:50:01 +02:00
GerhardHoffmann c7c765a263 testing 2022-06-04 22:41:01 +02:00
GerhardHoffmann 7296deee30 testing 2022-06-04 22:40:23 +02:00
GerhardHoffmann 209ce4652d testing 2022-06-04 22:35:59 +02:00
GerhardHoffmann 44ae96ac98 testing 2022-06-04 22:35:26 +02:00
GerhardHoffmann c71ab77a0f testing 2022-06-04 22:27:00 +02:00
GerhardHoffmann 2b5ccd1376 testing 2022-06-04 22:26:23 +02:00
GerhardHoffmann 9d71a409ff testing 2022-06-04 22:22:07 +02:00
GerhardHoffmann 14cca78e35 testing 2022-06-04 22:21:38 +02:00
GerhardHoffmann c85d4249d2 testing 2022-06-04 22:19:02 +02:00
GerhardHoffmann a18ae8193b testing 2022-06-04 22:18:29 +02:00
GerhardHoffmann 50f4f5b303 testing 2022-06-04 22:13:17 +02:00
GerhardHoffmann 620e92217a testing 2022-06-04 22:12:38 +02:00
GerhardHoffmann fa73e2155e testing 2022-06-04 22:09:53 +02:00
GerhardHoffmann f58579367e testing 2022-06-04 22:09:13 +02:00
GerhardHoffmann 114d038f41 testing 2022-06-04 22:05:05 +02:00
GerhardHoffmann 836cb1cbcb testing 2022-06-04 22:04:25 +02:00
GerhardHoffmann c446ae0322 testing 2022-06-04 21:57:42 +02:00
GerhardHoffmann ac88d453d1 testing 2022-06-04 21:56:47 +02:00
GerhardHoffmann a58b3da2ca testing 2022-06-04 19:54:59 +02:00
GerhardHoffmann 91a219b63a testing 2022-06-04 19:54:16 +02:00
GerhardHoffmann 3a53b28f4e testing 2022-06-04 19:49:07 +02:00
GerhardHoffmann 1017fc2bbd testing 2022-06-04 19:48:37 +02:00
GerhardHoffmann 2043a302ba testing 2022-06-04 19:42:45 +02:00
GerhardHoffmann fb7bcdd881 testing 2022-06-04 19:42:13 +02:00
GerhardHoffmann 622a34e849 testing 2022-06-04 19:36:08 +02:00
GerhardHoffmann 742eb4845f testing 2022-06-04 19:35:34 +02:00
GerhardHoffmann 55f8e3fe30 testing 2022-06-04 19:31:34 +02:00
GerhardHoffmann eb49671d7e testing 2022-06-04 19:31:03 +02:00
GerhardHoffmann 7c68fa8918 testing 2022-06-04 19:27:52 +02:00
GerhardHoffmann 0224691612 testing 2022-06-04 19:26:51 +02:00
GerhardHoffmann 9e9460310c testing 2022-06-04 19:20:23 +02:00
GerhardHoffmann ad167d76db testing 2022-06-04 19:18:47 +02:00
GerhardHoffmann c9ccab0dad Add customer-specific ATBQT.ini file 2022-06-04 18:05:37 +02:00
GerhardHoffmann c2577dc743 replaced by atb-directory 2022-06-04 17:55:13 +02:00
GerhardHoffmann d6ae1aa4ad initialized ini-files 2022-06-04 17:53:15 +02:00
GerhardHoffmann 49237d528c initialized ini-files 2022-06-04 17:52:32 +02:00
GerhardHoffmann 11c0b305f8 initialized ini-files 2022-06-04 17:51:40 +02:00
GerhardHoffmann 709cd02675 added ATBQT entry for /etc/atb 2022-06-04 17:47:53 +02:00
GerhardHoffmann d9451649a2 added json-comments 2022-06-04 17:42:20 +02:00
GerhardHoffmann 686d849fe5 Added atb-directory and included ini-files 2022-06-04 16:49:11 +02:00
GerhardHoffmann de89b4834e Add init-files for zone=3 2022-06-04 16:45:44 +02:00
GerhardHoffmann 6fbcb00b99 Add init-files for zone=2 2022-06-04 16:44:43 +02:00
GerhardHoffmann 0b1ff2b96f renamed psa_ini to atb 2022-06-04 16:36:56 +02:00
GerhardHoffmann 941de85dc3 Add current date 2022-06-02 21:58:09 +02:00
GerhardHoffmann 9b4a89d246 extended version for DC 2022-06-02 21:54:57 +02:00
GerhardHoffmann 341fb34bba test version 2022-06-02 17:32:31 +02:00
GerhardHoffmann 3c88679f51 Adding file for current tariff setting 2022-06-02 16:49:43 +02:00
GerhardHoffmann f2573049e7 Adding tariff for winter time 2022-06-02 15:51:32 +02:00
GerhardHoffmann 1f0bb050ad Adding tariff for winter time 2022-06-02 15:50:39 +02:00
GerhardHoffmann c14f7a5f8d renamed 2022-06-02 15:49:41 +02:00
GerhardHoffmann b74830f8fa renamed 2022-06-02 15:49:32 +02:00
GerhardHoffmann 296257cb07 Adding info key 2022-06-02 15:48:01 +02:00
GerhardHoffmann fe57d474e2 Adding project and zone keys 2022-06-02 15:43:32 +02:00
GerhardHoffmann 5d5c76a2d5 Adding tariff config files for szeged 2022-06-02 15:35:15 +02:00
GerhardHoffmann 8983a8c4a0 delete 2022-06-06 18:39:43 +02:00
GerhardHoffmann 794f484abc renamed to unique name 2022-06-06 18:39:19 +02:00
GerhardHoffmann 1f3e6ab5f8 Added md5 for device-controller-binary 2022-06-06 18:38:25 +02:00
GerhardHoffmann 1fb3ded23a add device-controller-binary 2022-06-06 18:28:24 +02:00
GerhardHoffmann a486aee3dd Add entries for zone2 and zone3 in szeged. 2022-06-05 21:56:44 +02:00
GerhardHoffmann 04a0d9f1a4 Add necessay files for zone 3. 2022-06-05 21:24:20 +02:00
GerhardHoffmann 050c0faad5 Merge branch 'master' of https://git.mimbach49.de/GerhardHoffmann/customer_281
Fetch data before push.
2022-06-05 21:22:07 +02:00
GerhardHoffmann edfba776e2 Fixed the json-file. Use empty comments in update.conf. 2022-06-05 21:21:15 +02:00
GerhardHoffmann 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
GerhardHoffmann a9452b8a89 fixed # 2022-06-04 21:12:02 +02:00
GerhardHoffmann 8881ec8abb testing 2022-06-04 18:03:33 +02:00
GerhardHoffmann 8f0dc4c459 testing 2022-06-04 18:03:00 +02:00
GerhardHoffmann 87453f92f4 testing 2022-06-04 17:59:44 +02:00
GerhardHoffmann c7d0f4774e testing 2022-06-04 17:58:58 +02:00
GerhardHoffmann 54aff079e7 testing 2022-06-04 17:56:41 +02:00
GerhardHoffmann ac4082e1a9 testing 2022-06-04 17:56:02 +02:00
GerhardHoffmann 9d4da5d962 testing 2022-06-04 17:53:51 +02:00
GerhardHoffmann 809e48f539 testing 2022-06-04 17:53:22 +02:00
GerhardHoffmann 579b6a1d9f testing 2022-06-04 17:49:25 +02:00
GerhardHoffmann 282274694e testing 2022-06-04 17:48:51 +02:00
GerhardHoffmann 9606e5ffc1 testing 2022-06-04 17:36:27 +02:00
GerhardHoffmann 262882f79d testing 2022-06-04 17:35:51 +02:00
GerhardHoffmann 125fcd05d5 testing 2022-06-04 17:31:19 +02:00
GerhardHoffmann 5079d95246 testing 2022-06-04 17:30:48 +02:00
GerhardHoffmann f4b7e35433 testing 2022-06-04 17:26:49 +02:00
GerhardHoffmann 3d5efd31fd testing 2022-06-04 17:26:09 +02:00
GerhardHoffmann 14d943513e testing 2022-06-04 17:22:55 +02:00
GerhardHoffmann 1ccf403e23 testing 2022-06-04 17:19:53 +02:00
GerhardHoffmann db6b6a37a3 testing 2022-06-02 22:10:31 +02:00
GerhardHoffmann 1f2ac5ee21 testing 2022-06-02 22:09:11 +02:00
GerhardHoffmann fd4cd064f9 testing 2022-06-02 21:43:40 +02:00
GerhardHoffmann 2b27c782a2 testing 2022-06-02 21:43:04 +02:00
GerhardHoffmann 30516350f5 testing 2022-06-02 21:41:54 +02:00
GerhardHoffmann e69967bf87 testing 2022-06-02 21:41:24 +02:00
GerhardHoffmann 1556af19b2 testing 2022-06-02 21:38:45 +02:00
GerhardHoffmann ee7d502e82 testing 2022-06-02 21:38:11 +02:00
GerhardHoffmann 624ecd4cd3 testing 2022-06-02 21:35:40 +02:00
GerhardHoffmann e05144752e testing 2022-06-02 21:35:07 +02:00
GerhardHoffmann f2ff055a7e testing 2022-06-02 21:32:07 +02:00
GerhardHoffmann 4e4088ba75 testing 2022-06-02 21:31:31 +02:00
GerhardHoffmann 85efadadc9 testing 2022-06-02 21:29:01 +02:00
GerhardHoffmann 2c27e76a6a testing 2022-06-02 21:28:14 +02:00
GerhardHoffmann 0bbaabea5e add conf-files as json-files 2022-06-02 20:42:07 +02:00
GerhardHoffmann 547e2c62d7 Removed unneeded file 2022-06-02 18:53:40 +02:00
GerhardHoffmann 35d570274e removed 2022-06-02 18:39:53 +02:00
GerhardHoffmann e09737fdb0 renamed from .conf to .json 2022-06-02 18:38:35 +02:00
GerhardHoffmann 1e07d78987 Remove obsolete files 2022-06-02 18:27:52 +02:00
GerhardHoffmann 6347409f22 Add real files 2023-02-27 11:32:59 +01:00
GerhardHoffmann 96897cd972 Adding more real config files 2023-02-27 11:09:32 +01:00
GerhardHoffmann 240202e507 testing 2022-06-05 19:53:56 +02:00
GerhardHoffmann 8ec07ed041 testing 2022-06-05 19:43:49 +02:00
GerhardHoffmann 8b2dfa838b testing 2022-06-05 19:29:00 +02:00
GerhardHoffmann 9467492959 testing 2022-06-05 19:27:22 +02:00
GerhardHoffmann ab3b0e1b85 testing 2022-06-05 19:26:26 +02:00
GerhardHoffmann e7d8064ba4 testing 2022-06-05 19:21:02 +02:00
GerhardHoffmann 95373a678b testing 2022-06-05 19:20:15 +02:00
GerhardHoffmann bd791ca190 testing 2022-06-05 19:18:38 +02:00
GerhardHoffmann e84aeb07d2 testing 2022-06-05 19:18:08 +02:00
GerhardHoffmann baa5301b4f testing 2022-06-05 19:15:38 +02:00
GerhardHoffmann 5a41d7b350 testing 2022-06-05 19:15:05 +02:00
GerhardHoffmann 6cb238c885 testing 2022-06-05 18:58:56 +02:00
GerhardHoffmann 7feac1c99a testing 2022-06-05 18:58:10 +02:00
GerhardHoffmann ed985bd9be testing 2022-06-05 18:28:40 +02:00
GerhardHoffmann 77ed8c2df8 testing 2022-06-05 18:27:51 +02:00
GerhardHoffmann 3e82b36e6b testing 2022-06-05 18:10:58 +02:00
GerhardHoffmann 11221f5373 testing 2022-06-05 18:10:26 +02:00
GerhardHoffmann bf9bed6f4a testing 2022-06-05 18:08:43 +02:00
GerhardHoffmann e584acc552 testing 2022-06-05 18:07:57 +02:00
GerhardHoffmann d5f8373b81 testing 2022-06-05 17:16:33 +02:00
GerhardHoffmann 5e8e086ca6 testing 2022-06-05 17:15:44 +02:00
GerhardHoffmann 93efbafd0f testing 2022-06-05 17:06:29 +02:00
GerhardHoffmann ee8e20e202 testing 2022-06-05 17:05:52 +02:00
GerhardHoffmann 88e11d40b0 testing 2022-06-05 17:00:41 +02:00
GerhardHoffmann e17386ca8b testing 2022-06-05 17:00:11 +02:00
GerhardHoffmann 98f41f6f27 testing 2022-06-05 16:53:04 +02:00
GerhardHoffmann a7ae5ef768 testing 2022-06-05 16:52:29 +02:00
GerhardHoffmann bfc70d7228 testing 2022-06-05 16:45:58 +02:00
GerhardHoffmann 902c035747 testing 2022-06-05 16:45:27 +02:00
GerhardHoffmann 30cf4abab3 testing 2022-06-05 16:40:16 +02:00
GerhardHoffmann 5d8c3d1f2a testing 2022-06-05 16:39:42 +02:00
GerhardHoffmann d4a70807bb testing 2022-06-05 16:33:09 +02:00
GerhardHoffmann 0054570966 testing 2022-06-05 16:32:15 +02:00
GerhardHoffmann eff93f30d1 testing 2022-06-05 15:20:14 +02:00
GerhardHoffmann c40eb482f0 testing 2022-06-05 15:19:44 +02:00
GerhardHoffmann edcdb43f59 testing 2022-06-05 15:12:14 +02:00
GerhardHoffmann 77799a4d5b testing 2022-06-05 15:11:43 +02:00
GerhardHoffmann 2d769aa459 testing 2022-06-05 15:08:28 +02:00
GerhardHoffmann 394f1448a4 testing 2022-06-05 15:07:57 +02:00
GerhardHoffmann 572a8a542e testing 2022-06-05 15:06:00 +02:00
GerhardHoffmann 0d712e8548 testing 2022-06-05 15:05:15 +02:00
GerhardHoffmann 8b71490b14 testing 2022-06-05 15:03:10 +02:00
GerhardHoffmann 580556d743 testing 2022-06-05 14:53:44 +02:00
GerhardHoffmann dd1136658e testing 2022-06-05 14:51:48 +02:00
GerhardHoffmann 04b477579a testing 2022-06-05 14:51:11 +02:00
GerhardHoffmann e6531725fe testing 2022-06-05 14:44:49 +02:00
GerhardHoffmann 46ffcbb531 testing 2022-06-05 14:43:31 +02:00
GerhardHoffmann cb4facc2b3 testing 2022-06-04 21:01:02 +02:00
GerhardHoffmann faf1d8f9dd testing 2022-06-04 21:00:13 +02:00
GerhardHoffmann 4a369d16b1 testing 2022-06-04 20:49:17 +02:00
GerhardHoffmann fdf69f146c testing 2022-06-04 20:48:24 +02:00
GerhardHoffmann 9ed92fb592 testing 2022-06-04 20:43:25 +02:00
GerhardHoffmann 2c92ea04aa testing 2022-06-04 20:42:52 +02:00
GerhardHoffmann 91bc02d7b6 testing 2022-06-04 20:22:41 +02:00
GerhardHoffmann 7b722433e4 testing 2022-06-04 20:22:11 +02:00
GerhardHoffmann d781a3e766 testing 2022-06-04 20:16:17 +02:00
GerhardHoffmann 046dafb8b3 testing 2022-06-04 20:15:47 +02:00
34 changed files with 8285 additions and 2969 deletions
+62
View File
@@ -0,0 +1,62 @@
#!/bin/bash -
# echo "POST-CHECKOUT"
# echo "PREV-HEAD=$1"
# echo "CURR-HEAD=$2"
# echo "BRANCH-CHECKOUT=$3"
readonly GIT_UPDATE_LOG="/opt/app/tools/atbupdate/update_log.csv"
readonly OPKG_COMMANDS_FILE="./etc/psa_update/opkg_commands"
write_log_file () {
# repo: customer_281
# readonly repo=$(basename $(git rev-parse --show-toplevel))
# branch: customer_281:HEAD->zg1/zone1,origin/zg1/zone1
# readonly branch=$(git log --graph --all --decorate $2 | head -n 1 | sed -E -e 's/(.*?)\((.*)\)/\2/g' | sed -E -e s/[[:space:]]//g)
# readonly line="$repo:$branch"
readonly now="$(date +%Y-%m-%dT%T)"
# echo "DOWNLOAD, /etc/dc/dc2c.bin, $now, N/A" >> $GIT_UPDATE_LOG
# echo "DOWNLOAD, /etc/psa_config/DC2C_print01.json, $now, N/A" >> $GIT_UPDATE_LOG
# echo "DOWNLOAD, /etc/psa_config/DC2C_print02.json, $now, N/A" >> $GIT_UPDATE_LOG
# echo "DOWNLOAD, /etc/psa_config/DC2C_print03.json, $now, N/A" >> $GIT_UPDATE_LOG
# echo "DOWNLOAD, /etc/psa_config/DC2C_print04.json, $now, N/A" >> $GIT_UPDATE_LOG
# echo "DOWNLOAD, /etc/psa_config/DC2C_print05.json, $now, N/A" >> $GIT_UPDATE_LOG
# echo "DOWNLOAD, /etc/psa_config/DC2C_print06.json, $now, N/A" >> $GIT_UPDATE_LOG
# echo "DOWNLOAD, /etc/psa_config/DC2C_print07.json, $now, N/A" >> $GIT_UPDATE_LOG
# echo "DOWNLOAD, /etc/psa_config/DC2C_print08.json, $now, N/A" >> $GIT_UPDATE_LOG
# echo "DOWNLOAD, /etc/psa_config/DC2C_print09.json, $now, N/A" >> $GIT_UPDATE_LOG
# echo "DOWNLOAD, /etc/psa_config/DC2C_print10.json, $now, N/A" >> $GIT_UPDATE_LOG
# echo "DOWNLOAD, /etc/psa_config/DC2C_print11.json, $now, N/A" >> $GIT_UPDATE_LOG
# echo "DOWNLOAD, /etc/psa_config/DC2C_print12.json, $now, N/A" >> $GIT_UPDATE_LOG
# echo "DOWNLOAD, /etc/psa_config/DC2C_print13.json, $now, N/A" >> $GIT_UPDATE_LOG
# echo "DOWNLOAD, /etc/psa_config/DC2C_print14.json, $now, N/A" >> $GIT_UPDATE_LOG
# echo "DOWNLOAD, /etc/psa_config/DC2C_print15.json, $now, N/A" >> $GIT_UPDATE_LOG
# echo "DOWNLOAD, /etc/psa_config/DC2C_print16.json, $now, N/A" >> $GIT_UPDATE_LOG
# echo "DOWNLOAD, /etc/psa_config/DC2C_print17.json, $now, N/A" >> $GIT_UPDATE_LOG
# echo "DOWNLOAD, /etc/psa_config/DC2C_print18.json, $now, N/A" >> $GIT_UPDATE_LOG
# echo "DOWNLOAD, /etc/psa_config/DC2C_print19.json, $now, N/A" >> $GIT_UPDATE_LOG
# echo "DOWNLOAD, /etc/psa_config/DC2C_print20.json, $now, N/A" >> $GIT_UPDATE_LOG
# echo "DOWNLOAD, /etc/psa_config/DC2C_print29.json, $now, N/A" >> $GIT_UPDATE_LOG
# echo "DOWNLOAD, /etc/psa_config/DC2C_print32.json, $now, N/A" >> $GIT_UPDATE_LOG
# echo "DOWNLOAD, /etc/psa_config/DC2C_device.json, $now, N/A" >> $GIT_UPDATE_LOG
# echo "DOWNLOAD, /etc/psa_config/DC2C_cash.json, $now, N/A" >> $GIT_UPDATE_LOG
# echo "DOWNLOAD, /etc/psa_config/DC2C_conf.json, $now, N/A" >> $GIT_UPDATE_LOG
if [ -f "$OPKG_COMMANDS_FILE" ]; then
if grep -qE . "${OPKG_COMMANDS_FILE}"; then
# make sure the file is empty
echo -n "" > $GIT_UPDATE_LOG
readarray opkg_commands < <(cat $OPKG_COMMANDS_FILE)
for opkg_c in "${opkg_commands[@]}"; do
# check for lines longer than 'opkg '
if [ "${#opkg_c}" -gt 4 ]; then
# comment: spaces, at least one '#'
grep -qE '^[[:space:]]*#+.*$' <<< "$opkg_c" && continue
echo -n "EXECUTE, $opkg_c, $now, N/A" | tr -d '\n\r' >> $GIT_UPDATE_LOG 2>&1
echo "" >> $GIT_UPDATE_LOG 2>&1
fi
done
fi
fi
}
write_log_file
+56
View File
@@ -0,0 +1,56 @@
#!/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_UPDATE_LOG=/opt/app/tools/atbupdate/update_log.csv
#TODO: use in UpdateController
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")
}
write_log_file () {
local now=$(date +"%Y-%m-%dT%T")
for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do
if grep -qE "DC2C.*json" <<< $fn; then
# called in repository: $fn is e.g. etc/psa_tariff/tariff01.json
# add '/' prefix
echo "DOWNLOAD, $(echo $fn | awk '{ printf "/"$0 }'), $now, N/A" >> "$GIT_UPDATE_LOG"
elif grep -qE "dc2c.bin" <<< $fn; then
# download the file referenced by the link dc2c.bin
echo "DOWNLOAD, "/etc/dc/dc2c.bin", $now, N/A" >> "$GIT_UPDATE_LOG"
elif grep -qE ".*opkg_commands" <<< $fn; then
readarray opkg_commands < <(cat $fn)
for opkg_c in "${opkg_commands[@]}"; do
# check for lines longer than 'opkg '
if [ "${#opkg_c}" -gt 4 ]; then
# comment: spaces, at least one '#'
grep -qE '^[[:space:]]*#+.*$' <<< "$opkg_c" && continue
echo -n "EXECUTE, $opkg_c, $now, N/A" | tr -d '\n\r' >> $GIT_UPDATE_LOG 2>&1
echo "" >> $GIT_UPDATE_LOG 2>&1
fi
done
fi
done
}
write_log_file
+16
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
+16
View File
@@ -0,0 +1,16 @@
{
"title":"DC2C_cash ",
"project":"DBM Szeged",
"version":"1.0.0-2024-07-05",
"CoinDenom(15..0)":[200,100,50,0,0,0,0,100,200,100,50,20,10,5,0,3],
"CoinValue(15..0)":[672,336,168,0,0,0,0,100,200,100,50,20,10,5,0,3],
"CoinAccept(15..0)":[1,1,1,0,0,0,0,1,1,1,1,1,1,1,0,1],
"ExchangeRate":336,
"TokenChannel":1,
"BillValues(7..0)":[0,0,0,0,0,0,0,0],
"LocalTaxRate":20,
"ForeignTaxRate":19,
"Surcharge":0,
"Discount":0
}
+27
View File
@@ -0,0 +1,27 @@
"title":"DC2C_pri22",
"project":"DBM Szeged StartParking",
"styl":"size 00",
"text":"Automata száma: ",
"vari":"manu",
"feed":"nl",
"text":"Igazoló sz. sorsz: ",
"feed":"nl",
"vari":"Dynamic07",
"feed":"nl",
"vari":"Dynamic08",
"feed":"nl",
"text":"Az igazolo szelvény",
"feed":"nl"
"text":"a nyugtával együtt érvényes. ",
"feed":"nl",
"feed":"nl",
"text":"Üf. szolg nyitvatartás:",
"feed":"nl",
"text":"Zrínyi utca 4-8",
"feed":"nl",
"text":"H - P: 7:45 - 17:00",
"feed":"nl",
"text":"Tel: (80) 820-500",
"feed":"nl",
"feed":"nl"
}
+29
View File
@@ -0,0 +1,29 @@
{
"title":"DC2C_pri25",
"project":"DBM Szeged StopParking",
"text":"érvényes.",
"feed":"nl",
"feed":"nl",
"text":"Üf. szolg nyitvatartás:"
"feed":"nl",
"text":" Zrínyi utca 4-8",
"styl":"size 00",
"feed":"nl",
"text":" H - P: 7:45 - 17:00",
"feed":"nl",
"text":" Tel: (80) 820-500",
"feed":"nl",
"feed":"nl",
"text":"Szegedi Közlekedési Kft",
"feed":"nl",
"text":" 6720 Szeged ",
"feed":"nl",
"text":" Zrínyi utca 4-8.",
"feed":"nl",
"text":"Adósz: 11092612-2-06",
"feed":"nl",
"text":" A jegy ára az ÁFA-t",
"feed":"nl",
"text":" tartalmazza!",
"feed":"nl"
}
+34
View File
@@ -0,0 +1,34 @@
{
"title":"DC2C_pri28",
"project":"DBM Szeged Error",
"styl":"size 00",
"text":" Üf. szolg nyitvatartás:",
"feed":"nl",
"text":" Zrínyi utca 4-8 ",
"feed":"nl",
"text":" H - P: 7:45 - 17:00",
"feed":"nl",
"text":" Tel: (80) 820-500",
"feed":"nl",
"feed":"nl",
"text":"Szegedi Közlekedési Kft",
"feed":"nl",
"text":" 6720",
"text":" Szeged ",
"feed":"nl",
"text":" Zrínyi utca 4-8",
"feed":"nl",
"text":"Adósz: ",
"text":"11092612-2-06",
"feed":"nl",
"feed":"nl",
"text":"Parkoljon egy érintéssel.",
"feed":"nl",
"text":"Használja bankkártyáját",
"feed":"nl",
"text":" automatáinknál",
"text":" is!",
"feed":"nl",
"feed":"eject"
}
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+851
View File
@@ -0,0 +1,851 @@
{
"Project" : "Szeged Zone 5",
"Version" : "1.0.1",
"Info" : "6723",
"Currency": [
{
"pcu_id": 2,
"pcu_sign": "Ft",
"pcu_major": "HUF",
"pcu_minor": "",
"pcu_active": true
}
],
"PaymentMethod": [
{
"pme_id": 1,
"pme_label": "progressive"
},
{
"pme_id": 2,
"pme_label": "degressive"
},
{
"pme_id": 3,
"pme_label": "linear"
},
{
"pme_id": 4,
"pme_label": "steps"
}
],
"PaymentOption": [
{
"pop_id": 1081,
"pop_label": "Zone Gelb Mars 5",
"pop_payment_method_id": 3,
"pop_day_end_time": "15:08:00",
"pop_day_night_end_time": "15:08:00",
"pop_price_night": 0,
"pop_min_time": 15,
"pop_max_time": 360,
"pop_min_price": 90,
"pop_carry_over": 1,
"pop_daily_card_price": 2160,
"pop_multi_hour_price": 0
}
],
"PaymentRate": [
{
"pra_payment_option_id": 1081,
"pra_payment_unit_id": 1,
"pra_price": 360
}
],
"Duration": [
{
"pun_id": 1,
"pun_label": "1h",
"pun_duration": 60
},
{
"pun_id": 3,
"pun_label": "15 min",
"pun_duration": 15
},
{
"pun_id": 4,
"pun_label": "1 min",
"pun_duration": 1
},
{
"pun_id": 5,
"pun_label": "Voller Tag",
"pun_duration": 1441
}
],
"WeekDaysWorktime": [
{
"pwd_id": 632,
"pwd_period_week_day_id": 37,
"pwd_period_day_in_week_id": 1,
"pwd_time_from": "08:00:00",
"pwd_time_to": "18:00:00"
},
{
"pwd_id": 633,
"pwd_period_week_day_id": 37,
"pwd_period_day_in_week_id": 2,
"pwd_time_from": "08:00:00",
"pwd_time_to": "18:00:00"
},
{
"pwd_id": 634,
"pwd_period_week_day_id": 37,
"pwd_period_day_in_week_id": 3,
"pwd_time_from": "08:00:00",
"pwd_time_to": "18:00:00"
},
{
"pwd_id": 635,
"pwd_period_week_day_id": 37,
"pwd_period_day_in_week_id": 4,
"pwd_time_from": "08:00:00",
"pwd_time_to": "18:00:00"
},
{
"pwd_id": 636,
"pwd_period_week_day_id": 37,
"pwd_period_day_in_week_id": 5,
"pwd_time_from": "08:00:00",
"pwd_time_to": "18:00:00"
},
{
"pwd_id": 637,
"pwd_period_week_day_id": 37,
"pwd_period_day_in_week_id": 6,
"pwd_time_from": "08:00:00",
"pwd_time_to": "12:00:00"
}
],
"PeriodYear": [
{
"pye_id": 2,
"pye_label": "Whole year",
"pye_start_month": 1,
"pye_start_day": 1,
"pye_end_month": 12,
"pye_end_day": 31
},
{
"pye_id": 9,
"pye_label": "Whole year",
"pye_start_month": 1,
"pye_start_day": 1,
"pye_end_month": 12,
"pye_end_day": 31
},
{
"pye_id": 10,
"pye_label": "Whole year",
"pye_start_month": 1,
"pye_start_day": 1,
"pye_end_month": 12,
"pye_end_day": 31
},
{
"pye_id": 11,
"pye_label": "Whole Year",
"pye_start_month": 1,
"pye_start_day": 1,
"pye_end_month": 12,
"pye_end_day": 31
},
{
"pye_id": 12,
"pye_label": "Whole Year",
"pye_start_month": 1,
"pye_start_day": 1,
"pye_end_month": 12,
"pye_end_day": 31
},
{
"pye_id": 13,
"pye_label": "Whole Year",
"pye_start_month": 1,
"pye_start_day": 1,
"pye_end_month": 12,
"pye_end_day": 31
},
{
"pye_id": 14,
"pye_label": "Whole Year",
"pye_start_month": 1,
"pye_start_day": 1,
"pye_end_month": 12,
"pye_end_day": 31
},
{
"pye_id": 15,
"pye_label": "Whole year",
"pye_start_month": 1,
"pye_start_day": 1,
"pye_end_month": 12,
"pye_end_day": 31
},
{
"pye_id": 17,
"pye_label": "Whole year",
"pye_start_month": 1,
"pye_start_day": 1,
"pye_end_month": 12,
"pye_end_day": 31
},
{
"pye_id": 18,
"pye_label": "Whole Year",
"pye_start_month": 1,
"pye_start_day": 1,
"pye_end_month": 12,
"pye_end_day": 31
}
],
"SpecialDays": [
{
"ped_id": 1,
"ped_label": "Republic Day (Hungary)",
"ped_date_start": "2026-10-23",
"ped_date_end": "2026-10-23",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 2,
"ped_label": "Good Friday",
"ped_date_start": "2026-04-03",
"ped_date_end": "2026-04-03",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 3,
"ped_label": "NewYear 27",
"ped_date_start": "2027-01-01",
"ped_date_end": "2027-01-01",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 4,
"ped_label": "NewYear extended 26",
"ped_date_start": "2026-01-02",
"ped_date_end": "2026-01-02",
"ped_period_special_day_id": 2,
"ped_year": 2025
},
{
"ped_id": 5,
"ped_label": "Easter Sunday",
"ped_date_start": "2026-04-05",
"ped_date_end": "2026-04-05",
"ped_period_special_day_id": 2,
"ped_year": 2025
},
{
"ped_id": 6,
"ped_label": "Easter Monday",
"ped_date_start": "2026-04-06",
"ped_date_end": "2026-04-06",
"ped_period_special_day_id": 2,
"ped_year": 2025
},
{
"ped_id": 7,
"ped_label": "Whit Sunday",
"ped_date_start": "2025-06-08",
"ped_date_end": "2025-06-08",
"ped_period_special_day_id": 2,
"ped_year": 2025
},
{
"ped_id": 8,
"ped_label": "Whit Monday",
"ped_date_start": "2026-05-25",
"ped_date_end": "2026-05-25",
"ped_period_special_day_id": 2,
"ped_year": 2025
},
{
"ped_id": 9,
"ped_label": "Revolution Day (Hungary)",
"ped_date_start": "2026-03-15",
"ped_date_end": "2026-03-15",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 10,
"ped_label": "Labour Day",
"ped_date_start": "2026-05-01",
"ped_date_end": "2026-05-01",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 11,
"ped_label": "",
"ped_date_start": "2026-08-21",
"ped_date_end": "2026-08-21",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 12,
"ped_label": "Saint Stephens Day (Hungary)",
"ped_date_start": "2026-08-20",
"ped_date_end": "2026-08-20",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 13,
"ped_label": "All Saints Day",
"ped_date_start": "2026-11-01",
"ped_date_end": "2026-11-01",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 14,
"ped_label": "Christmas 1st day",
"ped_date_start": "2026-12-25",
"ped_date_end": "2026-12-25",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 15,
"ped_label": "Christmas 2nd day",
"ped_date_start": "2026-12-26",
"ped_date_end": "2026-12-26",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 16,
"ped_label": "Christmas 3rd day",
"ped_date_start": "",
"ped_date_end": "",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 17,
"ped_label": "Christmas 4th day",
"ped_date_start": "",
"ped_date_end": "",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 18,
"ped_label": "Christmas (Sunday)",
"ped_date_start": "2026-12-24",
"ped_date_end": "2026-12-24",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 19,
"ped_label": "Christmas 1st day",
"ped_date_start": "2025-12-25",
"ped_date_end": "2025-12-25",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 20,
"ped_label": "Christmas 2nd day",
"ped_date_start": "2025-12-26",
"ped_date_end": "2025-12-26",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 21,
"ped_label": "Christmas 3rd day",
"ped_date_start": "",
"ped_date_end": "",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 22,
"ped_label": "Christmas",
"ped_date_start": "2025-12-24",
"ped_date_end": "2025-12-24",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 30,
"ped_label": "Saturday 25",
"ped_date_start": "2025-12-06",
"ped_date_end": "2025-12-06",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 31,
"ped_label": "Saturday 25",
"ped_date_start": "2025-12-20",
"ped_date_end": "2025-12-20",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 32,
"ped_label": "Saturday 25",
"ped_date_start": "2025-12-27",
"ped_date_end": "2025-12-27",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 33,
"ped_label": "Saturday 26",
"ped_date_start": "2026-01-03",
"ped_date_end": "2026-01-03",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 34,
"ped_label": "Saturday 26",
"ped_date_start": "2026-01-17",
"ped_date_end": "2026-01-17",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 34,
"ped_label": "Saturday 26",
"ped_date_start": "2026-01-24",
"ped_date_end": "2026-01-24",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 35,
"ped_label": "Saturday 26",
"ped_date_start": "2026-01-31",
"ped_date_end": "2026-01-31",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 36,
"ped_label": "Saturday 26",
"ped_date_start": "2026-02-07",
"ped_date_end": "2026-02-07",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 37,
"ped_label": "Saturday 26",
"ped_date_start": "2026-02-14",
"ped_date_end": "2026-02-14",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 38,
"ped_label": "Saturday 26",
"ped_date_start": "2026-02-21",
"ped_date_end": "2026-02-21",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 38,
"ped_label": "Saturday 26",
"ped_date_start": "2026-02-28",
"ped_date_end": "2026-02-28",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 39,
"ped_label": "Saturday 26",
"ped_date_start": "2026-03-07",
"ped_date_end": "2026-03-07",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 40,
"ped_label": "Saturday 26",
"ped_date_start": "2026-03-14",
"ped_date_end": "2026-03-14",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 41,
"ped_label": "Saturday 26",
"ped_date_start": "2026-03-21",
"ped_date_end": "2026-03-21",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 42,
"ped_label": "Saturday 26",
"ped_date_start": "2026-03-28",
"ped_date_end": "2026-03-28",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 43,
"ped_label": "Saturday 26",
"ped_date_start": "2026-04-04",
"ped_date_end": "2026-04-04",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 44,
"ped_label": "Saturday 26",
"ped_date_start": "2026-04-11",
"ped_date_end": "2026-04-11",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 45,
"ped_label": "Saturday 26",
"ped_date_start": "2026-04-18",
"ped_date_end": "2026-04-18",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 46,
"ped_label": "Saturday 26",
"ped_date_start": "2026-04-25",
"ped_date_end": "2026-04-25",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 47,
"ped_label": "Saturday 26",
"ped_date_start": "2026-05-02",
"ped_date_end": "2026-05-02",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 48,
"ped_label": "Saturday 26",
"ped_date_start": "2026-05-09",
"ped_date_end": "2026-05-09",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 49,
"ped_label": "Saturday 26",
"ped_date_start": "2026-05-16",
"ped_date_end": "2026-05-16",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 50,
"ped_label": "Saturday 26",
"ped_date_start": "2026-05-23",
"ped_date_end": "2026-05-23",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 51,
"ped_label": "Saturday 26",
"ped_date_start": "2026-05-30",
"ped_date_end": "2026-05-30",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 52,
"ped_label": "Saturday 26",
"ped_date_start": "2026-06-06",
"ped_date_end": "2026-06-06",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 53,
"ped_label": "Saturday 26",
"ped_date_start": "2026-06-13",
"ped_date_end": "2026-06-13",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 54,
"ped_label": "Saturday 26",
"ped_date_start": "2026-06-20",
"ped_date_end": "2026-06-20",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 55,
"ped_label": "Saturday 26",
"ped_date_start": "2026-06-27",
"ped_date_end": "2026-06-27",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 56,
"ped_label": "Saturday 26",
"ped_date_start": "2026-07-04",
"ped_date_end": "2026-07-04",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 57,
"ped_label": "Saturday 26",
"ped_date_start": "2026-07-11",
"ped_date_end": "2026-07-11",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 58,
"ped_label": "Saturday 26",
"ped_date_start": "2026-07-18",
"ped_date_end": "2026-07-18",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 59,
"ped_label": "Saturday 26",
"ped_date_start": "2026-07-25",
"ped_date_end": "2026-07-25",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 60,
"ped_label": "Saturday 26",
"ped_date_start": "2026-08-01",
"ped_date_end": "2026-08-01",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 61,
"ped_label": "Saturday 26",
"ped_date_start": "",
"ped_date_end": "",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 62,
"ped_label": "Saturday 26",
"ped_date_start": "2026-08-15",
"ped_date_end": "2026-08-15",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 63,
"ped_label": "Saturday 26",
"ped_date_start": "2026-08-22",
"ped_date_end": "2026-08-22",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 64,
"ped_label": "Saturday 26",
"ped_date_start": "2026-08-29",
"ped_date_end": "2026-08-29",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 65,
"ped_label": "Saturday 26",
"ped_date_start": "2026-09-05",
"ped_date_end": "2026-09-05",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 66,
"ped_label": "Saturday 26",
"ped_date_start": "2026-09-12",
"ped_date_end": "2026-09-12",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 67,
"ped_label": "Saturday 26",
"ped_date_start": "2026-09-19",
"ped_date_end": "2026-09-19",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 68,
"ped_label": "Saturday 26",
"ped_date_start": "2026-09-26",
"ped_date_end": "2026-09-26",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 69,
"ped_label": "Saturday 26",
"ped_date_start": "2026-10-03",
"ped_date_end": "2026-10-03",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 70,
"ped_label": "Saturday 26",
"ped_date_start": "2026-10-10",
"ped_date_end": "2026-10-10",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 71,
"ped_label": "Saturday 26",
"ped_date_start": "2026-10-17",
"ped_date_end": "2026-10-17",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 72,
"ped_label": "Saturday 26",
"ped_date_start": "2026-10-24",
"ped_date_end": "2026-10-24",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 73,
"ped_label": "Saturday 26",
"ped_date_start": "2026-10-31",
"ped_date_end": "2026-10-31",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 74,
"ped_label": "Saturday 26",
"ped_date_start": "2026-11-07",
"ped_date_end": "2026-11-07",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 75,
"ped_label": "Saturday 26",
"ped_date_start": "2026-11-14",
"ped_date_end": "2026-11-14",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 76,
"ped_label": "Saturday 26",
"ped_date_start": "2026-11-21",
"ped_date_end": "2026-11-21",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 77,
"ped_label": "Saturday 26",
"ped_date_start": "2026-11-28",
"ped_date_end": "2026-11-28",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 78,
"ped_label": "Saturday 26",
"ped_date_start": "2026-12-05",
"ped_date_end": "2026-12-05",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 79,
"ped_label": "Saturday 26",
"ped_date_start": "",
"ped_date_end": "",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 80,
"ped_label": "Saturday 26",
"ped_date_start": "2026-12-19",
"ped_date_end": "2026-12-19",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 81,
"ped_label": "Saturday 26",
"ped_date_start": "2026-12-26",
"ped_date_end": "2026-12-26",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 82,
"ped_label": "Saturday 27",
"ped_date_start": "2027-01-02",
"ped_date_end": "2027-01-02",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 83,
"ped_label": "reserve",
"ped_date_start": "",
"ped_date_end": "",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 84,
"ped_label": "reserve",
"ped_date_start": "",
"ped_date_end": "",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 85,
"ped_label": "reserve",
"ped_date_start": "",
"ped_date_end": "",
"ped_period_special_day_id": 2,
"ped_year": 0
}
]
}
File diff suppressed because it is too large Load Diff
+20
View File
@@ -0,0 +1,20 @@
###############################################################################
# !!! NOTE !!!
###############################################################################
# opkg-commands added to this file will be executed by ATBUpdateTool.
###############################################################################
##
opkg update
# opkg install prepare-update
# download packages
# opkg --cache /var/cache/opkg --download-only upgrade tariff-config-281
# opkg --cache /var/cache/opkg --download-only upgrade libmobilisis-calc2
# opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-calculateprice-mobilisis
opkg --cache /var/cache/opkg --download-only upgrade atbqt=4.99.11+git0+66f98a3bef-r0
opkg --cache /var/cache/opkg --download-only upgrade apism=1.7.0-r1
# install packages
# opkg --cache /var/cache/opkg upgrade tariff-config-281
# opkg --cache /var/cache/opkg upgrade libmobilisis-calc2
# opkg --cache /var/cache/opkg upgrade atb-plugin-calculateprice-mobilisis
opkg --cache /var/cache/opkg upgrade atbqt=4.99.11+git0+66f98a3bef-r0
opkg --cache /var/cache/opkg upgrade apism=1.7.0-r1
-1
View File
@@ -1 +0,0 @@
szeged
-1
View File
@@ -1 +0,0 @@
contained zones in group 1
-1
View File
@@ -1 +0,0 @@
1
View File
-17
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
-13
View File
@@ -1,13 +0,0 @@
{
}
\n\n
\n\n
\n\n
\n\n
\n\n
\n\n
\n\n
\n\n
\n\n
-15
View File
@@ -1,15 +0,0 @@
{
"name1" : "wert1",
"name2" : "wert2",
"name3" : "wert3",
"name4" : "wert4",
"name5" : "wert5",
"name6" : "wert6",
"name7" : "wert7",
"name8" : "wert8",
"name9" : "wert9",
"name10" : "wert10",
"name11" : "wert11",
"name12" : "wert12",
"name100" : "wert100"
}
View File
-9
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
-110
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
-3
View File
@@ -1,3 +0,0 @@
{
"" : ""
}
@@ -1,3 +0,0 @@
{
"xxx" : "yyyy"
}
@@ -1,3 +0,0 @@
{
"wwwww" : "zzzzzz"
}
@@ -1,8 +0,0 @@
{
"aaaaaa" : "bbbbb"
}
View File
-2659
View File
File diff suppressed because it is too large Load Diff
-50
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.
-76
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": "d72537ff92cfec6de8a9e01c6fe4886f",
"device" : "05cc52f8c4690efc0c833f5f196c74f9"
}
}}
]
}]
}
},
"c19" : "opkg-files section",
"opkg" : {
"atbqt" : {
"Version" : "1.0.0-r1",
"MD5Sum" : "642eda2b3637291b024ef152479218bc",
"Architecture" : "cortexa9t2hf-neon"
}
}
}