Update ATBQT.ini SysetemControl.ini for Szeged Test

.githooks/post-checkout

@@ -1,4 +0,0 @@
-echo "POST-CHECKOUT"
-echo "PREV-HEAD=$1"
-echo "CURR-HEAD=$2"
-echo "BRANCH-CHECKOUT=$3"

.githooks/post-merge

@@ -11,7 +11,7 @@ if [ -z $IFS ]; then
     IFS=$'\n'
 fi
 
-GIT_PULL_TMP=/tmp/git_pull
+GIT_PULL_TMP=/tmp/git_changed_files_for_last_pull
 OPKG_CMDS_TMP=/tmp/opkg_commands
 
 rm -f $GIT_PULL_TMP
@@ -23,28 +23,23 @@ get_blob () {   # get the blob of the file(name) passed as $1
 }
 
 get_commit_for_blob () {
-    blob=$(get_blob $1)
+    # search for the blob in all commits for the file(name) $1
-    if [ ! -z $blob ]; then
+    echo $(git log --all --pretty=format:%H -- $2   |
-        # search for the blob in all commits for the file(name) $1
+           xargs -I{} bash -c "git ls-tree {} -- $2 |
-        echo $(echo $(git log --all --pretty=format:%H -- $1) |
+           grep -q $1 && echo -n {} && head -n 1")
-               xargs -I{} bash -c "git ls-tree {} -- $1       |
-               grep -q $blob && echo {}")
-    fi
-}
-
-changed_file_names () {
-    for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do
-        CHANGED_FILE_NAMES+=($fn)
-    done
 }
 
 for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do
     if grep -E -q "(DC.*json|dc.*hex|dc.*bin|tariff.*json)" <<< $fn; then
-        fsize=0
+        # called in repository: $fn is e.g. etc/psa_tariff/tariff01.json
+        # add '/' prefix
+        fn=$(echo $fn | awk '{ printf "/"$0 }')
         if [[ -f "$fn" ]]; then
+            blob=$(get_blob "$fn")
+            commit=$(get_commit_for_blob $blob "$fn")
             fsize=$(ls -l "$fn" | awk '{ print $5 }')
+            echo "$fn $fsize $blob $commit" >> $GIT_PULL_TMP
         fi
-        echo "$fn $fsize" >> $GIT_PULL_TMP
     fi
     if grep -E -q ".*opkg_commands" <<< $fn; then
         readarray opkg_commands < <(cat $fn)

.gitignore

@@ -1,27 +1,16 @@
-# First, ignore everything
 *
-# Now, whitelist anything that's a directory
-!*/
-# And all the file types you're interested in
-!.gitignore
-!.githooks/post-merge
-!.githooks/post-checkout
-!**/.gitignore
-!**/.githooks/post-merge
-!**/.githooks/post-checkout
 
 ## Except
-!etc/atb/*
+!**/.gitignore
-!etc/psa_config/*
+!**/.githooks/post-merge
-!etc/psa_update/*
+!/etc/*.ini
-!etc/psa_tariff/*
+!/etc/atb/*.ini
-!etc/dc/*.hex
+!/etc/psa_config/*
-!etc/dc/*.bin
+!/etc/psa_update/*
-!*/etc/*.ini
+!/etc/psa_tariff/*
-!*/etc/atb/*
+!/etc/dc/dc2c.hex
-!*/etc/psa_config/*
+
-!*/etc/psa_update/*
+!/opt/app/ATBAPP/*.ini
-!*/etc/psa_tariff/*
+!/opt/app/sysconfig/*.ini
-!*/etc/dc/*.hex
+!/opt/app/ISMASMgr/*.ini
-!*/etc/dc/*.bin
 

etc/atb/ATBAPP.ini

@@ -24,7 +24,7 @@ useVehicle=240
 #useProduct=[128+][64+][32+][16+][8]
 useProduct=240
 
-textfile=/opt/app/ATBQT/text/HMI_Texte.xml
+textfile=/opt/app/ATBAPP/text/HMI_Texte.xml
 logfile=/var/log/atbqt.log
 alternativeLogoFile=
 
@@ -54,6 +54,7 @@ showInfoButton=false
 showHelpButton=false
 
 useAppStates=1
+statefile=/opt/app/ATBAPP/states/APP_States.xml
 
 [SCREENCONFIG]
 sc_31="1,1,0"
@@ -70,6 +71,7 @@ sc_53="1,0,0"
 [PLUGINS]
 CCPlugin=IngenicoISelf_CCPlugin
 CalculatePricePlugin=MOBILISIS_CalculatePricePlugin
+DeviceControllerPlugin=ATBDeviceControllerPlugin
 
 
 [IngenicoISelf_CCPlugin]
@@ -94,4 +96,5 @@ paymentPointInTime=poa
 [MOBILISIS_CalculatePricePlugin]
 useDebug=1
 
-
+[ATBDeviceControllerPlugin]
+serialPort=ttymxc2

etc/atb/SystemControl.ini

@@ -46,5 +46,6 @@ networkRestart="/sbin/ifup -a"
 size=1
 1\id=PTU5UPDATE
 1\program="/opt/app/tools/atbupdate/PTUGitInstaller"
-1\arguments="-q,--platform,wayland"
+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/psa_config/DC2C_print01.json

@@ -1,36 +1,28 @@
 {
 "title":"DC2C_pri01",
-"project":"DBM Szeged park_coins",
+"project":"DBM Szeged",
-"issued":"13.04.2023 01.01",
+"version":"13.02.2023 12:20 00001",
-"styl":"size 01",
+"styl":"bold on",
-"text":"PARKOLÓJEGY",
+"text":"Parkingticket ",
-"styl":"size 11",
+"styl":"bold off",
 "feed":"nl",
-"text":"Nyugta",
+"text":"Parkingticket ",
-"styl":"size 00",
+"styl":"under on",
+"text":"Parkingticket ",
+"styl":"under off",
 "feed":"nl",
+"text":"Parkingticket ",
+"styl":"latin on",
+"text":"Parkingticket ",
+"styl":"latin off",
 "feed":"nl",
-"text":"mögé jól láthatóan", 
+"text":"Parkingticket ",
-"feed":"nl",
+"styl":"font 09",
-"text":"elhelyezni!",
+"text":"Park ",
-"feed":"nl",
+"styl":"font 16",
-"text":"A PARKOLÓ NEM ŐRZÖTT!",
+"text":"Park ",
-"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:",
-"vari":"location",
-"text":"Összeg: ",
-"vari":"Dynamic04",
 "feed":"nl",
 "":""
 }
 
+

etc/psa_config/DC2C_print02.json

@@ -1,31 +1,5 @@
-{
+{
-"title":"DC2C_pri02",
+"title":"DC2C_pri02",
-"project":"DBM Szeged park_coins",
+"version":"27.02.2023 12:20 00001",
-"issued":"13.04.2023 01.01",
+"":""
-"text":"Kiadás időpontja:",
+}
-"vari":"date us",	
-"vari":"time long",	
-"text":"Automata száma: ",
-"vari":"manu",
-"feed":"nl",
-"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",
-"":""
-}
-
-

etc/psa_config/DC2C_print03.json

@@ -1,21 +1,5 @@
-{
+{
-"title":"DC2C_pri03",
+"title":"DC2C_pri03",
-"project":"DBM Szeged park_coins",
+"version":"27.02.2023 12:20 00001",
-"issued":"13.04.2023 01.01",
+"":""
-"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",i
-"":""
-}
-
-

etc/psa_config/DC2C_print32.json

@@ -2,5 +2,5 @@
 "title":"DC2C_pri32",
 "version":"27.02.2023 12:20 00001",
 "":"",
-"":"8:50 3.April"
+"":"10001"
 }