Adapt format needed by new tariff library

Merge branch 'zg1/zone101' of https://ptu-config.atb-comm.de/ATB/customer_332 into zg1/zone101
Improve cut for ticket
2025-02-03 12:39:06 +01:00 · 2025-02-03 12:38:48 +01:00 · 2024-12-02 11:41:36 +01:00 · 2024-12-02 10:32:11 +01:00 · 2024-12-02 10:31:08 +01:00 · 2024-12-02 10:30:35 +01:00
10 changed files with 33 additions and 165 deletions
--- a/etc/atb/SystemControl.ini
+++ b/etc/atb/SystemControl.ini
@@ -34,7 +34,7 @@ inputBrightness=499
 startBacklightController=true
 startMQTTController=false
 startMonitoringController=false
-startSuspendController=false
+startSuspendController=true

 [MONITORING]
 http_dataFormat=HTTP
--- a/etc/atbapp/states/APP_States.xml
+++ b/etc/atbapp/states/APP_States.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ATB_APP_STATES version="1.1">
    <APP_STATE name="IDLE">
-        <EVENT name="BUTTON_START" resultingState="PRODUCT_SELECTION"/>
+        <!-- <EVENT name="BUTTON_START" resultingState="PRODUCT_SELECTION"/> -->
+        <EVENT name="BUTTON_START" resultingState="SETUP_SELL_STATE"/>
        <EVENT name="SELL_DISABLE" resultingState="FREE_PARK"/>
        <SCREEN name="START"/>
        <MODE name="IDLE"/>
--- a/etc/atbapp/text/HMI_Texte.xml
+++ b/etc/atbapp/text/HMI_Texte.xml
@@ -1000,14 +1000,14 @@
      <en_GB>PLATE ENTRY\n(not required for display in the vehicle)</en_GB>
      <fr_FR>D'IDENTIFICATION\n(pas nécessaire de l'afficher dans le véhicule)</fr_FR>
      <nl_NL> </nl_NL>
-      <es_ES>ENTRADA DE PLACA\n(no necesaria para exhibir en el vehículo)</es_ES>
+      <es_ES>ENTRADA DE PLACA (no necesaria para exhibir en el vehículo)</es_ES>
    </Text>
    <Text textnr="0x32">
      <de_DE>PAPIERTICKET\n(zur Auslage im Fahrzeug)</de_DE>
      <en_GB>PAPER TICKET\n(for display in the vehicle)</en_GB>
      <fr_FR>BILLET PAPIER\n(à présenter dans le véhicule)</fr_FR>
      <nl_NL> </nl_NL>
-      <es_ES>BILLETE DE PAPEL\n(para exponer en el vehículo)</es_ES>
+      <es_ES>BILLETE DE PAPEL (para exponer en el vehículo)</es_ES>
    </Text>
    <Text textnr="0x33">
      <de_DE> </de_DE>
