67 Commits

Author SHA1 Message Date
GerhardHoffmann 60a375a773 Change for szeged: do not install atbupdatetool and do not upgrade the machine 2023-12-20 12:50:58 +01:00
GerhardHoffmann b4c50748ba Reset to previous prices keeping current holidays 2023-12-20 12:50:39 +01:00
GerhardHoffmann c3c07329b6 Updated to use new prices. 2023-12-19 16:49:12 +01:00
GerhardHoffmann d14dc38340 Replace year period id from 8 to 2 as the special days refer to it 2023-12-19 14:57:18 +01:00
GerhardHoffmann ecabc589d8 delete all json files 2023-12-19 13:54:09 +01:00
GerhardHoffmann 6e756202d7 use opkg_commands file as used in schoenau (00332) 2023-12-19 11:56:39 +01:00
GerhardHoffmann d478ce44ab switch back to previous prices, but keeping current holidays 2023-12-19 11:17:30 +01:00
GerhardHoffmann 1746b94678 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:42:54 +01:00
GerhardHoffmann 1f54b1ec90 Fixed wrong comma after exchange rate 2023-10-11 14:13:59 +02:00
GerhardHoffmann e1c39f1df6 set exchange rate to 360 2023-10-10 16:29:38 +02:00
SiegfriedSiegert 2d65b9ba14 Merge branch 'zg1/zone2' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone2 2023-09-18 17:18:26 +02:00
SiegfriedSiegert 38386d7aed Update test 20230811113644-00281 2023-09-18 17:16:56 +02:00
GerhardHoffmann e9dc8f6e10 Remove ini-file (used for testing) and obsolete tariff.current file. 2023-08-11 12:44:07 +02:00
GerhardHoffmann 2cc7ec9dc7 Install ptu5-gitinstaller, atbupdatetool and atbqt. 2023-08-11 12:43:10 +02:00
GerhardHoffmann 25e9e014de set useLanguage 240 -> 248 2023-08-10 16:37:45 +02:00
GerhardHoffmann 0657b3ea27 install apism via opkg 2023-08-09 16:21:48 +02:00
GerhardHoffmann 5629444870 Appended a dateline. Set useLanguage 248 -> 240 2023-08-09 16:20:08 +02:00
GerhardHoffmann 9461dfafb0 add another line for testing 2023-08-09 10:20:38 +02:00
GerhardHoffmann 5a25611a39 240 -> 248 2023-08-09 10:16:51 +02:00
GerhardHoffmann 73f5bfd568 add another line for testing 2023-08-09 10:13:42 +02:00
GerhardHoffmann 4331c32dc5 Add file for testing. 248 -> 240 for useLanguage 2023-08-09 09:58:28 +02:00
GerhardHoffmann 23e5e1339e appended datelien for testing 2023-08-09 09:54:41 +02:00
GerhardHoffmann 5d9882c569 set daily cardprice to 2400 2023-08-03 15:44:06 +02:00
GerhardHoffmann 6ed893f3fc add json files for zones 5 and 6 2023-08-03 15:30:58 +02:00
GerhardHoffmann 69e3fbe55a use same tariff-file as branch for zone4 2023-07-26 14:48:20 +02:00
GerhardHoffmann d72bafb8d7 Set max_time to 240 2023-07-25 10:15:11 +02:00
GerhardHoffmann 0b7614c2d9 Do not download anything. Only execute opkg-commands 2023-07-06 15:44:17 +02:00
GerhardHoffmann de0b5a3e70 Update json-printer-files (provided by Dennis) 2023-07-06 15:10:50 +02:00
GerhardHoffmann e9fa1e6dd5 remove file in wrong localtion 2023-07-06 15:10:14 +02:00
GerhardHoffmann ee0a06ba0b remove handling og checkout_history file 2023-07-04 14:00:48 +02:00
GerhardHoffmann 96a1db1fba populate opkg_commands-file with valid opkg instructions 2023-07-04 12:17:23 +02:00
GerhardHoffmann 1071e8e762 Merge branch 'zg1/zone2' of https://git.mimbach49.de/GerhardHoffmann/customer_281 into zg1/zone2 2023-07-04 12:14:20 +02:00
GerhardHoffmann 794c26ee97 use opgk_commands-file in repository rather than in global file-system 2023-07-04 12:14:13 +02:00
SiegfriedSiegert 8211505d34 Revert last ATBQT.ini change 2023-06-30 15:42:20 +02:00
SiegfriedSiegert 1c08df6da1 Fix: filename 2023-06-30 15:33:45 +02:00
SiegfriedSiegert 031c9653f1 Update Test for ATBQT.ini 2023-06-30 15:28:33 +02:00
SiegfriedSiegert 9643f36c1d Add dc2c.4.33.bin for test 2023-06-30 15:13:31 +02:00
SiegfriedSiegert d6ef0ac4a6 Prevent updating atbqt 2023-06-30 15:12:13 +02:00
SiegfriedSiegert bf5bce2be8 DC Update Test 2023-06-30 15:10:13 +02:00
SiegfriedSiegert ef12748e72 Szeged Test 2023-06-30 14:37:52 +02:00
SiegfriedSiegert 6a47b52c24 Merge branch 'zg1/zone2' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone2 2023-06-30 14:36:47 +02:00
GerhardHoffmann cebda53e85 return to normal workflow after testing 2023-06-30 10:51:32 +02:00
GerhardHoffmann 8b5f310464 Provide opkg commands for zone2 2023-06-29 14:30:39 +02:00
GerhardHoffmann db54f86be9 dc2c.bin -> dc2c.4.35.bin 2023-06-27 16:21:37 +02:00
GerhardHoffmann cf5b677bfe Adding device-controller firmware version 4.35 2023-06-27 16:21:28 +02:00
GerhardHoffmann d25e6232e0 install same post-merge-hook as in branch zg1/zone1 2023-06-27 14:32:34 +02:00
GerhardHoffmann 8949d1850c install same post-checkout-hook as in branch zg1/zone1 2023-06-27 14:31:17 +02:00
GerhardHoffmann 22d1a9f8a1 Set daily_card_price to 2400 for zone4 2023-06-27 14:17:37 +02:00
SiegfriedSiegert ee70081ab3 Remove old deviceController firmware 2023-06-26 14:37:00 +02:00
SiegfriedSiegert a5f76131ff Add correct tariff config files 2023-06-25 15:04:58 +02:00
SiegfriedSiegert 7ed84450e2 Merge branch 'zg1/zone2' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone2 2023-06-25 14:57:42 +02:00
SiegfriedSiegert 8b58d78cd8 Remove invalid config files 2023-06-25 14:57:13 +02:00
SiegfriedSiegert fe7c8bf282 Merge branch 'zg1/zone2' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone2 2023-06-19 10:37:27 +02:00
SiegfriedSiegert 8fdb94ac90 Merge branch 'zg1/zone1' into zg1/zone2 2023-06-19 10:32:20 +02:00
GerhardHoffmann 1e629e5fea check for existence of opkg_commands-file (2) 2023-06-05 15:58:15 +02:00
GerhardHoffmann 7939f576a0 check for existence of opkg_commands-file 2023-06-05 15:52:30 +02:00
GerhardHoffmann bbd39fbccb adding post-checkout hook ad for zone1 2023-06-05 15:46:25 +02:00
GerhardHoffmann 8d8cc811c6 Add device controller version 4.22 2023-05-31 08:58:21 +02:00
GerhardHoffmann 4d698ffb79 Adding new print-templates because of printing-problems on DC-side 2023-05-24 16:20:16 +02:00
GerhardHoffmann e83e1589fb Adding dc-version 4.21 2023-05-24 16:19:39 +02:00
GerhardHoffmann 4bf9efcf3a Updating print templates as of 11 May, 2023. 2023-05-18 12:15:37 +02:00
SiegfriedSiegert be84634d62 Update ATBQT.ini SysetemControl.ini for Szeged Test 2023-05-05 10:59:31 +02:00
GerhardHoffmann 64937d6fb4 Add tariff-file for zone 4 2023-05-04 10:55:28 +02:00
GerhardHoffmann 6acc53275d Update as for branch zg1/zone1 2023-04-25 11:53:41 +02:00
GerhardHoffmann 87af143cbd Removed *.ini-Files. 2023-03-31 11:46:54 +02:00
GerhardHoffmann e46c1f272b Add .gitignore 2023-03-31 09:51:38 +02:00
GerhardHoffmann 73fbc3d5ad Add handling for binary dc-files 2023-03-30 12:48:33 +02:00
19 changed files with 2448 additions and 5311 deletions
-28
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
+3
View File
@@ -11,8 +11,10 @@ if [ -z $IFS ]; then
IFS=$'\n' IFS=$'\n'
fi fi
GIT_UPDATE_LOG=/opt/app/tools/atbupdate/update_log.csv GIT_UPDATE_LOG=/opt/app/tools/atbupdate/update_log.csv
#TODO: use in UpdateController #TODO: use in UpdateController
get_blob () { # get the blob of the file(name) passed as $1 get_blob () { # get the blob of the file(name) passed as $1
@@ -27,6 +29,7 @@ get_commit_for_blob () {
grep -q $1 && echo -n {} && head -n 1") grep -q $1 && echo -n {} && head -n 1")
} }
write_log_file () { write_log_file () {
local now=$(date +"%Y-%m-%dT%T") local now=$(date +"%Y-%m-%dT%T")
for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do
View File
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
+1
View File
@@ -0,0 +1 @@
dc2c.4.33.bin
-16
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)":[652,326,163,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":326,
"TokenChannel":1,
"BillValues(7..0)":[0,0,0,0,0,0,0,0],
"LocalTaxRate":20,
"ForeignTaxRate":19,
"Surcharge":0,
"Discount":0
}
-27
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"
}
-29
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"
}
-34
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"
}
Binary file not shown.
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
+14 -14
View File
@@ -3,18 +3,18 @@
############################################################################### ###############################################################################
# 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 info atbupdatetool
opkg update opkg update
# opkg install prepare-update opkg install prepare-update
# download packages # opkg install atbupdatetool
# opkg --cache /var/cache/opkg --download-only upgrade tariff-config-281 # opkg remove atb-accountingtool
# opkg --cache /var/cache/opkg --download-only upgrade libmobilisis-calc2 # opkg install atb-accountingtool
# opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-calculateprice-mobilisis # opkg --cache /var/cache/opkg --download-only upgrade
opkg --cache /var/cache/opkg --download-only upgrade atbqt=4.99.11+git0+66f98a3bef-r0 # opkg --cache /var/cache/opkg upgrade
opkg --cache /var/cache/opkg --download-only upgrade apism=1.7.0-r1 # opkg remove apism
# install packages # opkg install apism
# opkg --cache /var/cache/opkg upgrade tariff-config-281 opkg info apism
# opkg --cache /var/cache/opkg upgrade libmobilisis-calc2 opkg info atbqt
# opkg --cache /var/cache/opkg upgrade atb-plugin-calculateprice-mobilisis opkg info atbupdatetool
opkg --cache /var/cache/opkg upgrade atbqt=4.99.11+git0+66f98a3bef-r0
opkg --cache /var/cache/opkg upgrade apism=1.7.0-r1