89 Commits

Author SHA1 Message Date
7bb275b2f1 Updated Holidays for all zones and set Saturday as holiday for zone 1 to
4
2025-12-09 08:58:55 +01:00
41e7dcaa2e added missing comma 2025-10-23 18:09:00 +02:00
16b3a656bb fixed saints_day 2025-11-01 2025-10-23 18:02:53 +02:00
ff2868e405 updated holidays 2025-10-23 10:20:06 +02:00
ba041c79dc quick hack for saturday workday, revert in KW 43!!! 2025-10-17 13:14:53 +02:00
2b1933d810 etc/psa_config/DC2C_print23.json gelöscht 2025-08-19 09:29:33 +02:00
a85381cf81 DC2C_print23.json provided by customer 2025-08-19 08:20:01 +02:00
6bcdfdfb30 DC 2025-08-19 08:19:39 +02:00
6f3a997762 Remove Sat 08:00-12:00 for Zone 3 (Yellow) -> slipped in Dec 2024. 2025-05-22 11:06:44 +02:00
d54b6da3c5 restore tariff files after special day at 17th of May 2025-05-20 10:09:18 +02:00
27fdf1c51c comment all opkg lines 2025-05-12 09:48:36 +02:00
43e81f7d37 special saturday 2025/05/17 2025-05-12 08:54:33 +02:00
da069ba4ea set service fridays: 8-18 2025-01-07 10:46:48 +01:00
1fc3c49288 Add holiday 2024-12-28. Switch back to normal handling of Saturdays. 2024-12-16 15:50:08 +01:00
3f9bb85be9 additional holidays 2024/2025 2024-12-03 13:49:08 +01:00
951c42123d Adapt for Saturday 07/12 2024-12-02 17:12:18 +01:00
7abf1ddefe Remove Sat 08:00-12:00 from Zone 3 (Yellow) 2024-10-29 15:32:42 +01:00
8888fcd395 Revert to original versions 2024-08-08 12:24:01 +02:00
a481f892b6 set 8:00-18:00 for 03.08 2024-08-01 12:39:15 +02:00
db5e5f9ecc Activate opkg_commands 2024-07-15 08:55:18 +02:00
215863270c opkg: none 2024-07-08 13:38:30 +02:00
cfc571f591 Set ex.rate to 365. 2024-07-05 10:01:02 +02:00
1953ead089 euro exchange rate update 2024-06-30 19:10:15 +02:00
4a9818c0fb re-commit: change of ISMAS settings 2024-06-25 08:37:22 +02:00
904024453f ZoneId in tariff-files 2024-06-24 11:33:17 +02:00
fa2a3e336e Tariff: add tariff-info aka "TARIFF_ID" 2024-06-07 08:12:12 +02:00
0cd48239af Remove all files except DC2C_cash/print22/print25/print28.json 2024-04-30 14:33:54 +02:00
41e59fceb0 Repeat update procedure in Szeged for 145-148,171,172,159-161 2024-04-30 08:51:28 +02:00
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
1ebe2a16b9 Use empty file. 2024-04-18 16:10:31 +02:00
d6d86bd5f1 readd empty lines (just to be sure that files have been changed) 2024-03-28 12:10:06 +01:00
d9b5661a0f added empty lines to restart download 2024-03-28 11:57:38 +01:00
baf0dba915 even remove opkg update 2024-03-26 10:06:38 +01:00
2e0e69d3ec only install prepare-update script 2024-03-26 09:52:01 +01:00
79564c1eff Removed all holidays except thos for 2024 2024-03-26 09:40:36 +01:00
d25dda1187 tariff01 -> exact prize: 42
tarif 04/06 -> exact price: 163
2024-02-19 17:30:48 +01:00
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
9034218e2d add libmobilisis-calc2 and activate upgrade step 2024-01-09 11:45:36 +01:00
8b8ba69a92 Set max. parking time: 360; tartiff04/06: daily ticket price (unused): 2600 2024-01-08 15:43:58 +01:00
c2206fdb49 Set zone 'green mars' as 'green', 'yellow mars' as 'yello' 2024-01-08 10:59:41 +01:00
0f5fbb497c Update exchange rate to 352. 2023-12-31 08:17:33 +01:00
4377307430 turn on new tariffs for szeged, valid from 01.01.2014, containing updated exceptional days. 2023-12-31 08:08:30 +01:00
4f660ee640 switch back to previous prices until 01.01.2024 2023-12-23 08:34:00 +01:00
57dd5a5364 set new prices: purple: 165, 990; blue: 260, 1560; yellow: 360, 2160; green: 650 2023-12-21 15:25:18 +01:00
d806c84f95 Remove dc-files (to be used later) 2023-12-20 13:56:20 +01:00
520daa4d0c Change for szeged: do not install atbupdatetool and do not upgrade the machine 2023-12-20 12:51:39 +01:00
d8ec03f03f Reset to previous prices keeping current holidays 2023-12-20 12:51:29 +01:00
34d3201a29 Updated to use new prices. 2023-12-19 16:49:38 +01:00
242de9080f Replace year period id from 8 to 2 as the special days refer to it 2023-12-19 14:57:41 +01:00
4c219d4aad delete all json files 2023-12-19 13:54:39 +01:00
020e8eb32b use opkg_commands file as used in schoenau (00332) 2023-12-19 11:57:04 +01:00
717239b1e6 switch back to previous prices, but keeping current holidays 2023-12-19 11:17:56 +01:00
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
fc69c5259f Fixed wrong comma after exchange rate 2023-10-11 14:14:22 +02:00
08a7586026 set exchange rate to 360 2023-10-10 16:30:17 +02:00
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
32720ad250 remove absolete file 2023-08-11 12:41:23 +02:00
77045d85c0 set daily cardprice to 2400 2023-08-03 15:44:26 +02:00
4384d17c80 add json files for zones 5 and 6 2023-08-03 15:31:46 +02:00
467cdeee18 use same tariff-file as branch for zone4 2023-07-26 14:48:38 +02:00
503a8a5f19 Set max_time to 240 2023-07-25 10:15:36 +02:00
b82c876ece Do not download anything. Only execute opkg-commands 2023-07-06 15:44:31 +02:00
5257ec6b2b Update json-printer-files (provided by Dennis) 2023-07-06 15:11:43 +02:00
4fe11fae51 remove handling og checkout_history file 2023-07-04 14:01:10 +02:00
0133e505a1 populate opkg_commands-file with valid opkg instructions 2023-07-04 12:17:36 +02:00
52b5e76257 use opgk_commands-file in repository rather than in global file-system 2023-07-04 12:14:50 +02:00
90e66b5be6 prevent any opkg command 2023-07-02 16:30:11 +02:00
0a16863267 return to normal workflow after testing 2023-06-30 10:51:49 +02:00
62b617e136 Provide opkg commands for zone3 2023-06-29 14:31:34 +02:00
835cbeae0b dc2c.bin -> dc2c.4.35.bin 2023-06-27 16:23:52 +02:00
423c0bec8a Adding device-controller firmware version 4.35 2023-06-27 16:23:16 +02:00
a6cec85e46 remove obsolete file 2023-06-27 16:22:42 +02:00
8592f044d8 sync tariff-files with zg1/zone1 2023-06-27 14:42:01 +02:00
36894ae00b remove unued tariff-files 2023-06-27 14:40:27 +02:00
9519a6555e install same post-merge-hook as in branch zg1/zone1 2023-06-27 14:36:36 +02:00
28f597898e install same post-checkout-hook as in branch zg1/zone1 2023-06-27 14:35:27 +02:00
3643c06c19 Set daily_card_price to 2400 for zone4 2023-06-27 14:20:58 +02:00
98a69bc779 check for existence of opkg_commands-file (2) 2023-06-05 15:58:27 +02:00
14b49b4b21 check for existence of opkg_commands-file 2023-06-05 15:52:45 +02:00
a08d654c26 adding post-checkout hook ad for zone1 2023-06-05 15:46:58 +02:00
101d6b8071 Add device controller version 4.22 2023-05-31 08:59:01 +02:00
4371fdd8f1 Adding new print-templates because of printing-problems on DC-side 2023-05-24 16:21:30 +02:00
f821294816 Add DC-version 4.21 2023-05-24 16:21:24 +02:00
a06c333894 Updating print templates as of May 11, 2023. 2023-05-18 12:16:32 +02:00
bddb6a1a84 Add tariff-file for zone 4 2023-05-04 10:56:09 +02:00
8dea72e22b Update as for branch zg1/zone1 2023-04-25 11:54:03 +02:00
10f95e328a Removed *.ini-Files. 2023-03-31 11:47:16 +02:00
fcd6301141 Add .gitignore 2023-03-31 09:51:54 +02:00
bfff914e1d Add handling for binary dc-files 2023-03-30 12:49:45 +02:00
21 changed files with 4555 additions and 2095 deletions

