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
9 changed files with 74 additions and 79 deletions
--- 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="LICENSEPLATE_INPUT"/>
+        <!-- <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"/>
@ -12,17 +13,32 @@
        <MODE name="IDLE"/>
    </APP_STATE>
    
+    <APP_STATE name="SETUP_SELL_STATE">
+        <ENTRY_TASK name="TIMER" timeout="500"/>
+        <EVENT name="TIMEOUT" resultingState="PARKTIME_SELECTION" setProduct="SHORT_TERM_PARKING"/>
+    </APP_STATE>   
+    
+    <APP_STATE name="PRODUCT_SELECTION">
+        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
+        <EVENT name="BUTTON_VEHICLE_1" resultingState="LICENSEPLATE_INPUT" setProduct="SHORT_TERM_PARKING" setCheckFeature="SKIP_TICKET_PRINT"/>
+        <EVENT name="BUTTON_VEHICLE_2" resultingState="PARKTIME_SELECTION" setProduct="SHORT_TERM_PARKING"/>
+        <SCREEN name="PRODUCT_SELECTION"/>
+    </APP_STATE>
+    
+    <!--
+    <APP_STATE name="SKIP_TICKET_PRINT_TEST">
+        <ENTRY_TASK name="PRINT_LOG" text="APP_STATE name=SKIP_TICKET_PRINT_TEST"/>
+        <ENTRY_TASK name="CHECK_FEATURE" checkFeatureName="SKIP_TICKET_PRINT"/>
+        <EVENT name="CHECK_TRUE"  resultingState="LICENSEPLATE_INPUT"/>
+        <EVENT name="CHECK_FALSE" resultingState="PARKTIME_SELECTION"/>
+    </APP_STATE>
+    -->
+    
    <APP_STATE name="LICENSEPLATE_INPUT">
        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
-        <EVENT name="BUTTON_NEXT" resultingState="PARKTIME_SELECTION" setProduct="ShortTimeParking"/>
+        <EVENT name="BUTTON_NEXT" resultingState="PARKTIME_SELECTION" setProduct="SHORT_TERM_PARKING"/>
        <SCREEN name="LICENSEPLATE_INPUT"/>
    </APP_STATE>
-   <APP_STATE name="PRODUCT_SELECTION">
-       <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
-       <EVENT name="BUTTON_VEHICLE_1" resultingState="PAYMENT_SELECTION_SHORT_TIME" setCashInputMode="PAY_UP"   setProduct="ShortTimeParking"/>
-       <EVENT name="BUTTON_VEHICLE_2" resultingState="PAYMENT_SELECTION_DAY" setCashInputMode="PAY_DOWN" setProduct="DayTicket"/>
-       <SCREEN name="PRODUCT_SELECTION"/>
-   </APP_STATE>
   
   <APP_STATE name="PAYMENT_SELECTION">
       <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
@ -62,7 +78,7 @@
    <APP_STATE name="CARD_PAYMENT">
        <ENTRY_TASK name="REQUEST_PARKING_ENDTIME" key="PRICE_INFO_GROSS"/>
        <ENTRY_TASK name="REQUEST_CC_START_TRANSACTION"/>
-        <EVENT name="RECEIVED_CARD_TRANSACTION_SUCCESS" resultingState="PRINT_TICKET_CARD"/>
+        <EVENT name="RECEIVED_CARD_TRANSACTION_SUCCESS" resultingState="CHECK_PAPERLESS_CARD"/>
        <EVENT name="RECEIVED_CARD_TRANSACTION_ERROR" resultingState="CC_PAYMENT_ERROR"/>
        <EVENT name="BUTTON_CANCEL" resultingState="USER_CC_ABORT"/>
        <SCREEN name="CC_PAYMENT"/>
@ -71,8 +87,8 @@
    <APP_STATE name="CASH_PAYMENT">
        <ENTRY_TASK name="REQUEST_CASH_INPUT"/>
        <EVENT name="RECEIVED_CASH_INPUT" resultingState="CASH_PAYMENT_INPUT"/>
