extend zone3-tariff to 10 days

Revert "Revert "ATBAPP: Selection: Licenceplate or paper ticket""
This reverts commit fdcaaefa36.
2025-06-23 11:47:15 +02:00 · 2025-06-04 09:23:11 +02:00 · 2025-06-02 11:13:26 +02:00 · 2025-03-18 13:09:48 +01:00 · 2025-03-18 13:09:41 +01:00 · 2025-02-03 12:38:00 +01:00
10 changed files with 17 additions and 62 deletions
--- a/0
+++ b/0
--- a/etc/atbapp/states/APP_States.xml
+++ b/etc/atbapp/states/APP_States.xml
@@ -1,8 +1,7 @@
 <?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/psa_config/DC2C_conf.json
+++ b/etc/psa_config/DC2C_conf.json
--- 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,5 +1,5 @@
 {
-"Title":"DC2C_device",
+"title":"DC2C_device",
 "Project":"Schoenau",
 "Version":"6.7.1-2024-06-17",
 "printer":1,
--- a/etc/psa_config/DC2C_device.json-netz
+++ b/etc/psa_config/DC2C_device.json-netz
@@ -1,12 +1,12 @@
 {
 "title":"DC2C_device",
-"Project":"Schoenau",
+"project":"Schoenau",
-"Version":"6.7.1-2024-06-17",
+"Version":"15.11.2023 00102",
 "printer":1,
 "coinChk":3,
 "mifRd":1,
 "solarPwr":0,
-"modem":1,
+"modem":0,
 "creditCard":1,
 "escrow":0,
 "RejMotor":0,
@@ -23,9 +23,5 @@
 "BattWarn":11800,
 "BattErr":11200,
 "foreign":1,
-"refundPrint":1,
+"refPrint":1
 "billWarnLev":300,
 "billFullLev":380,
 "housing":1
 }
--- a/etc/psa_config/DC2C_device.json-solar
+++ b/etc/psa_config/DC2C_device.json-solar
@@ -1,7 +1,7 @@
 {
 "title":"DC2C_device",
-"Project":"Schoenau",
+"project":"Schoenau",
-"Version":"6.7.2-2024-06-17",
+"Version":"15.11.2023 00102",
 "printer":1,
 "coinChk":3,
 "mifRd":1,
@@ -23,9 +23,5 @@
 "BattWarn":11800,
 "BattErr":11200,
 "foreign":1,
-"refundPrint":1,
+"refPrint":1
 "billWarnLev":300,
 "billFullLev":380,
 "housing":1
 }
--- 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 update
-# opkg install prepare-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-dc-libraries
-# opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-dc
+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 atbqt
 #
-# opkg --cache /var/cache/opkg upgrade atb-dc-libraries
+opkg --cache /var/cache/opkg upgrade atb-dc-libraries
-# opkg --cache /var/cache/opkg upgrade atb-plugin-dc
+opkg --cache /var/cache/opkg upgrade atb-plugin-dc
-# opkg --cache /var/cache/opkg upgrade atbqt
+opkg --cache /var/cache/opkg upgrade atbqt
Author	SHA1	Message	Date
Gerhard Hoffmann	2197560e8f	extend zone3-tariff to 10 days	2025-06-23 11:47:15 +02:00
Siegfried Siegert	a81a157d70	Revert "Revert "ATBAPP: Selection: Licenceplate or paper ticket"" This reverts commit `fdcaaefa36`.	2025-06-04 09:23:11 +02:00
Siegfried Siegert	fdcaaefa36	Revert "ATBAPP: Selection: Licenceplate or paper ticket" This reverts commit `c9aa209d8f`.	2025-06-02 11:13:26 +02:00
Siegfried Siegert	8c3d947ab6	HMI: Textupdate (es_ES)	2025-03-18 13:09:48 +01:00
Siegfried Siegert	c9aa209d8f	ATBAPP: Selection: Licenceplate or paper ticket	2025-03-18 13:09:41 +01:00
Gerhard Hoffmann	1eacba3508	Adapt format needed by new tariff library	2025-02-03 12:38:00 +01:00
Siegfried Siegert	672d57a481	Add /etc/atb/SystemControl.ini	2024-12-02 10:30:02 +01:00
Gerhard Hoffmann	d4855e0279	Change price for 1st hour: 5 Euro -> 10 Euro	2024-11-27 09:42:55 +01:00
Gerhard Hoffmann	cd5e899530	Improve cut for ticket	2024-11-22 11:50:51 +01:00
Gerhard Hoffmann	27ab4b7051	Add tariff for BUS	2024-11-06 10:43:36 +01:00
Siegfried Siegert	5ef8acb23c	Textupdate: "Wait for Terminal"	2024-08-02 10:28:59 +02:00
Gerhard Hoffmann	fa701aaac0	Fix (Thomas): Title -> title	2024-06-17 15:49:14 +02:00
Gerhard Hoffmann	b618047d5e	Update Jsons for Schoenau as provided by Thomas	2024-06-17 11:58:54 +02:00
Siegfried Siegert	4215909e07	Update release 2024-06-17	2024-06-17 09:54:40 +02:00
Siegfried Siegert	357a91a312	Update release 2024-06-10	2024-06-10 12:54:40 +02:00
Siegfried Siegert	dc99caf97e	Merge branch 'zg1/zone3' of git.mimbach49.de:GerhardHoffmann/customer_332 into zg1/zone3	2024-05-28 08:25:36 +02:00
Siegfried Siegert	c6b8dc4a4e	Update release 20240521	2024-05-27 16:37:09 +02:00
Gerhard Hoffmann	b504cdd5b9	Use cent-values: 5000,2000,1000,500 instead of euro-values.	2024-05-07 13:27:15 +02:00
Siegfried Siegert	81cf5aab42	Fix: remove unused DC json files	2024-05-07 12:36:16 +02:00
Siegfried Siegert	8fa6157d04	Fix: opkg commands	2024-05-07 11:58:38 +02:00
Siegfried Siegert	fad2f2f910	OPKG: release 20240506	2024-05-07 11:58:31 +02:00
Siegfried Siegert	87dbf245b1	Update ATBQT/States: skip LicencePlate input	2024-05-06 15:32:11 +02:00
Siegfried Siegert	3e234e2957	Update ATBQT/States: - product selection: with licenscplate results in paperless ticket - ask for printing bank receipt	2024-05-06 12:44:19 +02:00
Siegfried Siegert	79ce47f693	Merge branch 'zg1/zone3' of git.mimbach49.de:GerhardHoffmann/customer_332 into zg1/zone3	2024-05-06 12:44:04 +02:00
Gerhard Hoffmann	353a02b72d	keep only 'opkg update'	2024-05-06 12:24:05 +02:00
Gerhard Hoffmann	8ca05780ed	Update DC2C_cash/device.json as provided by Thomas	2024-05-06 11:09:38 +02:00
Gerhard Hoffmann	c49dc48067	Set version date (23/04) -> trigger git	2024-04-23 12:37:29 +02:00
Gerhard Hoffmann	f05df3eac9	sync with master	2024-04-12 09:15:38 +02:00
Gerhard Hoffmann	e27f8e76aa	add tariff101.json for zone101 (solar)	2024-04-10 10:29:34 +02:00
Gerhard Hoffmann	8975b51efe	Add ptu5-systemcontroller using upgrade	2024-04-10 10:11:31 +02:00
Gerhard Hoffmann	58358816d5	Added opkg install tariff-config-332	2024-04-09 17:02:16 +02:00
Gerhard Hoffmann	bbb2405a55	Update tariff-info to trigger new download	2024-04-09 15:10:42 +02:00
Gerhard Hoffmann	6d6be41af7	update tariff for zone1 and zone2: new prices and extension of parking times	2024-04-08 16:25:19 +02:00
Gerhard Hoffmann	2b3af88e2e	update version to 05.04.2024	2024-04-05 13:52:19 +02:00
Gerhard Hoffmann	045be2682c	Fix typo: Koenigssee	2024-03-28 09:14:33 +01:00
Gerhard Hoffmann	d7006c5871	Merge branch 'zg1/zone3' of https://git.mimbach49.de/GerhardHoffmann/customer_332 into zg1/zone3	2024-03-25 10:29:18 +01:00
Gerhard Hoffmann	d1fac0ee15	renamed files (solar/netz not used)	2024-03-25 10:28:55 +01:00
Siegfried Siegert	eded88b199	ATBAPP: vending process: set product names	2024-03-19 11:10:45 +01:00
Gerhard Hoffmann	1ce158bfaf	Set version to 1.1.1 for testing.	2024-03-15 11:37:08 +01:00
Gerhard Hoffmann	7a03194b44	Set pop_max_time: 10080, pop_multi_hour_price: 8	2024-03-15 10:40:46 +01:00
Siegfried Siegert	5c68cad3c9	ATBAPP: Add customer vending process description (states)	2024-03-13 13:58:35 +01:00
Gerhard Hoffmann	37e263ccad	sync with master-branch	2024-03-13 13:12:36 +01:00
Gerhard Hoffmann	dc4ca6bdf5	sync with tariff01.json in zg1/zone1 -> Minor: version from 1.0.0 to 1.0.15	2024-01-25 11:41:22 +01:00
Gerhard Hoffmann	cc9ffdb7c8	Do not upgrade, but only install packages 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:53:16 +01:00
Gerhard Hoffmann	4770eadcfd	Add opkg install mxt-touch-reset to fix touch-screen issues	2024-01-24 12:43:40 +01:00
Gerhard Hoffmann	daf8b11f34	sync with branch zg1/zone1	2024-01-24 12:31:08 +01:00
Gerhard Hoffmann	ffce955fe1	set version to 00003	2023-11-29 10:15:09 +01:00
Gerhard Hoffmann	19c8d4152f	Sync with branch zg1/zone1	2023-11-29 09:35:08 +01:00
Gerhard Hoffmann	ab6b687eb2	Fix typo: 5670 -> 5760.	2023-11-28 10:24:27 +01:00
Gerhard Hoffmann	9e83b095f5	Add new files (used for new templates)	2023-11-24 13:43:42 +01:00
Gerhard Hoffmann	d910374873	Remove euro sign	2023-11-24 09:37:22 +01:00
Siegfried Siegert	c5cf8c052b	Price in cents	2023-11-22 17:12:04 +01:00
Gerhard Hoffmann	a654cd5571	Add json-config files for schoanau.	2023-11-20 13:11:18 +01:00
Gerhard Hoffmann	ed80b4dd2d	Add opkg_commands file.	2023-11-16 09:49:32 +01:00