quick hack for saturday workday, revert in KW 43!!!

etc/psa_config/DC2C_print23.json gelöscht
DC2C_print23.json provided by customer
2025-10-17 13:14:53 +02:00 · 2025-08-19 09:29:33 +02:00 · 2025-08-19 08:20:01 +02:00 · 2025-08-19 08:19:39 +02:00 · 2025-05-22 11:06:44 +02:00 · 2025-05-20 10:09:18 +02:00
9 changed files with 25 additions and 160 deletions
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,28 +0,0 @@
 [core]
 	repositoryformatversion = 0
 	filemode = true
 	bare = false
 	logallrefupdates = true
 	symlinks = true
 [remote "origin"]
 	url = https://git.mimbach49.de/GerhardHoffmann/customer_999.git
 	fetch = +refs/heads/*:refs/remotes/origin/*
 [branch "master"]
 	remote = origin
 	merge = refs/heads/master
 [branch "zg1/zone1"]
 	remote = origin
 	merge = refs/heads/zg1/zone1
 [branch "zg1/zone2"]
 	remote = origin
 	merge = refs/heads/zg1/zone2
 [branch "zg1/zone3"]
 	remote = origin
 	merge = refs/heads/zg1/zone3
 [branch "zg1/zone4"]
 	remote = origin
 	merge = refs/heads/zg1/zone4
 [pull]
 	rebase = false
 [push]
 	autoSetupRemote = true
--- a/.gitignore
+++ b/.gitignore
@@ -1,27 +1,16 @@
 # First, ignore everything
 *
 # Now, whitelist anything that's a directory
 !*/
 # And all the file types you're interested in
 !.gitignore
 !.githooks/post-merge
 !.githooks/post-checkout
 !**/.gitignore
 !**/.githooks/post-merge
 !**/.githooks/post-checkout
 ## Except
