Update ATBQT.ini SysetemControl.ini for Szeged Test

Fetch data before push.

.githooks/post-merge

@@ -0,0 +1,54 @@
+#!/bin/bash -
+
+# FILE="/tmp/post-merge$(date +%FT%H-%M-%S)"
+# commit=$(git rev-parse --verify HEAD)
+# echo "$commit $(git cat-file commit $commit)" >> /tmp/post-merge
+
+# Redirect output to stderr.
+exec 1>&2
+
+if [ -z $IFS ]; then
+    IFS=$'\n'
+fi
+
+GIT_PULL_TMP=/tmp/git_changed_files_for_last_pull
+OPKG_CMDS_TMP=/tmp/opkg_commands
+
+rm -f $GIT_PULL_TMP
+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
+    echo $(git hash-object $1)
+}
+
+get_commit_for_blob () {
+    # search for the blob in all commits for the file(name) $1
+    echo $(git log --all --pretty=format:%H -- $2   |
+           xargs -I{} bash -c "git ls-tree {} -- $2 |
+           grep -q $1 && echo -n {} && head -n 1")
+}
+
+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
+        # 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
+    fi
+    if grep -E -q ".*opkg_commands" <<< $fn; then
+        readarray opkg_commands < <(cat $fn)
+        for opkg_c in "${opkg_commands[@]}"; do
+            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

.gitignore

@@ -0,0 +1,16 @@
+*
+
+## Except
+!**/.gitignore
+!**/.githooks/post-merge
+!/etc/*.ini
+!/etc/atb/*.ini
+!/etc/psa_config/*
+!/etc/psa_update/*
+!/etc/psa_tariff/*
+!/etc/dc/dc2c.hex
+
+!/opt/app/ATBAPP/*.ini
+!/opt/app/sysconfig/*.ini
+!/opt/app/ISMASMgr/*.ini
+

etc/atb/ATBAPP.ini

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

@@ -0,0 +1,51 @@
+[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/psa_config/DC2C_cash.json

@@ -14,4 +14,3 @@
 "discount":0,
 "":""
 }
-

etc/psa_config/DC2C_print02.json

@@ -3,6 +3,3 @@
 "version":"27.02.2023 12:20 00001",
 "":""
 }
-#
-#
-#

etc/psa_config/DC2C_print31.json

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

etc/psa_config/DC2C_print32.json

@@ -1,5 +1,6 @@
 {
 "title":"DC2C_pri32",
 "version":"27.02.2023 12:20 00001",
-"":""
+"":"",
-}
+"":"10001"
+}

etc/psa_tariff/tariff02.json

@@ -0,0 +1,4 @@
+{
+
+
+}

etc/psa_update/opkg_commands

@@ -16,5 +16,13 @@
 # --force-reinstall install ptu5-atb-apinfo
 # --force-reinstall install atbqt
 # update
+
+opkg update
+opkg --noaction install atbqt
+opkg install atbqt
+
+
 #
-list
+#
+#
+

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"

szeged/.location

@@ -1 +0,0 @@
-szeged

szeged/1/.zone_group

@@ -1 +0,0 @@
-contained zones in group 1

szeged/1/1/.zone

@@ -1 +0,0 @@
-1

szeged/1/1/opt/app/ATBAPP/ATBQT.ini

@@ -1,110 +0,0 @@
-[COMMON]
-com_port_name=/dev/ttyS1
-com_baud_rate=9600
-lang1=de_DE
-lang2=en_GB
-lang3=fr_FR
-lang4=tr_TR
-#lang3=fr_FR
-#lang4=ja_JP
-defaultLanguage=1
-#useLanguage=[128+][64+][32+][16]
-useLanguage=224
-usePayment=192
-
-textfile=/opt/app/ATBQT/text/HMI_Texte.xml
-logfile=/var/log/atbqt.log
-
-alternativeLogoFile=/opt/app/ATBQT/logo/logo_betterPark.png
-
-feature_Log=off
-feature_TouchFeedback=off
-feature_SystemSuspend=off
-feature_StartButton=on
-feature_selfOOO=off
-feature_DBusDisplayControl=on
-feature_DBusSuspendControl=off
-feature_ShowParkingTime=off
-
-touch_feedback_gpio=121
-touch_feedback_on_value=1
-touch_feedback_off_value=0
-
-#ooo_mode={useDisk|otherMachine}
-ooo_mode=otherMachine
-sellTimeout_time=120
-
-LicencePlateExampleString=HOAB123
-
-showInfoButton=false
-showHelpButton=false
-
-
-[PLUGINS]
-CalculatePricePlugin=ATB_Soap_CalculatePricePlugin
-SimulationPlugin=TouchSimulationPlugin
-CCPlugin=TCP_ZVT_CCPlugin
-
-
-[TCP_ZVT_CCPlugin]
-CurrencyCode=EUR
-debug=1
-IP=192.168.5.242
-Port=22000
-SSL=0
-ZVT=DE
-sleep=1
-printIntermediateStatus=1
-Password=277296
-preAuthReservation=2500
-
-
-[ATB_Soap_CalculatePricePlugin]
-#useRFID=yes
-#useBarcode=yes
-
-useDebug=true
-ignoreSslErrors=true
-
-protocol=https
-host=atb-api.nexobility.de
-port=443
-service=
-
-areaId=1
-deviceId=1
-Password=12335
-UserName=user
-
-useSystemSetting=1
-
-fallbackThreshold=1
-connectionTimeout=7
-
-maxOfflineTransactions=1000
-
-
-[SCREENCONFIG]
-sc_31="1,1,0"
-sc_33="1,0,1"
-sc_3F="1,0,0"
-sc_40="1,1,1"
-sc_41="1,0,0"
-sc_35="0,0,0"
-sc_51="1,0,1"
-sc_52="1,0,0"
-sc_55="1,0,0"
-sc_82="1,0,0"
-
-[ERRORCODE_MAPPING]
-VOUCHER:PROCESS=0xFA30
-VOUCHER:SOAP=0xFA31
-VOUCHER:TYPE=FA32
-VOUCHER:SERVICE=FA33
-VOUCHER:VALIDITY=FA34
-120103004=FA35
-
-
-
-
-

szeged/1/1/opt/app/ISMASMgr/ISMASMgr.ini

@@ -1,5 +0,0 @@
-{
-    "" : "",
-    "" : "",
-    "" : ""
-}

szeged/1/1/opt/app/sysconfig/ISMASMgr.ini

@@ -1,6 +0,0 @@
-{
-    "xxx"   : "yyyy",
-    "xxx"   : "yyyy",
-    "xxx"   : "yyyy",
-    "xxx"   : "yyyy"
-}

szeged/1/1/opt/app/sysconfig/SystemControl.ini

@@ -1,5 +0,0 @@
-{
-    "wwwww"  : "zzzzzz",
-    "wwwww"  : "zzzzzz",
-    "wwwww"  : "zzzzzz"
-}

szeged/1/1/opt/app/sysconfig/sysconfig.ini

@@ -1,3 +0,0 @@
-{
-    "aaaaaa"    : "bbbbb"
-}

szeged/preauth/README

@@ -1,50 +0,0 @@
-Idee fuer pre-authorization:
-
-Es gibt bei der Pre-Auth. zwei Schritte.
-
-1. Schritt: hier wird ueberprueft, ob die Karte den Preis bezahlen kann. 
-2. Schritt: (notification) hier wird die Karte dann mit dem Endpreis belastet.
-    Kann von einem anderen PSA durchgefuehrt werden.
-
-PSA1 macht Schritt 1, PSA2 Schritt 2.
-
-Woher weiss jetzt PSA1, dass PSA2 Schritt 2 gemacht hat?
-
-Jeder Kunde hat ein Repository (schon wegen dem PSA-Update).
-Hier koennte man ein weiteres Verzeichnis unterbringen namens 'preauth'.
-
-In diesem Verzeichnis werden pro Vorgang zwei Dateien angelegt.
-
-Schritt 1: 
-
-Datei "open_preauth_<psa_serien_nummer>_<psa_zaehler>" wird angelegt.
-Hier kann man dann alle moeglichen Daten eintragen.
-
-Die Datei wird im Repository eingecheckt.
-
-Schritt 2:
-PSA2 macht zunaechst ein 'git pull'.
-Damit sieht er, dass (mindestens) eine Pre-Auth. offen ist.
-Sie ist nicht von ihm, da seine Seriennummer eine andere ist.
-(Eventuell koennte man es so machen, dass in der Datei eine Kennung fuer
-die Kreditkarte enthalten ist, so dass der Kunde nichts eingeben muss.)
-
-Die Transaktion wird abgeschlossen, und PSA2 erzeugt die
-Datei "close_preauth_<psa_serien_nummer>_<psa_zaehler>" und checkt sie ein.
-
-Beim neachsten Bezahlvorgang oder Tagesschnitt macht PSA1 ein 'git pull'
-und sieht dass die Pre-Auth abgeschlossen wurde.
-
-PSA1 kann nun die beiden Dateien aus dem Repository entfernen.
-
-Der Punkt ist wichtig: *nur* PSA1 kann das, also immer der PSA, der die
-Sache angefangen hat, kann Daten loeschen.
-
-Frage: Kann man 2 Bezahlvorgaenge mit derselben Kreditkarten haben?
-Im Prinzip offenbar ja, aber falls man das macht, dann kann der erste Vorgang
-nicht mehr rueckgaengig gemacht werden. Nur fuer den jeweils letzten Vorgang
-ist das moeglich.
-Hier muesste man den Kunden dann fragen, was er tun will: erst den ersten
-Vorgang bezahlen (Schritt 2), oder was Neues auf PSA2 anfangen.
-
-

szeged/update.conf

@@ -1,123 +0,0 @@
-{
-    "c0"    : "config-file for update process",
-
-    "c1"    : "ini-files section",
-    "ini"   : {
-
-        "c2"     : "location", 
-        "szeged" : {
-            
-           "c3"   :   "each location can have multiple",
-           "c4"   :   "zone-groups and/or zones",
-           "c5"   :   "0-index used as size of following array",
-           "c6"   :   ".zg[0]: #n of zones_groups",
-           "c7"   :   ".zg[1].z[0]: #n of zones in zg[1]",
-           "c8"   :   ".zg[1].z[1]: zone 1 in zone_group 1",
-           "c9"   :   "-> .zg[1].z[1].opt.app.sysconfig.ISMASMgr ",
-            "zg"  : [ 1, {
-                "z" : [ 1, {
-                    "opt" : {
-                        "app" : {
-                            "sysconfig" : {
-                                "ISMASMgr"       : "b7012a0beff0ca4b67aa56c1f095294f",
-                                "sysconfig"      : "0c9f9e4380c7378bcb18c137f4ac9bd1",
-                                "SystemControl"  : "67701bda779ebf450d3420e141167d3a"
-                            },
-                            "ISMASMgr" : {
-                                "ISMASMgr"       : "48abad21b3e1bf76ff9b2e247f49d9b1"
-                            },
-                            "ATBAPP" : {
-                                "ATBQT"      : "c30e90c795bb1a4508668995f9f3014b"
-                            }
-                        }
-                    }}
-                ]
-            }]
-        }
-    },
-
-    "c10"    : "conf-files section",
-    "conf"  : {
-
-        "c11"     : "location", 
-        "szeged" : {
-           
-           "c12"   :   "each location can have multiple",
-           "c13"   :   "zone-groups and/or zones",
-           "c14"   :   "0-index used as size of following array",
-           "c15"   :   ".zg[0]: #n of zones_groups",
-           "c16"   :   ".zg[1].z[0]: #n of zones in zg[1]",
-           "c17"   :   ".zg[1].z[1]: zone 1 in zone_group 1",
-           "c18"   :   "-> .zg[1].z[1].etc.psa_config.emp ",
-            "zg" :  [ 1, {
-                "z" : [ 1, { 
-                    "etc" : {
-                        "psa_config" : {
-                            "DC2C_print01" : "6471d430aeacd9858f395de3bf1ac769",
-                            "DC2C_print02" : "e3a0a2909e7ee5d72af6867e7b95b6e4", 
-                            "DC2C_print03" : "6fc45b54f7c6d39c76d65740700c011a",
-                            "DC2C_print04" : "89768a07b40b4f60dda3d8f8c1dfc18a", 
-                            "DC2C_print05" : "4f11024b0f07573c3c7774761c5d2dec", 
-                            "DC2C_print06" : "6304a88d49eb4ee8c81bb9a7f7ce2fbb", 
-                            "DC2C_print07" : "eaaff0172af0b36e20749ea241f023f6", 
-                            "DC2C_print08" : "27c6d96adc6bf1e512c284b9067e41a3", 
-                            "DC2C_print09" : "3b3b8f42e7f0f3d8fa7c0a69656631f9", 
-                            "DC2C_print10" : "5e165046ff4b9b437331d4d6e336ade0", 
-                            "DC2C_print11" : "98211929ed8d8ef2d01b9f2b6db77181", 
-                            "DC2C_print12" : "8612e55a02c8c803eb4e948ed372725c", 
-                            "DC2C_print13" : "5d01caf4cd6382eb606efff873b567bd", 
-                            "DC2C_print14" : "2dfa3a8bd7cb8d0076c097343cb02e7d", 
-                            "DC2C_print15" : "dd96ddaffaad12c45fed3229de3a0884",
-                            "DC2C_print16" : "279f7ebaf5dc1fd379f1f836c6ec2304", 
-                            "DC2C_print17" : "934aef4475a9189ff5b7e46e7b3159d1", 
-                            "DC2C_print18" : "2f7ead8b83cd058b50c2261e8743f32a", 
-                            "DC2C_print19" : "c8ed484cedf585b25d18136d5a3480fb",
-                            "DC2C_print20" : "2d4db9e692cbb0a399b4a652b694bbde", 
-                            "DC2C_print21" : "0bee561a835cbaaf8e569739230ee23c", 
-                            "DC2C_print22" : "e2d53c6ffe30be1b36be98b2a3d49a6c", 
-                            "DC2C_print23" : "5959737a61d01be103fa13a2047578a0", 
-                            "DC2C_print24" : "cb39f44446b50811e6fa7d78f701620b", 
-                            "DC2C_print25" : "8025b245ccec28421a8e1be9110b25c1", 
-                            "DC2C_print26" : "bbd098a6232006af55a6468ed45e03d9", 
-                            "DC2C_print27" : "57b8305f2c8f031f1888adecb53b8417", 
-                            "DC2C_print28" : "4e2be8b30e3813aa1ea7f1106ab8b20c", 
-                            "DC2C_print29" : "8a24198dc52ed054a3f1ff755a04cdcc", 
-                            "DC2C_print30" : "266037bd9349e4f58d5de0b5532898c2", 
-                            "DC2C_print31" : "9728e490441bd088d2f9e03e71f3105a", 
-                            "DC2C_conf"    : "56526d457b91d300968f6106648981fd",
-                            "DC2C_cash"    : "75c180260030b00aeb3ba98b2179c188",
-                            "DC2C_serial"  : "557374244a352579ab87057f759ea67e" 
-                        },
-                        "psa_update" : {
-                            "opkg_commands": "c0e4bf23a2a766d9bf655532751069a4"
-                        }
-                    }}
-                ]
-            }]
-        }
-    },
-    
-    "c19"    : "opkg-files section",
-    "opkg"  : { 
-        "atbqt" : {
-                "Version"       :   "1.0.0-r1",
-                "MD5Sum"        :   "642eda2b3637291b024ef152479218bc",
-                "Architecture"  :   "cortexa9t2hf-neon"
-        },
-        "ptu5-atb-apinfo" : { 
-                "Version"       :   "0.1.0-r0",
-                "MD5Sum"        :   "a8f826b1618b62a5fe5dd491294e5c02",
-                "Architecture"  :   "cortexa9t2hf-neon"
-        },
-        "atb-plugin-calculateprice-prm" : {
-                "Version"       :   "1.0.0-r0",
-                "MD5Sum"        :   "7d2d37fc3143891714faaba31957ade7",
-                "Architecture"  :   "cortexa9t2hf-neon"
-        },
-        "atb-plugin-cc-tcpzvt" : {
-                "Version"       :   "1.0.0-r0",
-                "MD5Sum"        :   "546e2a7444eea2234af4b2d1a720930f",
-                "Architecture"  :   "cortexa9t2hf-neon"
-        }
-    }
-}