comment for pure tariff-update

This reverts commit fdcaaefa36.

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"/>

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>

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"
-}
-

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"
-}
-

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"
-}
-

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,

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
-
 }

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
-
 }

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_time" : 14400,
-                    "max_price": 500,
+                    "max_price": 5000,
                     "min_price": 200
                 }
             ],
@@ -137,8 +218,8 @@
             "payment_settings" : [
                 {
                     "min_time" : 60,
-                    "max_time" : 1440,
+                    "max_time" : 14400,
-                    "max_price": 500,
+                    "max_price": 5000,
                     "min_price": 200
                 }
             ],
@@ -167,8 +248,8 @@
             "payment_settings" : [
                 {
                     "min_time" : 60,
-                    "max_time" : 1440,
+                    "max_time" : 14400,
-                    "max_price": 500,
+                    "max_price": 5000,
                     "min_price": 200
                 }
             ],
@@ -197,8 +278,8 @@
             "payment_settings" : [
                 {
                     "min_time" : 60,
-                    "max_time" : 1440,
+                    "max_time" : 14400,
-                    "max_price": 500,
+                    "max_price": 5000,
                     "min_price": 200
                 }
             ],
@@ -227,8 +308,8 @@
             "payment_settings" : [
                 {
                     "min_time" : 60,
-                    "max_time" : 1440,
+                    "max_time" : 14400,
-                    "max_price": 500,
+                    "max_price": 5000,
                     "min_price": 200
                 }
             ],
@@ -257,8 +338,8 @@
             "payment_settings" : [
                 {
                     "min_time" : 60,
-                    "max_time" : 1440,
+                    "max_time" : 14400,
-                    "max_price": 500,
+                    "max_price": 5000,
                     "min_price": 200
                 }
             ],
@@ -287,8 +368,8 @@
             "payment_settings" : [
                 {
                     "min_time" : 60,
-                    "max_time" : 1440,
+                    "max_time" : 14400,
-                    "max_price": 500,
+                    "max_price": 5000,
                     "min_price": 200
                 }
             ],

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 --cache /var/cache/opkg --download-only upgrade atb-dc-libraries
-# opkg install apism
+# opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-dc
-# opkg install tariff-config-332
+# opkg --cache /var/cache/opkg --download-only upgrade atbqt
-# opkg --cache /var/cache/opkg --download-only upgrade ptu5-systemcontroller
+#
-# opkg --cache /var/cache/opkg upgrade ptu5-systemcontroller
+# 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