Remove Sat 08:00-12:00 for Zone 3 (Yellow) -> slipped in Dec 2024.

Switch back to tariffs before 05/17.
comment all opkg lines
2025-05-22 11:07:23 +02:00 · 2025-05-20 14:43:39 +02:00 · 2025-05-12 09:49:14 +02:00 · 2025-05-12 08:55:57 +02:00 · 2025-01-07 10:47:34 +01:00 · 2024-12-16 15:52:28 +01:00
3 changed files with 12 additions and 51 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/*
-!etc/psa_config/*
-!etc/psa_update/*
-!etc/psa_tariff/*
-!etc/dc/*.hex
-!etc/dc/*.bin
-!*/etc/*.ini
-!*/etc/atb/*
-!*/etc/psa_config/*
-!*/etc/psa_update/*
-!*/etc/psa_tariff/*
-!*/etc/dc/*.hex
-!*/etc/dc/*.bin
+!**/.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

--- a/README.md
+++ b/README.md
Author	SHA1	Message	Date
Gerhard Hoffmann	f94b8abc66	Remove Sat 08:00-12:00 for Zone 3 (Yellow) -> slipped in Dec 2024.	2025-05-22 11:07:23 +02:00
Gerhard Hoffmann	649b260685	Switch back to tariffs before 05/17.	2025-05-20 14:43:39 +02:00
Gerhard Hoffmann	fd15196f8e	comment all opkg lines	2025-05-12 09:49:14 +02:00
Gerhard Hoffmann	b15068f21f	special saturday 2025/05/17	2025-05-12 08:55:57 +02:00
Gerhard Hoffmann	48ec3432b1	set service fridays: 8-18	2025-01-07 10:47:34 +01:00
Gerhard Hoffmann	37522a8a97	Add holiday 2024-12-28. Switch back to normal handling of Saturdays.	2024-12-16 15:52:28 +01:00
Gerhard Hoffmann	bf3fe7ffd2	additional holidays 2024/2025	2024-12-03 13:49:56 +01:00
Gerhard Hoffmann	d288123575	Adapt for Saturday 07/12	2024-12-02 17:12:57 +01:00
Gerhard Hoffmann	2822db5e2f	Remove Sat 08:00-12:00 from Zone 3 (Yellow)	2024-10-29 15:33:18 +01:00
Gerhard Hoffmann	71fdf02bf4	Revert to original versions	2024-08-08 12:24:57 +02:00
Gerhard Hoffmann	ffb969e2e2	set 8:00-18:00 for 03.08	2024-08-01 12:39:56 +02:00
Gerhard Hoffmann	70727db07a	Activate opkg_commands	2024-07-15 08:56:02 +02:00
Gerhard Hoffmann	7960874f95	opkg: none	2024-07-08 13:39:17 +02:00
Gerhard Hoffmann	99de8a08ec	Set ex.rate to 365.	2024-07-05 10:03:49 +02:00
Gnemeth	6968d15458	euro exchange rate update	2024-06-30 19:11:49 +02:00
Gerhard Hoffmann	828a9a69b4	re-commit: change of ISMAS settings	2024-06-25 08:38:12 +02:00
Gerhard Hoffmann	7e0b58e2be	ZoneId in tariff-files	2024-06-24 11:34:36 +02:00
Siegfried Siegert	e5508f3ba6	Tariff: add tariff-info aka "TARIFF_ID"	2024-06-07 08:12:33 +02:00
Gerhard Hoffmann	f889943a1b	Remove all files except DC2C_cash/print22/print25/print28.json	2024-04-30 14:34:16 +02:00
Gerhard Hoffmann	0840e20b82	Repeat update procedure in Szeged for 145-148,171,172,159-161	2024-04-30 08:51:49 +02:00
Gerhard Hoffmann	a003e880f7	Set exchange rate to 350. Add all other json-files from at-dat as provided by Thomas	2024-04-26 12:11:46 +02:00
Gerhard Hoffmann	9aa652d307	Use empty file.	2024-04-18 16:10:59 +02:00
Gerhard Hoffmann	87c23c9d11	readd empty lines (just to be sure that files have been changed)	2024-03-28 12:10:26 +01:00
Gerhard Hoffmann	68856b876a	added empty lines to restart download	2024-03-28 11:58:09 +01:00
Gerhard Hoffmann	90d545016f	even remove opkg update	2024-03-26 10:06:56 +01:00
Gerhard Hoffmann	82146f7dfb	only install prepare-update script	2024-03-26 09:50:06 +01:00
Gerhard Hoffmann	ddc5fad05a	Removed all holidays except thos for 2024	2024-03-26 09:40:58 +01:00
Gerhard Hoffmann	917ba07e58	tariff01 -> exact prize: 42 tarif 04/06 -> exact price: 163	2024-02-19 17:31:23 +01:00
Gerhard Hoffmann	a5ed998753	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:42 +01:00
Gerhard Hoffmann	68bd83a63f	Added # character: Testing PSA 997	2024-01-23 16:41:45 +01:00
Gerhard Hoffmann	a7bb2c1aaf	add libmobilisis-calc2 and activate upgrade step	2024-01-09 11:45:56 +01:00
Gerhard Hoffmann	0c504b4832	Set max. parking time: 360; tartiff04/06: daily ticket price (unused): 2600	2024-01-08 15:44:20 +01:00
Gerhard Hoffmann	672bd852ed	Set zone 'green mars' as 'green', 'yellow mars' as 'yello'	2024-01-08 11:00:12 +01:00
Gerhard Hoffmann	699a777dfd	Update exchange rate to 352.	2023-12-31 08:17:59 +01:00
Gerhard Hoffmann	869cecdb4a	turn on new tariffs for szeged, valid from 01.01.2014, containing updated exceptional days.	2023-12-31 08:08:52 +01:00
Gerhard Hoffmann	f85bf40d3d	switch back to previous prices until 01.01.2024	2023-12-23 08:34:21 +01:00
Gerhard Hoffmann	088228d0ad	set new prices: purple: 165, 990; blue: 260, 1560; yellow: 360, 2160; green: 650	2023-12-21 15:26:00 +01:00
Gerhard Hoffmann	fd61002d65	Remove dc-files (to be used later)	2023-12-20 13:56:41 +01:00
Gerhard Hoffmann	35f198ba7c	Change for szeged: do not install atbupdatetool and do not upgrade the machine	2023-12-20 12:52:21 +01:00
Gerhard Hoffmann	b0b43603b4	Reset to previous prices keeping current holidays	2023-12-20 12:52:10 +01:00
Gerhard Hoffmann	7c6d92b38c	Updated to use new prices.	2023-12-19 16:50:10 +01:00
Gerhard Hoffmann	6209855f0b	Replace year period id from 8 to 2 as the special days refer to it	2023-12-19 14:58:01 +01:00
Gerhard Hoffmann	14807f7a1d	delete all json files	2023-12-19 13:55:49 +01:00
Gerhard Hoffmann	382e2b34ab	use opkg_commands file as used in schoenau (00332)	2023-12-19 11:57:32 +01:00
Gerhard Hoffmann	9c3147101f	switch back to previous prices, but keeping current holidays	2023-12-19 11:18:24 +01:00
Gerhard Hoffmann	a851b59581	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:44:14 +01:00
Gerhard Hoffmann	cc5b4947c2	Fixed wrong comma after exchange rate	2023-10-11 14:14:56 +02:00
Gerhard Hoffmann	de7c644813	set exchange rate to 360	2023-10-10 16:30:48 +02:00
Gerhard Hoffmann	0caaece756	remove absolete file	2023-08-11 12:41:04 +02:00
Gerhard Hoffmann	b20097a867	Install ptu5-gitinstaller, atbupdatetool and atbqt.	2023-08-11 12:40:04 +02:00
Gerhard Hoffmann	fa0a7e2c10	set daily cardprice to 2400	2023-08-03 15:39:34 +02:00
Gerhard Hoffmann	89d2812724	add json files for zones 5 and 6	2023-08-03 15:32:38 +02:00
Gerhard Hoffmann	d23139f5af	add another empty line	2023-07-25 17:21:11 +02:00
Gerhard Hoffmann	d5425192b6	add empty line	2023-07-25 17:15:07 +02:00
Gerhard Hoffmann	8b25cd70b3	Set carry over to 1, daily_price to 2400	2023-07-25 16:07:54 +02:00
Gerhard Hoffmann	9f83afce3a	add another empty line	2023-07-25 14:07:30 +02:00
Gerhard Hoffmann	c958ed2632	add another empty line	2023-07-25 12:39:16 +02:00
Gerhard Hoffmann	583955df67	add 2 other lines	2023-07-25 12:15:18 +02:00
Gerhard Hoffmann	a6a8ad436a	add another testline	2023-07-25 11:50:10 +02:00
Gerhard Hoffmann	33e9f2a3f2	add another empty line for testing	2023-07-25 11:36:02 +02:00
Gerhard Hoffmann	6117764e42	add new line	2023-07-25 11:29:24 +02:00
Gerhard Hoffmann	55f23b4099	Set max_time to 240	2023-07-25 10:13:18 +02:00
Gerhard Hoffmann	9443f5c372	Do not download anything. Only execute opkg-commands	2023-07-06 15:44:43 +02:00
Gerhard Hoffmann	1b9e55592f	Update json-printer-files (provided by Dennis)	2023-07-06 15:11:59 +02:00
Gerhard Hoffmann	92e8e0946d	remove handling og checkout_history file	2023-07-04 14:01:23 +02:00
Gerhard Hoffmann	c272d9013d	populate opkg_commands-file with valid opkg instructions	2023-07-04 12:17:48 +02:00
Gerhard Hoffmann	1dd56a5084	use opgk_commands-file in repository rather than in global file-system	2023-07-04 12:15:07 +02:00
Gerhard Hoffmann	236c4ea33a	Add some debug output	2023-07-04 10:56:43 +02:00
Gerhard Hoffmann	c8dc474476	Add some debug output	2023-07-04 10:54:24 +02:00
Gerhard Hoffmann	8d87f21cce	Add some debug output	2023-07-04 10:52:24 +02:00
Gerhard Hoffmann	3c32455a12	Merge branch 'zg1/zone4' of https://git.mimbach49.de/GerhardHoffmann/customer_281 into zg1/zone4	2023-07-04 10:44:59 +02:00
Gerhard Hoffmann	8679da9be4	Use OPKG_COMMANDS_FILE in repository, not in global file-system	2023-07-04 10:44:47 +02:00
Siegfried Siegert	f8178f1f7f	pr	2023-07-02 16:30:39 +02:00
Gerhard Hoffmann	2bc06c4027	return to normal workflow after testing	2023-06-30 10:52:03 +02:00
Gerhard Hoffmann	24a06b54f3	Provide opkg commands for zone4	2023-06-29 14:31:50 +02:00
Gerhard Hoffmann	0daa7cb254	dc2c.bin -> dc2c.4.35.bin	2023-06-27 16:25:34 +02:00
Gerhard Hoffmann	e40c1b54c8	Adding device-controller firmware version 4.35	2023-06-27 16:25:08 +02:00
Gerhard Hoffmann	f4771cb2be	remove obsolete file	2023-06-27 16:24:22 +02:00
Gerhard Hoffmann	760819d4e8	sync post-checkout/merge-hooks with zg/zone1	2023-06-27 14:45:43 +02:00
Gerhard Hoffmann	e4ce5cbd84	sync tariff-files with zg1/zone1	2023-06-27 14:44:33 +02:00
Gerhard Hoffmann	fa90fa90e9	remove unused tariff-files	2023-06-27 14:43:18 +02:00
Gerhard Hoffmann	9f2525e503	Set daily_card_price to 2400 for zone4	2023-06-27 14:22:09 +02:00
Gerhard Hoffmann	cc62a9b139	check for existence of opkg_commands-file (2)	2023-06-05 15:58:43 +02:00
Gerhard Hoffmann	2d27a8a6d4	check for existence of opkg_commands-file	2023-06-05 15:52:57 +02:00
Gerhard Hoffmann	2618ee154d	adding post-checkout hook ad for zone1	2023-06-05 15:47:26 +02:00
Gerhard Hoffmann	4f5a45f096	Add device controller version 4.22	2023-05-31 08:59:27 +02:00
Gerhard Hoffmann	3e7ae97312	Adding new print-templates because of printing-problems on DC-side	2023-05-24 16:22:03 +02:00
Gerhard Hoffmann	df2ca1901e	Add DC-version 4.21	2023-05-24 16:21:58 +02:00
Gerhard Hoffmann	bb812c882b	Updating print templates as of May 11, 2023.	2023-05-18 12:17:22 +02:00
Gerhard Hoffmann	044b9e6834	Add tariff-file for zone 4	2023-05-04 10:56:37 +02:00
Gerhard Hoffmann	8828b75917	Update as for branch zg1/zone1	2023-04-25 11:53:13 +02:00
Gerhard Hoffmann	4e4320c4a2	test	2022-07-08 14:55:05 +02:00
Gerhard Hoffmann	7013aeea3e	test	2022-07-08 14:52:35 +02:00
Gerhard Hoffmann	abc5bc57d4	Removed *.ini-Files.	2023-03-31 11:46:18 +02:00
Gerhard Hoffmann	d7168d096f	Add .gitignore	2023-03-31 09:51:11 +02:00