Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1

This commit is contained in:
Siegfried Siegert 2023-09-26 16:31:19 +02:00
commit d08e7d61dd
Signed by: SiegfriedSiegert
GPG Key ID: 68371E015E8F0B03
39 changed files with 3042 additions and 190 deletions

28
.gitconfig Normal file
View File

@ -0,0 +1,28 @@
[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

View File

@ -4,49 +4,46 @@
# echo "CURR-HEAD=$2" # echo "CURR-HEAD=$2"
# echo "BRANCH-CHECKOUT=$3" # echo "BRANCH-CHECKOUT=$3"
readonly CHECKOUT_HISTORY_FILE="/opt/app/tools/atbupdate/checkout_history"
readonly GIT_UPDATE_LOG="/opt/app/tools/atbupdate/update_log.csv" readonly GIT_UPDATE_LOG="/opt/app/tools/atbupdate/update_log.csv"
readonly OPKG_COMMANDS_FILE="/etc/psa_update/opkg_commands" readonly OPKG_COMMANDS_FILE="./etc/psa_update/opkg_commands"
write_log_file () { write_log_file () {
if [ -f $CHECKOUT_HISTORY_FILE ]; then
# repo: customer_281 # repo: customer_281
readonly repo=$(basename $(git rev-parse --show-toplevel)) # readonly repo=$(basename $(git rev-parse --show-toplevel))
# branch: customer_281:HEAD->zg1/zone1,origin/zg1/zone1 # branch: customer_281:HEAD->zg1/zone1,origin/zg1/zone1
readonly branch=$(git log --graph --all --decorate $2 | head -n 1 | sed -E -e 's/(.*?)\((.*)\)/\2/g' | sed -E -e s/[[:space:]]//g) # readonly branch=$(git log --graph --all --decorate $2 | head -n 1 | sed -E -e 's/(.*?)\((.*)\)/\2/g' | sed -E -e s/[[:space:]]//g)
readonly line="$repo:$branch" # readonly line="$repo:$branch"
readonly now="$(date +%Y-%m-%dT%T)" readonly now="$(date +%Y-%m-%dT%T)"
if ! grep -Eq "$line" $CHECKOUT_HISTORY_FILE; then # echo "DOWNLOAD, /etc/dc/dc2c.bin, $now, N/A" >> $GIT_UPDATE_LOG
# line not found. first checkout of this branch (on this PSA). # echo "DOWNLOAD, /etc/psa_config/DC2C_print01.json, $now, N/A" >> $GIT_UPDATE_LOG
# mark dc and print-templates to be downloaded by update-tool. # echo "DOWNLOAD, /etc/psa_config/DC2C_print02.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/dc/dc2c.bin, $now, N/A" >> $GIT_UPDATE_LOG # echo "DOWNLOAD, /etc/psa_config/DC2C_print03.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print01.json, $now, N/A" >> $GIT_UPDATE_LOG # echo "DOWNLOAD, /etc/psa_config/DC2C_print04.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print02.json, $now, N/A" >> $GIT_UPDATE_LOG # echo "DOWNLOAD, /etc/psa_config/DC2C_print05.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print03.json, $now, N/A" >> $GIT_UPDATE_LOG # echo "DOWNLOAD, /etc/psa_config/DC2C_print06.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print04.json, $now, N/A" >> $GIT_UPDATE_LOG # echo "DOWNLOAD, /etc/psa_config/DC2C_print07.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print05.json, $now, N/A" >> $GIT_UPDATE_LOG # echo "DOWNLOAD, /etc/psa_config/DC2C_print08.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print06.json, $now, N/A" >> $GIT_UPDATE_LOG # echo "DOWNLOAD, /etc/psa_config/DC2C_print09.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print07.json, $now, N/A" >> $GIT_UPDATE_LOG # echo "DOWNLOAD, /etc/psa_config/DC2C_print10.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print08.json, $now, N/A" >> $GIT_UPDATE_LOG # echo "DOWNLOAD, /etc/psa_config/DC2C_print11.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print09.json, $now, N/A" >> $GIT_UPDATE_LOG # echo "DOWNLOAD, /etc/psa_config/DC2C_print12.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print10.json, $now, N/A" >> $GIT_UPDATE_LOG # echo "DOWNLOAD, /etc/psa_config/DC2C_print13.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print11.json, $now, N/A" >> $GIT_UPDATE_LOG # echo "DOWNLOAD, /etc/psa_config/DC2C_print14.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print12.json, $now, N/A" >> $GIT_UPDATE_LOG # echo "DOWNLOAD, /etc/psa_config/DC2C_print15.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print13.json, $now, N/A" >> $GIT_UPDATE_LOG # echo "DOWNLOAD, /etc/psa_config/DC2C_print16.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print14.json, $now, N/A" >> $GIT_UPDATE_LOG # echo "DOWNLOAD, /etc/psa_config/DC2C_print17.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print15.json, $now, N/A" >> $GIT_UPDATE_LOG # echo "DOWNLOAD, /etc/psa_config/DC2C_print18.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print16.json, $now, N/A" >> $GIT_UPDATE_LOG # echo "DOWNLOAD, /etc/psa_config/DC2C_print19.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print17.json, $now, N/A" >> $GIT_UPDATE_LOG # echo "DOWNLOAD, /etc/psa_config/DC2C_print20.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print18.json, $now, N/A" >> $GIT_UPDATE_LOG # echo "DOWNLOAD, /etc/psa_config/DC2C_print29.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print19.json, $now, N/A" >> $GIT_UPDATE_LOG # echo "DOWNLOAD, /etc/psa_config/DC2C_print32.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print20.json, $now, N/A" >> $GIT_UPDATE_LOG # echo "DOWNLOAD, /etc/psa_config/DC2C_device.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print29.json, $now, N/A" >> $GIT_UPDATE_LOG # echo "DOWNLOAD, /etc/psa_config/DC2C_cash.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_print32.json, $now, N/A" >> $GIT_UPDATE_LOG # echo "DOWNLOAD, /etc/psa_config/DC2C_conf.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_device.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_cash.json, $now, N/A" >> $GIT_UPDATE_LOG
echo "DOWNLOAD, /etc/psa_config/DC2C_conf.json, $now, N/A" >> $GIT_UPDATE_LOG
if [ -f "$OPKG_COMMANDS_FILE" ]; then if [ -f "$OPKG_COMMANDS_FILE" ]; then
if grep -qE . "${OPKG_COMMANDS_FILE}"; then if grep -qE . "${OPKG_COMMANDS_FILE}"; then
# make sure the file is empty
echo -n "" > $GIT_UPDATE_LOG
readarray opkg_commands < <(cat $OPKG_COMMANDS_FILE) readarray opkg_commands < <(cat $OPKG_COMMANDS_FILE)
for opkg_c in "${opkg_commands[@]}"; do for opkg_c in "${opkg_commands[@]}"; do
# check for lines longer than 'opkg ' # check for lines longer than 'opkg '
@ -59,16 +56,6 @@ write_log_file () {
done done
fi fi
fi fi
echo "$line" >> $CHECKOUT_HISTORY_FILE
else
echo "Found existing line: $line. Do nothing"
fi
# echo "$line @$now" >> $CHECKOUT_HISTORY_FILE
else
echo "*******************************************************"
echo " $CHECKOUT_HISTORY_FILE DOES NOT EXIST !!! "
echo "*******************************************************"
fi
} }
write_log_file write_log_file

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

Binary file not shown.

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

Binary file not shown.

View File

@ -1 +1 @@
dc2c.4.33.bin dc2c.04.36.bin

View File

@ -1,7 +1,7 @@
{ {
"title":"DC2C_cash ", "title":"DC2C_cash ",
"project":"DBM Szeged", "project":"DBM Szeged",
"version":"22.03.2023 11:59 01.02.03", "version":"0.0.5",
"CoinDenom(15..0)":[200,100,50,0,0,0,0,100,200,100,50,20,10,5,0,3], "CoinDenom(15..0)":[200,100,50,0,0,0,0,100,200,100,50,20,10,5,0,3],
"CoinValue(15..0)":[760,380,190,0,0,0,0,100,200,100,50,20,10,5,0,3], "CoinValue(15..0)":[760,380,190,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], "CoinAccept(15..0)":[1,1,1,0,0,0,0,1,1,1,1,1,1,1,0,1],

View File

@ -1,7 +1,7 @@
{ {
"title":"DC2C_config", "title":"DC2C_config",
"project":"DBM Szeged", "project":"DBM Szeged",
"version":"13.02.2023 12:20 00001", "version":"0.0.1",
"custNum":281, "custNum":281,
"machNum":997, "machNum":997,
"borough":1, "borough":1,

View File

@ -1,7 +1,5 @@
{ {
"title":"DC2C_pri01", "title":"DC2C_pri01",
"project":"DBM Szeged coins hour",
"issued":"13.04.2023 01.02",
"styl":"font 08", "styl":"font 08",
"styl":"size 10", "styl":"size 10",
"feed":"margin02", "feed":"margin02",
@ -9,8 +7,6 @@
"text":"PARKOLÓJEGY", "text":"PARKOLÓJEGY",
"styl":"size 00", "styl":"size 00",
"feed":"nl", "feed":"nl",
"text":"cash short term",
"feed":"nl",
"text":"Kérjük az elsö szélvédö", "text":"Kérjük az elsö szélvédö",
"feed":"nl", "feed":"nl",
"text":"mögé jól láthatóan", "text":"mögé jól láthatóan",
@ -19,6 +15,11 @@
"feed":"nl", "feed":"nl",
"text":"A PARKOLÓ NEM ÕRZÖTT", "text":"A PARKOLÓ NEM ÕRZÖTT",
"feed":"nl", "feed":"nl",
"text":"Please place it clearly visible",
"feed":"nl",
"text":"behind the",
"text":" front windshield!",
"feed":"nl",
"feed":"nl", "feed":"nl",
"text":"Rendszám: ", "text":"Rendszám: ",
"vari":"Dynamic01", "vari":"Dynamic01",

View File

@ -1,8 +1,5 @@
{ {
"title":"DC2C_pri02", "title":"DC2C_pri02",
"project":"DBM Szeged park_coins",
"issued":"13.04.2023 01.01",
"text":"Összeg: ", "text":"Összeg: ",
"styl":"size 01", "styl":"size 01",
"vari":"Dynamic02", "vari":"Dynamic02",

View File

@ -2,7 +2,7 @@
"title":"DC2C_pri04", "title":"DC2C_pri04",
"project":"empty template", "project":"empty template",
"issued":"09.06.2023 01.01", "issued":"09.06.2023 01.01",
"styl":"size 10" "styl":"size 00"
} }

View File

@ -1,7 +1,5 @@
{ {
"title":"DC2C_pri05", "title":"DC2C_pri05",
"project":"DBM Szeged CC hour",
"issued":"13.04.2023 01.02",
"styl":"font 08", "styl":"font 08",
"styl":"size 10", "styl":"size 10",
"feed":"margin02", "feed":"margin02",
@ -9,8 +7,6 @@
"text":"PARKOLÓJEGY", "text":"PARKOLÓJEGY",
"styl":"size 00", "styl":"size 00",
"feed":"nl", "feed":"nl",
"text":"card pay short",
"feed":"nl",
"text":"Kérjük az elsö szélvédö", "text":"Kérjük az elsö szélvédö",
"feed":"nl", "feed":"nl",
"text":"mögé jól láthatóan", "text":"mögé jól láthatóan",
@ -19,6 +15,11 @@
"feed":"nl", "feed":"nl",
"text":"A PARKOLÓ NEM ÕRZÖTT", "text":"A PARKOLÓ NEM ÕRZÖTT",
"feed":"nl", "feed":"nl",
"text":"Please place it clearly visible",
"feed":"nl",
"text":"behind the",
"text":" front windshield!",
"feed":"nl",
"feed":"nl", "feed":"nl",
"text":"Rendszám: ", "text":"Rendszám: ",
"vari":"Dynamic01", "vari":"Dynamic01",

View File

@ -1,8 +1,5 @@
{ {
"title":"DC2C_pri06", "title":"DC2C_pri06",
"project":"DBM Szeged",
"issued":"13.04.2023 01.01",
"text":"Összeg: ", "text":"Összeg: ",
"styl":"size 01", "styl":"size 01",
"vari":"Dynamic02", "vari":"Dynamic02",

View File

@ -2,7 +2,7 @@
"title":"DC2C_pri08", "title":"DC2C_pri08",
"project":"empty template", "project":"empty template",
"issued":"09.06.2023 01.01", "issued":"09.06.2023 01.01",
"styl":"size 10" "styl":"size 00"
} }

View File

@ -1,7 +1,5 @@
{ {
"title":"DC2C_pri09", "title":"DC2C_pri09",
"project":"DBM Szeged cash day",
"issued":"13.04.2023 01.02",
"styl":"font 08", "styl":"font 08",
"styl":"size 10", "styl":"size 10",
"feed":"margin02", "feed":"margin02",
@ -9,8 +7,6 @@
"text":"PARKOLÓJEGY", "text":"PARKOLÓJEGY",
"styl":"size 00", "styl":"size 00",
"feed":"nl", "feed":"nl",
"text":"Cash day ticket",
"feed":"nl",
"text":"Kérjük az elsö szélvédö", "text":"Kérjük az elsö szélvédö",
"feed":"nl", "feed":"nl",
"text":"mögé jól láthatóan", "text":"mögé jól láthatóan",
@ -19,6 +15,11 @@
"feed":"nl", "feed":"nl",
"text":"A PARKOLÓ NEM ÕRZÖTT", "text":"A PARKOLÓ NEM ÕRZÖTT",
"feed":"nl", "feed":"nl",
"text":"Please place it clearly visible",
"feed":"nl",
"text":"behind the",
"text":" front windshield!",
"feed":"nl",
"feed":"nl", "feed":"nl",
"text":"Rendszám: ", "text":"Rendszám: ",
"vari":"Dynamic01", "vari":"Dynamic01",

View File

@ -1,8 +1,9 @@
{ {
"title":"DC2C_pri10", "title":"DC2C_pri10",
"project":"DBM Szeged", "styl":"size 01",
"issued":"13.04.2023 01.01", "text":"Napijegy K",
"styl":"size 00",
"feed":"nl",
"text":"Összeg: ", "text":"Összeg: ",
"styl":"size 01", "styl":"size 01",
"vari":"Dynamic02", "vari":"Dynamic02",

View File

@ -16,7 +16,7 @@
"feed":"nl", "feed":"nl",
"feed":"nl", "feed":"nl",
"feed":"nl", "feed":"nl",
"feed":"eject", "feed":"nl"
} }

View File

@ -2,7 +2,8 @@
"title":"DC2C_pri12", "title":"DC2C_pri12",
"project":"empty template", "project":"empty template",
"issued":"09.06.2023 01.01", "issued":"09.06.2023 01.01",
"styl":"size 10" "styl":"size 00"
} }

View File

@ -1,7 +1,5 @@
{ {
"title":"DC2C_pri13", "title":"DC2C_pri13",
"project":"DBM Szeged card day",
"issued":"13.04.2023 01.02",
"styl":"font 08", "styl":"font 08",
"styl":"size 10", "styl":"size 10",
"feed":"margin02", "feed":"margin02",
@ -9,8 +7,6 @@
"text":"PARKOLÓJEGY", "text":"PARKOLÓJEGY",
"styl":"size 00", "styl":"size 00",
"feed":"nl", "feed":"nl",
"text":"card pay day",
"feed":"nl",
"text":"Kérjük az elsö szélvédö", "text":"Kérjük az elsö szélvédö",
"feed":"nl", "feed":"nl",
"text":"mögé jól láthatóan", "text":"mögé jól láthatóan",
@ -19,6 +15,11 @@
"feed":"nl", "feed":"nl",
"text":"A PARKOLÓ NEM ÕRZÖTT", "text":"A PARKOLÓ NEM ÕRZÖTT",
"feed":"nl", "feed":"nl",
"text":"Please place it clearly visible",
"feed":"nl",
"text":"behind the",
"text":" front windshield!",
"feed":"nl",
"feed":"nl", "feed":"nl",
"text":"Rendszám: ", "text":"Rendszám: ",
"vari":"Dynamic01", "vari":"Dynamic01",

View File

@ -1,8 +1,9 @@
{ {
"title":"DC2C_pri14", "title":"DC2C_pri14",
"project":"DBM Szeged", "styl":"size 01",
"issued":"13.04.2023 01.01", "text":"Napijegy K",
"styl":"size 00",
"feed":"nl",
"text":"Összeg: ", "text":"Összeg: ",
"styl":"size 01", "styl":"size 01",
"vari":"Dynamic02", "vari":"Dynamic02",

View File

@ -16,7 +16,7 @@
"feed":"nl", "feed":"nl",
"feed":"nl", "feed":"nl",
"feed":"nl", "feed":"nl",
"feed":"eject", "feed":"nl"
} }

View File

@ -2,7 +2,7 @@
"title":"DC2C_pri16", "title":"DC2C_pri16",
"project":"empty template", "project":"empty template",
"issued":"09.06.2023 01.01", "issued":"09.06.2023 01.01",
"styl":"size 10" "styl":"size 00"
} }

View File

@ -6,27 +6,20 @@
"feed":"nl", "feed":"nl",
"feed":"nl", "feed":"nl",
"feed":"part", "feed":"part",
"text":"Utazzon tovább " "text":"Utazzon tovább közösségi közle-",
"text":"közösségi " "feed":"nl",
"text":"közle-" "text":"kedéssel! Ehhez a leválasztható",
"text":"kedéssel! Ehhez a " "feed":"nl",
"text":"leválasztható" "text":" szelvényhez a közösségi közle- ",
"text":" szelvényhez a közösségi " "feed":"nl",
"text":"közle- " "text":"kedési járművek (villamos, helyi-",
"text":"kedési járművek (villa" "feed":"nl",
"text":"mos, helyi- jár" "text":"járatos busz,trolibusz,vasútvilla-",
"text":"atos busz,troli" "feed":"nl",
"text":"busz,vasút", "text":"mos) bankkártyás fedélzeti jegy-",
"text":"villa-mos) ba", "feed":"nl",
"text":"nkkártyás fedélzeti " "text":"kiadó automatáiból,illetve a jegy-",
"text":"jegy- kiadó automatá" "feed":"nl",
"text":"iból,illetve" "feed":"nl"
"text":" a jegy- árusí" }
"text":"tó applikációk"
"text":"ból Közte"
"text":"rületi"
"text":"fizető ",
"text":"parkolás na"
"text":"pijegyhez vál- tott "

View File

@ -1,21 +1,18 @@
"title":"DC2C_pri18", "title":"DC2C_pri18",
"styl":"align l", "styl":"align l",
"feed":"margin01", "feed":"margin01",
"text":"fizető ",
"text":"parkolás na" "text":"árusító applikációkból Közterületi",
"text":"pijegyhez vál- tott " "feed":"nl",
"text":"kiegészítő " "text":"fizető parkolás napijegyhez vál-",
"text":"Körút napijegy" "feed":"nl",
"text":" vá-sárolható " "text":"tott kiegészítő Körút napijegy vá-",
"text":"(ára 440,-Ft)" "feed":"nl",
"text":"1 fő részé-re." "text":"sárolható (ára 440,-Ft)1 fő részé-",
"text":" Ez a napijegy " "feed":"nl",
"text":"Szeged, Nagy- körút" "text":"re. Ez a napijegy Szeged, Nagy-",
"text":"ig bezárólag illet" "feed":"nl",
"text":"ve a Nagy- kör" "text":" körútig bezárólag illetve a Nagy-",
"text":"úton túli első " "feed":"nl",
"text":"megálló" "feed":"nl"
"text":"helytől" }
"text":" agy megálló"
"text":"helyig kor"
"text":"látlan uta-"

View File

@ -2,30 +2,12 @@
"title":"DC2C_pri19", "title":"DC2C_pri19",
"styl":"align l", "styl":"align l",
"feed":"margin01", "feed":"margin01",
"text":"vagy megálló"
"text":"helyig kor" "text":"körúton túli első megállóhelytől",
"text":"látlan uta-" "feed":"nl",
"text":"zás" "text":"vagy megállóhelyig korlátlan uta-",
"text":"ra érvényes a " "feed":"nl",
"text":"parkolás nap-" "text":"zásra érvényes a parkolás nap-",
"feed":"nl",
"text":"ján." "text":"ján."
"text":"Ellenőrz" }
"text":"éshez ezt a szelvényt"
"text":"és az utazásra "
"text":"jogosító papírt"
"feed":"nl",
"text":"vagy elektronikus "
"text":"napijegyet "
"feed":"nl",
"text":"együttesen kell "
"text":"bemutatni."
"feed":"nl",
"text":"Rendszám:"
"vari":"Dynamic01",
"text":"Parkolás kezdete:"
"feed":"nl",
"text":"(Kék Zóna)"
"feed":"nl",
"vari":"date us",
"vari":"time short",
"feed":"eject",

View File

@ -2,7 +2,26 @@
"title":"DC2C_pri20", "title":"DC2C_pri20",
"project":"empty template", "project":"empty template",
"issued":"09.06.2023 01.01", "issued":"09.06.2023 01.01",
"styl":"size 10" "styl":"size 00"
"text":"Ellenőrzéshez ezt a szelvényt",
"feed":"nl",
"text":"és az utazásra jogosító papírt" ,
"feed":"nl",
"text":"vagy elektronikus napijegyet ",
"feed":"nl",
"text":"együttesen kell bemutatni.",
"feed":"nl",
"text":"Rendszám: ",
"vari":"Dynamic01",
"feed":"nl",
"text":"Parkolás kezdete:",
"text":"(Kék Zóna)",
"feed":"nl",
"vari":"date us",
"vari":"time short",
"feed":"nl",
"feed":"eject"
} }

View File

@ -0,0 +1,40 @@
{
"title":"DC2C_pri21",
"project":"DBM Szeged StartParking",
"styl":"size 10",
"text":"Igazoló ",
"text":"szelvény",
"styl":"size 00",
"feed":"nl",
"feed":"nl",
"text":" Bizonylat ",
"feed":"nl",
"text":"Szélvédõ mögé NEM",
"feed":"nl",
"text":"kell kihelyezni!",
"feed":"nl",
"text":"A PARKOLÓ NEM ÕRZÖTT!",
"feed":"nl",
"feed":"nl",
"text":"Rendszám: ",
"vari":"Dynamic01",
"feed":"nl",
"text":"Parkolás helye: ",
"feed":"nl",
"styl":"size 10",
"vari":"location",
"styl":"size 00",
"feed":"nl",
"text":"Zárolt összeg/Ft.: ",
"feed":"nl",
"styl":"size 11",
"vari":"Dynamic02",
"styl":"size 00",
"feed":"nl",
"text":"Kiadás idõpontja:",
"feed":"nl",
"vari":"date us",
"vari":"time short",
"feed":"nl"
}

View File

@ -0,0 +1,29 @@
"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":"Deák Ferenc u. 31.",
"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,34 @@
"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":"Parkoljon egy érintéssel.",
"feed":"nl",
"text":"Használja bankkártyáját",
"feed":"nl",
"text":" automatáinknál is!",
"feed":"nl",
"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"
}

View File

@ -0,0 +1,39 @@
{
"title":"DC2C_pri24",
"project":"DBM Szeged StopParking",
"styl":"size 10"
"text":"Parkolójegy",
"styl":"size 00"
"feed":"nl",
"feed":"nl",
"text":"Nyugta : ",
"feed":"nl",
"vari":"Dynamic07",
"feed":"nl",
"vari":"Dynamic08",
"feed":"nl",
"text":"Rendszám: ",
"vari":"Dynamic01",
"feed":"nl",
"text":"Leállítás helye:",
"feed":"nl",
"styl":"size 10"
"vari":"location",
"styl":"size 00",
"text":"Leállítás idõpontja:",
"feed":"nl",
"vari":"date us",
"vari":"time short",
"feed":"nl",
"text":"Automata száma: ",
"vari":"manu",
"feed":"nl",
"text":"Terhelt Összeg: ",
"vari":"Dynamic02",
"text":"Ft. (BK)",
"feed":"nl",
"text":"A nyugta az igazoló",
"feed":"nl",
"text":"szelvénnyel együtt"
}

View File

@ -0,0 +1,31 @@
{
"title":"DC2C_pri25",
"project":"DBM Szeged StopParking",
"text":"érvényes.",
"feed":"nl",
"feed":"nl",
"text":"Üf. szolg nyitvatartás:"
"feed":"nl",
"text":" Arany Janos u. 5",
"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,17 @@
{
"title":"DC2C_pri26",
"project":"DBM Szeged StopParking",
"feed":"nl",
"text":"Start azonosító:",
"styl":"size 00",
"feed":"nl",
"vari":"Dynamic07",
"feed":"nl",
"vari":"Dynamic08",
"feed":"nl",
"text":"Õrizze meg, tartsa magánál!",
"feed":"nl",
"feed":"eject"
}

View File

@ -0,0 +1,36 @@
{
"title":"DC2C_pri27",
"project":"DBM Szeged Error",
"styl":"size 00",
"feed":"nl",
"text":"TRANZAKCIÓ ELUTASÍTVA!",
"feed":"nl",
"feed":"nl",
"text":" Bizonylat",
"feed":"nl",
"feed":"nl",
"text":"Rendszám: ",
"vari":"Dynamic01",
"feed":"nl",
"text":"Indítás helye:",
"feed":"nl",
"vari":"location",
"feed":"nl",
"text":"Kiadás idõpontja:",
"feed":"nl",
"vari":"date us",
"vari":"time short",
"feed":"nl",
"text":"Automata száma: ",
"vari":"manu",
"text":"Bizonylat sorsz.: ",
"feed":"nl",
"vari":"Dynamic07",
"feed":"nl",
"vari":"Dynamic08",
"feed":"nl",
"text":"Hibaüzenet: ",
"vari":"Dynamic06",
"feed":"nl"
}

View File

@ -0,0 +1,35 @@
{
"title":"DC2C_pri28",
"project":"DBM Szeged Error",
"styl":"size 00",
"text":" Üf. szolg nyitvatartás:",
"feed":"nl",
"text":" Deák Ferenc u. 31. ",
"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"
}

View File

@ -35,10 +35,11 @@
"pop_day_night_end_time": "16:30:00", "pop_day_night_end_time": "16:30:00",
"pop_price_night": 0, "pop_price_night": 0,
"pop_min_time": 15, "pop_min_time": 15,
"pop_max_time": 600, "pop_max_time": 240,
"pop_min_price": 0, "pop_min_price": 0,
"pop_carry_over": 1, "pop_carry_over": 1,
"pop_daily_card_price": 0 "pop_daily_card_price": 2400,
"pop_multi_hour_price": 0
} }
], ],
"PaymentRate": [ "PaymentRate": [
@ -63,6 +64,11 @@
"pun_id": 4, "pun_id": 4,
"pun_label": "1 min", "pun_label": "1 min",
"pun_duration": 1 "pun_duration": 1
},
{
"pun_id": 5,
"pun_label": "Voller Tag",
"pun_duration": 1441
} }
], ],
"WeekDaysWorktime": [ "WeekDaysWorktime": [
@ -166,6 +172,22 @@
"pye_start_day": 1, "pye_start_day": 1,
"pye_end_month": 12, "pye_end_month": 12,
"pye_end_day": 31 "pye_end_day": 31
},
{
"pye_id": 17,
"pye_label": "Whole year",
"pye_start_month": 1,
"pye_start_day": 1,
"pye_end_month": 12,
"pye_end_day": 31
},
{
"pye_id": 18,
"pye_label": "Whole Year",
"pye_start_month": 1,
"pye_start_day": 1,
"pye_end_month": 12,
"pye_end_day": 31
} }
], ],
"SpecialDaysWorktime": [ "SpecialDaysWorktime": [
@ -462,6 +484,146 @@
"pedwt_time_from": "00:00:00", "pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00", "pedwt_time_to": "00:00:00",
"pedwt_price": 0 "pedwt_price": 0
},
{
"pedwt_id": 2271,
"pedwt_period_exc_day_id": 2072,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2272,
"pedwt_period_exc_day_id": 2073,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2273,
"pedwt_period_exc_day_id": 2074,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2274,
"pedwt_period_exc_day_id": 2075,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2275,
"pedwt_period_exc_day_id": 2076,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2276,
"pedwt_period_exc_day_id": 2077,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2277,
"pedwt_period_exc_day_id": 2078,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2278,
"pedwt_period_exc_day_id": 2079,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2279,
"pedwt_period_exc_day_id": 2080,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2280,
"pedwt_period_exc_day_id": 2081,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2281,
"pedwt_period_exc_day_id": 2082,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2282,
"pedwt_period_exc_day_id": 2083,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2283,
"pedwt_period_exc_day_id": 2084,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2284,
"pedwt_period_exc_day_id": 2085,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2285,
"pedwt_period_exc_day_id": 2086,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2286,
"pedwt_period_exc_day_id": 2087,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2287,
"pedwt_period_exc_day_id": 2088,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2288,
"pedwt_period_exc_day_id": 2089,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2289,
"pedwt_period_exc_day_id": 2090,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
},
{
"pedwt_id": 2290,
"pedwt_period_exc_day_id": 2091,
"pedwt_time_from": "00:00:00",
"pedwt_time_to": "00:00:00",
"pedwt_price": 0
} }
], ],
"SpecialDays": [ "SpecialDays": [
@ -800,6 +962,168 @@
"ped_date_end": "2024-05-19", "ped_date_end": "2024-05-19",
"ped_period_special_day_id": 2, "ped_period_special_day_id": 2,
"ped_year": 2024 "ped_year": 2024
},
{
"ped_id": 2072,
"ped_label": "Christmas 1st day",
"ped_date_start": "2022-12-25",
"ped_date_end": "2022-12-25",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 2073,
"ped_label": "Christmas 2nd day",
"ped_date_start": "2022-12-26",
"ped_date_end": "2022-12-26",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 2074,
"ped_label": "Republic Day (Hungary)",
"ped_date_start": "2022-10-23",
"ped_date_end": "2022-10-23",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 2075,
"ped_label": "Christmas (Sunday)",
"ped_date_start": "2022-12-24",
"ped_date_end": "2022-12-24",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 2076,
"ped_label": "Holiday (Hungary)",
"ped_date_start": "2022-12-31",
"ped_date_end": "2022-12-31",
"ped_period_special_day_id": 1,
"ped_year": 0
},
{
"ped_id": 2077,
"ped_label": "NewYear",
"ped_date_start": "2023-01-01",
"ped_date_end": "2023-01-01",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 2078,
"ped_label": "Good Friday",
"ped_date_start": "2023-04-07",
"ped_date_end": "2023-04-07",
"ped_period_special_day_id": 2,
"ped_year": 2023
},
{
"ped_id": 2079,
"ped_label": "Easter Sunday",
"ped_date_start": "2023-04-09",
"ped_date_end": "2023-04-09",
"ped_period_special_day_id": 2,
"ped_year": 2023
},
{
"ped_id": 2080,
"ped_label": "Easter Monday",
"ped_date_start": "2023-04-10",
"ped_date_end": "2023-04-10",
"ped_period_special_day_id": 2,
"ped_year": 2023
},
{
"ped_id": 2081,
"ped_label": "Whit Sunday",
"ped_date_start": "2023-05-28",
"ped_date_end": "2023-05-28",
"ped_period_special_day_id": 2,
"ped_year": 2023
},
{
"ped_id": 2082,
"ped_label": "Whit Monday",
"ped_date_start": "2023-05-29",
"ped_date_end": "2023-05-29",
"ped_period_special_day_id": 2,
"ped_year": 2023
},
{
"ped_id": 2083,
"ped_label": "Revolution Day (Hungary)",
"ped_date_start": "2023-03-15",
"ped_date_end": "2023-03-15",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 2084,
"ped_label": "Labour Day",
"ped_date_start": "2023-05-01",
"ped_date_end": "2023-05-01",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 2085,
"ped_label": "Saint Stephens Day (Hungary)",
"ped_date_start": "2023-08-20",
"ped_date_end": "2023-08-20",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 2086,
"ped_label": "All Saints Day",
"ped_date_start": "2023-11-01",
"ped_date_end": "2023-11-01",
"ped_period_special_day_id": 2,
"ped_year": 0
},
{
"ped_id": 2087,
"ped_label": "Good Friday",
"ped_date_start": "2024-03-29",
"ped_date_end": "2024-03-29",
"ped_period_special_day_id": 2,
"ped_year": 2024
},
{
"ped_id": 2088,
"ped_label": "Easter",
"ped_date_start": "2024-03-31",
"ped_date_end": "2024-03-31",
"ped_period_special_day_id": 2,
"ped_year": 2024
},
{
"ped_id": 2089,
"ped_label": "Easter Monday",
"ped_date_start": "2024-04-01",
"ped_date_end": "2024-04-01",
"ped_period_special_day_id": 2,
"ped_year": 2024
},
{
"ped_id": 2090,
"ped_label": "Whit Monday",
"ped_date_start": "2024-05-20",
"ped_date_end": "2024-05-20",
"ped_period_special_day_id": 2,
"ped_year": 2024
},
{
"ped_id": 2091,
"ped_label": "Whit Sunday",
"ped_date_start": "2024-05-19",
"ped_date_end": "2024-05-19",
"ped_period_special_day_id": 2,
"ped_year": 2024
} }
] ]
} }