--- a/etc/psa_config/DC2C_device.json
+++ b/etc/psa_config/DC2C_device.json
@@ -1,11 +1,11 @@
 {
 "title":"DC2C_device",
 "Project":"Schoenau",
-"Version":"6.7.1-2024-06-17",
+"Version":"6.7.2-2024-06-17",
 "printer":1,
 "coinChk":3,
 "mifRd":1,
-"solarPwr":0,
+"solarPwr":1,
 "modem":1,
 "creditCard":1,
 "escrow":0,
--- a/etc/psa_config/DC2C_device.json-netz
+++ b/etc/psa_config/DC2C_device.json-netz
@@ -1,27 +0,0 @@
-{
-"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
@@ -1,27 +0,0 @@
-{
-"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
@@ -3,6 +3,7 @@
 "Project":"Schoenau",
 "Version":"6.7.1-2024-06-17",
 "styl":"font 10",
+"styl":"csiz 10",
 "styl":"size 11",
 "styl":"align c",
 "feed":"margin02",
--- a/etc/psa_config/DC2C_print05.json
+++ b/etc/psa_config/DC2C_print05.json
@@ -3,6 +3,7 @@
 "Project":"Schoenau",
 "Version":"6.7.1-2024-06-17",
 "styl":"font 10",
+"styl":"csiz 10",
 "styl":"size 11",
 "styl":"align c",
 "feed":"margin02",
--- a/etc/psa_tariff/tariff03.json
+++ b/etc/psa_tariff/tariff03.json
@@ -58,10 +58,10 @@
      "pop_payment_method_id": 5,
      "pop_min_time": 60,
      "comment_pop_min_time": "60mins -> 200 cent",
-      "pop_max_time": 14400,
+      "pop_max_time": 1440,
      "comment_pop_max_time": "1440mins = 24h -> 5 euros",
      "pop_min_price": 200,
-      "pop_max_price": 5000,
+      "pop_max_price": 500,
      "pop_plus_steps": 1,
      "pop_minus_steps": 1,
      "pop_time_step_config": 1,
@@ -86,51 +86,6 @@
        "pra_payment_option_id": 1049,
        "pra_payment_unit_id": 2,
        "pra_price": 500
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 3,
-        "pra_price": 1000
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 4,
-        "pra_price": 1500
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 5,
-        "pra_price": 2000
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 6,
-        "pra_price": 2500
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 7,
-        "pra_price": 3000
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 8,
-        "pra_price": 3500
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 9,
-        "pra_price": 4000
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 10,
-        "pra_price": 4500
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 11,
-        "pra_price": 5000
    }
  ],
  "Duration": [
@@ -145,42 +100,6 @@
    {
 	"pun_duration": 1440,
 	"pun_id": 2
-    },
-    {
-	"pun_duration": 2880,
-	"pun_id": 3
-    },
-    {
-	"pun_duration": 4320,
-	"pun_id": 4
-    },
-    {
-	"pun_duration": 5760,
-	"pun_id": 5
-    },
-    {
-	"pun_duration": 7200,
-	"pun_id": 6
-    },
-    {
-	"pun_duration": 8640,
-	"pun_id": 7
-    },
-    {
-	"pun_duration": 10080,
-	"pun_id": 8
-    },
-    {
-	"pun_duration": 11520,
-	"pun_id": 9
-    },
-    {
-	"pun_duration": 12960,
-	"pun_id": 10
-    },
-    {
-	"pun_duration": 14400,
-	"pun_id": 11
    }
  ],
    "Monday" : [{
@@ -188,8 +107,8 @@
            "payment_settings" : [
                {
                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 5000,
+                    "max_time" : 1440,
+                    "max_price": 500,
                    "min_price": 200
                }
            ],
@@ -218,8 +137,8 @@
            "payment_settings" : [
                {
                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 5000,
+                    "max_time" : 1440,
+                    "max_price": 500,
                    "min_price": 200
                }
            ],
@@ -248,8 +167,8 @@
            "payment_settings" : [
                {
                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 5000,
+                    "max_time" : 1440,
+                    "max_price": 500,
                    "min_price": 200
                }
            ],
@@ -278,8 +197,8 @@
            "payment_settings" : [
                {
                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 5000,
+                    "max_time" : 1440,
+                    "max_price": 500,
                    "min_price": 200
                }
            ],
@@ -308,8 +227,8 @@
            "payment_settings" : [
                {
                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 5000,
+                    "max_time" : 1440,
+                    "max_price": 500,
                    "min_price": 200
                }
            ],
@@ -338,8 +257,8 @@
            "payment_settings" : [
                {
                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 5000,
+                    "max_time" : 1440,
+                    "max_price": 500,
                    "min_price": 200
                }
            ],
@@ -368,8 +287,8 @@
            "payment_settings" : [
                {
                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 5000,
+                    "max_time" : 1440,
+                    "max_price": 500,
                    "min_price": 200
                }
            ],
--- a/etc/psa_update/opkg_commands
+++ b/etc/psa_update/opkg_commands
@@ -4,13 +4,13 @@
 # opkg-commands added to this file will be executed by ATBUpdateTool.          
 ###############################################################################
 # 
-# opkg update
-# opkg install prepare-update
+opkg update
+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 --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 --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	bfcfd2f37a	Adapt format needed by new tariff library	2025-02-03 12:39:06 +01:00
Gerhard Hoffmann	8e091ed190	Merge branch 'zg1/zone101' of https://ptu-config.atb-comm.de/ATB/customer_332 into zg1/zone101	2025-02-03 12:38:48 +01:00
Gerhard Hoffmann	b404fc5729	Improve cut for ticket	2024-12-02 11:41:36 +01:00
Siegfried Siegert	9f3e01ce9e	Merge branch 'zg1/zone101' of git.mimbach49.de:GerhardHoffmann/customer_332 into zg1/zone101	2024-12-02 10:32:11 +01:00
Siegfried Siegert	f31dcb6aee	SystemController: start suspend controller	2024-12-02 10:31:08 +01:00
Siegfried Siegert	9e4808893e	Add /etc/atb/SystemControl.ini	2024-12-02 10:30:35 +01:00
Gerhard Hoffmann	ae9fdb420b	Improve cut for ticket	2024-11-22 11:50:24 +01:00
Gerhard Hoffmann	459244226e	Merge branch 'zg1/zone101' of https://ptu-config.atb-comm.de/ATB/customer_332 into zg1/zone101	2024-10-22 13:16:36 +02:00
Gerhard Hoffmann	e54a9a9a38	Update printer files as provided by Thomas Sax	2024-10-22 13:15:48 +02:00
Siegfried Siegert	0fa851e2b1	Textupdate: "Wait for Terminal"	2024-08-02 10:25:01 +02:00
Siegfried Siegert	6510c0b932	Merge branch 'zg1/zone101' of git.mimbach49.de:GerhardHoffmann/customer_332 into zg1/zone101	2024-07-16 17:27:33 +02:00
Gerhard Hoffmann	8f944a41d7	Fix (Thomas): Title -> title	2024-06-17 15:50:39 +02:00
Gerhard Hoffmann	49827c1887	Merge branch 'zg1/zone101' of https://git.mimbach49.de/GerhardHoffmann/customer_332 into zg1/zone101	2024-06-17 11:53:47 +02:00
Gerhard Hoffmann	96204fc048	Update Jsons for Schoenau as provided by Thomas	2024-06-17 11:53:07 +02:00
Siegfried Siegert	23c7e92cb8	Update release 2024-06-17	2024-06-17 09:59:21 +02:00
Siegfried Siegert	1f9a861781	Update release 2024-06-10	2024-06-10 12:51:06 +02:00
Siegfried Siegert	afb91a5e86	Update release 20240521	2024-05-27 16:30:05 +02:00
Gerhard Hoffmann	d582a0eb2b	Use cent-values: 5000,2000,1000,500 instead of euro-values.	2024-05-07 13:27:55 +02:00
Siegfried Siegert	d74b9284ca	Fix: remove unused DC json files	2024-05-07 12:36:54 +02:00
Siegfried Siegert	ec8d05ef74	Fix: opkg commands	2024-05-07 12:00:05 +02:00
Siegfried Siegert	98527ac0a9	OPKG: release 20240506	2024-05-07 11:59:54 +02:00
Siegfried Siegert	fc7f0b49a1	Update ATBQT/States: skip LicencePlate input	2024-05-06 15:34:45 +02:00
Siegfried Siegert	a439d98e30	Update ATBQT/States: - product selection: with licenscplate results in paperless ticket - ask for printing bank receipt	2024-05-06 12:42:10 +02:00
Gerhard Hoffmann	a0dcee6c0d	keep only 'opkg update'	2024-05-06 12:24:40 +02:00
Gerhard Hoffmann	8908ab6a8a	Update DC2C_cash/device.json as provided by Thomas	2024-05-06 11:13:10 +02:00
Gerhard Hoffmann	4d30cab52a	Set version for testing	2024-04-23 12:22:39 +02:00
Gerhard Hoffmann	f7d34c852c	Set version to 1.2.1 for testing	2024-04-11 16:03:35 +02:00
Gerhard Hoffmann	63342a73fa	set new version: 11.04.2024, 1	2024-04-10 10:48:42 +02:00
Gerhard Hoffmann	98139519d3	Add tariff-file for zone101	2024-04-10 10:22:38 +02:00
Gerhard Hoffmann	52de7318dd	remove obsolete files	2024-04-10 10:20:49 +02:00
Gerhard Hoffmann	a5ce1dae97	Configure devices in zone101 as solar-psa	2024-04-10 10:19:43 +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