From ab371e437c6f8862187ee9ec3eeaec1e15a2d9e0 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Mon, 17 Jun 2024 11:43:49 +0200 Subject: [PATCH] Update Jsons for Schoenau as provided by Thomas --- etc/psa_config/DC2C_cash.json | 6 +++--- etc/psa_config/DC2C_conf.json | 14 ++++++------ etc/psa_config/DC2C_device.json | 8 +++---- etc/psa_config/DC2C_device_json.netz | 31 +++++++++++++++++++++++++++ etc/psa_config/DC2C_device_json.solar | 31 +++++++++++++++++++++++++++ etc/psa_config/DC2C_print01.json | 6 +++--- etc/psa_config/DC2C_print02.json | 7 +++--- etc/psa_config/DC2C_print03.json | 9 +++++--- etc/psa_config/DC2C_print04.json | 6 +++--- etc/psa_config/DC2C_print05.json | 6 +++--- etc/psa_config/DC2C_print06.json | 5 ++--- etc/psa_config/DC2C_print07.json | 9 +++++--- etc/psa_config/DC2C_print08.json | 6 +++--- etc/psa_config/DC2C_print31.json | 6 +++--- etc/psa_config/DC2C_print32.json | 7 +++--- 15 files changed, 112 insertions(+), 45 deletions(-) create mode 100644 etc/psa_config/DC2C_device_json.netz create mode 100644 etc/psa_config/DC2C_device_json.solar diff --git a/etc/psa_config/DC2C_cash.json b/etc/psa_config/DC2C_cash.json index 4f152b0..707f8df 100755 --- a/etc/psa_config/DC2C_cash.json +++ b/etc/psa_config/DC2C_cash.json @@ -1,7 +1,7 @@ { -"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], diff --git a/etc/psa_config/DC2C_conf.json b/etc/psa_config/DC2C_conf.json index bee0a61..c24a068 100755 --- a/etc/psa_config/DC2C_conf.json +++ b/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" } diff --git a/etc/psa_config/DC2C_device.json b/etc/psa_config/DC2C_device.json index 9596d1c..96f7fae 100755 --- a/etc/psa_config/DC2C_device.json +++ b/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, diff --git a/etc/psa_config/DC2C_device_json.netz b/etc/psa_config/DC2C_device_json.netz new file mode 100644 index 0000000..96f7fae --- /dev/null +++ b/etc/psa_config/DC2C_device_json.netz @@ -0,0 +1,31 @@ +{ +"Title":"DC2C_device", +"Project":"Schoenau", +"Version":"6.7.1-2024-06-17", +"printer":1, +"coinChk":3, +"mifRd":1, +"solarPwr":0, +"modem":1, +"creditCard":1, +"escrow":0, +"RejMotor":0, +"shutter":1, +"billRd":1, +"vaultLock":0, +"autoAlarm":1, +"autoOpen":1, +"AccPrint":1, +"DorPrint":1, +"TokPrint":1, +"CBwarnLev":1600, +"CBerrLev":1900, +"BattWarn":11800, +"BattErr":11200, +"foreign":1, +"refundPrint":1, +"billWarnLev":300, +"billFullLev":380, +"housing":1 + +} diff --git a/etc/psa_config/DC2C_device_json.solar b/etc/psa_config/DC2C_device_json.solar new file mode 100644 index 0000000..fdcf969 --- /dev/null +++ b/etc/psa_config/DC2C_device_json.solar @@ -0,0 +1,31 @@ +{ +"Title":"DC2C_device", +"Project":"Schoenau", +"Version":"6.7.2-2024-06-17", +"printer":1, +"coinChk":3, +"mifRd":1, +"solarPwr":1, +"modem":1, +"creditCard":1, +"escrow":0, +"RejMotor":0, +"shutter":1, +"billRd":1, +"vaultLock":0, +"autoAlarm":1, +"autoOpen":1, +"AccPrint":1, +"DorPrint":1, +"TokPrint":1, +"CBwarnLev":1600, +"CBerrLev":1900, +"BattWarn":11800, +"BattErr":11200, +"foreign":1, +"refundPrint":1, +"billWarnLev":300, +"billFullLev":380, +"housing":1 + +} diff --git a/etc/psa_config/DC2C_print01.json b/etc/psa_config/DC2C_print01.json index 48ad85f..6f5c4f0 100755 --- a/etc/psa_config/DC2C_print01.json +++ b/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", diff --git a/etc/psa_config/DC2C_print02.json b/etc/psa_config/DC2C_print02.json index 4e40b09..3c23a10 100755 --- a/etc/psa_config/DC2C_print02.json +++ b/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", diff --git a/etc/psa_config/DC2C_print03.json b/etc/psa_config/DC2C_print03.json index 5d0dc9c..f05cc41 100755 --- a/etc/psa_config/DC2C_print03.json +++ b/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", diff --git a/etc/psa_config/DC2C_print04.json b/etc/psa_config/DC2C_print04.json index c330d4d..9864d00 100755 --- a/etc/psa_config/DC2C_print04.json +++ b/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":""; } \ No newline at end of file diff --git a/etc/psa_config/DC2C_print05.json b/etc/psa_config/DC2C_print05.json index 9e637b6..aed27cd 100755 --- a/etc/psa_config/DC2C_print05.json +++ b/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", diff --git a/etc/psa_config/DC2C_print06.json b/etc/psa_config/DC2C_print06.json index f43402e..3f50da4 100755 --- a/etc/psa_config/DC2C_print06.json +++ b/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", diff --git a/etc/psa_config/DC2C_print07.json b/etc/psa_config/DC2C_print07.json index f25e7a0..9414b5f 100755 --- a/etc/psa_config/DC2C_print07.json +++ b/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", diff --git a/etc/psa_config/DC2C_print08.json b/etc/psa_config/DC2C_print08.json index 83c9e9c..ff0bd70 100755 --- a/etc/psa_config/DC2C_print08.json +++ b/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":""; } \ No newline at end of file diff --git a/etc/psa_config/DC2C_print31.json b/etc/psa_config/DC2C_print31.json index bdc8844..9bddf69 100755 --- a/etc/psa_config/DC2C_print31.json +++ b/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", diff --git a/etc/psa_config/DC2C_print32.json b/etc/psa_config/DC2C_print32.json index f9241c8..1771756 100755 --- a/etc/psa_config/DC2C_print32.json +++ b/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",