-!etc/atb/*
+!**/.gitignore
-!etc/psa_config/*
+!**/.githooks/post-merge
-!etc/psa_update/*
+!/etc/*.ini
-!etc/psa_tariff/*
+!/etc/atb/*.ini
-!etc/dc/*.hex
+!/etc/psa_config/*
-!etc/dc/*.bin
+!/etc/psa_update/*
-!*/etc/*.ini
+!/etc/psa_tariff/*
-!*/etc/atb/*
+!/etc/dc/dc2c.hex
-!*/etc/psa_config/*
+
-!*/etc/psa_update/*
+!/opt/app/ATBAPP/*.ini
-!*/etc/psa_tariff/*
+!/opt/app/sysconfig/*.ini
-!*/etc/dc/*.hex
+!/opt/app/ISMASMgr/*.ini
 !*/etc/dc/*.bin
--- a/README.md
+++ b/README.md
--- a/etc/psa_tariff/tariff01.json
+++ b/etc/psa_tariff/tariff01.json
@@ -249,13 +249,6 @@
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
    },
    {
      "pedwt_id": 2180,
      "pedwt_period_exc_day_id": 15,
      "pedwt_time_from": "00:00:00",
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
    },
    {
      "pedwt_id": 2184,
      "pedwt_period_exc_day_id": 2021,
@@ -483,14 +476,6 @@
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 15,
      "ped_label": "Republic Day (Hungary)",
      "ped_date_start": "2025-10-24",
      "ped_date_end": "2025-10-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2022,
      "ped_label": "NewYear",
--- a/etc/psa_tariff/tariff02.json
+++ b/etc/psa_tariff/tariff02.json
@@ -248,13 +248,6 @@
      "pedwt_time_from": "00:00:00",
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
    },
 	{
      "pedwt_id": 2180,
      "pedwt_period_exc_day_id": 15,
      "pedwt_time_from": "00:00:00",
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
    },
    {
      "pedwt_id": 2184,
@@ -482,14 +475,6 @@
      "ped_date_end": "2025-10-23",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },    
 	{
      "ped_id": 15,
      "ped_label": "Republic Day (Hungary)",
      "ped_date_start": "2025-10-24",
      "ped_date_end": "2025-10-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2022,
--- a/etc/psa_tariff/tariff03.json
+++ b/etc/psa_tariff/tariff03.json
@@ -103,6 +103,13 @@
      "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": "18:00:00"
    }
  ],
  "PeriodYear": [
@@ -248,13 +255,6 @@
      "pedwt_time_from": "00:00:00",
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
    },
 	{
      "pedwt_id": 2180,
      "pedwt_period_exc_day_id": 15,
      "pedwt_time_from": "00:00:00",
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
    },
    {
      "pedwt_id": 2184,
@@ -482,14 +482,6 @@
      "ped_date_end": "2025-10-23",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
 	{
      "ped_id": 15,
      "ped_label": "Republic Day (Hungary)",
      "ped_date_start": "2025-10-24",
      "ped_date_end": "2025-10-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2022,
--- a/etc/psa_tariff/tariff04.json
+++ b/etc/psa_tariff/tariff04.json
@@ -270,13 +270,6 @@
      "pedwt_time_from": "00:00:00",
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
    },
 	{
      "pedwt_id": 2180,
      "pedwt_period_exc_day_id": 15,
      "pedwt_time_from": "00:00:00",
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
    },
    {
      "pedwt_id": 2184,
@@ -645,15 +638,8 @@
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
-	{
+    {
-      "ped_id": 15,
+      "ped_id": 2022,
      "ped_label": "Republic Day (Hungary)",
      "ped_date_start": "2025-10-24",
      "ped_date_end": "2025-10-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {"ped_id": 2022,
      "ped_label": "NewYear",
      "ped_date_start": "2025-01-01",
      "ped_date_end": "2025-01-01",
--- a/etc/psa_tariff/tariff05.json
+++ b/etc/psa_tariff/tariff05.json
@@ -277,20 +277,6 @@
      "pedwt_time_from": "00:00:00",
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
    },
 	{
      "pedwt_id": 2180,
      "pedwt_period_exc_day_id": 15,
      "pedwt_time_from": "00:00:00",
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
    },
 	{
      "pedwt_id": 2180,
      "pedwt_period_exc_day_id": 16,
      "pedwt_time_from": "00:00:00",
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
    },
    {
      "pedwt_id": 2184,
@@ -658,14 +644,6 @@
      "ped_date_end": "2025-10-23",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
 	{
      "ped_id": 15,
      "ped_label": "Republic Day (Hungary)",
      "ped_date_start": "2025-10-24",
      "ped_date_end": "2025-10-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2022,
@@ -748,8 +726,8 @@
      "ped_year": 0
    },
    {
-      "ped_id": 16,
+      "ped_id": 2032,
-      "ped_label": "Saints Day",
+      "ped_label": "All Saints Day",
      "ped_date_start": "2025-11-01",
      "ped_date_end": "2025-11-01",
      "ped_period_special_day_id": 2,
--- a/etc/psa_tariff/tariff06.json
+++ b/etc/psa_tariff/tariff06.json
@@ -277,20 +277,6 @@
      "pedwt_time_from": "00:00:00",
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
    },    
 	{
      "pedwt_id": 2180,
      "pedwt_period_exc_day_id": 15,
      "pedwt_time_from": "00:00:00",
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
    },
 	{
      "pedwt_id": 2180,
      "pedwt_period_exc_day_id": 16,
      "pedwt_time_from": "00:00:00",
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
    },
    {
      "pedwt_id": 2184,
@@ -658,14 +644,6 @@
      "ped_date_end": "2025-10-23",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
 	{
      "ped_id": 15,
      "ped_label": "Republic Day (Hungary)",
      "ped_date_start": "2025-10-24",
      "ped_date_end": "2025-10-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2022,
@@ -748,8 +726,8 @@
      "ped_year": 0
    },
    {
-      "ped_id": 16,
+      "ped_id": 2032,
-      "ped_label": "Saints Day",
+      "ped_label": "All Saints Day",
      "ped_date_start": "2025-11-01",
      "ped_date_end": "2025-11-01",
      "ped_period_special_day_id": 2,
Author	SHA1	Message	Date
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
Gerhard Hoffmann	6f3a997762	Remove Sat 08:00-12:00 for Zone 3 (Yellow) -> slipped in Dec 2024.	2025-05-22 11:06:44 +02:00
Gerhard Hoffmann	d54b6da3c5	restore tariff files after special day at 17th of May	2025-05-20 10:09:18 +02:00
Gerhard Hoffmann	27fdf1c51c	comment all opkg lines	2025-05-12 09:48:36 +02:00
Gerhard Hoffmann	43e81f7d37	special saturday 2025/05/17	2025-05-12 08:54:33 +02:00
Gerhard Hoffmann	da069ba4ea	set service fridays: 8-18	2025-01-07 10:46:48 +01:00
Gerhard Hoffmann	1fc3c49288	Add holiday 2024-12-28. Switch back to normal handling of Saturdays.	2024-12-16 15:50:08 +01:00
Gerhard Hoffmann	3f9bb85be9	additional holidays 2024/2025	2024-12-03 13:49:08 +01:00
Gerhard Hoffmann	951c42123d	Adapt for Saturday 07/12	2024-12-02 17:12:18 +01:00
Gerhard Hoffmann	7abf1ddefe	Remove Sat 08:00-12:00 from Zone 3 (Yellow)	2024-10-29 15:32:42 +01:00
Gerhard Hoffmann	8888fcd395	Revert to original versions	2024-08-08 12:24:01 +02:00
Gerhard Hoffmann	a481f892b6	set 8:00-18:00 for 03.08	2024-08-01 12:39:15 +02:00
Gerhard Hoffmann	db5e5f9ecc	Activate opkg_commands	2024-07-15 08:55:18 +02:00
Gerhard Hoffmann	215863270c	opkg: none	2024-07-08 13:38:30 +02:00
Gerhard Hoffmann	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
Gerhard Hoffmann	4a9818c0fb	re-commit: change of ISMAS settings	2024-06-25 08:37:22 +02:00
Gerhard Hoffmann	904024453f	ZoneId in tariff-files	2024-06-24 11:33:17 +02:00
Siegfried Siegert	fa2a3e336e	Tariff: add tariff-info aka "TARIFF_ID"	2024-06-07 08:12:12 +02:00
Gerhard Hoffmann	0cd48239af	Remove all files except DC2C_cash/print22/print25/print28.json	2024-04-30 14:33:54 +02:00
Gerhard Hoffmann	41e59fceb0	Repeat update procedure in Szeged for 145-148,171,172,159-161	2024-04-30 08:51:28 +02:00
Gerhard Hoffmann	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
Gerhard Hoffmann	1ebe2a16b9	Use empty file.	2024-04-18 16:10:31 +02:00
Gerhard Hoffmann	d6d86bd5f1	readd empty lines (just to be sure that files have been changed)	2024-03-28 12:10:06 +01:00
Gerhard Hoffmann	d9b5661a0f	added empty lines to restart download	2024-03-28 11:57:38 +01:00
Gerhard Hoffmann	baf0dba915	even remove opkg update	2024-03-26 10:06:38 +01:00
Gerhard Hoffmann	2e0e69d3ec	only install prepare-update script	2024-03-26 09:52:01 +01:00
Gerhard Hoffmann	79564c1eff	Removed all holidays except thos for 2024	2024-03-26 09:40:36 +01:00
Gerhard Hoffmann	d25dda1187	tariff01 -> exact prize: 42 tarif 04/06 -> exact price: 163	2024-02-19 17:30:48 +01:00
Gerhard Hoffmann	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
Gerhard Hoffmann	9034218e2d	add libmobilisis-calc2 and activate upgrade step	2024-01-09 11:45:36 +01:00
Gerhard Hoffmann	8b8ba69a92	Set max. parking time: 360; tartiff04/06: daily ticket price (unused): 2600	2024-01-08 15:43:58 +01:00
Gerhard Hoffmann	c2206fdb49	Set zone 'green mars' as 'green', 'yellow mars' as 'yello'	2024-01-08 10:59:41 +01:00
Gerhard Hoffmann	0f5fbb497c	Update exchange rate to 352.	2023-12-31 08:17:33 +01:00
Gerhard Hoffmann	4377307430	turn on new tariffs for szeged, valid from 01.01.2014, containing updated exceptional days.	2023-12-31 08:08:30 +01:00
Gerhard Hoffmann	4f660ee640	switch back to previous prices until 01.01.2024	2023-12-23 08:34:00 +01:00
Gerhard Hoffmann	57dd5a5364	set new prices: purple: 165, 990; blue: 260, 1560; yellow: 360, 2160; green: 650	2023-12-21 15:25:18 +01:00
Gerhard Hoffmann	d806c84f95	Remove dc-files (to be used later)	2023-12-20 13:56:20 +01:00
Gerhard Hoffmann	520daa4d0c	Change for szeged: do not install atbupdatetool and do not upgrade the machine	2023-12-20 12:51:39 +01:00
Gerhard Hoffmann	d8ec03f03f	Reset to previous prices keeping current holidays	2023-12-20 12:51:29 +01:00
Gerhard Hoffmann	34d3201a29	Updated to use new prices.	2023-12-19 16:49:38 +01:00
Gerhard Hoffmann	242de9080f	Replace year period id from 8 to 2 as the special days refer to it	2023-12-19 14:57:41 +01:00
Gerhard Hoffmann	4c219d4aad	delete all json files	2023-12-19 13:54:39 +01:00
Gerhard Hoffmann	020e8eb32b	use opkg_commands file as used in schoenau (00332)	2023-12-19 11:57:04 +01:00
Gerhard Hoffmann	717239b1e6	switch back to previous prices, but keeping current holidays	2023-12-19 11:17:56 +01:00
Gerhard Hoffmann	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
Gerhard Hoffmann	fc69c5259f	Fixed wrong comma after exchange rate	2023-10-11 14:14:22 +02:00
Gerhard Hoffmann	08a7586026	set exchange rate to 360	2023-10-10 16:30:17 +02:00
Gerhard Hoffmann	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
Gerhard Hoffmann	32720ad250	remove absolete file	2023-08-11 12:41:23 +02:00
Gerhard Hoffmann	77045d85c0	set daily cardprice to 2400	2023-08-03 15:44:26 +02:00
Gerhard Hoffmann	4384d17c80	add json files for zones 5 and 6	2023-08-03 15:31:46 +02:00
Gerhard Hoffmann	467cdeee18	use same tariff-file as branch for zone4	2023-07-26 14:48:38 +02:00
Gerhard Hoffmann	503a8a5f19	Set max_time to 240	2023-07-25 10:15:36 +02:00
Gerhard Hoffmann	b82c876ece	Do not download anything. Only execute opkg-commands	2023-07-06 15:44:31 +02:00
Gerhard Hoffmann	5257ec6b2b	Update json-printer-files (provided by Dennis)	2023-07-06 15:11:43 +02:00
Gerhard Hoffmann	4fe11fae51	remove handling og checkout_history file	2023-07-04 14:01:10 +02:00
Gerhard Hoffmann	0133e505a1	populate opkg_commands-file with valid opkg instructions	2023-07-04 12:17:36 +02:00
Gerhard Hoffmann	52b5e76257	use opgk_commands-file in repository rather than in global file-system	2023-07-04 12:14:50 +02:00
Siegfried Siegert	90e66b5be6	prevent any opkg command	2023-07-02 16:30:11 +02:00
Gerhard Hoffmann	0a16863267	return to normal workflow after testing	2023-06-30 10:51:49 +02:00
Gerhard Hoffmann	62b617e136	Provide opkg commands for zone3	2023-06-29 14:31:34 +02:00
Gerhard Hoffmann	835cbeae0b	dc2c.bin -> dc2c.4.35.bin	2023-06-27 16:23:52 +02:00
Gerhard Hoffmann	423c0bec8a	Adding device-controller firmware version 4.35	2023-06-27 16:23:16 +02:00
Gerhard Hoffmann	a6cec85e46	remove obsolete file	2023-06-27 16:22:42 +02:00
Gerhard Hoffmann	8592f044d8	sync tariff-files with zg1/zone1	2023-06-27 14:42:01 +02:00
Gerhard Hoffmann	36894ae00b	remove unued tariff-files	2023-06-27 14:40:27 +02:00
Gerhard Hoffmann	9519a6555e	install same post-merge-hook as in branch zg1/zone1	2023-06-27 14:36:36 +02:00
Gerhard Hoffmann	28f597898e	install same post-checkout-hook as in branch zg1/zone1	2023-06-27 14:35:27 +02:00
Gerhard Hoffmann	3643c06c19	Set daily_card_price to 2400 for zone4	2023-06-27 14:20:58 +02:00
Gerhard Hoffmann	98a69bc779	check for existence of opkg_commands-file (2)	2023-06-05 15:58:27 +02:00
Gerhard Hoffmann	14b49b4b21	check for existence of opkg_commands-file	2023-06-05 15:52:45 +02:00
Gerhard Hoffmann	a08d654c26	adding post-checkout hook ad for zone1	2023-06-05 15:46:58 +02:00
Gerhard Hoffmann	101d6b8071	Add device controller version 4.22	2023-05-31 08:59:01 +02:00
Gerhard Hoffmann	4371fdd8f1	Adding new print-templates because of printing-problems on DC-side	2023-05-24 16:21:30 +02:00
Gerhard Hoffmann	f821294816	Add DC-version 4.21	2023-05-24 16:21:24 +02:00
Gerhard Hoffmann	a06c333894	Updating print templates as of May 11, 2023.	2023-05-18 12:16:32 +02:00
Gerhard Hoffmann	bddb6a1a84	Add tariff-file for zone 4	2023-05-04 10:56:09 +02:00
Gerhard Hoffmann	8dea72e22b	Update as for branch zg1/zone1	2023-04-25 11:54:03 +02:00
Gerhard Hoffmann	10f95e328a	Removed *.ini-Files.	2023-03-31 11:47:16 +02:00
Gerhard Hoffmann	fcd6301141	Add .gitignore	2023-03-31 09:51:54 +02:00
Gerhard Hoffmann	bfff914e1d	Add handling for binary dc-files	2023-03-30 12:49:45 +02:00