Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_332 into zg1/zone1

etc/psa_config/DC2C_cash.json

@@ -1,13 +1,13 @@
 {	     
-"title":"DC2C_cash  ",
-"project":"Schoenau",
-"version":"06.05.2024 02.00.07",
+"Title":"DC2C_cash  ",
+"Project":"Schoenau",
+"Version":"6.7.1-2024-06-17",
 "CoinDenom(15..0)":[0,0,0,0,0,0,0,0,0,255,200,100,50,20,10,5],
 "CoinValue(15..0)":[0,0,0,0,0,0,0,0,0,3,200,100,50,20,10,5],
 "CoinAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,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,50,20,10,5],
+"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,5000,2000,1000,500],
 "BillAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1],
 "LocalTaxRate":19,
 "ForeignTaxRate":0,

etc/psa_config/DC2C_conf.json

@@ -1,12 +1,12 @@
 { 
-"title":"DC2C_config",
-"project":"Schoenau",
-"version":"15.11.2023 00001",
+"Title":"DC2C_config",
+"Project":"Schoenau",
+"Version":"6.7.1-2024-06-17",
 "custNum":332,
-"machNum":1000,
-"borough":0,
-"zone":0,
+"machNum":99,
+"borough":101,
+"zone":1,
 "alias":0,
-"location":"Vorplatz 1"
+"location":"Atb Buero Gerhardt"
 }
 

etc/psa_config/DC2C_conf21.json

@@ -1,12 +0,0 @@
-{ 
-"title":"DC2C_config",
-"project":"Schoenau",
-"version":"15.11.2023 00001",
-"custNum":332,
-"machNum":21,
-"borough":0,
-"zone":0,
-"alias":0,
-"location":"Vorplatz 1"
-}
-

etc/psa_config/DC2C_conf25.json

@@ -1,12 +0,0 @@
-{ 
-"title":"DC2C_config",
-"project":"Schoenau",
-"version":"15.11.2023 00001",
-"custNum":332,
-"machNum":25,
-"borough":0,
-"zone":0,
-"alias":0,
-"location":"Vorplatz 1"
-}
-

etc/psa_config/DC2C_conf26.json

@@ -1,12 +0,0 @@
-{ 
-"title":"DC2C_config",
-"project":"Schoenau",
-"version":"15.11.2023 00001",
-"custNum":332,
-"machNum":26,
-"borough":0,
-"zone":0,
-"alias":0,
-"location":"Vorplatz 1"
-}
-

etc/psa_config/DC2C_device.json

@@ -1,12 +1,12 @@
 {
-"title":"DC2C_device",
-"project":"Schoenau",
-"Version":"15.11.2023 00102",
+"Title":"DC2C_device",
+"Project":"Schoenau",
+"Version":"6.7.1-2024-06-17",
 "printer":1,
 "coinChk":3,
 "mifRd":1,
 "solarPwr":0,
-"modem":0,
+"modem":1,
 "creditCard":1,
 "escrow":0,
 "RejMotor":0,

etc/psa_config/DC2C_print01.json

@@ -1,7 +1,7 @@
 {
-"title":"DC2C_pri01",
-"project":"Schoenau",
-"Version":"15.11.2023 00001",
+"Title":"DC2C_pri01",
+"Project":"Schoenau",
+"Version":"6.7.1-2024-06-17",
 "styl":"font 10",
 "styl":"size 11",
 "styl":"align c",

etc/psa_config/DC2C_print02.json

@@ -1,8 +1,7 @@
 {
-"title":"DC2C_pri02",
-"project":"Schoenau",
-"Version":"01.12.2023 00008",
-"issued":"13.11.2023 01.01",
+"Title":"DC2C_pri02",
+"Project":"Schoenau",
+"Version":"6.7.1-2024-06-17",
 "text":"Standort: ",
 "feed":"nl",
 "vari":"location",

etc/psa_config/DC2C_print03.json

@@ -1,7 +1,7 @@
 {
-"title":"DC2C_pri03",
-"project":"Schoenau",
-"Version":"09.04.2024 00001",
+"Title":"DC2C_pri03",
+"Project":"Schoenau",
+"Version":"6.7.1-2024-06-17",
 "feed":"nl",
 "styl":"size 00",
 "text":"Automat: ",
@@ -16,6 +16,9 @@
 "styl":"align c",
 "text":"Schönau am Königssee",
 "feed":"nl",
+"text":"Ticket-Nr. ",
+"vari":"TickCtr",
+"feed":"nl",
 "text":"Automatentechnik ",
 "feed":"nl",
 "text":"Baumann GmbH",

etc/psa_config/DC2C_print04.json

@@ -1,6 +1,6 @@
 {
-"title":"DC2C_pri04",
-"project":"Schoenau",
-"Version":"15.11.2023 01.01",
+"Title":"DC2C_pri04",
+"Project":"Schoenau",
+"Version":"6.7.1-2024-06-17",
 "text":"";
 }

etc/psa_config/DC2C_print05.json

@@ -1,7 +1,7 @@
 {
-"title":"DC2C_pri05",
-"project":"Schoenau",
-"Version":"15.11.2023 00001",
+"Title":"DC2C_pri05",
+"Project":"Schoenau",
+"Version":"6.7.1-2024-06-17",
 "styl":"font 10",
 "styl":"size 11",
 "styl":"align c",

etc/psa_config/DC2C_print06.json

@@ -1,8 +1,7 @@
 {
 "title":"DC2C_pri06",
-"project":"Schoenau",
-"Version":"15.11.2023 00002",
-"issued":"13.11.2023 01.01",
+"Project":"Schoenau",
+"Version":"6.7.1-2024-06-17",
 "text":"Standort: ",
 "feed":"nl",
 "vari":"location",

etc/psa_config/DC2C_print07.json

@@ -1,7 +1,7 @@
 {
-"title":"DC2C_pri07",
-"project":"Schoenau",
-"Version":"09.04.2024 00001",
+"Title":"DC2C_pri07",
+"Project":"Schoenau",
+"Version":"6.7.1-2024-06-17",
 "feed":"nl",
 "styl":"size 00",
 "text":"Automat: ",
@@ -16,6 +16,9 @@
 "styl":"align c",
 "text":"Schönau am Königssee",
 "feed":"nl",
+"text":"Ticket-Nr. ",
+"vari":"TickCtr",
+"feed":"nl",
 "text":"Automatentechnik ",
 "feed":"nl",
 "text":"Baumann GmbH",

etc/psa_config/DC2C_print08.json

@@ -1,6 +1,6 @@
 {
-"title":"DC2C_pri08",
-"project":"Schoenau",
-"Version":"15.11.2023 01.01",
+"Title":"DC2C_pri08",
+"Project":"Schoenau",
+"Version":"6.7.1-2024-06-17",
 "text":"";
 }

etc/psa_config/DC2C_print31.json

@@ -1,7 +1,7 @@
 {
-"title":"DC2C_pri31",
-"project":"door close print",
-"Version":"15.11.2023 00001",
+"Title":"DC2C_pri31",
+"Project":"door close print",
+"Version":"6.7.1-2024-06-17",
 "styl":"font 08",
 "styl":"size 10",
 "feed":"margin02",

etc/psa_config/DC2C_print32.json

@@ -1,7 +1,7 @@
 {
-"title":"DC2C_pri32",
-"project":"refund reciept",
-"Version":"01.12.2023 00007",
+"Ttitle":"DC2C_pri32",
+"Project":"refund reciept",
+"Version":"6.7.1-2024-06-17",
 "styl":"font 08",
 "styl":"size 10",
 "feed":"margin02",
@@ -14,6 +14,7 @@
 "text":"Erstattungsbetrag: ",
 "feed":"nl",
 "vari":"Dynamic07",
+"text":"€",
 "feed":"nl",
 "text":"KuNu: ",
 "vari":"cunu",	

etc/psa_update/opkg_commands

@@ -5,10 +5,12 @@
 ###############################################################################
 # 
 opkg update
-# opkg install prepare-update
-# opkg install atbupdatetool
-# opkg install mxt-touch-reset
-# opkg install apism
-# opkg install tariff-config-332
-# opkg --cache /var/cache/opkg --download-only upgrade ptu5-systemcontroller
-# opkg --cache /var/cache/opkg upgrade ptu5-systemcontroller
+opkg install prepare-update
+#
+opkg --cache /var/cache/opkg --download-only upgrade atb-dc-libraries
+opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-dc
+opkg --cache /var/cache/opkg --download-only upgrade atbqt
+#
+opkg --cache /var/cache/opkg upgrade atb-dc-libraries
+opkg --cache /var/cache/opkg upgrade atb-plugin-dc
+opkg --cache /var/cache/opkg upgrade atbqt