-        <EVENT name="RECEIVED_CASH_INPUT_OVERPAYED" resultingState="PRINT_TICKET_CASH"/>
-        <EVENT name="RECEIVED_CASH_INPUT_FINISHED" resultingState="PRINT_TICKET_CASH"/>
+        <EVENT name="RECEIVED_CASH_INPUT_OVERPAYED" resultingState="CHECK_PAPERLESS_CASH"/>
+        <EVENT name="RECEIVED_CASH_INPUT_FINISHED"  resultingState="CHECK_PAPERLESS_CASH"/>
 	<EVENT name="RECEIVED_CASH_INPUT_ERROR" resultingState="CASH_PAYMENT_ERROR"/>
 	<EVENT name="BUTTON_CANCEL" resultingState="CASH_PAYMENT_ABORT"/>
        <SCREEN name="COIN_PAYMENT"/>
@ -80,8 +96,8 @@
    <APP_STATE name="CASH_PAYMENT_INPUT">
        <ENTRY_TASK name="REQUEST_PARKING_ENDTIME" key="PRICE_INFO_GROSS"/>
        <EVENT name="RECEIVED_CASH_INPUT" resultingState="CASH_PAYMENT_INPUT"/>
-        <EVENT name="RECEIVED_CASH_INPUT_OVERPAYED" resultingState="PRINT_TICKET_CASH"/>
-        <EVENT name="RECEIVED_CASH_INPUT_FINISHED" resultingState="PRINT_TICKET_CASH"/>
+        <EVENT name="RECEIVED_CASH_INPUT_OVERPAYED" resultingState="CHECK_PAPERLESS_CASH"/>
+        <EVENT name="RECEIVED_CASH_INPUT_FINISHED"  resultingState="CHECK_PAPERLESS_CASH"/>
        <EVENT name="RECEIVED_CASH_INPUT_ERROR" resultingState="CASH_PAYMENT_ERROR"/>
        <EVENT name="BUTTON_CANCEL" resultingState="CASH_PAYMENT_ABORT"/>
        <EVENT name="BUTTON_NEXT" task="PAYMENT_ACCEPTED" resultingState="CASH_PAYMENT_INPUT"/>
@ -94,7 +110,7 @@
        <SCREEN name="CASH_PAYMENT_FAILED" note="screennumber 0x39"/>
    </APP_STATE>
    <APP_STATE name="CASH_OVERPAYED">
-        <ENTRY_TASK name="REQUEST_ISAMAS_FAIL_TRANSACTION"/>
+        <ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
        <ENTRY_TASK name="CASH_ABORT"/>
        <ENTRY_TASK name="TIMER" timeout="3000"/>
        <EVENT name="TIMEOUT" resultingState="IDLE"/>
@ -114,6 +130,19 @@
        <SCREEN name="BUSY"/>
    </APP_STATE>
    -->
+    
+    <APP_STATE name="CHECK_PAPERLESS_CASH">
+        <ENTRY_TASK name="CHECK_FEATURE" checkFeatureName="SKIP_TICKET_PRINT"/>
+        <EVENT name="CHECK_TRUE"  resultingState="FINALISE_CASH_PAYMENT" setTransactionDelivery="ONLINE" setTransactionResult="SUCCESS"/>
+        <EVENT name="CHECK_FALSE" resultingState="PRINT_TICKET_CASH"/>
+    </APP_STATE>
+    <APP_STATE name="CHECK_PAPERLESS_CARD">
+        <ENTRY_TASK name="CHECK_FEATURE" checkFeatureName="SKIP_TICKET_PRINT"/>
+        <EVENT name="CHECK_TRUE"  resultingState="CARD_PAYMENT_CONFIRM" setTransactionDelivery="ONLINE" setTransactionResult="SUCCESS"/>
+        <EVENT name="CHECK_FALSE" resultingState="PRINT_TICKET_CARD"/>
+    </APP_STATE>
+    
+    
    <APP_STATE name="PRINT_TICKET_CASH">
        <ENTRY_TASK name="REQUEST_PRINT_TICKET"/>
        <EVENT name="PRINT_TICKET_FINISHED" resultingState="FINALISE_CASH_PAYMENT"/>
