From b18f3c56b995da2844fa4a0bb122ce7e8cbdf9d5 Mon Sep 17 00:00:00 2001
From: Gerhard Hoffmann <g.hoffmann@atb-online.eu>
Date: Wed, 28 Feb 2024 13:27:45 +0100
Subject: [PATCH 1/2] sync with master

---
 etc/psa_config/DC2C_cash.json    | 18 +++++++++++++
 etc/psa_config/DC2C_conf.json    | 12 +++++++++
 etc/psa_config/DC2C_device.json  | 27 ++++++++++++++++++++
 etc/psa_config/DC2C_print01.json | 43 ++++++++++++++++++++++++++++++++
 etc/psa_config/DC2C_print02.json | 25 +++++++++++++++++++
 etc/psa_config/DC2C_print03.json | 30 ++++++++++++++++++++++
 etc/psa_config/DC2C_print04.json |  6 +++++
 etc/psa_config/DC2C_print05.json | 43 ++++++++++++++++++++++++++++++++
 etc/psa_config/DC2C_print06.json | 26 +++++++++++++++++++
 etc/psa_config/DC2C_print07.json | 30 ++++++++++++++++++++++
 etc/psa_config/DC2C_print08.json |  6 +++++
 etc/psa_config/DC2C_print31.json | 21 ++++++++++++++++
 etc/psa_config/DC2C_print32.json | 42 +++++++++++++++++++++++++++++++
 13 files changed, 329 insertions(+)
 create mode 100755 etc/psa_config/DC2C_cash.json
 create mode 100755 etc/psa_config/DC2C_conf.json
 create mode 100755 etc/psa_config/DC2C_device.json
 create mode 100755 etc/psa_config/DC2C_print01.json
 create mode 100755 etc/psa_config/DC2C_print02.json
 create mode 100755 etc/psa_config/DC2C_print03.json
 create mode 100755 etc/psa_config/DC2C_print04.json
 create mode 100755 etc/psa_config/DC2C_print05.json
 create mode 100755 etc/psa_config/DC2C_print06.json
 create mode 100755 etc/psa_config/DC2C_print07.json
 create mode 100755 etc/psa_config/DC2C_print08.json
 create mode 100755 etc/psa_config/DC2C_print31.json
 create mode 100755 etc/psa_config/DC2C_print32.json

