Change price for 1st hour: 5 Euro -> 10 Euro

Improve cut for ticket
Same as for Zone 1
2024-11-27 09:44:18 +01:00 · 2024-11-22 11:47:57 +01:00 · 2024-11-06 11:23:08 +01:00 · 2024-11-06 10:44:30 +01:00 · 2024-11-05 16:27:48 +01:00 · 2024-08-02 10:32:47 +02:00
22 changed files with 237 additions and 225 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_conf21.json
+++ b/etc/psa_config/DC2C_conf21.json
@@ -0,0 +1,12 @@
+{ 
+"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
@@ -0,0 +1,12 @@
+{ 
+"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
@@ -0,0 +1,12 @@
+{ 
+"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",
+"Title":"DC2C_device",
+"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,31 @@
+{
+"title":"DC2C_device",
+"Project":"Schoenau",
+"Version":"6.7.1-2024-06-17",
+"printer":1,
+"coinChk":3,
+"mifRd":1,
+"solarPwr":0,
+"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,
+"refundPrint":1,
+"billWarnLev":300,
+"billFullLev":380,
+"housing":1
+
+}
--- a/etc/psa_config/DC2C_device_json.solar
+++ b/etc/psa_config/DC2C_device_json.solar
@@ -0,0 +1,31 @@
+{
+"title":"DC2C_device",
+"Project":"Schoenau",
+"Version":"6.7.2-2024-06-17",
+"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,
+"refundPrint":1,
+"billWarnLev":300,
+"billFullLev":380,
+"housing":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,9 +16,14 @@
 "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",
+"feed":"nl",
+"feed":"nl",
 "feed":"eject"
 }

--- 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,9 +16,14 @@
 "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",
+"feed":"nl",
+"feed":"nl",
 "feed":"eject"
 }

--- 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.3.0",
+  "Info"    :   "<<Tariff for Zone 4>> (Bus)",
+  "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": 1000
+    },
+    {
+      "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
@@ -5,22 +5,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 atbqt
-opkg --cache /var/cache/opkg upgrade atbqt
+# 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
Author	SHA1	Message	Date
Gerhard Hoffmann	9c6b7af475	Change price for 1st hour: 5 Euro -> 10 Euro	2024-11-27 09:44:18 +01:00
Gerhard Hoffmann	4d025c2ac2	Improve cut for ticket	2024-11-22 11:47:57 +01:00
Gerhard Hoffmann	b4d92ad239	Same as for Zone 1	2024-11-06 11:23:08 +01:00
Gerhard Hoffmann	7af48cf589	Add tariff for BUS	2024-11-06 10:44:30 +01:00
Gerhard Hoffmann	9062ca899a	tariff for bus (schoenau)	2024-11-05 16:27:48 +01:00
Siegfried Siegert	b3233143d6	Textupdate: "Wait for Terminal"	2024-08-02 10:32:47 +02:00
Gerhard Hoffmann	99defbb851	Fix (Thomas): Title -> title	2024-06-17 15:41:27 +02:00
Gerhard Hoffmann	ab371e437c	Update Jsons for Schoenau as provided by Thomas	2024-06-17 11:43:49 +02:00
Gerhard Hoffmann	82a04d0a06	sync master with zg1/zone1 (-> and all other branches)	2024-05-08 11:19:12 +02:00
Gerhard Hoffmann	4915aaaa38	keep only 'opkg update'	2024-05-06 12:22:19 +02:00
Gerhard Hoffmann	262f333864	Update DC2C_cash/device.json as provides by Thomas	2024-05-06 11:15:38 +02:00
Gerhard Hoffmann	a5aaf055f9	Set version date (23/04) -> trigger git	2024-04-23 12:38:50 +02:00
Gerhard Hoffmann	1362c61ae4	sync with brancht zg1/zone101	2024-04-12 09:11:01 +02:00
Gerhard Hoffmann	d9c98d5748	add tariff101.json for zone101 (solar)	2024-04-10 10:27:41 +02:00
Gerhard Hoffmann	c767849c2c	remove separate solar/net.jsons	2024-04-10 10:17:11 +02:00
Gerhard Hoffmann	74dad410bb	Add ptu5-systemcontroller using upgrade	2024-04-10 10:12:09 +02:00
Gerhard Hoffmann	0e6272602c	Added opkg install tariff-config-332	2024-04-09 17:00:35 +02:00
Gerhard Hoffmann	c537095c46	Update tariff-info to trigger new download	2024-04-09 15:09:40 +02:00
Gerhard Hoffmann	038bc004a8	Update tariffs for zone1 and zone2	2024-04-09 10:27:52 +02:00
Gerhard Hoffmann	db10f7fcf8	update version to 05.04.2024	2024-04-05 13:50:23 +02:00
Gerhard Hoffmann	3a51bebd82	Fix typo: Koenigssee	2024-03-28 09:15:24 +01:00
Gerhard Hoffmann	491624619a	Set version to 1.1.1 for testing.	2024-03-15 11:33:18 +01:00
Gerhard Hoffmann	03d1a113a8	Set pop_max_time: 10080, pop_multi_hour_price: 8	2024-03-15 10:39:32 +01:00
Siegfried Siegert	a49807484b	Merge branch 'master' of git.mimbach49.de:GerhardHoffmann/customer_332	2024-03-13 13:52:42 +01:00
Siegfried Siegert	983d54d838	ATBAPP: Add customer vending process description (states)	2024-03-13 13:28:43 +01:00
Gerhard Hoffmann	f1e7dc9e0f	set min-price to 300	2024-03-13 13:10:57 +01:00
Siegfried Siegert	9dc0e02105	Merge branch 'master' of git.mimbach49.de:GerhardHoffmann/customer_332	2024-03-13 12:44:28 +01:00
Gerhard Hoffmann	a5835dddae	Change tariff for zone2 (Hinterbrand)	2024-02-26 09:39:10 +01:00
Gerhard Hoffmann	9569c90ddc	sync with tariff01.json in zg1/zone1 -> Minor: version from 1.0.0 to 1.0.15	2024-01-25 11:39:26 +01:00
Gerhard Hoffmann	5036717517	On not upgrade, but install packages only with direct commands. 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:50:14 +01:00
Gerhard Hoffmann	f0180cbe30	Add opkg install mxt-touch-reset to fix touch-screen issues	2024-01-24 12:42:37 +01:00
Gerhard Hoffmann	9480f75479	sync with branch zg1/zone1	2024-01-24 12:31:38 +01:00
Gerhard Hoffmann	a3868cea1b	Sync with branch zg1/zone1	2023-11-29 09:33:53 +01:00
Gerhard Hoffmann	eff3c6351d	Fix typo: 5670 -> 5760.	2023-11-28 10:26:06 +01:00
Gerhard Hoffmann	909c124fb8	Add new files (used for new templates)	2023-11-24 13:42:42 +01:00
Gerhard Hoffmann	5f755bd800	Revert version to original 00001.	2023-11-24 09:39:53 +01:00
Gerhard Hoffmann	fd3ef4d79f	Remove euro sign.	2023-11-24 09:30:36 +01:00
Gerhard Hoffmann	cd7db15372	Remove euro sign.	2023-11-24 09:30:16 +01:00
Gerhard Hoffmann	3ac760eb9b	Switch back to machine-id 1000 and zone = 0 (original setting)	2023-11-24 09:29:38 +01:00
Gerhard Hoffmann	01166c2644	witch back to machine-id 1000 and zone=0.	2023-11-24 09:28:34 +01:00
Siegfried Siegert	0fe79592ee	Merge branch 'zg1/zone1'	2023-11-22 17:14:36 +01:00
Gerhard Hoffmann	938bcc0144	Add json-config files for schoenau.	2023-11-20 13:10:20 +01:00
Gerhard Hoffmann	1f9c20f774	Add opkg_commands file.	2023-11-16 09:47:27 +01:00