Compare commits
158 Commits
60a375a773
...
zg1/zone6
| Author | SHA1 | Date | |
|---|---|---|---|
| 31f6626098 | |||
|
f16eaeaa7f
|
|||
|
298250ad64
|
|||
| 9ed8927938 | |||
|
1980a7ce1c
|
|||
| 8489eec036 | |||
| de3a35f4b3 | |||
| 3d23211538 | |||
| a9b0f93e06 | |||
| 2d2d490cb3 | |||
| b1ac7b061f | |||
| fffcd84052 | |||
| 5f5390084b | |||
| 2d6ba5c8b2 | |||
| 021bb2c27a | |||
| 598fd88ca6 | |||
| e9c0768970 | |||
| aff4369dde | |||
| 2e025adfc2 | |||
| 1b0633842b | |||
| 9d9fd125de | |||
| 840b56a652 | |||
| d87c3ff62f | |||
| e0056c49be | |||
| 79d1708ac8 | |||
| 1c5c8a3584 | |||
| 718e252c64 | |||
| e35b6d8107 | |||
| 81aa0281aa | |||
| 04922cc479 | |||
| b0bc71a220 | |||
|
56c4ab886b
|
|||
| 620b4b10b0 | |||
| 64ac21c6cc | |||
| b2b7a18bb9 | |||
| bf48cdc42b | |||
| e553f0ef82 | |||
| 7852b6c694 | |||
| 5ee81bece3 | |||
| 59b0ebbf9b | |||
| d8e111931d | |||
| 9e427b917e | |||
| ba006b5252 | |||
| 7d0fb15e5c | |||
| 301dd74972 | |||
| 6071df2816 | |||
| bd2bd4d16b | |||
| 73142dd26e | |||
| c22393def3 | |||
| 8c236230eb | |||
| 19f1ba8ac4 | |||
| b0c2816996 | |||
| 595968c4cf | |||
| 4aa49ac8fa | |||
| ddabd2bd26 | |||
| ae65e6edea | |||
| 2728b9b3f0 | |||
| 329c90a899 | |||
| cabf3f50d1 | |||
| 77b551d15f | |||
| b13384de31 | |||
| 671b4dea92 | |||
| 026688f963 | |||
| 1f8868fe0c | |||
| 70d38b9748 | |||
| 3c57fc010f | |||
| 0e23677ab5 | |||
| f5aeff8f0c | |||
| 8bf0d9d14f | |||
| b2dbcc6a5f | |||
| 78d6f4664a | |||
| e5882900f4 | |||
| a387a0c9aa | |||
| 172856a885 | |||
| c619c7c0d7 | |||
| b8d9a63222 | |||
| 1b70bbeb88 | |||
| 0f28608171 | |||
| 494db162aa | |||
| f557ed3c3c | |||
| b088ac3b09 | |||
| 48279336b8 | |||
| aa3bda2908 | |||
| 1e84465467 | |||
| eec9bbc74a | |||
| 2362cbe7ee | |||
| fce1413566 | |||
| 306a040375 | |||
| 2fd02b6b32 | |||
| 0cb961a8bd | |||
| cc937b5930 | |||
| 11c838f048 | |||
| 335e9499bc | |||
| 71938af63d | |||
| 5f0f82fbe5 | |||
| 3bd28424d1 | |||
| 0cc2cf32ba | |||
| a9ed15d977 | |||
| 2a805233ac | |||
| 60d8d6dced | |||
| dc58292190 | |||
| a3616aa653 | |||
| c70f3a9005 | |||
| b3222fb9c5 | |||
| 15291c13ba | |||
| 07bee37fc3 | |||
| 6d600d5225 | |||
| 5a53dced33 | |||
| a195d1873b | |||
| ca5f8a56b0 | |||
| 00ce1863ba | |||
| 9060a0c93d | |||
| da62892c1f | |||
| 358f1dbc36 | |||
| 89d2812724 | |||
| d23139f5af | |||
| d5425192b6 | |||
| 8b25cd70b3 | |||
| 9f83afce3a | |||
| c958ed2632 | |||
| 583955df67 | |||
| a6a8ad436a | |||
| 33e9f2a3f2 | |||
| 6117764e42 | |||
| 55f23b4099 | |||
| 9443f5c372 | |||
| 1b9e55592f | |||
| 92e8e0946d | |||
| c272d9013d | |||
| 1dd56a5084 | |||
| 236c4ea33a | |||
| c8dc474476 | |||
| 8d87f21cce | |||
| 3c32455a12 | |||
| 8679da9be4 | |||
| f8178f1f7f | |||
| 2bc06c4027 | |||
| 24a06b54f3 | |||
| 0daa7cb254 | |||
| e40c1b54c8 | |||
| f4771cb2be | |||
| 760819d4e8 | |||
| e4ce5cbd84 | |||
| fa90fa90e9 | |||
| 9f2525e503 | |||
| cc62a9b139 | |||
| 2d27a8a6d4 | |||
| 2618ee154d | |||
| 4f5a45f096 | |||
| 3e7ae97312 | |||
| df2ca1901e | |||
| bb812c882b | |||
| 044b9e6834 | |||
| 8828b75917 | |||
| 4e4320c4a2 | |||
| 7013aeea3e | |||
| abc5bc57d4 | |||
| d7168d096f |
@@ -11,10 +11,8 @@ 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
|
||||||
@@ -29,7 +27,6 @@ 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
|
||||||
|
|||||||
35
.gitignore
vendored
35
.gitignore
vendored
@@ -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.
@@ -1 +0,0 @@
|
|||||||
dc2c.4.33.bin
|
|
||||||
16
etc/psa_config/DC2C_cash.json
Normal file
16
etc/psa_config/DC2C_cash.json
Normal 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
|
||||||
|
}
|
||||||
|
|
||||||
27
etc/psa_config/DC2C_print22.json
Executable file
27
etc/psa_config/DC2C_print22.json
Executable 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"
|
||||||
|
}
|
||||||
35
etc/psa_config/DC2C_print23.json
Normal file
35
etc/psa_config/DC2C_print23.json
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
"title":"DC2C_pri23",
|
||||||
|
"project":"DBM Szeged StartParking",
|
||||||
|
"styl":"size 00",
|
||||||
|
"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",
|
||||||
|
"feed":"nl",
|
||||||
|
"text":"Parkolás a zónában érvényes",
|
||||||
|
"feed":"nl",
|
||||||
|
"text":"4 óra maximális
|
||||||
|
"feed":"nl",
|
||||||
|
"text":"várakozási idő után ",
|
||||||
|
"feed":"nl",
|
||||||
|
"text":"AUTOMATIKUSAN LEÁLL",
|
||||||
|
"feed":"nl",
|
||||||
|
"text":"Leállító KÓD:",
|
||||||
|
"feed":"nl",
|
||||||
|
"styl":"size 11",
|
||||||
|
"vari":"Dynamic07",
|
||||||
|
"feed":"nl",
|
||||||
|
"vari":"Dynamic08",
|
||||||
|
"styl":"size 00",
|
||||||
|
"feed":"nl",
|
||||||
|
"text":"Õrizze meg, tartsa magánál!",
|
||||||
|
"feed":"nl",
|
||||||
|
"feed":"eject"
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
29
etc/psa_config/DC2C_print25.json
Executable file
29
etc/psa_config/DC2C_print25.json
Executable 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"
|
||||||
|
}
|
||||||
34
etc/psa_config/DC2C_print28.json
Executable file
34
etc/psa_config/DC2C_print28.json
Executable 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"
|
||||||
|
|
||||||
|
}
|
||||||
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
@@ -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
|
||||||
# opkg install atbupdatetool
|
# download packages
|
||||||
# opkg remove atb-accountingtool
|
# opkg --cache /var/cache/opkg --download-only upgrade tariff-config-281
|
||||||
# opkg install atb-accountingtool
|
# opkg --cache /var/cache/opkg --download-only upgrade libmobilisis-calc2
|
||||||
# opkg --cache /var/cache/opkg --download-only upgrade
|
# opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-calculateprice-mobilisis
|
||||||
# opkg --cache /var/cache/opkg upgrade
|
opkg --cache /var/cache/opkg --download-only upgrade atbqt=4.99.11+git0+66f98a3bef-r0
|
||||||
# opkg remove apism
|
opkg --cache /var/cache/opkg --download-only upgrade apism=1.7.0-r1
|
||||||
# opkg install apism
|
# install packages
|
||||||
opkg info apism
|
# opkg --cache /var/cache/opkg upgrade tariff-config-281
|
||||||
opkg info atbqt
|
# opkg --cache /var/cache/opkg upgrade libmobilisis-calc2
|
||||||
opkg info atbupdatetool
|
# opkg --cache /var/cache/opkg upgrade atb-plugin-calculateprice-mobilisis
|
||||||
|
opkg --cache /var/cache/opkg upgrade atbqt=4.99.11+git0+66f98a3bef-r0
|
||||||
|
opkg --cache /var/cache/opkg upgrade apism=1.7.0-r1
|
||||||
|
|||||||
Reference in New Issue
Block a user