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

.githooks/post-checkout

@@ -1,4 +1,75 @@
-echo "POST-CHECKOUT"
+#!/bin/bash -
-echo "PREV-HEAD=$1"
+# echo "POST-CHECKOUT"
-echo "CURR-HEAD=$2"
+# echo "PREV-HEAD=$1"
-echo "BRANCH-CHECKOUT=$3"
+# 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"
+
+write_log_file () {
+    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
+            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
+

.githooks/post-merge

@@ -11,11 +11,9 @@ if [ -z $IFS ]; then
     IFS=$'\n'
 fi
 
-GIT_PULL_TMP=/tmp/git_changed_files_for_last_pull
+GIT_UPDATE_LOG=/opt/app/tools/atbupdate/update_log.csv
-OPKG_CMDS_TMP=/tmp/opkg_commands
 
-rm -f $GIT_PULL_TMP
+#TODO: use in UpdateController
-rm -f $OPKG_CMDS_TMP
 
 get_blob () {   # get the blob of the file(name) passed as $1
                 # note: this can be used for any file in the filesystem
@@ -29,26 +27,30 @@ get_commit_for_blob () {
            grep -q $1 && echo -n {} && head -n 1")
 }
 
-for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do
+write_log_file () {
-    if grep -E -q "(DC.*json|dc.*hex|dc.*bin|tariff.*json)" <<< $fn; then
+    local now=$(date +"%Y-%m-%dT%T")
-        # called in repository: $fn is e.g. etc/psa_tariff/tariff01.json
+    for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do
-        # add '/' prefix
+        if grep -qE "DC2C.*json" <<< $fn; then
-        fn=$(echo $fn | awk '{ printf "/"$0 }')
+            # called in repository: $fn is e.g. etc/psa_tariff/tariff01.json
-        if [[ -f "$fn" ]]; then
+            # add '/' prefix
-            blob=$(get_blob "$fn")
+            echo "DOWNLOAD, $(echo $fn | awk '{ printf "/"$0 }'), $now, N/A" >> "$GIT_UPDATE_LOG"
-            commit=$(get_commit_for_blob $blob "$fn")
+        elif grep -qE "dc2c.bin" <<< $fn; then
-            fsize=$(ls -l "$fn" | awk '{ print $5 }')
+            # download the file referenced by the link dc2c.bin
-            echo "$fn $fsize $blob $commit" >> $GIT_PULL_TMP
+            echo "DOWNLOAD, "/etc/dc/dc2c.bin", $now, N/A" >> "$GIT_UPDATE_LOG"
+        elif grep -qE ".*opkg_commands" <<< $fn; then
+            readarray opkg_commands < <(cat $fn)
+            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
-    fi
+    done
-    if grep -E -q ".*opkg_commands" <<< $fn; then
+}
-        readarray opkg_commands < <(cat $fn)
+
-        for opkg_c in "${opkg_commands[@]}"; do
+write_log_file
-            test -z $opkg_c && continue;
+
-            test ! -z $(grep -E "^\s*[#]+.*$" <<< $opkg_c) && continue
-            echo -n "$opkg_c" | tr -d '\n\r' >> $OPKG_CMDS_TMP 2>&1
-            echo "" >> $OPKG_CMDS_TMP 2>&1
-        done
-        source "$fn"
-    fi
-done

etc/atb/ATBAPP.ini

@@ -1,100 +0,0 @@
-[COMMON]
-com_port_name=/dev/ttyS1
-com_baud_rate=9600
-lang1=hu_HU
-lang2=en_GB
-lang3=de_DE
-lang4=sr
-lang5=ro_RO
-
-
-defaultLanguage=1
-
-showInfoButton=false
-showHelpButton=false
-
-CharacterSet="ISO 8859-2"
-
-#useLanguage=[128+][64+][32+][16]
-useLanguage=248
-#usePayment=[128+][64+][32+][16]
-usePayment=96
-#useVehicle=[128+][64+][32+][16+][8]
-useVehicle=240
-#useProduct=[128+][64+][32+][16+][8]
-useProduct=240
-
-textfile=/opt/app/ATBAPP/text/HMI_Texte.xml
-logfile=/var/log/atbqt.log
-alternativeLogoFile=
-
-feature_Log=off
-feature_TouchFeedback=off
-feature_DisplayControl=off
-feature_SystemSuspend=off
-feature_StartButton=on
-feature_selfOOO=off
-feature_DBusDisplayControl=on
-feature_DBusSuspendControl=on
-feature_ShowParkingTime=off
-
-suspend_methode=sysfs
-suspend_program=
-suspend_time=8
-
-touch_feedback_gpio=121
-touch_feedback_on_value=1
-touch_feedback_off_value=0
-
-#ooo_mode={useDisk|otherMachine}
-ooo_mode=otherMachine
-sellTimeout_time=60
-
-showInfoButton=false
-showHelpButton=false
-
-useAppStates=1
-statefile=/opt/app/ATBAPP/states/APP_States.xml
-
-[SCREENCONFIG]
-sc_31="1,1,0"
-sc_33="1,0,1"
-sc_3F="1,0,0"
-sc_40="1,0,1"
-sc_41="1,0,1"
-sc_35="0,0,0"
-sc_51="1,0,1"
-sc_52="1,0,0"
-sc_53="1,0,0"
-
-
-[PLUGINS]
-CCPlugin=IngenicoISelf_CCPlugin
-CalculatePricePlugin=MOBILISIS_CalculatePricePlugin
-DeviceControllerPlugin=ATBDeviceControllerPlugin
-
-
-[IngenicoISelf_CCPlugin]
-debug=1
-PortName=/dev/ttymxc0
-ZVT=DE
-sleep=1
-sleepExtended=1
-Currency=HUF
-
-
-[TCP_CONTROL]
-enable=1
-
-
-[PAYMENT]
-currencySymbol=€
-cashVariant=CoinsOnly
-paymentPointInTime=poa
-
-
-[MOBILISIS_CalculatePricePlugin]
-useDebug=1
-
-[ATBDeviceControllerPlugin]
-serialPort=ttymxc2

etc/atb/SystemControl.ini

@@ -1,51 +0,0 @@
-[COMMON]
-startBacklightController=1
-startSuspendController=1
-startMonitoringController=0
-startMQTTController=0
-
-[BACKLIGHT]
-inputBrightness=80
-curve=1
-dimLowValue=1
-
-SensorMax=3500
-SensorMin=0
-dimMin=20
-dimMax=100
-
-[SUSPEND]
-program=/home/root/system_powerdown_wakeup.sh
-
-
-[MONITORING]
-protocol=mqtt
-
-useDeviceId=on
-monitoring_heartbeatInterval=60
-
-[MQTT]
-mqtt_host=mqtt2.atb-comm.de
-mqtt_port=8883
-mqtt_username=testuser
-mqtt_password=xyz123
-mqtt_useSsl=on
-mqtt_debug=on
-mqtt_QoS=0
-mqtt_TopicScheme=ATB_ISMAS
-mqtt_TopicDeviceType=MP
-mqtt_TopicPrefix=ATB
-
-[NETWORKCHECK]
-useNetworkCheck=on
-setOOO=off
-PingHost=google.com
-networkRestart="/sbin/ifup -a"
-
-[AT_TASKS]
-size=1
-1\id=PTU5UPDATE
-1\program="/opt/app/tools/atbupdate/PTUGitInstaller"
-1\arguments=-q,--platform,wayland
-1\envs=QT_QPA_EGLFS_KMS_ATOMIC=1,QT_QPA_EGLFS_ALWAYS_SET_MODE=1,XDG_RUNTIME_DIR=/var/run/user/0
-1\hourOfDay=1

etc/dc/dc2c.bin

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

etc/psa_config/DC2C_cash.json

@@ -1,16 +1,17 @@
 {	     
 "title":"DC2C_cash  ",
 "project":"DBM Szeged",
-"version":"13.02.2023 12:20 00001",
+"version":"22.03.2023 11:59 01.02.03",
-"localCoinAccept(7..0)":[0,0,0,1,1,1,1,1],
+"CoinDenom(15..0)":[200,100,50,0,0,0,0,100,200,100,50,20,10,5,0,3],
-"Name of Currency":"Huf",
+"CoinValue(15..0)":[760,380,190,0,0,0,0,100,200,100,50,20,10,5,0,3],
-"local tax rate":20,
+"CoinAccept(15..0)":[1,1,1,0,0,0,0,1,1,1,1,1,1,1,0,1],
-"foreignCoinAccept(15..8)":[0,0,0,0,0,1,1,1],
+"ExchangeRate":378
-"CurrencyName":"EUR",
+"TokenChannel":1,
-"foreign tax rate":19,
+"BillValues(7..0)":[0,0,0,0,0,0,0,0],
-"TokenChannel":3,
+"LocalTaxRate":20,
-"Bills(7..0)":[0,0,0,0,0,0,0,0],
+"ForeignTaxRate":19,
-"surcharge":0,	
+"Surcharge":0,	
-"discount":0,
+"Discount":0,	
-"":""
+
 }
+

etc/psa_config/DC2C_conf.json

@@ -3,11 +3,10 @@
 "project":"DBM Szeged",
 "version":"13.02.2023 12:20 00001",
 "custNum":281,
-"machNum":999,
+"machNum":997,
 "borough":1,
 "zone":1,
-"alias":1357,
+"alias":997,
-"location":"92637Weiden/Opf_Bahnhofstraße 65",
+"location":"ATB Thomas' office"
-"":""
 }
 

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
+
+}
+

