Fixed JSON-typo

.githooks/post-checkout

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

.githooks/post-merge

@@ -14,12 +14,37 @@ fi
 GIT_PULL_TMP=/tmp/git_pull
 OPKG_CMDS_TMP=/tmp/opkg_commands
 
-rm -f $OPKG_PULL_TMP
+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 () {
+    blob=$(get_blob $1)
+    if [ ! -z $blob ]; then
+        # search for the blob in all commits for the file(name) $1
+        echo $(echo $(git log --all --pretty=format:%H -- $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|dc2c.hex|tariff.*json)" <<< $fn; then
-        echo "$fn" >> $GIT_PULL_TMP
+    if grep -E -q "(DC.*json|dc.*hex|dc.*bin|tariff.*json)" <<< $fn; then
+        fsize=0
+        if [[ -f "$fn" ]]; then
+            fsize=$(ls -l "$fn" | awk '{ print $5 }')
+        fi
+        echo "$fn $fsize" >> $GIT_PULL_TMP
     fi
     if grep -E -q ".*opkg_commands" <<< $fn; then
         readarray opkg_commands < <(cat $fn)

.gitignore

@@ -0,0 +1,27 @@
+# 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/*
+!etc/psa_config/*
+!etc/psa_update/*
+!etc/psa_tariff/*
+!etc/dc/*.hex
+!etc/dc/*.bin
+!*/etc/*.ini
+!*/etc/atb/*
+!*/etc/psa_config/*
+!*/etc/psa_update/*
+!*/etc/psa_tariff/*
+!*/etc/dc/*.hex
+!*/etc/dc/*.bin
+

etc/ATBQT.ini

@@ -1,113 +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"
-
-[mmmmmmmmmmmmmmm]
-[ERRORCODE_MAPPING]
-VOUCHER:PROCESS=0xFA30
-VOUCHER:SOAP=0xFA31
-VOUCHER:TYPE=FA32
-VOUCHER:SERVICE=FA33
-VOUCHER:VALIDITY=FA34
-120103004=FA35
-
-
-
-
-
-
-

etc/atb/ATBAPP.ini

@@ -69,6 +69,7 @@ sc_53="1,0,0"
 
 [PLUGINS]
 CCPlugin=IngenicoISelf_CCPlugin
+CalculatePricePlugin=MOBILISIS_CalculatePricePlugin
 
 
 [IngenicoISelf_CCPlugin]
@@ -83,5 +84,14 @@ Currency=HUF
 [TCP_CONTROL]
 enable=1
 
-############
+
+[PAYMENT]
+currencySymbol=€
+cashVariant=CoinsOnly
+paymentPointInTime=poa
+
+
+[MOBILISIS_CalculatePricePlugin]
+useDebug=1
+
 

etc/atb/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"
-
-[mmmmmmmmmmmmmmm]
-[ERRORCODE_MAPPING]
-VOUCHER:PROCESS=0xFA30
-VOUCHER:SOAP=0xFA31
-VOUCHER:TYPE=FA32
-VOUCHER:SERVICE=FA33
-VOUCHER:VALIDITY=FA34
-120103004=FA35
-
-
-
-

etc/atb/ISMASMgr.ini

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

etc/atb/SystemControl.ini

@@ -1,6 +1,50 @@
-{
-    "wwwww"  : "zzzzzz",
-    "wwwww"  : "zzzzzz",
-    "wwwww"  : "zzzzzz",
-    "wwwww"  : "zzzzzz"
-}
+[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\hourOfDay=1

etc/atb/sysconfig.ini

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

etc/psa_config/DC2C_print01.json

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

opt/app/ISMASMgr/ISMASMgr.ini

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

opt/app/sysconfig/ISMASMgr.ini

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

opt/app/sysconfig/SystemControl.ini

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

opt/app/sysconfig/sysconfig.ini

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