Add refund and bill-lines

Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_746 into zg1/zone1
removed empty lines
2024-06-25 16:45:00 +02:00 · 2024-06-25 16:40:06 +02:00 · 2024-06-25 16:34:24 +02:00 · 2024-06-25 16:25:24 +02:00 · 2024-06-25 15:44:11 +02:00 · 2024-06-25 15:42:26 +02:00
17 changed files with 66 additions and 160 deletions
--- a/etc/atbapp/ATBAPP.ini
+++ b/etc/atbapp/ATBAPP.ini
@@ -97,6 +97,6 @@ SSL=0
 ZVT=DE
 sleep=1
 printIntermediateStatus=1
-Password=835322
+Password=749729
 NumberOfChars=37
 dcHours="0"
--- a/etc/atbapp/text/HMI_Texte.xml
+++ b/etc/atbapp/text/HMI_Texte.xml
@@ -209,7 +209,7 @@
 			<fr_FR>Start</fr_FR>
 			<de_DE>Start</de_DE>
            <it_IT>Start</it_IT>
-            <cs_CZ> </cs_CZ>
+            <cs_CZ>Start</cs_CZ>
 		</Text>
 		<Text textnr="0x3D">
 			<de_AT> </de_AT>
--- a/etc/psa_config/DC2C_cash.json
+++ b/etc/psa_config/DC2C_cash.json
@@ -1,19 +1,16 @@
-{	     
-"title":"DC2C_cash  ",
-"project":"Korneuburg",
-"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,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
-}
-
-#
-#
+{
+"title":"DC2C_cash  ",
+"project":"Christoph Reisen",
+"version":"1.0.0 2024.04.26",
+"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
+}
--- a/etc/psa_config/DC2C_conf.json
+++ b/etc/psa_config/DC2C_conf.json
@@ -1,7 +1,7 @@
-{ 
+{
 "title":"DC2C_config",
-"project":"Korneuburg",
-"version":"15.11.2023 00001",
+"project":"Christoph Reisen",
+"version":"1.0.0 2024.04.26",
 "custNum":714,
 "machNum":8,
 "borough":1,
@@ -9,5 +9,3 @@
 "alias":0,
 "location":"Hauptplatz 39 Gericht"
 }
-#
-#
--- a/etc/psa_config/DC2C_device.json
+++ b/etc/psa_config/DC2C_device.json
@@ -1,10 +1,10 @@
 {
 "title":"DC2C_device",
-"project":"Korneuburg",
-"Version":"04.12.2023 00103",
+"project":"Christoph Reisen",
+"version":"1.0.0 2024.04.26",
 "printer":1,
 "coinChk":1,
-"mifRd":1,
+"mifRd":3,
 "solarPwr":0,
 "modem":1,
 "creditCard":1,
@@ -23,8 +23,8 @@
 "BattWarn":11800,
 "BattErr":11200,
 "foreign":1,
-"refPrint":0
+"refundPrint":0,
+"billWarnLev":400,
+"billFullLev":500,
+"housing":1
 }
-#
-#
-#
--- a/etc/psa_config/DC2C_print01.json
+++ b/etc/psa_config/DC2C_print01.json
@@ -1,15 +1,12 @@
 {
 "title":"DC2C_pri01",
-"project":"Korneuburg",
-"Version":"15.11.2023 00001",
+"project":"Christoph Reisen",
+"version":"1.0.0 2024.04.26",
 "styl":"font 10",
 "styl":"size 11",
 "styl":"align c",
 "feed":"margin02",
 "feed":"rim02",
-"text":"Korneuburg",
-"feed":"nl"
-"feed":"nl"
 "text":"Parkschein",
 "feed":"nl",
 "feed":"nl",
@@ -26,18 +23,3 @@
 "styl":"size 00",
 "feed":"nl"
 }
-#
-
-
-
-
-
-
-
-
-
-
-
-
-#
-#
--- a/etc/psa_config/DC2C_print02.json
+++ b/etc/psa_config/DC2C_print02.json
@@ -1,7 +1,7 @@
 {
 "title":"DC2C_pri02",
-"project":"Korneuburg",
-"Version":"15.11.2023 00001",
+"project":"Christoph Reisen",
+"version":"1.0.0 2024.04.26",
 "issued":"13.11.2023 01.01",
 "feed":"nl",
 "text":"Bezahlt: ",
@@ -11,6 +11,3 @@
 "feed":"nl",
 "styl":"size 00"
 }
-#
-#
-#
--- a/etc/psa_config/DC2C_print03.json
+++ b/etc/psa_config/DC2C_print03.json
@@ -1,7 +1,7 @@
 {
 "title":"DC2C_pri03",
-"project":"Korneuburg",
-"Version":"15.11.2023 00001",
+"project":"Christoph Reisen",
+"version":"1.0.0 2024.04.26",
 "feed":"nl",
 "styl":"size 00",
 "text":"Standort: ",
@@ -19,6 +19,3 @@
 "feed":"nl",
 "feed":"eject"
 }
-#
-#
-#
--- a/etc/psa_config/DC2C_print04.json
+++ b/etc/psa_config/DC2C_print04.json
@@ -1,8 +1,6 @@
 {
 "title":"DC2C_pri04",
-"project":"Korneuburg",
-"Version":"15.11.2023 01.01",
+"project":"Christoph Reisen",
+"version":"1.0.0 2024.04.26",
 "text":"";
-}#
-#
-#
+}
--- a/etc/psa_config/DC2C_print05.json
+++ b/etc/psa_config/DC2C_print05.json
@@ -1,15 +1,12 @@
 {
 "title":"DC2C_pri05",
-"project":"Korneuburg",
-"Version":"15.11.2023 00001",
+"project":"Christoph Reisen",
+"version":"1.0.0 2024.04.26",
 "styl":"font 10",
 "styl":"size 11",
 "styl":"align c",
 "feed":"margin02",
 "feed":"rim02",
-"text":"Korneuburg",
-"feed":"nl"
-"feed":"nl"
 "text":"Parkschein",
 "feed":"nl",
 "feed":"nl",
@@ -26,18 +23,3 @@
 "styl":"size 00",
 "feed":"nl"
 }
