comment for pure tariff-update

extend zone3-tariff to 10 days
Revert "ATBAPP: Selection: Licenceplate or paper ticket"
2025-06-25 09:37:30 +02:00 · 2025-06-23 11:50:31 +02:00 · 2025-04-29 08:25:20 +02:00 · 2025-04-29 08:24:50 +02:00 · 2025-03-18 13:13:27 +01:00 · 2025-03-18 13:13:22 +01:00
5 changed files with 165 additions and 45 deletions
--- a/0
+++ b/0
--- 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 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"/>
+        <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,7 +198,7 @@
        <ENTRY_TASK name="REQUEST_ISMAS_TRANSACTION"/>
        <ENTRY_TASK name="TIMER" timeout="2000"/>
        <EVENT name="TIMEOUT" resultingState="IDLE"/>
-        <SCREEN name="GOODBYE_PAYMENT_OK"/>
+        <SCREEN name="GOODBYE_3" note="green_hook"/>
    </APP_STATE>   
    
    <APP_STATE name="CC_PAYMENT_ERROR">
--- 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 (no necesaria para exhibir en el vehículo)</es_ES>
+      <es_ES>ENTRADA DE PLACA\n(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 (para exponer en el vehículo)</es_ES>
+      <es_ES>BILLETE DE PAPEL\n(para exponer en el vehículo)</es_ES>
    </Text>
    <Text textnr="0x33">
      <de_DE> </de_DE>
--- 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": 1440,
+      "pop_max_time": 14400,
      "comment_pop_max_time": "1440mins = 24h -> 5 euros",
      "pop_min_price": 200,
-      "pop_max_price": 500,
+      "pop_max_price": 5000,
      "pop_plus_steps": 1,
      "pop_minus_steps": 1,
      "pop_time_step_config": 1,
@@ -86,6 +86,51 @@
        "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": [
@@ -100,6 +145,42 @@
    {
 	"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" : [{
@@ -107,8 +188,8 @@
            "payment_settings" : [
                {
                    "min_time" : 60,
-                    "max_time" : 1440,
-                    "max_price": 500,
+                    "max_time" : 14400,
+                    "max_price": 5000,
                    "min_price": 200
                }
            ],
@@ -137,8 +218,8 @@
            "payment_settings" : [
                {
                    "min_time" : 60,
-                    "max_time" : 1440,
-                    "max_price": 500,
+                    "max_time" : 14400,
+                    "max_price": 5000,
                    "min_price": 200
                }
            ],
@@ -167,8 +248,8 @@
            "payment_settings" : [
                {
                    "min_time" : 60,
-                    "max_time" : 1440,
-                    "max_price": 500,
+                    "max_time" : 14400,
+                    "max_price": 5000,
                    "min_price": 200
                }
            ],
@@ -197,8 +278,8 @@
            "payment_settings" : [
                {
                    "min_time" : 60,
-                    "max_time" : 1440,
-                    "max_price": 500,
+                    "max_time" : 14400,
+                    "max_price": 5000,
                    "min_price": 200
                }
            ],
@@ -227,8 +308,8 @@
            "payment_settings" : [
                {
                    "min_time" : 60,
-                    "max_time" : 1440,
-                    "max_price": 500,
+                    "max_time" : 14400,
+                    "max_price": 5000,
                    "min_price": 200
                }
            ],
@@ -257,8 +338,8 @@
            "payment_settings" : [
                {
                    "min_time" : 60,
-                    "max_time" : 1440,
-                    "max_price": 500,
+                    "max_time" : 14400,
+                    "max_price": 5000,
                    "min_price": 200
                }
            ],
@@ -287,8 +368,8 @@
            "payment_settings" : [
                {
                    "min_time" : 60,
-                    "max_time" : 1440,
-                    "max_price": 500,
+                    "max_time" : 14400,
+                    "max_price": 5000,
                    "min_price": 200
                }
            ],
--- a/etc/psa_update/opkg_commands
+++ b/etc/psa_update/opkg_commands
@@ -4,11 +4,13 @@
 # opkg-commands added to this file will be executed by ATBUpdateTool.          
 ###############################################################################
 # 
-opkg update
+# 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 --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	5a45b798f9	comment for pure tariff-update	2025-06-25 09:37:30 +02:00
Gerhard Hoffmann	c1e810c003	extend zone3-tariff to 10 days	2025-06-23 11:50:31 +02:00
Siegfried Siegert	ce5721edff	Revert "ATBAPP: Selection: Licenceplate or paper ticket" This reverts commit `6322b3983e`.	2025-04-29 08:25:20 +02:00
Siegfried Siegert	3c64e20786	Add zone description	2025-04-29 08:24:50 +02:00
Siegfried Siegert	8bb300634e	HMI: Textupdate (es_ES)	2025-03-18 13:13:27 +01:00
Siegfried Siegert	6322b3983e	ATBAPP: Selection: Licenceplate or paper ticket	2025-03-18 13:13:22 +01:00
Gerhard Hoffmann	0165903542	Adapt format needed by new tariff library	2025-02-03 12:34:30 +01:00
Siegfried Siegert	900c1f03bd	Add /etc/atb/SystemControl.ini	2024-12-02 10:29:03 +01:00
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