1134
etc/psa_tariff/tariff05.json Normal file

File diff suppressed because it is too large Load Diff

1134
etc/psa_tariff/tariff06.json Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,28 +1,21 @@
###############################################################################
# !!! NOTE !!!
###############################################################################
# opkg-commands added to this file will be executed by ATBUpdateTool.
###############################################################################
# opkg prefix will be added inside evaluating script # opkg prefix will be added inside evaluating script
# #
# package manipulation commands without package: opkg info ptu5-gitinstaller
# update, upgrade, clean opkg info atbqt
# opkg info atbupdatetool
# 2023-06-22: force update
#
# informational commands without package:
# list, list-installed, list-upgradable
# ptu5-atb-apinfo
# ptu5-scripts
# ptu5-atb-apinfo
# atb-plugin-calculateprice-prm
# atb-plugin-cc-tcpzvt
# atbqt
# list-installed
# --force-reinstall install ptu5-atb-apinfo
# --force-reinstall install atbqt
# opkg update
# opkg install atbqt // die PTU-Kundenapplikation
# opkg install atb-plugin-cc-iself // das Ingenico-iSelf plugin
# opkg install atb-plugin-dc // das DeviceController plugin für ATBQT
# opkg install libdevicecontroller // libCAmaster.so
opkg update opkg update
#opkg install ptu5-gitinstaller
opkg install atbupdatetool
opkg install yogurt-version
opkg install ptu5-atb-apinfo
opkg install apism
opkg install ptu5-systemcontroller
opkg install atbqt opkg install atbqt
opkg install atb-plugin-cc-iself opkg info ptu5-gitinstaller
opkg install atb-plugin-dc opkg info atbqt
opkg install libdevicecontroller opkg info atbupdatetool

View File

@ -1 +0,0 @@
"VERSION":"0.1.0","PROJECT":"szeged","ZONE":1,"INFO":"summer sale","LOADED":"2022-06-02T21:57:29"