Adding new print-templates because of printing-problems on DC-side

.githooks/post-merge

@@ -11,15 +11,35 @@ 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 $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 () {
+    # 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|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
+        # 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)

.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/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/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 +0,0 @@
-{
-    "wwwww"  : "zzzzzz",
-    "wwwww"  : "zzzzzz",
-    "wwwww"  : "zzzzzz",
-    "wwwww"  : "zzzzzz"
-}

etc/atb/sysconfig.ini

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

etc/psa_config/DC2C_print01.json

@@ -1,28 +1,38 @@
 {
 "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.02",
+"styl":"font 08",
+"styl":"size 10",
+"feed":"margin02",
+"feed":"rim02",
+"text":"PARKOLÓJEGY",
+"styl":"size 00",
 "feed":"nl",
-"text":"Parkingticket ",
-"styl":"under on",
-"text":"Parkingticket ",
-"styl":"under off",
+"text":"      Nyugta",
 "feed":"nl",
-"text":"Parkingticket ",
-"styl":"latin on",
-"text":"Parkingticket ",
-"styl":"latin off",
+"text":"Kérjük az elsö szélvédö",
 "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",
+"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",
 }
 
 

etc/psa_config/DC2C_print02.json

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

etc/psa_config/DC2C_print03.json

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

etc/psa_config/DC2C_print04.json

@@ -1,5 +1,8 @@
-{
-"title":"DC2C_pri04",
-"version":"27.02.2023 12:20 00001",
-"":""
-}
+{
+"title":"DC2C_pri04",
+"project":"empty",
+"issued":"24.05.2023 01.00",
+"text":""
+}
+
+

etc/psa_config/DC2C_print29.json

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

etc/psa_config/DC2C_print32.json

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

opt/app/ATBAPP/ATBQT.ini

@@ -1,87 +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/ATBQT/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
-
-[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
-
-
-[IngenicoISelf_CCPlugin]
-debug=1
-PortName=/dev/ttymxc0
-ZVT=DE
-sleep=1
-sleepExtended=1
-Currency=HUF
-
-
-[TCP_CONTROL]
-enable=1
-
-############
-

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