-
-
-
-
-
-
-
-
-
-
-
-
-#
-#
-#
--- a/etc/psa_config/DC2C_print06.json
+++ b/etc/psa_config/DC2C_print06.json
@@ -1,7 +1,7 @@
 {
 "title":"DC2C_pri06",
-"project":"Korneuburg",
-"Version":"15.11.2023 00001",
+"project":"Christoph Reisen",
+"version":"1.0.0 2024.04.26",
 "issued":"13.11.2023 01.01",
 "feed":"nl",
 "text":"Bezahlt: ",
@@ -12,18 +12,3 @@
 "styl":"size 00"

 }
-
-
-
-
-
-
-
-
-
-
-
-
-#
-#
-#
--- a/etc/psa_config/DC2C_print07.json
+++ b/etc/psa_config/DC2C_print07.json
@@ -1,7 +1,7 @@
 {
 "title":"DC2C_pri07",
-"project":"Korneuburg",
-"Version":"15.11.2023 00001",
+"project":"Christoph Reisen",
+"version":"1.0.0 2024.04.26",
 "feed":"nl",
 "styl":"size 00",
 "text":"Standort: ",
@@ -19,18 +19,3 @@
 "feed":"nl",
 "feed":"eject"
 }
-
-
-
-
-
-
-
-
-
-
-
-
-#
-#
-#
--- a/etc/psa_config/DC2C_print08.json
+++ b/etc/psa_config/DC2C_print08.json
@@ -1,8 +1,6 @@
 {
 "title":"DC2C_pri08",
-"project":"Korneuburg",
-"Version":"15.11.2023 01.01",
+"project":"Christoph Reisen",
+"version":"1.0.0 2024.04.26",
 "text":"";
-}#
-#
-#
+}
--- 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",
+"project":"Christoph Reisen",
+"version":"1.0.0 2024.04.26",
 "styl":"font 08",
 "styl":"size 10",
 "feed":"margin02",
@@ -17,8 +17,3 @@
 "feed":"nl",
 "feed":"eject"
 }
-
-
-#
-#
-#
--- 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":"15.11.2023 00001",
+"project":"Christoph Reisen",
+"version":"1.0.0 2024.04.26",
 "styl":"font 08",
 "styl":"size 10",
 "feed":"margin02",
@@ -38,8 +38,3 @@
 "feed":"nl",
 "feed":"eject"
 }
-
-
-#
-#
-#
--- a/etc/psa_tariff/tariff01.json
+++ b/etc/psa_tariff/tariff01.json
@@ -40,11 +40,11 @@
      "pop_min_time": 360,
      "pop_max_time": 7440,
      "pop_min_price": 600,