diff --git a/etc/psa_config/DC2C_cash.json b/etc/psa_config/DC2C_cash.json
new file mode 100755
index 0000000..5cbc9ed
--- /dev/null
+++ b/etc/psa_config/DC2C_cash.json
@@ -0,0 +1,18 @@
+	     
+"title":"DC2C_cash  ",
+"project":"NVT NAZ",
+"Version":"28.02.2024 00103",
+"CoinDenom(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,0,1],
+"CoinValue(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,0,3],
+"CoinAccept(15..0)":[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0],
+"ExchangeRate":1,
+"TokenChannel":6,
+"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+"BillAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+"LocalTaxRate":19,
+"ForeignTaxRate":0,
+"Surcharge":0,	
+"Discount":0
+}
+
+
diff --git a/etc/psa_config/DC2C_conf.json b/etc/psa_config/DC2C_conf.json
new file mode 100755
index 0000000..ace3a64
--- /dev/null
+++ b/etc/psa_config/DC2C_conf.json
@@ -0,0 +1,12 @@
+{ 
+"title":"DC2C_config",
+"project":"NVT NAZ",
+"version":"28.02.2024 00001",
+"custNum":744,
+"machNum":1,
+"borough":1,
+"zone":1,
+"alias":0,
+"location":"NAZ Parkplatz"
+}
+
diff --git a/etc/psa_config/DC2C_device.json b/etc/psa_config/DC2C_device.json
new file mode 100755
index 0000000..a5222f3
--- /dev/null
+++ b/etc/psa_config/DC2C_device.json
@@ -0,0 +1,27 @@
+{
+"title":"DC2C_device",
+"project":"NVT NAZ",
+"Version":"28.02.2024 00103",
+"printer":1,
+"coinChk":1,
+"mifRd":1,
+"solarPwr":0,
+"modem":0,
+"creditCard":1,
+"escrow":1,
+"RejMotor":0,
+"shutter":1,
+"billRd":0,
+"vaultLock":0,
+"autoAlarm":1,
+"autoOpen":1,
+"AccPrint":1,
+"DorPrint":1,
+"TokPrint":1,
+"CBwarnLev":1600,
+"CBerrLev":1900,
+"BattWarn":11800,
+"BattErr":11200,
+"foreign":1,
+"refPrint":0
+}
diff --git a/etc/psa_config/DC2C_print01.json b/etc/psa_config/DC2C_print01.json
new file mode 100755
index 0000000..d7f3542
--- /dev/null
+++ b/etc/psa_config/DC2C_print01.json
@@ -0,0 +1,43 @@
+{
+"title":"DC2C_pri01",
+"project":"NVT NAZ",
+"Version":"28.02.2024 00103",
+"styl":"font 08",
+"feed":"margin05",
+"feed":"rim02",
+"styl":"size 00",
+"graf":"logo1",
+"styl":"font 10",
+"styl":"size 11",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
+"text":"Galtür",
+"feed":"nl"
+"feed":"nl"
+"text":"Parkschein",
+"feed":"nl",
+"feed":"nl",
+"styl":"size 00",
+"styl":"align l",
+"styl":"size 00",
+"text":"Parkzeit bezahlt bis: ",
+"feed":"nl",
+"styl":"size 11",
+"vari":"Dynamic04",
+"vari":"Dynamic03",
+"styl":"size 00",
+"feed":"nl"
+}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/etc/psa_config/DC2C_print02.json b/etc/psa_config/DC2C_print02.json
new file mode 100755
index 0000000..baeb254
--- /dev/null
+++ b/etc/psa_config/DC2C_print02.json
@@ -0,0 +1,25 @@
+{
+"title":"DC2C_pri02",
+"project":"NVT NAZ",
+"Version":"28.02.2024 00103",
+"issued":"22.01.2024 01.01",
+"feed":"nl",
+"text":"Bezahlt: ",
+"styl":"size 11",
+"vari":"Dynamic07",
+"text":"",
+"feed":"nl",
+"styl":"size 00"
+}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/etc/psa_config/DC2C_print03.json b/etc/psa_config/DC2C_print03.json
new file mode 100755
index 0000000..bc42203
--- /dev/null
+++ b/etc/psa_config/DC2C_print03.json
@@ -0,0 +1,30 @@
+{
+"title":"DC2C_pri03",
+"project":"NVT NAZ",
+"Version":"28.02.2024 00103",
+"feed":"nl",
+"styl":"size 00",
+"text":"Automat: ",
+"vari":"manu",	
+"feed":"nl",
+"styl":"align c",
+"text":"Bitte gut sichtbar",
+"feed":"nl",
+"text":"hinter die Scheibe",
+"feed":"nl",
+"text":"legen",
+"feed":"nl",
+"feed":"eject"
+}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/etc/psa_config/DC2C_print04.json b/etc/psa_config/DC2C_print04.json
new file mode 100755
index 0000000..47a656f
--- /dev/null
+++ b/etc/psa_config/DC2C_print04.json
@@ -0,0 +1,6 @@
+{
+"title":"DC2C_pri04",
+"project":"NVT NAZ",
+"Version":"28.02.2024 00103",
+"text":"";
+}
\ No newline at end of file
diff --git a/etc/psa_config/DC2C_print05.json b/etc/psa_config/DC2C_print05.json
new file mode 100755
index 0000000..5ef72fb
--- /dev/null
+++ b/etc/psa_config/DC2C_print05.json
@@ -0,0 +1,43 @@
+{
+"title":"DC2C_pri05",
+"project":"NVT NAZ",
+"Version":"28.02.2024 00103",
+"styl":"font 08",
+"feed":"margin05",
+"feed":"rim02",
+"styl":"size 00",
+"graf":"logo1",
+"styl":"font 10",
+"styl":"size 11",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
+"text":"Galtür",
+"feed":"nl"
+"feed":"nl"
+"text":"Parkschein",
+"feed":"nl",
+"feed":"nl",
+"styl":"size 00",
+"styl":"align l",
+"styl":"size 00",
+"text":"Parkzeit bezahlt bis: ",
+"feed":"nl",
+"styl":"size 11",
+"vari":"Dynamic04",
+"vari":"Dynamic03",
+"styl":"size 00",
+"feed":"nl"
+}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/etc/psa_config/DC2C_print06.json b/etc/psa_config/DC2C_print06.json
new file mode 100755
index 0000000..af02f1f
--- /dev/null
+++ b/etc/psa_config/DC2C_print06.json
@@ -0,0 +1,26 @@
+{
+"title":"DC2C_pri06",
+"project":"NVT NAZ",
+"Version":"28.02.2024 00103",
+"issued":"13.11.2023 01.01",
+"feed":"nl",
+"text":"Bezahlt: ",
+"styl":"size 11",
+"vari":"Dynamic07",
+"text":"",
+"feed":"nl",
+"styl":"size 00"
+
+}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/etc/psa_config/DC2C_print07.json b/etc/psa_config/DC2C_print07.json
new file mode 100755
index 0000000..32bfe28
--- /dev/null
+++ b/etc/psa_config/DC2C_print07.json
@@ -0,0 +1,30 @@
+{
+"title":"DC2C_pri07",
+"project":"NVT NAZ",
+"Version":"28.02.2024 00103",
+"feed":"nl",
+"styl":"size 00",
+"text":"Automat: ",
+"vari":"manu",	
+"feed":"nl",
+"styl":"align c",
+"text":"Bitte gut sichtbar",
+"feed":"nl",
+"text":"hinter die Scheibe",
+"feed":"nl",
+"text":"legen",
+"feed":"nl",
+"feed":"eject"
+}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/etc/psa_config/DC2C_print08.json b/etc/psa_config/DC2C_print08.json
new file mode 100755
index 0000000..4c9715d
--- /dev/null
+++ b/etc/psa_config/DC2C_print08.json
@@ -0,0 +1,6 @@
+{
+"title":"DC2C_pri08",
+"project":"NVT NAZ",
+"Version":"28.02.2024 00103",
+"text":"";
+}
\ No newline at end of file
diff --git a/etc/psa_config/DC2C_print31.json b/etc/psa_config/DC2C_print31.json
new file mode 100755
index 0000000..407bf89
--- /dev/null
+++ b/etc/psa_config/DC2C_print31.json
@@ -0,0 +1,21 @@
+{
+"title":"DC2C_pri31",
+"project":"door close print",
+"Version":"15.11.2023 00001",
+"styl":"font 08",
+"styl":"size 10",
+"feed":"margin02",
+"feed":"rim02",
+"feed":"speed10",
+"styl":"size 11",
+"feed":"nl",
+"text":"Türöffnung um:",
+"feed":"nl",
+"styl":"size 00",
+"vari":"date ge",
+"vari":"time long",
+"feed":"nl",
+"feed":"eject"
+}
+
+
diff --git a/etc/psa_config/DC2C_print32.json b/etc/psa_config/DC2C_print32.json
new file mode 100755
index 0000000..2f1c024
--- /dev/null
+++ b/etc/psa_config/DC2C_print32.json
@@ -0,0 +1,42 @@
+{
+"title":"DC2C_pri32",
+"project":"refund reciept",
+"Version":"15.11.2023 00001",
+"styl":"font 08",
+"styl":"size 10",
+"feed":"margin02",
+"feed":"rim02",
+"feed":"speed10",
+"styl":"size 11",
+"text":"Ersatzbeleg",
+"feed":"nl",
+"styl":"size 00",
+"text":"Erstattungsbetrag: ",
+"feed":"nl",
+"vari":"Dynamic07",
+"text":"€",
+"feed":"nl",
+"text":"KuNu: ",
+"vari":"cunu",	
+"text":"MaNu: ",
+"vari":"manu",	
+"text":"Ort: ",
+"vari":"location",	
+"text":"Gruppe: ",
+"vari":"group",	
+"text":"Zone: ",
+"vari":"zone",	
+"text":"Name: ",
+"vari":"alias",	
+"text":"Am: ",
+"vari":"date us",
+"text":"Um: ",
+"vari":"time long",
+"feed":"nl",
+"text":" * * * * * * * * ",
+"feed":"nl",
+"feed":"nl",
+"feed":"eject"
+}
+
+

