Merge branch 'zg1/zone2' of https://ptu-config.atb-comm.de/ATB/customer_332 into zg1/zone2

Add tariff for BUS
Textupdate: "Wait for Terminal"
2024-11-06 10:42:42 +01:00 · 2024-11-06 10:42:17 +01:00 · 2024-08-02 10:29:52 +02:00 · 2024-06-17 15:47:20 +02:00 · 2024-06-17 11:56:59 +02:00 · 2024-06-17 09:58:44 +02:00
19 changed files with 185 additions and 219 deletions
--- a/1
+++ b/1
@@ -1 +0,0 @@
-This is a demo/test zone for update tests
--- 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",
+"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],
--- a/etc/psa_config/DC2C_conf.json
+++ 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"
+}
+
--- 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_device.json-netz
+++ b/etc/psa_config/DC2C_device.json-netz
@@ -0,0 +1,27 @@
+{
+"title":"DC2C_device",
+"project":"Schoenau",
+"Version":"15.11.2023 00102",
+"printer":1,
+"coinChk":3,
+"mifRd":1,
+"solarPwr":0,
+"modem":0,
+"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,
+"refPrint":1
+}
--- a/etc/psa_config/DC2C_device.json-solar
+++ b/etc/psa_config/DC2C_device.json-solar
@@ -0,0 +1,27 @@
+{
+"title":"DC2C_device",
+"project":"Schoenau",
+"Version":"15.11.2023 00102",
+"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,
+"refPrint":1
+}
--- 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_tariff/tariff100.json
+++ b/etc/psa_tariff/tariff100.json
@@ -1,177 +0,0 @@
-{
-  "Project" :   "Schoenau",
-  "Version" :   "1.2.0",
-  "Info"    :   "<<Tariff for Zone 1>>",
-  "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 1",
-      "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": 14400,
-      "pop_min_price": 300,
-      "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": 300
-    },
-    {
-      "pra_payment_option_id": 1099,
-      "pra_payment_unit_id": 6,
-      "pra_price": 700
-    },
-    {
-      "pra_payment_option_id": 1099,
-      "pra_payment_unit_id": 5,
-      "pra_price": 900
-    },
-    {
-      "pra_payment_option_id": 1099,
-      "pra_payment_unit_id": 7,
-      "pra_price": 1800
-    },
-    {
-      "pra_payment_option_id": 1099,
-      "pra_payment_unit_id": 8,
-      "pra_price": 2700
-    },
-    {
-      "pra_payment_option_id": 1099,
-      "pra_payment_unit_id": 9,
-      "pra_price": 3600
-    },
-    {
-      "pra_payment_option_id": 1099,
-      "pra_payment_unit_id": 10,
-      "pra_price": 4500
-    },
-    {
-      "pra_payment_option_id": 1099,
-      "pra_payment_unit_id": 11,
-      "pra_price": 5400
-    },
-    {
-      "pra_payment_option_id": 1099,
-      "pra_payment_unit_id": 12,
-      "pra_price": 6300
-    },
-    {
-      "pra_payment_option_id": 1099,
-      "pra_payment_unit_id": 13,
-      "pra_price": 7200
-    },
-    {
-      "pra_payment_option_id": 1099,
-      "pra_payment_unit_id": 14,
-      "pra_price": 8100
-    },
-    {
-      "pra_payment_option_id": 1099,
-      "pra_payment_unit_id": 15,
-      "pra_price": 9000
-    }
-  ],
-  "Duration": [
-    {
-      "pun_id": 1,
-      "pun_label": "1h",
-      "pun_duration": 60
-    },
-    {
-      "pun_id": 3,
-      "pun_label": "15 min",
-      "pun_duration": 15
-    },
-    {
-      "pun_id": 5,
-      "pun_label": "24h",
-      "pun_duration": 1440
-    },
-    {
-      "pun_id": 6,
-      "pun_label": "3h",
-      "pun_duration": 180
-    },
-    {
-      "pun_id": 7,
-      "pun_label": "48h",
-      "pun_duration": 2880
-    },
-    {
-      "pun_id": 8,
-      "pun_label": "72h",
-      "pun_duration": 4320
-    },
-    {
-      "pun_id": 9,
-      "pun_label": "96h",
-      "pun_duration": 5760
-    },
-    {
-      "pun_id": 10,
-      "pun_label": "120h",
-      "pun_duration": 7200
-    },
-    {
-      "pun_id": 11,
-      "pun_label": "144h",
-      "pun_duration": 8640
-    },
-    {
-      "pun_id": 12,
-      "pun_label": "168h",
-      "pun_duration": 10080
-    },
-    {
-      "pun_id": 13,
-      "pun_label": "192h",
-      "pun_duration": 11520
-    },
-    {
-      "pun_id": 14,
-      "pun_label": "216h",
-      "pun_duration": 12960
-    },
-    {
-      "pun_id": 15,
-      "pun_label": "240h",
-      "pun_duration": 14400
-    }
-  ]
-}
--- a/etc/psa_update/opkg_commands
+++ b/etc/psa_update/opkg_commands
@@ -7,20 +7,10 @@
 opkg update
 opkg install prepare-update
 #
-opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-dc
-opkg --cache /var/cache/opkg upgrade atb-plugin-dc
-#
-opkg --cache /var/cache/opkg --download-only upgrade apism
-opkg --cache /var/cache/opkg upgrade apism
-#
 opkg --cache /var/cache/opkg --download-only upgrade atb-dc-libraries
-opkg --cache /var/cache/opkg upgrade atb-dc-libraries
-#
-opkg --cache /var/cache/opkg --download-only upgrade atbupdatetool
-opkg --cache /var/cache/opkg upgrade atbupdatetool
-#
-opkg --cache /var/cache/opkg --download-only upgrade apconfig
-opkg --cache /var/cache/opkg upgrade apconfig
-#
+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	355ed52091	Merge branch 'zg1/zone2' of https://ptu-config.atb-comm.de/ATB/customer_332 into zg1/zone2	2024-11-06 10:42:42 +01:00
Gerhard Hoffmann	46d2060181	Add tariff for BUS	2024-11-06 10:42:17 +01:00
Siegfried Siegert	afe57d5c5f	Textupdate: "Wait for Terminal"	2024-08-02 10:29:52 +02:00
Gerhard Hoffmann	5ca70dec85	Fix (Thomas): Title -> title	2024-06-17 15:47:20 +02:00
Gerhard Hoffmann	b7f7445dd9	Update Jsons for Schoenau as provided by Thomas	2024-06-17 11:56:59 +02:00
Siegfried Siegert	7529ce31bc	Update release 2024-06-17	2024-06-17 09:58:44 +02:00
Siegfried Siegert	208abb072e	Update release 2024-06-10	2024-06-10 12:53:06 +02:00
Siegfried Siegert	99711cf6e9	Merge branch 'zg1/zone2' of git.mimbach49.de:GerhardHoffmann/customer_332 into zg1/zone2	2024-05-28 08:25:13 +02:00
Siegfried Siegert	113fbf76a3	Update release 20240521	2024-05-27 16:36:04 +02:00
Gerhard Hoffmann	fe0f8bcb7a	Use cent-values: 5000,2000,1000,500 instead of euro-values.	2024-05-07 13:25:51 +02:00
Siegfried Siegert	275f1c734a	Fix: remove unused DC json files	2024-05-07 12:35:39 +02:00
Siegfried Siegert	a90ec96175	Fix: opkg commands	2024-05-07 11:57:55 +02:00
Siegfried Siegert	b1e86edef8	OPKG: release 20240506	2024-05-07 11:57:22 +02:00
Siegfried Siegert	c747a199f4	Update ATBQT/States: skip LicencePlate input	2024-05-06 15:34:15 +02:00
Siegfried Siegert	641bffabd0	Update ATBQT/States: - product selection: with licenscplate results in paperless ticket - ask for printing bank receipt	2024-05-06 12:43:24 +02:00
Siegfried Siegert	767baa7dec	Merge branch 'zg1/zone2' of git.mimbach49.de:GerhardHoffmann/customer_332 into zg1/zone2	2024-05-06 12:43:05 +02:00
Gerhard Hoffmann	b08b0fabb3	keep only 'opkg update'	2024-05-06 12:23:37 +02:00
Gerhard Hoffmann	d23af48325	Update DC2C_cash/device.json as provided by Thomas	2024-05-06 11:09:11 +02:00
Gerhard Hoffmann	3b703a56bf	Set version date (23/04) -> trigger git	2024-04-23 12:36:44 +02:00
Gerhard Hoffmann	472e605ceb	sync with master	2024-04-12 09:14:35 +02:00
Gerhard Hoffmann	4cd5a889df	add tariff101.json for zone101 (solar)	2024-04-10 10:29:08 +02:00
Gerhard Hoffmann	bcf680cb85	Add ptu5-systemcontroller using upgrade	2024-04-10 10:13:05 +02:00
Gerhard Hoffmann	242cb32d02	Added opkg install tariff-config-332	2024-04-09 17:01:49 +02:00
Gerhard Hoffmann	a9cb491e09	Update tariff-info to trigger new download	2024-04-09 15:10:12 +02:00
Gerhard Hoffmann	c4b7fef7d4	update tariff for zone1 and zone2: new prices and extension of parking times	2024-04-08 16:25:04 +02:00
Gerhard Hoffmann	b5e5fd0a70	update version to 05.04.2024	2024-04-05 13:51:38 +02:00
Gerhard Hoffmann	b5a8cc493c	Fix typo: Koenigssee	2024-03-28 09:16:43 +01:00
Siegfried Siegert	c14fe5108b	ATBAPP: vending process: set product names	2024-03-19 11:11:20 +01:00
Gerhard Hoffmann	8d20c3dbd6	Set version to 1.1.1 for testing.	2024-03-15 11:32:34 +01:00
Gerhard Hoffmann	8a6f71bf13	Set pop_max_time: 10080, pop_multi_hour_price: 8	2024-03-15 10:38:22 +01:00
Gerhard Hoffmann	d804da3d03	Merge branch 'zg1/zone2' of https://git.mimbach49.de/GerhardHoffmann/customer_332 into zg1/zone2	2024-03-15 09:49:13 +01:00
Gerhard Hoffmann	2a2c7754e3	renamed DC2C_device netz.json -> DC2C_device.json-netz, DC2C_device solar.json -> DC2C_device.json-solar	2024-03-15 09:48:32 +01:00
Siegfried Siegert	605e7d2333	ATBAPP: Add customer vending process description (states)	2024-03-13 14:00:30 +01:00
Gerhard Hoffmann	b51fc3ec7b	sync with master-branch	2024-03-13 13:12:16 +01:00
Gerhard Hoffmann	470daee68c	sync with tariff01.json in zg1/zone1 -> Minor: version from 1.0.0 to 1.0.15	2024-01-25 11:40:43 +01:00
Gerhard Hoffmann	0112628a95	Do not upgrade, but install packages only directly. opkg update opkg install prepare-update opkg install atbupdatetool opkg install mxt-touch-reset opkg install apism opkg info apism opkg info atbupdatetool	2024-01-24 14:51:57 +01:00
Gerhard Hoffmann	300e8e7b10	Add opkg install mxt-touch-reset to fix touch-screen issues	2024-01-24 12:43:03 +01:00
Gerhard Hoffmann	f4903788f5	sync with branch zg1/zone1	2024-01-24 12:30:31 +01:00
Gerhard Hoffmann	5105dfe498	Set version to 00005 for testing	2023-12-01 10:13:43 +01:00
Gerhard Hoffmann	4735ba928a	Sync with branch zg1/zone1	2023-11-29 09:34:27 +01:00
Gerhard Hoffmann	e5ca24c457	Fix typo: 5670 -> 5760	2023-11-28 10:27:39 +01:00
Gerhard Hoffmann	ceedb0fe12	Add new files (used for new templates)	2023-11-24 13:43:18 +01:00
Gerhard Hoffmann	77e47b73bf	Remove euro sign	2023-11-24 09:36:37 +01:00
Siegfried Siegert	79ad353f5b	Price in cents	2023-11-22 17:12:24 +01:00
Gerhard Hoffmann	e41bd88914	Add json-config files for schoanau.	2023-11-20 13:10:51 +01:00
Gerhard Hoffmann	42d82f2380	Add opkg_commands file.	2023-11-16 09:49:19 +01:00