Set daily_card_price to 2400 for zone4

opkg install ptu5-gitinstaller
Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1
2023-06-27 14:19:03 +02:00 · 2023-06-27 12:13:26 +02:00 · 2023-06-27 11:59:54 +02:00 · 2023-06-22 19:13:00 +02:00 · 2023-06-22 19:11:19 +02:00 · 2023-06-22 12:11:26 +02:00
43 changed files with 2084 additions and 6320 deletions
--- a/.githooks/post-checkout
+++ b/.githooks/post-checkout
@@ -4,57 +4,70 @@
 # echo "CURR-HEAD=$2"
 # 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 OPKG_COMMANDS_FILE="./etc/psa_update/opkg_commands"
+readonly OPKG_COMMANDS_FILE="/etc/psa_update/opkg_commands"

 write_log_file () {
-    # repo: customer_281
-    # readonly repo=$(basename $(git rev-parse --show-toplevel))
-    # 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 line="$repo:$branch"
-    readonly now="$(date +%Y-%m-%dT%T)"
-    # echo "DOWNLOAD, /etc/dc/dc2c.bin, $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_print02.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_print04.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_print06.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_print08.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_print10.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_print12.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_print14.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_print16.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_print18.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_print20.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_print32.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 grep -qE . "${OPKG_COMMANDS_FILE}"; then
-            # make sure the file is empty
-            echo -n "" > $GIT_UPDATE_LOG 
-            readarray opkg_commands < <(cat $OPKG_COMMANDS_FILE)
-            for opkg_c in "${opkg_commands[@]}"; do
-                # check for lines longer than 'opkg '
-                if [ "${#opkg_c}" -gt 4 ]; then
-                    # comment: spaces, at least one '#'
-                    grep -qE '^[[:space:]]*#+.*$' <<< "$opkg_c" && continue
-                    echo -n "EXECUTE, $opkg_c, $now, N/A" | tr -d '\n\r' >> $GIT_UPDATE_LOG 2>&1
-                    echo "" >> $GIT_UPDATE_LOG 2>&1
+    if [ -f $CHECKOUT_HISTORY_FILE ]; then
+        # repo: customer_281
+        readonly repo=$(basename $(git rev-parse --show-toplevel))
+        # 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 line="$repo:$branch"
+        readonly now="$(date +%Y-%m-%dT%T)"
+        if ! grep -Eq "$line" $CHECKOUT_HISTORY_FILE; then
+            # line not found. first checkout of this branch (on this PSA).
+            # mark dc and print-templates to be downloaded by update-tool.
+            echo "DOWNLOAD, /etc/dc/dc2c.bin, $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_print02.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_print04.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_print06.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_print08.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_print10.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_print12.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_print14.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_print16.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_print18.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_print20.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_print32.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 grep -qE . "${OPKG_COMMANDS_FILE}"; then
+                    readarray opkg_commands < <(cat $OPKG_COMMANDS_FILE)
+                    for opkg_c in "${opkg_commands[@]}"; do
+                        # check for lines longer than 'opkg '
+                        if [ "${#opkg_c}" -gt 4 ]; then
+                            # comment: spaces, at least one '#'
+                            grep -qE '^[[:space:]]*#+.*$' <<< "$opkg_c" && continue
+                            echo -n "EXECUTE, $opkg_c, $now, N/A" | tr -d '\n\r' >> $GIT_UPDATE_LOG 2>&1
+                            echo "" >> $GIT_UPDATE_LOG 2>&1
+                        fi
+                    done
                fi
-            done
+            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
 }

--- a/.githooks/post-merge
+++ b/.githooks/post-merge
@@ -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
--- a/etc/dc/dc2c.4.11.bin
+++ b/etc/dc/dc2c.4.11.bin
--- a/etc/dc/dc2c.4.21.bin
+++ b/etc/dc/dc2c.4.21.bin
--- a/etc/dc/dc2c.4.22.bin
+++ b/etc/dc/dc2c.4.22.bin
--- a/etc/dc/dc2c.4.33.bin
+++ b/etc/dc/dc2c.4.33.bin
--- a/etc/dc/dc2c.bin
+++ b/etc/dc/dc2c.bin
@@ -0,0 +1 @@
+dc2c.4.33.bin
--- a/etc/psa_config/DC2C_cash.json
+++ b/etc/psa_config/DC2C_cash.json
@@ -1,16 +1,17 @@
 {	     
 "title":"DC2C_cash  ",
 "project":"DBM Szeged",
-"version":"1.0.0-2024-07-05",
+"version":"22.03.2023 11:59 01.02.03",
 "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],
+"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],
-"ExchangeRate":365,
+"ExchangeRate":378
 "TokenChannel":1,
 "BillValues(7..0)":[0,0,0,0,0,0,0,0],
 "LocalTaxRate":20,
 "ForeignTaxRate":19,
 "Surcharge":0,	
-"Discount":0
+"Discount":0,	
+
 }