From ef951b848cb4b6cfcb5eca82ba24ae17c0398721 Mon Sep 17 00:00:00 2001
From: Gerhard Hoffmann <g.hoffmann@atb-online.eu>
Date: Wed, 28 Feb 2024 13:45:03 +0100
Subject: [PATCH 2/2] Update files as changed by thomas

---
 etc/psa_config/DC2C_print01.json | 21 ++++++++++-----------
 etc/psa_config/DC2C_print02.json |  8 ++------
 etc/psa_config/DC2C_print03.json | 14 +-------------
 etc/psa_config/DC2C_print05.json | 21 ++++++++++-----------
 etc/psa_config/DC2C_print06.json | 10 +---------
 etc/psa_config/DC2C_print07.json | 14 +-------------
 etc/psa_config/DC2C_print08.json |  2 +-
 7 files changed, 26 insertions(+), 64 deletions(-)

diff --git a/etc/psa_config/DC2C_print01.json b/etc/psa_config/DC2C_print01.json
index d7f3542..b589c22 100755
--- a/etc/psa_config/DC2C_print01.json
+++ b/etc/psa_config/DC2C_print01.json
@@ -12,22 +12,21 @@
 "styl":"align c",
 "feed":"margin02",
 "feed":"rim02",
-"text":"Galtür",
 "feed":"nl"