@ -137,20 +166,28 @@

    <APP_STATE name="CARD_PAYMENT_CONFIRM">
        <ENTRY_TASK name="REQUEST_CC_CONFIRM_TRANSACTION"/>
-        <EVENT name="RECEIVED_CARD_CONFIRM_TRANSACTION_SUCCESS" resultingState="PRINT_RECEIPT"/>
+        <EVENT name="RECEIVED_CARD_CONFIRM_TRANSACTION_SUCCESS" resultingState="ASK_RECEIPT"/>
        <EVENT name="RECEIVED_CARD_CONFIRM_TRANSACTION_ERROR"   resultingState="CC_PAYMENT_ERROR"/>
-    </APP_STATE>      
+    </APP_STATE>
+    <APP_STATE name="ASK_RECEIPT">
+        <ENTRY_TASK name="TIMER" timeout="6000"/>
+        <EVENT name="TIMEOUT" resultingState="GOODBYE_PAYMENT_OK"/>
+        <EVENT name="BUTTON_YES" resultingState="PRINT_RECEIPT"/>
+        <EVENT name="BUTTON_NO"  resultingState="GOODBYE_PAYMENT_OK"/>
+        <SCREEN name="ASK_RECEIPT"/>
+    </APP_STATE>
    <APP_STATE name="PRINT_RECEIPT">
        <ENTRY_TASK name="REQUEST_PRINT_RECEIPT"/>
        <EVENT name="PRINT_RECEIPT_FINISHED" resultingState="GOODBYE_PAYMENT_OK"/>
        <EVENT name="PRINT_RECEIPT_ERROR" resultingState="PRINT_TICKET_FAILED"/>
-    </APP_STATE>   
+        <SCREEN name="PRINT_RECEIPT"/>
+    </APP_STATE>
    
    <APP_STATE name="FINALISE_CASH_PAYMENT">
        <ENTRY_TASK name="CASH_COLLECT"/>
        <EVENT name="RECEIVED_CASH_CHANGE_BACK" resultingState="GIVE_CHANGE"/>
        <EVENT name="RECEIVED_CASH_PAYMENT_FINISHED" resultingState="GOODBYE_PAYMENT_OK"/>
-        <!-- TODO: hangle changer Error -->
+        <!-- TODO: handle changer Error -->
        <!-- no screen change here -->
    </APP_STATE>   
    <APP_STATE name="GIVE_CHANGE">
@ -161,8 +198,8 @@
        <ENTRY_TASK name="REQUEST_ISMAS_TRANSACTION"/>
        <ENTRY_TASK name="TIMER" timeout="2000"/>
        <EVENT name="TIMEOUT" resultingState="IDLE"/>
-        <SCREEN name="GOODBYE_PAYMENT_OK"/>
-    </APP_STATE>
+        <SCREEN name="GOODBYE_3" note="green_hook"/>
+    </APP_STATE>   
    
    <APP_STATE name="CC_PAYMENT_ERROR">
        <ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
--- 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",
-"Version":"6.7.1-2024-06-17",
+"project":"Schoenau",
+"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,
-"billWarnLev":300,
-"billFullLev":380,
-"housing":1
-
+"refPrint":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",
-"Version":"6.7.2-2024-06-17",
+"project":"Schoenau",
+"Version":"15.11.2023 00102",
 "printer":1,
 "coinChk":3,
 "mifRd":1,
@ -23,9 +23,5 @@
 "BattWarn":11800,
 "BattErr":11200,
 "foreign":1,
-"refundPrint":1,
-"billWarnLev":300,
-"billFullLev":380,
-"housing":1
-
+"refPrint":1
 }
--- 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	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