--- a/etc/psa_config/DC2C_conf.json
+++ b/etc/psa_config/DC2C_conf.json
@@ -0,0 +1,12 @@
+{ 
+"title":"DC2C_config",
+"project":"DBM Szeged",
+"version":"13.02.2023 12:20 00001",
+"custNum":281,
+"machNum":997,
+"borough":1,
+"zone":1,
+"alias":997,
+"location":"ATB Thomas' office"
+}
+
--- a/etc/psa_config/DC2C_device.json
+++ b/etc/psa_config/DC2C_device.json
@@ -0,0 +1,25 @@
+{
+"title":"DC2C_device",
+"project":"DBM Szeged",
+"Version":"13.02.2023 12:20 00001",
+"printer":1,
+"coinChk":1,
+"mifRd":1,
+"solarPwr":1,
+"modem":1,
+"creditCard":0,
+"escrow":1,
+"RejMotor":1,
+"shutter":1,
+"billRd":1,
+"vaultLock":1,
+"autoAlarm":1,
+"autoOpen":1,
+"AccPrint":1,
+"DorPrint":1,
+"TokPrint":1,
+"CBwarnLev":1600,
+"CBerrLev":1900
+
+}
+
--- a/etc/psa_config/DC2C_print01.json
+++ b/etc/psa_config/DC2C_print01.json
@@ -0,0 +1,40 @@
+{
+"title":"DC2C_pri01",
+"project":"DBM Szeged coins hour",
+"issued":"13.04.2023 01.02",
+"styl":"font 08",
+"styl":"size 10",
+"feed":"margin02",
+"feed":"rim02",
+"text":"PARKOLÓJEGY",
+"styl":"size 00",
+"feed":"nl",
+"text":"cash short term",
+"feed":"nl",
+"text":"Kérjük az elsö szélvédö",
+"feed":"nl",
+"text":"mögé jól láthatóan", 
+"feed":"nl",
+"text":"elhelyezni!",
+"feed":"nl",
+"text":"A PARKOLÓ NEM ÕRZÖTT",
+"feed":"nl",
+"feed":"nl",
+"text":"Rendszám: ",
+"vari":"Dynamic01",
+"feed":"nl",
+"text":"Parkolási idõ vége:",
+"feed":"nl",
+"styl":"size 01",
+"vari":"Dynamic04",
+"vari":"Dynamic03",
+"styl":"size 00",
+"feed":"nl",
+"text":"Parkolás helye: ",
+"feed":"nl",
+"vari":"location",
+"feed":"nl",
+"feed":"nl",
+}
+
+
--- a/etc/psa_config/DC2C_print02.json
+++ b/etc/psa_config/DC2C_print02.json
@@ -0,0 +1,39 @@
+{
+"title":"DC2C_pri02",
+"project":"DBM Szeged park_coins",
+"issued":"13.04.2023 01.01",
+
+"text":"Összeg: ",
+"styl":"size 01",
+"vari":"Dynamic02",
+"styl":"size 00",
+"feed":"nl",
+"text":"Kiadás időpontja:",
+"feed":"nl",
+"vari":"date us",	
+"vari":"time short",	
+"feed":"nl",
+"text":"Automata száma: ",
+"vari":"manu",
+"text":"Park.jegy sorsz.: ",
+"vari":"TickCtr",
+"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",
+"text":"Üf. szolg nyitvatartás:",
+"feed":"nl",
+"feed":"nl",
+"feed":"nl",
+}
+
+
--- a/etc/psa_config/DC2C_print03.json
+++ b/etc/psa_config/DC2C_print03.json
@@ -0,0 +1,22 @@
+{
+"title":"DC2C_pri03",
+"project":"DBM Szeged park_coins",
+"issued":"13.04.2023 01.01",
+
+"styl":"size 00",
+"text":"H - P: 7:45 - 17:00",
+"feed":"nl",
+"text":"Tel: (80) 820-500",
+"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",
+"feed":"nl",
+"feed":"eject",
+}
+
+
--- a/etc/psa_config/DC2C_print04.json
+++ b/etc/psa_config/DC2C_print04.json
@@ -0,0 +1,9 @@
+{
+"title":"DC2C_pri04",
+"project":"empty template",
+"issued":"09.06.2023 01.01",
+"styl":"size 10"
+
+}
+
+
--- a/etc/psa_config/DC2C_print05.json
+++ b/etc/psa_config/DC2C_print05.json
@@ -0,0 +1,40 @@
+{
+"title":"DC2C_pri05",
+"project":"DBM Szeged CC hour",
+"issued":"13.04.2023 01.02",
+"styl":"font 08",
+"styl":"size 10",
+"feed":"margin02",
+"feed":"rim02",
+"text":"PARKOLÓJEGY",
+"styl":"size 00",
+"feed":"nl",
+"text":"card pay short",
+"feed":"nl",
+"text":"Kérjük az elsö szélvédö",
+"feed":"nl",
+"text":"mögé jól láthatóan", 
+"feed":"nl",
+"text":"elhelyezni!",
+"feed":"nl",
+"text":"A PARKOLÓ NEM ÕRZÖTT",
+"feed":"nl",
+"feed":"nl",
+"text":"Rendszám: ",
+"vari":"Dynamic01",
+"feed":"nl",
+"text":"Parkolási idõ vége:",
+"feed":"nl",
+"styl":"size 01",
+"vari":"Dynamic04",
+"vari":"Dynamic03",
+"styl":"size 00",
+"feed":"nl",
+"text":"Parkolás helye: ",
+"feed":"nl",
+"vari":"location",
+"feed":"nl",
+"feed":"nl",
+}
+
+
--- a/etc/psa_config/DC2C_print06.json
+++ b/etc/psa_config/DC2C_print06.json
@@ -0,0 +1,39 @@
+{
+"title":"DC2C_pri06",
+"project":"DBM Szeged",
+"issued":"13.04.2023 01.01",
+
+"text":"Összeg: ",
+"styl":"size 01",
+"vari":"Dynamic02",
+"styl":"size 00",
+"feed":"nl",
+"text":"Kiadás időpontja:",
+"feed":"nl",
+"vari":"date us",	
+"vari":"time short",	
+"feed":"nl",
+"text":"Automata száma: ",
+"vari":"manu",
+"text":"Park.jegy sorsz.: ",
+"vari":"TickCtr",
+"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",
+"text":"Üf. szolg nyitvatartás:",
+"feed":"nl",
+"feed":"nl",
+"feed":"nl",
+}
+
+
--- a/etc/psa_config/DC2C_print07.json
+++ b/etc/psa_config/DC2C_print07.json
@@ -0,0 +1,22 @@
+{
+"title":"DC2C_pri07",
+"project":"DBM Szeged",
+"issued":"13.04.2023 01.01",
+
+"styl":"size 00",
+"text":"H - P: 7:45 - 17:00",
+"feed":"nl",
+"text":"Tel: (80) 820-500",
+"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",
+"feed":"nl",
+"feed":"eject",
+}
+
+
--- a/etc/psa_config/DC2C_print08.json
+++ b/etc/psa_config/DC2C_print08.json
@@ -0,0 +1,8 @@
+{
+"title":"DC2C_pri08",
+"project":"empty template",
+"issued":"09.06.2023 01.01",
+"styl":"size 10"
+}
+
+
--- a/etc/psa_config/DC2C_print09.json
+++ b/etc/psa_config/DC2C_print09.json
@@ -0,0 +1,40 @@
+{
+"title":"DC2C_pri09",
+"project":"DBM Szeged cash day",
+"issued":"13.04.2023 01.02",
+"styl":"font 08",
+"styl":"size 10",
+"feed":"margin02",
+"feed":"rim02",
+"text":"PARKOLÓJEGY",
+"styl":"size 00",
+"feed":"nl",
+"text":"Cash day ticket",
+"feed":"nl",
+"text":"Kérjük az elsö szélvédö",
+"feed":"nl",
+"text":"mögé jól láthatóan", 
+"feed":"nl",
+"text":"elhelyezni!",
+"feed":"nl",
+"text":"A PARKOLÓ NEM ÕRZÖTT",
+"feed":"nl",
+"feed":"nl",
+"text":"Rendszám: ",
+"vari":"Dynamic01",
+"feed":"nl",
+"text":"Parkolási idõ vége:",
+"feed":"nl",
+"styl":"size 01",
+"vari":"Dynamic04",
+"vari":"Dynamic03",
+"styl":"size 00",
+"feed":"nl",
+"text":"Parkolás helye: ",
+"feed":"nl",
+"vari":"location",
+"feed":"nl",
+"feed":"nl",
+}
+
+
--- a/etc/psa_config/DC2C_print10.json
+++ b/etc/psa_config/DC2C_print10.json
@@ -0,0 +1,39 @@
+{
+"title":"DC2C_pri10",
+"project":"DBM Szeged",
+"issued":"13.04.2023 01.01",
+
+"text":"Összeg: ",
+"styl":"size 01",
+"vari":"Dynamic02",
+"styl":"size 00",
+"feed":"nl",
+"text":"Kiadás időpontja:",
+"feed":"nl",
+"vari":"date us",	
+"vari":"time short",	
+"feed":"nl",
+"text":"Automata száma: ",
+"vari":"manu",
+"text":"Park.jegy sorsz.: ",
+"vari":"TickCtr",
+"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",
+"text":"Üf. szolg nyitvatartás:",
+"feed":"nl",
+"feed":"nl",
+"feed":"nl",
+}
+
+
--- a/etc/psa_config/DC2C_print11.json
+++ b/etc/psa_config/DC2C_print11.json
@@ -0,0 +1,22 @@
+{
+"title":"DC2C_pri11",
+"project":"DBM Szeged",
+"issued":"13.04.2023 01.01",
+
+"styl":"size 00",
+"text":"H - P: 7:45 - 17:00",
+"feed":"nl",
+"text":"Tel: (80) 820-500",
+"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",
+"feed":"nl",
+"feed":"eject",
+}
+
+
--- a/etc/psa_config/DC2C_print12.json
+++ b/etc/psa_config/DC2C_print12.json
@@ -0,0 +1,8 @@
+{
+"title":"DC2C_pri12",
+"project":"empty template",
+"issued":"09.06.2023 01.01",
+"styl":"size 10"
+}
+
+
--- a/etc/psa_config/DC2C_print13.json
+++ b/etc/psa_config/DC2C_print13.json
@@ -0,0 +1,40 @@
+{
+"title":"DC2C_pri13",
+"project":"DBM Szeged card day",
+"issued":"13.04.2023 01.02",
+"styl":"font 08",
+"styl":"size 10",
+"feed":"margin02",
+"feed":"rim02",
+"text":"PARKOLÓJEGY",
+"styl":"size 00",
+"feed":"nl",
+"text":"card pay day",
+"feed":"nl",
+"text":"Kérjük az elsö szélvédö",
+"feed":"nl",
+"text":"mögé jól láthatóan", 
+"feed":"nl",
+"text":"elhelyezni!",
+"feed":"nl",
+"text":"A PARKOLÓ NEM ÕRZÖTT",
+"feed":"nl",
+"feed":"nl",
+"text":"Rendszám: ",
+"vari":"Dynamic01",
+"feed":"nl",
+"text":"Parkolási idõ vége:",
+"feed":"nl",
+"styl":"size 01",
+"vari":"Dynamic04",
+"vari":"Dynamic03",
+"styl":"size 00",
+"feed":"nl",
+"text":"Parkolás helye: ",
+"feed":"nl",
+"vari":"location",
+"feed":"nl",
+"feed":"nl",
+}
+
+
--- a/etc/psa_config/DC2C_print14.json
+++ b/etc/psa_config/DC2C_print14.json
@@ -0,0 +1,39 @@
+{
+"title":"DC2C_pri14",
+"project":"DBM Szeged",
+"issued":"13.04.2023 01.01",
+
+"text":"Összeg: ",
+"styl":"size 01",
+"vari":"Dynamic02",
+"styl":"size 00",
+"feed":"nl",
+"text":"Kiadás időpontja:",
+"feed":"nl",
+"vari":"date us",	
+"vari":"time short",	
+"feed":"nl",
+"text":"Automata száma: ",
+"vari":"manu",
+"text":"Park.jegy sorsz.: ",
+"vari":"TickCtr",
+"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",
+"text":"Üf. szolg nyitvatartás:",
+"feed":"nl",
+"feed":"nl",
+"feed":"nl",
+}
+
+
--- a/etc/psa_config/DC2C_print15.json
+++ b/etc/psa_config/DC2C_print15.json
@@ -0,0 +1,22 @@
+{
+"title":"DC2C_pri15",
+"project":"DBM Szeged park_coins",
+"issued":"13.04.2023 01.01",
+
+"styl":"size 00",
+"text":"H - P: 7:45 - 17:00",
+"feed":"nl",
+"text":"Tel: (80) 820-500",
+"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",
+"feed":"nl",
+"feed":"eject",
+}
+
+
--- a/etc/psa_config/DC2C_print16.json
+++ b/etc/psa_config/DC2C_print16.json
@@ -0,0 +1,8 @@
+{
+"title":"DC2C_pri16",
+"project":"empty template",
+"issued":"09.06.2023 01.01",
+"styl":"size 10"
+}
+
+
--- a/etc/psa_config/DC2C_print17.json
+++ b/etc/psa_config/DC2C_print17.json
@@ -0,0 +1,32 @@
+{
+"title":"DC2C_pri17",
+"styl":"align l",
+"feed":"margin01",
+"feed":"nl",
+"feed":"nl",
+"feed":"nl",
+"feed":"part",
+"text":"Utazzon tovább "
+"text":"közösségi "
+"text":"közle-"
+"text":"kedéssel! Ehhez a "
+"text":"leválasztható"
+"text":" szelvényhez a közösségi "
+"text":"közle- "
+"text":"kedési járművek (villa"
+"text":"mos, helyi- jár"
+"text":"atos busz,troli"
+"text":"busz,vasút",
+"text":"villa-mos) ba",
+"text":"nkkártyás fedélzeti "
+"text":"jegy-  kiadó automatá"
+"text":"iból,illetve"
+"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 "
+
+
--- a/etc/psa_config/DC2C_print18.json
+++ b/etc/psa_config/DC2C_print18.json
@@ -0,0 +1,21 @@
+"title":"DC2C_pri18",
+"styl":"align l",
+"feed":"margin01",
+"text":"fizető ",
+"text":"parkolás na"
+"text":"pijegyhez vál-   tott "
+"text":"kiegészítő "
+"text":"Körút napijegy"
+"text":" vá-sárolható "
+"text":"(ára 440,-Ft)"
+"text":"1 fő részé-re."
+"text":" Ez a napijegy "
+"text":"Szeged, Nagy- körút"
+"text":"ig bezárólag illet"
+"text":"ve a Nagy- kör"
+"text":"úton túli első "
+"text":"megálló"
+"text":"helytől"
+"text":"    agy megálló"
+"text":"helyig kor"
+"text":"látlan uta-"
--- a/etc/psa_config/DC2C_print19.json
+++ b/etc/psa_config/DC2C_print19.json
@@ -0,0 +1,31 @@
+{
+"title":"DC2C_pri19",
+"styl":"align l",
+"feed":"margin01",
+"text":"vagy megálló"
+"text":"helyig kor"
+"text":"látlan uta-"
+"text":"zás"
+"text":"ra érvényes a "
+"text":"parkolás nap-"
+"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",
--- a/etc/psa_config/DC2C_print20.json
+++ b/etc/psa_config/DC2C_print20.json
@@ -0,0 +1,9 @@
+{
+"title":"DC2C_pri20",
+"project":"empty template",
+"issued":"09.06.2023 01.01",
+"styl":"size 10"
+
+}
+
+
--- a/etc/psa_config/DC2C_print22.json
+++ b/etc/psa_config/DC2C_print22.json
@@ -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"
-}
--- a/etc/psa_config/DC2C_print25.json
+++ b/etc/psa_config/DC2C_print25.json
@@ -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"
-}
--- a/etc/psa_config/DC2C_print28.json
+++ b/etc/psa_config/DC2C_print28.json
@@ -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"
-
-}
--- a/etc/psa_config/DC2C_print29.json
+++ b/etc/psa_config/DC2C_print29.json
@@ -0,0 +1,24 @@
+{
+"title":"DC2C_pri29",
+"project":"ATB test",
+"issued":"24.05.2023 01.00",
+"styl":"font 08",
+"styl":"size 11",
+"feed":"margin02",
+"feed":"rim02",
+"text":"All 8 Variables:",
+"feed":"nl",
+"vari":"Dynamic01",
+"vari":"Dynamic02",
+"vari":"Dynamic03",
+"vari":"Dynamic04",
+"vari":"Dynamic05",
+"vari":"Dynamic06",
+"vari":"Dynamic07",
+"vari":"Dynamic08",
+"feed":"eject",
+
+
+}
+
+
--- a/etc/psa_config/DC2C_print32.json
+++ b/etc/psa_config/DC2C_print32.json
@@ -0,0 +1,39 @@
+{
+"title":"DC2C_pri32",
+"project":"DBM Szeged door",
+"issued":"18.04.2023 01.01",
+"styl":"font 08",
+"styl":"size 10",
+"feed":"margin02",
+"feed":"rim02",
+"styl":"size 11",
+"text":"AJTÓ NYITÁS",
+"feed":"nl",
+"styl":"size 00",
+"text":"Door closed",
+"feed":"nl",
+"feed":"nl",
+"text":"CuNu: ",
+"vari":"cunu",	
+"text":"MaNu: ",
+"vari":"manu",	
+"text":"Place: ",
+"vari":"location",	
+"text":"Group: ",
+"vari":"group",	
+"text":"Zone: ",
+"vari":"zone",	
+"text":"Name: ",
+"vari":"alias",	
+"text":"Date: ",
+"vari":"date us",
+"text":"Time: ",
+"vari":"time long",
+"feed":"nl",
+"text":" * * * * * * * * ",
+"feed":"nl",
+"feed":"nl",
+"feed":"eject",
+}
+
+
--- a/etc/psa_tariff/tariff01.json
+++ b/etc/psa_tariff/tariff01.json
--- a/etc/psa_tariff/tariff02.json
+++ b/etc/psa_tariff/tariff02.json
--- a/etc/psa_tariff/tariff03.json
+++ b/etc/psa_tariff/tariff03.json
--- a/etc/psa_tariff/tariff04.json
+++ b/etc/psa_tariff/tariff04.json
--- a/etc/psa_tariff/tariff05.json
+++ b/etc/psa_tariff/tariff05.json
@@ -1,851 +0,0 @@
-{
-  "Project" :   "Szeged Zone 5",
-  "Version" :   "1.0.1",
-  "Info"    :   "6723",
-  "Currency": [
-    {
-      "pcu_id": 2,
-      "pcu_sign": "Ft",
-      "pcu_major": "HUF",
-      "pcu_minor": "",
-      "pcu_active": true
-    }
-  ],
-  "PaymentMethod": [
-    {
-      "pme_id": 1,
-      "pme_label": "progressive"
-    },
-    {
-      "pme_id": 2,
-      "pme_label": "degressive"
-    },
-    {
-      "pme_id": 3,
-      "pme_label": "linear"
-    },
-    {
-      "pme_id": 4,
-      "pme_label": "steps"
-    }
-  ],
-  "PaymentOption": [
-    {
-      "pop_id": 1081,
-      "pop_label": "Zone Gelb Mars 5",
-      "pop_payment_method_id": 3,
-      "pop_day_end_time": "15:08:00",
-      "pop_day_night_end_time": "15:08:00",
-      "pop_price_night": 0,
-      "pop_min_time": 15,
-      "pop_max_time": 360,
-      "pop_min_price": 90,
-      "pop_carry_over": 1,
-      "pop_daily_card_price": 2160,
-      "pop_multi_hour_price": 0
-    }
-  ],
-  "PaymentRate": [
-    {
-      "pra_payment_option_id": 1081,
-      "pra_payment_unit_id": 1,
-      "pra_price": 360
-    }
-  ],
-  "Duration": [
-    {
-      "pun_id": 1,
-      "pun_label": "1h",
-      "pun_duration": 60
-    },
-    {
-      "pun_id": 3,
-      "pun_label": "15 min",
-      "pun_duration": 15
-    },
-    {
-      "pun_id": 4,
-      "pun_label": "1 min",
-      "pun_duration": 1
-    },
-    {
-      "pun_id": 5,
-      "pun_label": "Voller Tag",
-      "pun_duration": 1441
-    }
-  ],
-  "WeekDaysWorktime": [
-    {
-      "pwd_id": 632,
-      "pwd_period_week_day_id": 37,
-      "pwd_period_day_in_week_id": 1,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "18:00:00"
-    },
-    {
-      "pwd_id": 633,
-      "pwd_period_week_day_id": 37,
-      "pwd_period_day_in_week_id": 2,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "18:00:00"
-    },
-    {
-      "pwd_id": 634,
-      "pwd_period_week_day_id": 37,
-      "pwd_period_day_in_week_id": 3,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "18:00:00"
-    },
-    {
-      "pwd_id": 635,
-      "pwd_period_week_day_id": 37,
-      "pwd_period_day_in_week_id": 4,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "18:00:00"
-    },
-    {
-      "pwd_id": 636,
-      "pwd_period_week_day_id": 37,
-      "pwd_period_day_in_week_id": 5,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "18:00:00"
-    },
-    {
-      "pwd_id": 637,
-      "pwd_period_week_day_id": 37,
-      "pwd_period_day_in_week_id": 6,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "12:00:00"
-    }
-  ],
-  "PeriodYear": [
-    {
-      "pye_id": 2,
-      "pye_label": "Whole year",
-      "pye_start_month": 1,
-      "pye_start_day": 1,
-      "pye_end_month": 12,
-      "pye_end_day": 31
-    },
-    {
-      "pye_id": 9,
-      "pye_label": "Whole year",
-      "pye_start_month": 1,
-      "pye_start_day": 1,
-      "pye_end_month": 12,
-      "pye_end_day": 31
-    },
-    {
-      "pye_id": 10,
-      "pye_label": "Whole year",
-      "pye_start_month": 1,
-      "pye_start_day": 1,
-      "pye_end_month": 12,
-      "pye_end_day": 31
-    },
-    {
-      "pye_id": 11,
-      "pye_label": "Whole Year",
-      "pye_start_month": 1,
-      "pye_start_day": 1,
-      "pye_end_month": 12,
-      "pye_end_day": 31
-    },
-    {
-      "pye_id": 12,
-      "pye_label": "Whole Year",
-      "pye_start_month": 1,
-      "pye_start_day": 1,
-      "pye_end_month": 12,
-      "pye_end_day": 31
-    },
-    {
-      "pye_id": 13,
-      "pye_label": "Whole Year",
-      "pye_start_month": 1,
-      "pye_start_day": 1,
-      "pye_end_month": 12,
-      "pye_end_day": 31
-    },
-    {
-      "pye_id": 14,
-      "pye_label": "Whole Year",
-      "pye_start_month": 1,
-      "pye_start_day": 1,
-      "pye_end_month": 12,
-      "pye_end_day": 31
-    },
-    {
-      "pye_id": 15,
-      "pye_label": "Whole year",
-      "pye_start_month": 1,
-      "pye_start_day": 1,
-      "pye_end_month": 12,
-      "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
-    }
-  ],
-  "SpecialDays": [
-    {
-      "ped_id": 1,
-      "ped_label": "Republic Day (Hungary)",
-      "ped_date_start": "2026-10-23",
-      "ped_date_end": "2026-10-23",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2,
-      "ped_label": "Good Friday",
-      "ped_date_start": "2026-04-03",
-      "ped_date_end": "2026-04-03",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 3,
-      "ped_label": "NewYear 27",
-      "ped_date_start": "2027-01-01",
-      "ped_date_end": "2027-01-01",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 4,
-      "ped_label": "NewYear extended 26",
-      "ped_date_start": "2026-01-02",
-      "ped_date_end": "2026-01-02",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 5,
-      "ped_label": "Easter Sunday",
-      "ped_date_start": "2026-04-05",
-      "ped_date_end": "2026-04-05",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 6,
-      "ped_label": "Easter Monday",
-      "ped_date_start": "2026-04-06",
-      "ped_date_end": "2026-04-06",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 7,
-      "ped_label": "Whit Sunday",
-      "ped_date_start": "2025-06-08",
-      "ped_date_end": "2025-06-08",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 8,
-      "ped_label": "Whit Monday",
-      "ped_date_start": "2026-05-25",
-      "ped_date_end": "2026-05-25",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 9,
-      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2026-03-15",
-      "ped_date_end": "2026-03-15",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 10,
-      "ped_label": "Labour Day",
-      "ped_date_start": "2026-05-01",
-      "ped_date_end": "2026-05-01",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 11,
-      "ped_label": "",
-      "ped_date_start": "2026-08-21",
-      "ped_date_end": "2026-08-21",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 12,
-      "ped_label": "Saint Stephens Day (Hungary)",
-      "ped_date_start": "2026-08-20",
-      "ped_date_end": "2026-08-20",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 13,
-      "ped_label": "All Saints Day",
-      "ped_date_start": "2026-11-01",
-      "ped_date_end": "2026-11-01",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 14,
-      "ped_label": "Christmas 1st day",
-      "ped_date_start": "2026-12-25",
-      "ped_date_end": "2026-12-25",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 15,
-      "ped_label": "Christmas 2nd day",
-      "ped_date_start": "2026-12-26",
-      "ped_date_end": "2026-12-26",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 16,
-      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "",
-      "ped_date_end": "",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 17,
-      "ped_label": "Christmas 4th day",
-      "ped_date_start": "",
-      "ped_date_end": "",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 18,
-      "ped_label": "Christmas (Sunday)",
-      "ped_date_start": "2026-12-24",
-      "ped_date_end": "2026-12-24",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 19,
-      "ped_label": "Christmas 1st day",
-      "ped_date_start": "2025-12-25",
-      "ped_date_end": "2025-12-25",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 20,
-      "ped_label": "Christmas 2nd day",
-      "ped_date_start": "2025-12-26",
-      "ped_date_end": "2025-12-26",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 21,
-      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "",
-      "ped_date_end": "",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 22,
-      "ped_label": "Christmas",
-      "ped_date_start": "2025-12-24",
-      "ped_date_end": "2025-12-24",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	
-	{
-      "ped_id": 30,
-      "ped_label": "Saturday 25",
-      "ped_date_start": "2025-12-06",
-      "ped_date_end": "2025-12-06",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 31,
-      "ped_label": "Saturday 25",
-      "ped_date_start": "2025-12-20",
-      "ped_date_end": "2025-12-20",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 32,
-      "ped_label": "Saturday 25",
-      "ped_date_start": "2025-12-27",
-      "ped_date_end": "2025-12-27",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 33,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-01-03",
-      "ped_date_end": "2026-01-03",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 34,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-01-17",
-      "ped_date_end": "2026-01-17",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 34,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-01-24",
-      "ped_date_end": "2026-01-24",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 35,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-01-31",
-      "ped_date_end": "2026-01-31",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 36,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-02-07",
-      "ped_date_end": "2026-02-07",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 37,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-02-14",
-      "ped_date_end": "2026-02-14",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 38,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-02-21",
-      "ped_date_end": "2026-02-21",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 38,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-02-28",
-      "ped_date_end": "2026-02-28",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 39,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-03-07",
-      "ped_date_end": "2026-03-07",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 40,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-03-14",
-      "ped_date_end": "2026-03-14",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 41,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-03-21",
-      "ped_date_end": "2026-03-21",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 42,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-03-28",
-      "ped_date_end": "2026-03-28",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 43,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-04-04",
-      "ped_date_end": "2026-04-04",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 44,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-04-11",
-      "ped_date_end": "2026-04-11",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 45,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-04-18",
-      "ped_date_end": "2026-04-18",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 46,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-04-25",
-      "ped_date_end": "2026-04-25",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 47,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-05-02",
-      "ped_date_end": "2026-05-02",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 48,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-05-09",
-      "ped_date_end": "2026-05-09",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 49,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-05-16",
-      "ped_date_end": "2026-05-16",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 50,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-05-23",
-      "ped_date_end": "2026-05-23",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 51,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-05-30",
-      "ped_date_end": "2026-05-30",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 52,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-06-06",
-      "ped_date_end": "2026-06-06",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 53,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-06-13",
-      "ped_date_end": "2026-06-13",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 54,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-06-20",
-      "ped_date_end": "2026-06-20",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 55,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-06-27",
-      "ped_date_end": "2026-06-27",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 56,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-07-04",
-      "ped_date_end": "2026-07-04",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 57,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-07-11",
-      "ped_date_end": "2026-07-11",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 58,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-07-18",
-      "ped_date_end": "2026-07-18",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 59,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-07-25",
-      "ped_date_end": "2026-07-25",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 60,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-08-01",
-      "ped_date_end": "2026-08-01",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 61,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "",
-      "ped_date_end": "",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 62,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-08-15",
-      "ped_date_end": "2026-08-15",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 63,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-08-22",
-      "ped_date_end": "2026-08-22",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 64,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-08-29",
-      "ped_date_end": "2026-08-29",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 65,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-09-05",
-      "ped_date_end": "2026-09-05",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 66,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-09-12",
-      "ped_date_end": "2026-09-12",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 67,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-09-19",
-      "ped_date_end": "2026-09-19",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 68,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-09-26",
-      "ped_date_end": "2026-09-26",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 69,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-10-03",
-      "ped_date_end": "2026-10-03",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 70,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-10-10",
-      "ped_date_end": "2026-10-10",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 71,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-10-17",
-      "ped_date_end": "2026-10-17",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 72,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-10-24",
-      "ped_date_end": "2026-10-24",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 73,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-10-31",
-      "ped_date_end": "2026-10-31",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 74,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-11-07",
-      "ped_date_end": "2026-11-07",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 75,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-11-14",
-      "ped_date_end": "2026-11-14",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 76,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-11-21",
-      "ped_date_end": "2026-11-21",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 77,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-11-28",
-      "ped_date_end": "2026-11-28",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 78,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-12-05",
-      "ped_date_end": "2026-12-05",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 79,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "",
-      "ped_date_end": "",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 80,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-12-19",
-      "ped_date_end": "2026-12-19",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 81,
-      "ped_label": "Saturday 26",
-      "ped_date_start": "2026-12-26",
-      "ped_date_end": "2026-12-26",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 82,
-      "ped_label": "Saturday 27",
-      "ped_date_start": "2027-01-02",
-      "ped_date_end": "2027-01-02",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 83,
-      "ped_label": "reserve",
-      "ped_date_start": "",
-      "ped_date_end": "",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 84,
-      "ped_label": "reserve",
-      "ped_date_start": "",
-      "ped_date_end": "",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-	{
-      "ped_id": 85,
-      "ped_label": "reserve",
-      "ped_date_start": "",
-      "ped_date_end": "",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    }
-	
-  ]
-}
-
-
-
-
--- a/etc/psa_tariff/tariff06.json
+++ b/etc/psa_tariff/tariff06.json
--- a/etc/psa_update/opkg_commands
+++ b/etc/psa_update/opkg_commands
@@ -1,20 +1,29 @@
-###############################################################################
-#                          !!! NOTE !!!
-###############################################################################
-# opkg-commands added to this file will be executed by ATBUpdateTool.          
-###############################################################################
-##
+# opkg prefix will be added inside evaluating script
+#
+# package manipulation commands without package:
+# update, upgrade, clean
+# 
+# 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 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.11+git0+66f98a3bef-r0
-opkg --cache /var/cache/opkg --download-only upgrade apism=1.7.0-r1
-# 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.11+git0+66f98a3bef-r0
-opkg --cache /var/cache/opkg upgrade apism=1.7.0-r1
+#opkg install atbqt
+#opkg install atb-plugin-cc-iself
+#opkg install atb-plugin-dc
+#opkg install libdevicecontroller
+opkg install ptu5-gitinstaller
--- a/opt/app/ATBAPP/tariff.current
+++ b/opt/app/ATBAPP/tariff.current
@@ -0,0 +1 @@
+"VERSION":"0.1.0","PROJECT":"szeged","ZONE":1,"INFO":"summer sale","LOADED":"2022-06-02T21:57:29"
Author	SHA1	Message	Date
Gerhard Hoffmann	ef3c2ae212	Set daily_card_price to 2400 for zone4	2023-06-27 14:19:03 +02:00
Siegfried Siegert	5c312820bb	opkg install ptu5-gitinstaller	2023-06-27 12:13:26 +02:00
Siegfried Siegert	d98794f6bf	Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1	2023-06-27 11:59:54 +02:00
Siegfried Siegert	19b84dc37d	Force update opkg	2023-06-22 19:13:00 +02:00
Siegfried Siegert	0ddc9a3c5d	Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1	2023-06-22 19:11:19 +02:00
Gerhard Hoffmann	fd6798cbc0	Add all DC2C_print*.json files for Szeged. Add DC2C_conf/cash/device.json.	2023-06-22 12:11:26 +02:00
Gerhard Hoffmann	c9748ad177	made non-executable	2023-06-22 12:10:19 +02:00
Gerhard Hoffmann	34838567ae	delete unused files	2023-06-22 12:09:31 +02:00
Gerhard Hoffmann	c934e6b341	deleted obsolete file	2023-06-22 12:07:29 +02:00
Gerhard Hoffmann	01c063e3e4	deleted file as in the wrong location	2023-06-22 12:06:59 +02:00
Gerhard Hoffmann	046d16651a	Update json configuration files.	2023-06-22 12:01:35 +02:00
Gerhard Hoffmann	5c170821fc	Add new DC2C config file for device configuration	2023-06-22 11:59:00 +02:00
Gerhard Hoffmann	bac8368079	create link dc2c.bin -> dc2c.4.33.bin	2023-06-21 08:55:41 +02:00
Gerhard Hoffmann	6ee9d22e6e	delete link, reset as next step	2023-06-21 08:54:53 +02:00
Gerhard Hoffmann	8fbae9e16d	Add device controller firmware dc2c.4.33.bin	2023-06-21 08:52:08 +02:00
Gerhard Hoffmann	7a790e442f	Write $line to checkout_history-file only once	2023-06-20 16:06:33 +02:00
Gerhard Hoffmann	68d5205530	re-test post-merge-hook	2023-06-20 15:26:38 +02:00
Gerhard Hoffmann	d1cffff1ba	test for post-merge-hook	2023-06-20 12:36:01 +02:00
Gerhard Hoffmann	7c77f1fe11	Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_281 into zg1/zone1	2023-06-19 17:10:36 +02:00
Gerhard Hoffmann	2b10e4df93	add new opkg commands: install atbqt, atb-plugin-cc-iself, atb-plugin-dc, libdevicecontroller	2023-06-19 17:10:28 +02:00
Siegfried Siegert	9528fa5ffc	Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1	2023-06-19 10:38:53 +02:00
Gerhard Hoffmann	1780e75ac9	testing 16:03	2023-06-05 16:03:41 +02:00
Gerhard Hoffmann	d71556abba	testing 16:00	2023-06-05 16:00:49 +02:00
Gerhard Hoffmann	e6342a1e8f	check for existence of opkg_commands-file (2)	2023-06-05 15:58:01 +02:00
Gerhard Hoffmann	72e9e645a1	check for existence of opkg_commands-file	2023-06-05 15:51:30 +02:00
Gerhard Hoffmann	530327e20d	testing 15:39	2023-06-05 15:39:28 +02:00
Gerhard Hoffmann	0a3bfde486	testing 15:26	2023-06-05 15:26:16 +02:00
Gerhard Hoffmann	94bde10396	testing 15:22	2023-06-05 15:23:07 +02:00
Gerhard Hoffmann	b66848bb75	use the link dc2c.bin and do not add timestamp into file	2023-06-05 15:20:18 +02:00
Gerhard Hoffmann	42317e7660	testing 15:11	2023-06-05 15:11:49 +02:00
Gerhard Hoffmann	605461897e	testing new update_psa	2023-06-05 13:59:25 +02:00
				`@@ -0,0 +1 @@`
				`"VERSION":"0.1.0","PROJECT":"szeged","ZONE":1,"INFO":"summer sale","LOADED":"2022-06-02T21:57:29"`