-"feed":"nl"
-"text":"Parkschein",
+"text":"Nordisches Ausbildungszentrum",
 "feed":"nl",
+"text":" Eintritt Erwachsener",
 "feed":"nl",
-"styl":"size 00",
-"styl":"align l",
-"styl":"size 00",
-"text":"Parkzeit bezahlt bis: ",
+"text":"bezaht: 8,00€",
 "feed":"nl",
 "styl":"size 11",
-"vari":"Dynamic04",
-"vari":"Dynamic03",
-"styl":"size 00",
-"feed":"nl"
+"text":"am: ",
+"vari":"wday deu short",
+"feed":"nl",
+"text":"den ",
+"vari":"date ge",
+"feed":"nl",
+"feed":"eject"
 }
 
 
diff --git a/etc/psa_config/DC2C_print02.json b/etc/psa_config/DC2C_print02.json
index baeb254..6a42478 100755
--- a/etc/psa_config/DC2C_print02.json
+++ b/etc/psa_config/DC2C_print02.json
@@ -4,12 +4,8 @@
 "Version":"28.02.2024 00103",
 "issued":"22.01.2024 01.01",
 "feed":"nl",
-"text":"Bezahlt: ",
-"styl":"size 11",
-"vari":"Dynamic07",
-"text":"",
-"feed":"nl",
-"styl":"size 00"
+
+
 }
 
 