etc/psa_config/DC2C_print01.json

@@ -1,36 +1,40 @@
 {
 "title":"DC2C_pri01",
-"project":"DBM Szeged park_coins",
+"project":"DBM Szeged coins hour",
-"issued":"13.04.2023 01.01",
+"issued":"13.04.2023 01.02",
-"styl":"size 01",
+"styl":"font 08",
+"styl":"size 10",
+"feed":"margin02",
+"feed":"rim02",
 "text":"PARKOLÓJEGY",
-"styl":"size 11",
-"feed":"nl",
-"text":"Nyugta",
 "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!",
+"text":"A PARKOLÓ NEM ÕRZÖTT",
+"feed":"nl",
 "feed":"nl",
-"styl":"size 10",
 "text":"Rendszám: ",
-"styl":"size 00",
-"feed":"nl",
 "vari":"Dynamic01",
 "feed":"nl",
 "text":"Parkolási idõ vége:",
-"vari":"Dynamic02",
-"vari":"Dynamic03",
 "feed":"nl",
-"text":"Parkolás helye:",
+"styl":"size 01",
-"vari":"location",
-"text":"Összeg: ",
 "vari":"Dynamic04",
+"vari":"Dynamic03",
+"styl":"size 00",
+"feed":"nl",
+"text":"Parkolás helye: ",
+"feed":"nl",
+"vari":"location",
+"feed":"nl",
 "feed":"nl",
-"":""
 }
 
