Add tariff for BUS

Textupdate: "Wait for Terminal"
Fix (Thomas): Title -> title
2024-11-06 10:39:42 +01:00 · 2024-08-02 10:30:51 +02:00 · 2024-06-17 15:43:36 +02:00 · 2024-06-17 11:48:20 +02:00 · 2024-06-17 11:46:52 +02:00 · 2024-06-17 09:57:33 +02:00
19 changed files with 3008 additions and 78 deletions
--- a/etc/atbapp/text/HMI_Texte.xml
+++ b/etc/atbapp/text/HMI_Texte.xml
--- a/etc/psa_config/DC2C_cash.json
+++ b/etc/psa_config/DC2C_cash.json
@@ -1,13 +1,13 @@
 {	     
 "title":"DC2C_cash  ",
-"project":"Schoenau",
-"version":"06.05.2024 02.00.07",
+"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,
--- 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"
 }

--- a/etc/psa_config/DC2C_conf21.json
+++ b/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"
-}
-
--- a/etc/psa_config/DC2C_conf25.json
+++ b/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"
-}
-
--- a/etc/psa_config/DC2C_conf26.json
+++ b/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"
-}
-
--- 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",
+"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,
--- 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",
+"Project":"Schoenau",
+"Version":"6.7.1-2024-06-17",
 "styl":"font 10",
 "styl":"size 11",
 "styl":"align c",
--- 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",
+"Project":"Schoenau",
+"Version":"6.7.1-2024-06-17",
 "text":"Standort: ",
 "feed":"nl",
 "vari":"location",
--- 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",
+"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",
--- 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",
+"Project":"Schoenau",
+"Version":"6.7.1-2024-06-17",
 "text":"";
 }
--- 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",
+"Project":"Schoenau",
+"Version":"6.7.1-2024-06-17",
 "styl":"font 10",
 "styl":"size 11",
 "styl":"align c",
--- 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",
@@ -16,6 +15,7 @@
 "vari":"wday deu short",
 "vari":"date ge",	
 "vari":"time long"
+
 }


--- 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",
+"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",
--- 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",
+"Project":"Schoenau",
+"Version":"6.7.1-2024-06-17",
 "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":"door close print",
+"Version":"6.7.1-2024-06-17",
 "styl":"font 08",
 "styl":"size 10",
 "feed":"margin02",
--- 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",
+"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",	
--- a/etc/psa_tariff/tariff04.json
+++ b/etc/psa_tariff/tariff04.json
@@ -0,0 +1,82 @@
+{
+  "Project" :   "Schoenau",
+  "Version" :   "1.2.0",
+  "Info"    :   "<<Tariff for Zone 4>>",
+  "Currency": [
+    {
+      "pcu_id": 1,
+      "pcu_sign": "€",
+      "pcu_major": "Euro",
+      "pcu_minor": "Cent",
+      "pcu_active": true
+    }
+  ],
+  "PaymentMethod": [
+    {
+      "pme_id": 1,
+      "pme_label": "progressive"
+    },
+    {
+      "pme_id": 2,
+      "pme_label": "degressive"
+    },
+    {
+      "pme_id": 3,
+      "pme_label": "linear"
+    },
+    {
+      "pme_id": 4,
+      "pme_label": "steps"
+    }
+  ],
+  "PaymentOption": [
+    {
+      "pop_id": 1099,
+      "pop_label": "Zone 4",
+      "pop_payment_method_id": 4,
+      "pop_day_end_time": "15:20:00",
+      "pop_day_night_end_time": "15:20:00",
+      "pop_price_night": 0,
+      "pop_min_time": 60,
+      "pop_max_time": 1440,
+      "pop_min_price": 500,
+      "pop_carry_over": 1,
+      "pop_daily_card_price": 0,
+      "pop_multi_hour_price": 8
+    }
+  ],
+  "PaymentRate": [
+    {
+      "pra_payment_option_id": 1099,
+      "pra_payment_unit_id": 1,
+      "pra_price": 500
+    },
+    {
+      "pra_payment_option_id": 1099,
+      "pra_payment_unit_id": 6,
+      "pra_price": 2000
+    },
+    {
+      "pra_payment_option_id": 1099,
+      "pra_payment_unit_id": 5,
+      "pra_price": 2500
+    }
+  ],
+  "Duration": [
+    {
+      "pun_id": 1,
+      "pun_label": "1h",
+      "pun_duration": 60
+    },
+    {
+      "pun_id": 5,
+      "pun_label": "24h",
+      "pun_duration": 1440
+    },
+    {
+      "pun_id": 6,
+      "pun_label": "5h",
+      "pun_duration": 300
+    }
+  ]
+}
--- a/etc/psa_update/opkg_commands
+++ b/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
Author	SHA1	Message	Date
Gerhard Hoffmann	a1755d305c	Add tariff for BUS	2024-11-06 10:39:42 +01:00
Siegfried Siegert	04c549baa9	Textupdate: "Wait for Terminal"	2024-08-02 10:30:51 +02:00
Gerhard Hoffmann	15c4bbd8a0	Fix (Thomas): Title -> title	2024-06-17 15:43:36 +02:00
Gerhard Hoffmann	2486d71c34	Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_332 into zg1/zone1	2024-06-17 11:48:20 +02:00
Gerhard Hoffmann	7551b6b969	Update Jsons for Schoenau as provided by Thomas	2024-06-17 11:46:52 +02:00
Siegfried Siegert	2184c40256	Update release 2024-06-17	2024-06-17 09:57:33 +02:00
Siegfried Siegert	b8a4b41818	Update release 2024-06-10	2024-06-10 12:52:25 +02:00
Siegfried Siegert	0d24a80cb1	Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_332 into zg1/zone1	2024-05-28 08:24:28 +02:00
Siegfried Siegert	06a92a8330	Update release 20240521	2024-05-27 16:33:23 +02:00
Gerhard Hoffmann	0722fd1f13	Use cent-values: 5000,2000,1000,500 instead of euro-values.	2024-05-07 13:18:21 +02:00
Siegfried Siegert	c019713572	Fix: remove unused DC json files	2024-05-07 12:34:38 +02:00
Siegfried Siegert	128e4d9d14	Fix: opkg commands	2024-05-07 11:43:20 +02:00
Siegfried Siegert	db907417ef	OPKG: release 20240506	2024-05-07 11:29:10 +02:00