diff --git a/etc/psa_config/DC2C_print03.json b/etc/psa_config/DC2C_print03.json
index bc42203..69f38f5 100755
--- a/etc/psa_config/DC2C_print03.json
+++ b/etc/psa_config/DC2C_print03.json
@@ -2,19 +2,7 @@
 "title":"DC2C_pri03",
 "project":"NVT NAZ",
 "Version":"28.02.2024 00103",
-"feed":"nl",
-"styl":"size 00",
-"text":"Automat: ",
-"vari":"manu",	
-"feed":"nl",
-"styl":"align c",
-"text":"Bitte gut sichtbar",
-"feed":"nl",
-"text":"hinter die Scheibe",
-"feed":"nl",
-"text":"legen",
-"feed":"nl",
-"feed":"eject"
+"text":"";
 }
 
 
diff --git a/etc/psa_config/DC2C_print05.json b/etc/psa_config/DC2C_print05.json
index 5ef72fb..b9dd306 100755
--- a/etc/psa_config/DC2C_print05.json
+++ b/etc/psa_config/DC2C_print05.json
@@ -12,22 +12,21 @@
 "styl":"align c",
 "feed":"margin02",
 "feed":"rim02",
-"text":"Galtür",
 "feed":"nl"
-"feed":"nl"
-"text":"Parkschein",
+"text":"Nordisches Ausbildungszentrum",
 "feed":"nl",
+"text":" Eintritt Jugendlicher",
 "feed":"nl",
-"styl":"size 00",
-"styl":"align l",
-"styl":"size 00",
-"text":"Parkzeit bezahlt bis: ",
+"text":"bezaht: 4,00€",
 "feed":"nl",
 "styl":"size 11",
-"vari":"Dynamic04",
-"vari":"Dynamic03",
-"styl":"size 00",
-"feed":"nl"
+"text":"am: ",
+"vari":"wday deu short",
+"feed":"nl",
+"text":"den ",
+"vari":"date ge",
+"feed":"nl",
+"feed":"eject"
 }
 
 
diff --git a/etc/psa_config/DC2C_print06.json b/etc/psa_config/DC2C_print06.json
index af02f1f..8088b04 100755
--- a/etc/psa_config/DC2C_print06.json
+++ b/etc/psa_config/DC2C_print06.json
@@ -2,15 +2,7 @@
 "title":"DC2C_pri06",
 "project":"NVT NAZ",
 "Version":"28.02.2024 00103",
-"issued":"13.11.2023 01.01",
-"feed":"nl",
-"text":"Bezahlt: ",
-"styl":"size 11",
-"vari":"Dynamic07",
-"text":"",
-"feed":"nl",
-"styl":"size 00"
-
+"text":""
 }
 
 
diff --git a/etc/psa_config/DC2C_print07.json b/etc/psa_config/DC2C_print07.json
index 32bfe28..7cf1d18 100755
--- a/etc/psa_config/DC2C_print07.json
+++ b/etc/psa_config/DC2C_print07.json
@@ -2,19 +2,7 @@
 "title":"DC2C_pri07",
 "project":"NVT NAZ",
 "Version":"28.02.2024 00103",
-"feed":"nl",
-"styl":"size 00",
-"text":"Automat: ",
-"vari":"manu",	
-"feed":"nl",
-"styl":"align c",
-"text":"Bitte gut sichtbar",
-"feed":"nl",
-"text":"hinter die Scheibe",
-"feed":"nl",
-"text":"legen",
-"feed":"nl",
-"feed":"eject"
+"text":""
 }
 
 
diff --git a/etc/psa_config/DC2C_print08.json b/etc/psa_config/DC2C_print08.json
index 4c9715d..6ead7f8 100755
--- a/etc/psa_config/DC2C_print08.json
+++ b/etc/psa_config/DC2C_print08.json
@@ -2,5 +2,5 @@
 "title":"DC2C_pri08",
 "project":"NVT NAZ",
 "Version":"28.02.2024 00103",
-"text":"";
+"text":""
 }
\ No newline at end of file