+

etc/psa_config/DC2C_print02.json

@@ -2,12 +2,19 @@
 "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 long",	
+"vari":"time short",	
+"feed":"nl",
 "text":"Automata száma: ",
 "vari":"manu",
-"feed":"nl",
 "text":"Park.jegy sorsz.: ",
 "vari":"TickCtr",
 "feed":"nl",
@@ -25,7 +32,8 @@
 "feed":"nl",
 "text":"Üf. szolg nyitvatartás:",
 "feed":"nl",
-"":""
+"feed":"nl",
+"feed":"nl",
 }
 
 

etc/psa_config/DC2C_print03.json

@@ -2,6 +2,8 @@
 "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",
@@ -14,8 +16,7 @@
 "feed":"nl",
 "feed":"nl",
 "feed":"nl",
-"feed":"eject",i
+"feed":"eject",
-"":""
 }
 
 

etc/psa_config/DC2C_print04.json

@@ -1,5 +1,9 @@
-{
+{
-"title":"DC2C_pri04",
+"title":"DC2C_pri04",
-"version":"27.02.2023 12:20 00001",
+"project":"empty template",
-"":""
+"issued":"09.06.2023 01.01",
-}
+"styl":"size 10"
+
+}
+
+

etc/psa_config/DC2C_print05.json

