55 Commits

Author SHA1 Message Date
75e167f96e Updated to use new prices. 2023-12-19 16:50:36 +01:00
711bf8fb25 Replace year period id from 8 to 2 as the special days refer to it 2023-12-19 14:58:40 +01:00
36e6d8fc4f delete all json files 2023-12-19 13:56:10 +01:00
2427928c3c use opkg_commands file as used in schoenau (00332) 2023-12-19 11:57:52 +01:00
f0a9aa44a4 switch back to previous prices, but keeping current holidays 2023-12-19 11:18:49 +01:00
ac9f4c86ca 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:44 +01:00
18e2c5db94 Fixed wrong comma after exchange rate 2023-10-11 14:15:23 +02:00
7fd4352798 set exchange rate to 360 2023-10-10 16:31:14 +02:00
acf30adc5e remove obsolete file 2023-08-11 12:38:36 +02:00
cb789aa34f Install ptu5-gitinstaller, atbupdatetool and atbqt. 2023-08-11 12:37:17 +02:00
36a0d74ac1 set daily cardprice to 2400 2023-08-03 15:44:53 +02:00
89d2812724 add json files for zones 5 and 6 2023-08-03 15:32:38 +02:00
d23139f5af add another empty line 2023-07-25 17:21:11 +02:00
d5425192b6 add empty line 2023-07-25 17:15:07 +02:00
8b25cd70b3 Set carry over to 1, daily_price to 2400 2023-07-25 16:07:54 +02:00
9f83afce3a add another empty line 2023-07-25 14:07:30 +02:00
c958ed2632 add another empty line 2023-07-25 12:39:16 +02:00
583955df67 add 2 other lines 2023-07-25 12:15:18 +02:00
a6a8ad436a add another testline 2023-07-25 11:50:10 +02:00
33e9f2a3f2 add another empty line for testing 2023-07-25 11:36:02 +02:00
6117764e42 add new line 2023-07-25 11:29:24 +02:00
55f23b4099 Set max_time to 240 2023-07-25 10:13:18 +02:00
9443f5c372 Do not download anything. Only execute opkg-commands 2023-07-06 15:44:43 +02:00
1b9e55592f Update json-printer-files (provided by Dennis) 2023-07-06 15:11:59 +02:00
92e8e0946d remove handling og checkout_history file 2023-07-04 14:01:23 +02:00
c272d9013d populate opkg_commands-file with valid opkg instructions 2023-07-04 12:17:48 +02:00
1dd56a5084 use opgk_commands-file in repository rather than in global file-system 2023-07-04 12:15:07 +02:00
236c4ea33a Add some debug output 2023-07-04 10:56:43 +02:00
c8dc474476 Add some debug output 2023-07-04 10:54:24 +02:00
8d87f21cce Add some debug output 2023-07-04 10:52:24 +02:00
3c32455a12 Merge branch 'zg1/zone4' of https://git.mimbach49.de/GerhardHoffmann/customer_281 into zg1/zone4 2023-07-04 10:44:59 +02:00
8679da9be4 Use OPKG_COMMANDS_FILE in repository, not in global file-system 2023-07-04 10:44:47 +02:00
f8178f1f7f pr 2023-07-02 16:30:39 +02:00
2bc06c4027 return to normal workflow after testing 2023-06-30 10:52:03 +02:00
24a06b54f3 Provide opkg commands for zone4 2023-06-29 14:31:50 +02:00
0daa7cb254 dc2c.bin -> dc2c.4.35.bin 2023-06-27 16:25:34 +02:00
e40c1b54c8 Adding device-controller firmware version 4.35 2023-06-27 16:25:08 +02:00
f4771cb2be remove obsolete file 2023-06-27 16:24:22 +02:00
760819d4e8 sync post-checkout/merge-hooks with zg/zone1 2023-06-27 14:45:43 +02:00
e4ce5cbd84 sync tariff-files with zg1/zone1 2023-06-27 14:44:33 +02:00
fa90fa90e9 remove unused tariff-files 2023-06-27 14:43:18 +02:00
9f2525e503 Set daily_card_price to 2400 for zone4 2023-06-27 14:22:09 +02:00
cc62a9b139 check for existence of opkg_commands-file (2) 2023-06-05 15:58:43 +02:00
2d27a8a6d4 check for existence of opkg_commands-file 2023-06-05 15:52:57 +02:00
2618ee154d adding post-checkout hook ad for zone1 2023-06-05 15:47:26 +02:00
4f5a45f096 Add device controller version 4.22 2023-05-31 08:59:27 +02:00
3e7ae97312 Adding new print-templates because of printing-problems on DC-side 2023-05-24 16:22:03 +02:00
df2ca1901e Add DC-version 4.21 2023-05-24 16:21:58 +02:00
bb812c882b Updating print templates as of May 11, 2023. 2023-05-18 12:17:22 +02:00
044b9e6834 Add tariff-file for zone 4 2023-05-04 10:56:37 +02:00
8828b75917 Update as for branch zg1/zone1 2023-04-25 11:53:13 +02:00
4e4320c4a2 test 2022-07-08 14:55:05 +02:00
7013aeea3e test 2022-07-08 14:52:35 +02:00
abc5bc57d4 Removed *.ini-Files. 2023-03-31 11:46:18 +02:00
d7168d096f Add .gitignore 2023-03-31 09:51:11 +02:00
17 changed files with 2154 additions and 4668 deletions

View File

@@ -11,10 +11,8 @@ 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
@@ -29,7 +27,6 @@ get_commit_for_blob () {
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

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

BIN
etc/dc/dc2c.4.21.bin Executable file

Binary file not shown.

BIN
etc/dc/dc2c.4.22.bin Executable file

Binary file not shown.

BIN
etc/dc/dc2c.4.35.bin Executable file

Binary file not shown.

1
etc/dc/dc2c.bin Symbolic link
View File

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

View File

@@ -1,16 +0,0 @@
{
"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

@@ -1,27 +0,0 @@
"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

@@ -1,29 +0,0 @@
{
"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

@@ -1,34 +0,0 @@
{
"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,16 +3,18 @@
###############################################################################
# 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.9+git0+fa9d02636f-r0
# 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.9+git0+fa9d02636f-r0
#
opkg info atbqt
opkg info atbupdatetool
opkg update
opkg install prepare-update
opkg install atbupdatetool
# opkg remove atb-accountingtool
# opkg install atb-accountingtool
opkg --cache /var/cache/opkg --download-only upgrade
opkg --cache /var/cache/opkg upgrade
# opkg remove apism
# opkg install apism
opkg info apism
opkg info atbqt
opkg info atbupdatetool