From 96204fc048d1dad1947dec470e931b874f43b0e8 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Mon, 17 Jun 2024 11:53:07 +0200 Subject: [PATCH 1/2] Update Jsons for Schoenau as provided by Thomas --- etc/psa_config/DC2C_cash.json | 6 +++--- etc/psa_config/DC2C_conf.json | 12 ++++++++++++ etc/psa_config/DC2C_device.json | 6 +++--- 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 ++++--- 13 files changed, 54 insertions(+), 37 deletions(-) create mode 100644 etc/psa_config/DC2C_conf.json 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 new file mode 100644 index 0000000..c24a068 --- /dev/null +++ b/etc/psa_config/DC2C_conf.json @@ -0,0 +1,12 @@ +{ +"Title":"DC2C_config", +"Project":"Schoenau", +"Version":"6.7.1-2024-06-17", +"custNum":332, +"machNum":99, +"borough":101, +"zone":1, +"alias":0, +"location":"Atb Buero Gerhardt" +} + diff --git a/etc/psa_config/DC2C_device.json b/etc/psa_config/DC2C_device.json index bb04714..fdcf969 100755 --- a/etc/psa_config/DC2C_device.json +++ b/etc/psa_config/DC2C_device.json @@ -1,7 +1,7 @@ { -"title":"DC2C_device", -"project":"Schoenau", -"Version":"06.05.2024 00102", +"Title":"DC2C_device", +"Project":"Schoenau", +"Version":"6.7.2-2024-06-17", "printer":1, "coinChk":3, "mifRd":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 c896bd7..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":"05.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 b265397..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":"05.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 63584b5..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 00005", +"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", From 8f944a41d77a03a3a8f1a2182c89cf7b5ef802ef Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Mon, 17 Jun 2024 15:50:39 +0200 Subject: [PATCH 2/2] Fix (Thomas): Title -> title --- etc/psa_config/DC2C_cash.json | 2 +- etc/psa_config/DC2C_device.json | 2 +- etc/psa_config/DC2C_print01.json | 2 +- etc/psa_config/DC2C_print02.json | 2 +- etc/psa_config/DC2C_print03.json | 2 +- etc/psa_config/DC2C_print04.json | 2 +- etc/psa_config/DC2C_print05.json | 2 +- etc/psa_config/DC2C_print06.json | 1 + etc/psa_config/DC2C_print07.json | 2 +- etc/psa_config/DC2C_print08.json | 2 +- etc/psa_config/DC2C_print31.json | 2 +- etc/psa_config/DC2C_print32.json | 2 +- 12 files changed, 12 insertions(+), 11 deletions(-) diff --git a/etc/psa_config/DC2C_cash.json b/etc/psa_config/DC2C_cash.json index 707f8df..da9f987 100755 --- a/etc/psa_config/DC2C_cash.json +++ b/etc/psa_config/DC2C_cash.json @@ -1,5 +1,5 @@ { -"Title":"DC2C_cash ", +"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], diff --git a/etc/psa_config/DC2C_device.json b/etc/psa_config/DC2C_device.json index fdcf969..9e497a6 100755 --- a/etc/psa_config/DC2C_device.json +++ b/etc/psa_config/DC2C_device.json @@ -1,5 +1,5 @@ { -"Title":"DC2C_device", +"title":"DC2C_device", "Project":"Schoenau", "Version":"6.7.2-2024-06-17", "printer":1, diff --git a/etc/psa_config/DC2C_print01.json b/etc/psa_config/DC2C_print01.json index 6f5c4f0..7bf3de5 100755 --- a/etc/psa_config/DC2C_print01.json +++ b/etc/psa_config/DC2C_print01.json @@ -1,5 +1,5 @@ { -"Title":"DC2C_pri01", +"title":"DC2C_pri01", "Project":"Schoenau", "Version":"6.7.1-2024-06-17", "styl":"font 10", diff --git a/etc/psa_config/DC2C_print02.json b/etc/psa_config/DC2C_print02.json index 3c23a10..af53a0e 100755 --- a/etc/psa_config/DC2C_print02.json +++ b/etc/psa_config/DC2C_print02.json @@ -1,5 +1,5 @@ { -"Title":"DC2C_pri02", +"title":"DC2C_pri02", "Project":"Schoenau", "Version":"6.7.1-2024-06-17", "text":"Standort: ", diff --git a/etc/psa_config/DC2C_print03.json b/etc/psa_config/DC2C_print03.json index f05cc41..180a277 100755 --- a/etc/psa_config/DC2C_print03.json +++ b/etc/psa_config/DC2C_print03.json @@ -1,5 +1,5 @@ { -"Title":"DC2C_pri03", +"title":"DC2C_pri03", "Project":"Schoenau", "Version":"6.7.1-2024-06-17", "feed":"nl", diff --git a/etc/psa_config/DC2C_print04.json b/etc/psa_config/DC2C_print04.json index 9864d00..5920dcb 100755 --- a/etc/psa_config/DC2C_print04.json +++ b/etc/psa_config/DC2C_print04.json @@ -1,5 +1,5 @@ { -"Title":"DC2C_pri04", +"title":"DC2C_pri04", "Project":"Schoenau", "Version":"6.7.1-2024-06-17", "text":""; diff --git a/etc/psa_config/DC2C_print05.json b/etc/psa_config/DC2C_print05.json index aed27cd..3ea6c25 100755 --- a/etc/psa_config/DC2C_print05.json +++ b/etc/psa_config/DC2C_print05.json @@ -1,5 +1,5 @@ { -"Title":"DC2C_pri05", +"title":"DC2C_pri05", "Project":"Schoenau", "Version":"6.7.1-2024-06-17", "styl":"font 10", diff --git a/etc/psa_config/DC2C_print06.json b/etc/psa_config/DC2C_print06.json index 3f50da4..cda15c5 100755 --- a/etc/psa_config/DC2C_print06.json +++ b/etc/psa_config/DC2C_print06.json @@ -15,6 +15,7 @@ "vari":"wday deu short", "vari":"date ge", "vari":"time long" + } diff --git a/etc/psa_config/DC2C_print07.json b/etc/psa_config/DC2C_print07.json index 9414b5f..cb4f9c0 100755 --- a/etc/psa_config/DC2C_print07.json +++ b/etc/psa_config/DC2C_print07.json @@ -1,5 +1,5 @@ { -"Title":"DC2C_pri07", +"title":"DC2C_pri07", "Project":"Schoenau", "Version":"6.7.1-2024-06-17", "feed":"nl", diff --git a/etc/psa_config/DC2C_print08.json b/etc/psa_config/DC2C_print08.json index ff0bd70..8a366c8 100755 --- a/etc/psa_config/DC2C_print08.json +++ b/etc/psa_config/DC2C_print08.json @@ -1,5 +1,5 @@ { -"Title":"DC2C_pri08", +"title":"DC2C_pri08", "Project":"Schoenau", "Version":"6.7.1-2024-06-17", "text":""; diff --git a/etc/psa_config/DC2C_print31.json b/etc/psa_config/DC2C_print31.json index 9bddf69..5f5bb63 100755 --- a/etc/psa_config/DC2C_print31.json +++ b/etc/psa_config/DC2C_print31.json @@ -1,5 +1,5 @@ { -"Title":"DC2C_pri31", +"title":"DC2C_pri31", "Project":"door close print", "Version":"6.7.1-2024-06-17", "styl":"font 08", diff --git a/etc/psa_config/DC2C_print32.json b/etc/psa_config/DC2C_print32.json index 1771756..e30410c 100755 --- a/etc/psa_config/DC2C_print32.json +++ b/etc/psa_config/DC2C_print32.json @@ -1,5 +1,5 @@ { -"Ttitle":"DC2C_pri32", +"title":"DC2C_pri32", "Project":"refund reciept", "Version":"6.7.1-2024-06-17", "styl":"font 08",