@@ -1,5 +1,40 @@
-{
+{
-"title":"DC2C_pri05",
+"title":"DC2C_pri05",
-"version":"27.02.2023 12:20 00001",
+"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",
+}
+
+

etc/psa_config/DC2C_print06.json

@@ -1,5 +1,39 @@
-{
+{
-"title":"DC2C_pri06",
+"title":"DC2C_pri06",
-"version":"27.02.2023 12:20 00001",
+"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",
+}
+
+

etc/psa_config/DC2C_print07.json

@@ -1,5 +1,22 @@
-{
+{
-"title":"DC2C_pri07",
+"title":"DC2C_pri07",
-"version":"27.02.2023 12:20 00001",
+"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",
+}
+
+

etc/psa_config/DC2C_print08.json

@@ -1,5 +1,8 @@
-{
+{
-"title":"DC2C_pri08",
+"title":"DC2C_pri08",
-"version":"27.02.2023 12:20 00001",
+"project":"empty template",
-"":""
+"issued":"09.06.2023 01.01",
-}
+"styl":"size 10"
+}
+
+

etc/psa_config/DC2C_print09.json

@@ -1,5 +1,40 @@
-{
+{
-"title":"DC2C_pri09",
+"title":"DC2C_pri09",
-"version":"27.02.2023 12:20 00001",
+"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",
+}
+
+

etc/psa_config/DC2C_print10.json

@@ -1,5 +1,39 @@
-{
+{
-"title":"DC2C_pri10",
+"title":"DC2C_pri10",
-"version":"27.02.2023 12:20 00001",
+"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",
+}
+
+

etc/psa_config/DC2C_print11.json

@@ -1,5 +1,22 @@
-{
+{
-"title":"DC2C_pri11",
+"title":"DC2C_pri11",
-"version":"27.02.2023 12:20 00001",
+"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",
+}
+
+

etc/psa_config/DC2C_print12.json

@@ -1,5 +1,8 @@
-{
+{
-"title":"DC2C_pri12",
+"title":"DC2C_pri12",
-"version":"27.02.2023 12:20 00001",
+"project":"empty template",
-"":""
+"issued":"09.06.2023 01.01",
-}
+"styl":"size 10"
+}
+
+

etc/psa_config/DC2C_print13.json

@@ -1,5 +1,40 @@
-{
+{
-"title":"DC2C_pri13",
+"title":"DC2C_pri13",
-"version":"27.02.2023 12:20 00001",
+"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",
+}
+
+

etc/psa_config/DC2C_print14.json

@@ -1,5 +1,39 @@
-{
+{
-"title":"DC2C_pri14",
+"title":"DC2C_pri14",
-"version":"27.02.2023 12:20 00001",
+"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",
+}
+
+

etc/psa_config/DC2C_print15.json

@@ -1,5 +1,22 @@
-{
+{
-"title":"DC2C_pri15",
+"title":"DC2C_pri15",
-"version":"27.02.2023 12:20 00001",
+"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",
+}
+
+

etc/psa_config/DC2C_print16.json

@@ -1,5 +1,8 @@
-{
+{
-"title":"DC2C_pri16",
+"title":"DC2C_pri16",
-"version":"27.02.2023 12:20 00001",
+"project":"empty template",
-"":""
+"issued":"09.06.2023 01.01",
-}
+"styl":"size 10"
+}
+
+

etc/psa_config/DC2C_print17.json

@@ -1,5 +1,32 @@
-{
+{
-"title":"DC2C_pri17",
+"title":"DC2C_pri17",
-"version":"27.02.2023 12:20 00001",
+"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 "
+
+

etc/psa_config/DC2C_print18.json

@@ -1,5 +1,21 @@
-{
+"title":"DC2C_pri18",
-"title":"DC2C_pri18",
+"styl":"align l",
-"version":"27.02.2023 12:20 00001",
+"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-"

etc/psa_config/DC2C_print19.json

@@ -1,5 +1,31 @@
-{
+{
-"title":"DC2C_pri19",
+"title":"DC2C_pri19",
-"version":"27.02.2023 12:20 00001",
+"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",

etc/psa_config/DC2C_print20.json

@@ -1,5 +1,9 @@
-{
+{
-"title":"DC2C_pri20",
+"title":"DC2C_pri20",
-"version":"27.02.2023 12:20 00001",
+"project":"empty template",
-"":""
+"issued":"09.06.2023 01.01",
-}
+"styl":"size 10"
+
+}
+
+

etc/psa_config/DC2C_print21.json

@@ -1,5 +0,0 @@
-{
-"title":"DC2C_pri21",
-"version":"27.02.2023 12:20 00001",
-"":""
-}

etc/psa_config/DC2C_print22.json

@@ -1,5 +0,0 @@
-{
-"title":"DC2C_pri22",
-"version":"27.02.2023 12:20 00001",
-"":""
-}

etc/psa_config/DC2C_print23.json

@@ -1,5 +0,0 @@
-{
-"title":"DC2C_pri23",
-"version":"27.02.2023 12:20 00001",
-"":""
-}

etc/psa_config/DC2C_print24.json

@@ -1,5 +0,0 @@
-{
-"title":"DC2C_pri24",
-"version":"27.02.2023 12:20 00001",
-"":""
-}

etc/psa_config/DC2C_print25.json

@@ -1,5 +0,0 @@
-{
-"title":"DC2C_pri25",
-"version":"27.02.2023 12:20 00001",
-"":""
-}

etc/psa_config/DC2C_print26.json

@@ -1,5 +0,0 @@
-{
-"title":"DC2C_pri26",
-"version":"27.02.2023 12:20 00001",
-"":""
-}

etc/psa_config/DC2C_print27.json

@@ -1,5 +0,0 @@
-{
-"title":"DC2C_pri27",
-"version":"27.02.2023 12:20 00001",
-"":""
-}

etc/psa_config/DC2C_print28.json

@@ -1,5 +0,0 @@
-{
-"title":"DC2C_pri28",
-"version":"27.02.2023 12:20 00001",
-"":""
-}

etc/psa_config/DC2C_print29.json

@@ -1,5 +1,24 @@
-{
+{
-"title":"DC2C_pri29",
+"title":"DC2C_pri29",
-"version":"27.02.2023 12:20 00001",
+"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",
+
+
+}
+
+

etc/psa_config/DC2C_print30.json

@@ -1,5 +0,0 @@
-{
-"title":"DC2C_pri30",
-"version":"27.02.2023 12:20 00001",
-"":""
-}

etc/psa_config/DC2C_print31.json

@@ -1,5 +0,0 @@
-{
-"title":"DC2C_pri31",
-"version":"27.02.2023 12:20 00001",
-"":"iiii"
-}

etc/psa_config/DC2C_print32.json

@@ -1,6 +1,39 @@
-{
+{
-"title":"DC2C_pri32",
+"title":"DC2C_pri32",
-"version":"27.02.2023 12:20 00001",
+"project":"DBM Szeged door",
-"":"",
+"issued":"18.04.2023 01.01",
-"":"8:50 3.April"
+"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",
+}
+
+

etc/psa_config/DC2C_serial.json

@@ -1,13 +0,0 @@
-{	     
-"title":"DC2C_serial",
-"setup_master_interface":"",
-"project":"DBM Szeged",
-"version":"13.02.2023 12:20 00001",
-"crcChk":1,
-"baudRate":9600,
-"data":8,
-"parity":"no",
-"stop":1,
-"":""
-}
-

etc/psa_update/opkg_commands

@@ -3,9 +3,9 @@
 # package manipulation commands without package:
 # update, upgrade, clean
 #
+#
 # informational commands without package:
 # list, list-installed, list-upgradable
-#
 # ptu5-atb-apinfo
 # ptu5-scripts
 # ptu5-atb-apinfo
@@ -15,14 +15,13 @@
 # list-installed
 # --force-reinstall install ptu5-atb-apinfo
 # --force-reinstall install atbqt
-# update
+# 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 --noaction install atbqt
 opkg install atbqt
-
+opkg install atb-plugin-cc-iself
-
+opkg install atb-plugin-dc
-#
+opkg install libdevicecontroller
-#
-#
-