Remove Sat 08:00-12:00 from Zone 3 (Yellow)

Revert to original versions
set 8:00-18:00 for 03.08
2024-10-29 15:30:31 +01:00 · 2024-08-08 12:26:27 +02:00 · 2024-08-01 12:35:59 +02:00 · 2024-07-15 08:52:24 +02:00 · 2024-07-08 13:35:33 +02:00 · 2024-07-05 10:06:14 +02:00
4 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
--- a/etc/psa_config/DC2C_cash.json
+++ b/etc/psa_config/DC2C_cash.json
Author	SHA1	Message	Date
Gerhard Hoffmann	8e69715bcb	Remove Sat 08:00-12:00 from Zone 3 (Yellow)	2024-10-29 15:30:31 +01:00
Gerhard Hoffmann	7e0b93441b	Revert to original versions	2024-08-08 12:26:27 +02:00
Gerhard Hoffmann	563b033a00	set 8:00-18:00 for 03.08	2024-08-01 12:35:59 +02:00
Gerhard Hoffmann	5d42f46af1	Activate opkg_commands	2024-07-15 08:52:24 +02:00
Gerhard Hoffmann	cd4a0905d3	opkg: none	2024-07-08 13:35:33 +02:00
Gerhard Hoffmann	cc4c1c814e	Set ex.rate to 365.	2024-07-05 10:06:14 +02:00
Gerhard Hoffmann	1426390ff6	re-commit: change of ISMAS settings	2024-06-25 08:33:53 +02:00
Gerhard Hoffmann	ceb5739c92	ZoneId in tariff-files	2024-06-24 11:38:12 +02:00
Siegfried Siegert	7df184852d	Tariff: add tariff-info aka "TARIFF_ID"	2024-06-07 08:13:35 +02:00
Siegfried Siegert	06a42e0c95	Merge branch 'master' of git.mimbach49.de:GerhardHoffmann/customer_281	2024-06-07 08:13:17 +02:00
Gerhard Hoffmann	d633a62d87	Remove all files except DC2C_cash/print22/print25/print28.json	2024-04-30 14:32:36 +02:00
Gerhard Hoffmann	7e305e113c	Repeat update procedure in Szeged for 145-148,171,172,159-161	2024-04-30 08:48:43 +02:00
Gerhard Hoffmann	85a5e5065b	removed unnecessay file	2024-04-26 12:06:39 +02:00
Gerhard Hoffmann	e8b4b82a3a	Commit current files from at-date-server (provided by Thomas)	2024-04-26 12:05:54 +02:00
Gerhard Hoffmann	c72d4efa62	set exchange rate to 350	2024-04-26 12:05:11 +02:00
Gerhard Hoffmann	277a62464c	Use empty file.	2024-04-18 16:12:22 +02:00
Gerhard Hoffmann	1310305a2c	readd empty lines (just to be sure that files have been changed)	2024-03-28 12:12:00 +01:00
Gerhard Hoffmann	1e83a503ef	added empty lines to restart download	2024-03-28 11:56:33 +01:00
Gerhard Hoffmann	71bd12401f	even remove opkg update	2024-03-26 10:05:22 +01:00
Gerhard Hoffmann	37626f703d	only install prepare-update script	2024-03-26 09:50:51 +01:00
Gerhard Hoffmann	f671cc98d3	Removed all holidays except thos for 2024	2024-03-26 09:41:59 +01:00
Gerhard Hoffmann	5d6289d332	tariff01 -> exact prize: 42 tarif 04/06 -> exact price: 163	2024-02-19 17:27:36 +01:00
Gerhard Hoffmann	174bf875d5	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:24:35 +01:00
Gerhard Hoffmann	355ace836c	add libmobilisis-calc2 and activate upgrade step	2024-01-09 11:44:28 +01:00
Gerhard Hoffmann	324a8486b7	Set max. parking time: 360; tartiff04/06: daily ticket price (unused): 2600	2024-01-08 15:42:58 +01:00
Gerhard Hoffmann	97c9850fca	Set zone 'green mars' as 'green', 'yellow mars' as 'yello'	2024-01-08 10:58:31 +01:00
Gerhard Hoffmann	62e797158b	Update exchange rate to 352.	2023-12-31 08:12:51 +01:00
Gerhard Hoffmann	89d3fc8d3a	turn on new tariffs for szeged, valid from 01.01.2014, containing updated exceptional days.	2023-12-31 08:07:05 +01:00
Gerhard Hoffmann	48d8a10338	switch back to previous prices until 01.01.2024	2023-12-23 08:32:08 +01:00
Gerhard Hoffmann	5ba8072945	set new prices: purple: 165, 990; blue: 260, 1560; yellow: 360, 2160; green: 650	2023-12-21 15:24:01 +01:00
Gerhard Hoffmann	9dba635ced	Remove dc-files. (not used at the moment)	2023-12-20 13:54:13 +01:00
Gerhard Hoffmann	7b95ee61af	Change for szeged: do not install the atbupdatetool and do not upgrade the machine	2023-12-20 12:45:58 +01:00
Gerhard Hoffmann	792fe4cd34	Reset to previous prices.	2023-12-20 12:40:05 +01:00
Gerhard Hoffmann	77615f0ff1	add empty line for testing	2023-12-19 17:14:09 +01:00
Gerhard Hoffmann	602a04e283	Updated to use new prices.	2023-12-19 16:46:56 +01:00
Gerhard Hoffmann	c170e7d06b	Replace year period from 8 to 2 as the special days refer to this.	2023-12-19 14:54:12 +01:00
Gerhard Hoffmann	b2b32a216d	delete all json files	2023-12-19 13:53:00 +01:00
Gerhard Hoffmann	9f021007f3	Use opkg_commans file as given in schoenau (00332).	2023-12-19 11:55:00 +01:00
Gerhard Hoffmann	6ab7135963	switch back to previous prices, but keeping current holidays	2023-12-19 11:15:36 +01:00
Gerhard Hoffmann	82ace8a757	Set new price: 165 (prev: 150) Set new daily: 990 (prev: 900) Set new holidays starting from Dec. 2023.	2023-12-18 14:31:40 +01:00
Gerhard Hoffmann	0769d9e049	Set new price: 360 (prev: 330) Set new daily: 2160 (prev: 1980) Mex. parking time: 360 as given in tariff-file (prev: 300)	2023-12-18 14:25:08 +01:00
Gerhard Hoffmann	8705a98b45	Set new price: 260 (prev: 230). Set new daily: 1560 (prev: 1320)	2023-12-18 14:23:43 +01:00
Gerhard Hoffmann	f838b34537	Set new price: 165 (prev: 150) Set new daily: 990 (prev: 900)	2023-12-18 14:21:35 +01:00
Gerhard Hoffmann	c11754e821	Fixed wrong comma after exchange rate	2023-10-11 14:13:24 +02:00
Gerhard Hoffmann	99ee76ad9a	set exchange rate to 360	2023-10-10 16:24:07 +02:00
Siegfried Siegert	4d12b992f8	Merge branch 'master' of git.mimbach49.de:GerhardHoffmann/customer_281	2023-09-18 08:41:29 +02:00
Gerhard Hoffmann	06b675e542	remove obsolete tariff-file	2023-08-11 12:48:53 +02:00
Gerhard Hoffmann	481b861649	Install ptu5-gitinstaller, atbupdatetool and atbqt.	2023-08-11 12:48:00 +02:00
Gerhard Hoffmann	5d25ac3d69	set daily cardprice to 2400	2023-08-03 15:45:33 +02:00
Gerhard Hoffmann	41ec581d19	add json files for zones 5 and 6	2023-08-03 15:29:55 +02:00
Gerhard Hoffmann	a21328cef3	append date line	2023-08-02 17:16:43 +02:00
Gerhard Hoffmann	53f0f0e0f0	append date line	2023-08-02 17:09:06 +02:00
Gerhard Hoffmann	2966fa029e	first test	2023-08-02 14:00:02 +02:00
Gerhard Hoffmann	cf3aa28260	use same tariff-file as branch for zone4	2023-07-26 14:47:27 +02:00
Gerhard Hoffmann	284039b9a2	Set max_time to 240	2023-07-25 10:16:09 +02:00
Gerhard Hoffmann	5b5e653381	Do not download anything. Only execute opkg-commands	2023-07-06 15:44:58 +02:00
Gerhard Hoffmann	3cd6c6a7ab	Update json-printer-files (provided by Dennis)	2023-07-06 15:12:21 +02:00
Gerhard Hoffmann	d1e2024ef0	remove handling og checkout_history file	2023-07-04 14:01:40 +02:00
Gerhard Hoffmann	59ba072297	use opgk_commands-file in repository rather than in global file-system	2023-07-04 12:15:25 +02:00
Gerhard Hoffmann	cc6871dc07	return to normal workflow after testing	2023-06-30 10:52:26 +02:00
Gerhard Hoffmann	e420d7fe82	Provide opkg commands for master	2023-06-29 14:32:17 +02:00
Gerhard Hoffmann	724ef3520c	dc2c.bin -> dc2c.4.35.bin	2023-06-27 16:27:09 +02:00
Gerhard Hoffmann	e592f132c2	Adding device-controller firmware version 4.35	2023-06-27 16:26:44 +02:00
Gerhard Hoffmann	8b98b97906	remove obsolete file	2023-06-27 16:26:16 +02:00
Gerhard Hoffmann	e3e1670e82	sync tariff-files with branch zg1/zone1	2023-06-27 14:48:47 +02:00
Gerhard Hoffmann	68223896ae	remove unused tariff-files	2023-06-27 14:47:42 +02:00
Gerhard Hoffmann	c41530478a	sync post-checkout/merge-hooks with zg/zone1	2023-06-27 14:46:50 +02:00
Gerhard Hoffmann	c7f1c2d427	Set daily_card_price to 2400 for zone4	2023-06-27 14:22:41 +02:00
Gerhard Hoffmann	49f069e4fc	check for existence of opkg_commands-file (2)	2023-06-05 15:57:16 +02:00
Gerhard Hoffmann	fa1512a716	check for existence of opkg_commands-file	2023-06-05 15:53:16 +02:00
Gerhard Hoffmann	6edff44dc1	adding post-checkout hook ad for zone1	2023-06-05 15:47:45 +02:00
Gerhard Hoffmann	4a9427c239	Add device controller version 4.22	2023-05-31 08:59:49 +02:00
Gerhard Hoffmann	69459f1b91	Adding new print-templates because of printing-problems on DC-side	2023-05-24 16:22:35 +02:00
Gerhard Hoffmann	82199234e5	Add DC-version 4.21	2023-05-24 16:22:31 +02:00
Gerhard Hoffmann	b8312b6095	Updating print templates as of May 11, 2023.	2023-05-18 12:18:08 +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