-      "pop_max_price": 3600,
+      "pop_max_price": 4000,
      "pop_carry_over": 1,
      "pop_daily_card_price": 0,
-      "pop_business_hours": 16128,
-      "comment_pop_business_hours": "0x3F00 -> MON-SUN"
+      "pop_business_hours": 32512,
+      "comment_pop_business_hours": "0x7F00 -> MON-SUN"
    }
  ],
  "PaymentRate": [
@@ -76,12 +76,12 @@
    {
      "pra_payment_option_id": 1099,
      "pra_payment_unit_id": 6,
-      "pra_price": 3000
+      "pra_price": 3200
    },
    {
      "pra_payment_option_id": 1099,
      "pra_payment_unit_id": 7,
-      "pra_price": 3600
+      "pra_price": 4000
    }
  ],
  "Duration": [
@@ -173,3 +173,4 @@
    }
  ]
 }
+
--- a/etc/psa_update/opkg_commands
+++ b/etc/psa_update/opkg_commands
@@ -6,17 +6,13 @@
 # 
 opkg update
 opkg install prepare-update
-opkg install atbupdatetool
-opkg install mxt-touch-reset
-opkg install atb-dc-libraries
-opkg install ptu5-systemcontroller
-opkg install atb-modemtools
-# opkg remove atb-accountingtool
-# opkg install atb-accountingtool
-#opkg --cache /var/cache/opkg --download-only upgrade
-#opkg --cache /var/cache/opkg upgrade
-# opkg remove apism
-# opkg install apism
-opkg info apism
-opkg info atbqt
-opkg info atbupdatetool
+#
+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
+#opkg install --force-downgrade  https://firmware.ptu5.atb-comm.de/testing/00700/atb-plugin-calculateprice-mobilisis_1.5.0+git0+034adf9096-r1-00700_cortexa9t2hf-neon.ipk
+#opkg install --force-downgrade https://firmware.ptu5.atb-comm.de/testing/00700/libmobilisis-calc2_2.1.99+git0+c7623429d9-r0-00700_cortexa9t2hf-neon.ipk
Author	SHA1	Message	Date
Gerhard Hoffmann	48a03d5f7d	Add refund and bill-lines	2024-06-25 16:45:00 +02:00
Gerhard Hoffmann	5b09f281f4	Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_746 into zg1/zone1	2024-06-25 16:40:06 +02:00
Gerhard Hoffmann	bff7ff4032	removed empty lines	2024-06-25 16:34:24 +02:00
Siegfried Siegert	9e46295fe4	Fix: DC2C_cash.json	2024-06-25 16:25:24 +02:00
Siegfried Siegert	86fd25683c	DC_device: add paramter "housing" ... ... this is for enabling door switches on 1256 DC	2024-06-25 15:44:11 +02:00
Siegfried Siegert	e1782ae4f6	opkg install release 2024-06-18	2024-06-25 15:42:26 +02:00
Siegfried Siegert	15b5fef435	Disable opkg-commands	2024-05-23 15:38:55 +02:00
Siegfried Siegert	8af9af2e52	Downgrade tariff libs	2024-05-23 15:26:54 +02:00
Siegfried Siegert	7a95bb261f	Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_746 into zg1/zone1	2024-05-23 14:51:54 +02:00
Gerhard Hoffmann	1fc4224604	Fix wrong prices: 30 -> 32, 36 -> 40	2024-05-06 11:24:29 +02:00
Gerhard Hoffmann	93d5f23a43	Fix: set pop_business_hours: 0x3F00 -> 0x7F00	2024-05-06 10:15:53 +02:00
Gerhard Hoffmann	c8f9389f36	Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_746 into zg1/zone1	2024-05-06 09:34:02 +02:00
Gerhard Hoffmann	3b259a8e90	Reload tariff-file	2024-05-06 09:33:35 +02:00
Siegfried Siegert	7698f857ad	HMI: Textupdate (cs_CZ)	2024-04-26 11:19:14 +02:00
Siegfried Siegert	303f6b7d7a	ATBAPP: set password for FeigPlug Six (plugin CC_TCPZVT)	2024-04-26 10:27:10 +02:00
Siegfried Siegert	4578c4a84f	Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_746 into zg1/zone1	2024-04-26 10:26:13 +02:00
Gerhard Hoffmann	27d0c90612	Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_746 into zg1/zone1	2024-04-26 08:50:02 +02:00
Gerhard Hoffmann	7604f6661d	Set projetc Christoph Reisen	2024-04-26 08:49:14 +02:00