From 0fa2116748e6f5e4dca6aeecaa4817dcfa0c4dd2 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 24 Apr 2024 15:37:06 +0200 Subject: [PATCH] Sync with branch zg1/zone1. --- etc/psa_config/DC2C_cash.json | 5 ++--- etc/psa_config/DC2C_device.json | 8 ++++---- etc/psa_config/DC2C_print02.json | 19 ++++++++++++++----- etc/psa_config/DC2C_print03.json | 19 ++++++++++++++----- etc/psa_config/DC2C_print04.json | 4 +--- etc/psa_config/DC2C_print06.json | 3 --- etc/psa_config/DC2C_print07.json | 3 --- etc/psa_config/DC2C_print08.json | 4 +--- etc/psa_config/DC2C_print31.json | 3 --- etc/psa_config/DC2C_print32.json | 3 --- 10 files changed, 36 insertions(+), 35 deletions(-) diff --git a/etc/psa_config/DC2C_cash.json b/etc/psa_config/DC2C_cash.json index 77940f1..4da11dc 100755 --- a/etc/psa_config/DC2C_cash.json +++ b/etc/psa_config/DC2C_cash.json @@ -4,7 +4,7 @@ "version":"15.10.2023 14:55 02.00.06", "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,0,1,1,1,1,1,1,1,1,1,0], +"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], @@ -14,6 +14,5 @@ "Surcharge":0, "Discount":0 } +#"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,10000,5000,2000,1000,500], -# -# diff --git a/etc/psa_config/DC2C_device.json b/etc/psa_config/DC2C_device.json index 8f1174e..b9d073c 100755 --- a/etc/psa_config/DC2C_device.json +++ b/etc/psa_config/DC2C_device.json @@ -23,8 +23,8 @@ "BattWarn":11800, "BattErr":11200, "foreign":1, -"refPrint":0 +"refundPrint":1, +"billWarnLev":400, +"billFullLev":500 + } -# -# -# diff --git a/etc/psa_config/DC2C_print02.json b/etc/psa_config/DC2C_print02.json index 0a650c9..e12632d 100755 --- a/etc/psa_config/DC2C_print02.json +++ b/etc/psa_config/DC2C_print02.json @@ -1,4 +1,4 @@ -{ +{ "title":"DC2C_pri02", "project":"Korneuburg", "Version":"15.11.2023 00001", @@ -10,7 +10,16 @@ "text":"", "feed":"nl", "styl":"size 00" -} -# -# -# +} + + + + + + + + + + + + diff --git a/etc/psa_config/DC2C_print03.json b/etc/psa_config/DC2C_print03.json index f30d9a4..45bbd26 100755 --- a/etc/psa_config/DC2C_print03.json +++ b/etc/psa_config/DC2C_print03.json @@ -1,4 +1,4 @@ -{ +{ "title":"DC2C_pri03", "project":"Korneuburg", "Version":"15.11.2023 00001", @@ -18,7 +18,16 @@ "text":"legen", "feed":"nl", "feed":"eject" -} -# -# -# +} + + + + + + + + + + + + diff --git a/etc/psa_config/DC2C_print04.json b/etc/psa_config/DC2C_print04.json index 60329d8..ea36ed5 100755 --- a/etc/psa_config/DC2C_print04.json +++ b/etc/psa_config/DC2C_print04.json @@ -3,6 +3,4 @@ "project":"Korneuburg", "Version":"15.11.2023 01.01", "text":""; -}# -# -# +} \ No newline at end of file diff --git a/etc/psa_config/DC2C_print06.json b/etc/psa_config/DC2C_print06.json index 9302f75..7622b92 100755 --- a/etc/psa_config/DC2C_print06.json +++ b/etc/psa_config/DC2C_print06.json @@ -24,6 +24,3 @@ -# -# -# diff --git a/etc/psa_config/DC2C_print07.json b/etc/psa_config/DC2C_print07.json index 9939fab..4fc2640 100755 --- a/etc/psa_config/DC2C_print07.json +++ b/etc/psa_config/DC2C_print07.json @@ -31,6 +31,3 @@ -# -# -# diff --git a/etc/psa_config/DC2C_print08.json b/etc/psa_config/DC2C_print08.json index 9dfb910..e664cda 100755 --- a/etc/psa_config/DC2C_print08.json +++ b/etc/psa_config/DC2C_print08.json @@ -3,6 +3,4 @@ "project":"Korneuburg", "Version":"15.11.2023 01.01", "text":""; -}# -# -# +} \ No newline at end of file diff --git a/etc/psa_config/DC2C_print31.json b/etc/psa_config/DC2C_print31.json index bfe8a0f..407bf89 100755 --- a/etc/psa_config/DC2C_print31.json +++ b/etc/psa_config/DC2C_print31.json @@ -19,6 +19,3 @@ } -# -# -# diff --git a/etc/psa_config/DC2C_print32.json b/etc/psa_config/DC2C_print32.json index 34969cb..2f1c024 100755 --- a/etc/psa_config/DC2C_print32.json +++ b/etc/psa_config/DC2C_print32.json @@ -40,6 +40,3 @@ } -# -# -#