View File

@@ -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

35
.gitignore vendored
View File

@@ -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 ## 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

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -1 +0,0 @@
dc2c.04.36.bin

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)":[730,365,185,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":365,
"TokenChannel":1,
"BillValues(7..0)":[0,0,0,0,0,0,0,0],
"LocalTaxRate":20,
"ForeignTaxRate":19,
"Surcharge":0,
"Discount":0
}

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"
}

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"
}

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

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -3,18 +3,16 @@
############################################################################### ###############################################################################
# opkg-commands added to this file will be executed by ATBUpdateTool. # opkg-commands added to this file will be executed by ATBUpdateTool.
############################################################################### ###############################################################################
# ##
opkg info atbqt # opkg update
opkg info atbupdatetool # opkg install prepare-update
opkg update # download packages
opkg install prepare-update # opkg --cache /var/cache/opkg --download-only upgrade tariff-config-281
opkg install atbupdatetool # opkg --cache /var/cache/opkg --download-only upgrade libmobilisis-calc2
# opkg remove atb-accountingtool # opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-calculateprice-mobilisis
# opkg install atb-accountingtool # opkg --cache /var/cache/opkg --download-only upgrade atbqt
opkg --cache /var/cache/opkg --download-only upgrade # install packages
opkg --cache /var/cache/opkg upgrade # opkg --cache /var/cache/opkg upgrade tariff-config-281
# opkg remove apism # opkg --cache /var/cache/opkg upgrade libmobilisis-calc2
# opkg install apism # opkg --cache /var/cache/opkg upgrade atb-plugin-calculateprice-mobilisis
opkg info apism # opkg --cache /var/cache/opkg upgrade atbqt
opkg info atbqt
opkg info atbupdatetool