Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_743 into zg1/zone1

Add tariff-config to define the tariff as dynamic, meaning that it can start
at any minute (modulo operation times).

etc/atbapp/states/APP_States_743_Kirchdorf.xml

@@ -18,15 +18,12 @@
         <EVENT name="TIMEOUT" resultingState="CASH_PAYMENT" 
                setCashInputMode="PAY_UP" 
                setProduct="SHORT_TERM_PARKING"
-               setPaymentType="CASH"/>/>
+               setPaymentType="CASH"/>
     </APP_STATE>
     
     
     <APP_STATE name="PAYMENT_SELECTION">
         <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
-        <EVENT name="RECEIVED_DC_COIN_ATTACHED" resultingState="CASH_PAYMENT" setCashInputMode="PAY_UP" 
-                                                                              setProduct="SHORT_TERM_PARKING"
-                                                                              setPaymentType="CASH"/>
         <EVENT name="BUTTON_PAYMETHOD_1" resultingState="IDLE"/>
         <EVENT name="BUTTON_PAYMETHOD_2" resultingState="CASH_PAYMENT" setCashInputMode="PAY_UP" 
                                                                        setProduct="SHORT_TERM_PARKING"
@@ -81,6 +78,9 @@
     </APP_STATE>
     <APP_STATE name="CASH_PAYMENT_INPUT">
         <ENTRY_TASK name="REQUEST_PARKING_ENDTIME"/>
+        <!-- AUTO-TICKET on PayUp: change to new state -->
+        <EVENT name="RECEIVED_CALCULATE_TIME_OVERPAID" task="PAYMENT_ACCEPTED" resultingState="CASH_OVERPAYED_ASK"/>
+        <EVENT name="RECEIVED_CALCULATE_TIME_MAX"      task="PAYMENT_ACCEPTED" resultingState="PRINT_TICKET_CASH"/>
         <EVENT name="RECEIVED_CASH_INPUT" resultingState="CASH_PAYMENT_INPUT"/>
         <EVENT name="RECEIVED_CASH_INPUT_OVERPAYED" resultingState="CASH_OVERPAYED_ASK"/>
         <EVENT name="RECEIVED_CASH_INPUT_FINISHED" resultingState="PRINT_TICKET_CASH"/>

etc/psa_config/DC2C_cash.json

@@ -2,11 +2,11 @@
 "title":"DC2C_cash  ",
 "project":"Galltuer",
 "version":"15.10.2023 14:55 02.00.06",
-"CoinDenom(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,0,1],
+"CoinDenom(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,40,1],
-"CoinValue(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,0,3],
+"CoinValue(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,40,3],
 "CoinAccept(15..0)":[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0],
 "ExchangeRate":1,
-"TokenChannel":6,
+"TokenChannel":0,
 "BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
 "BillAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
 "LocalTaxRate":19,
@@ -15,4 +15,3 @@
 "Discount":0
 }
 #"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,10000,5000,2000,1000,500],
-

etc/psa_config/DC2C_conf.json

@@ -1,12 +0,0 @@
-{ 
-"title":"DC2C_config",
-"project":"Kirchdorf",
-"version":"22.01.2024 00001",
-"custNum":743,
-"machNum":1000,
-"borough":1,
-"zone":1,
-"alias":0,
-"location":""
-}
-

etc/psa_config/DC2C_device.json

@@ -1,7 +1,7 @@
 {
 "title":"DC2C_device",
-"project":"Galltuer",
+"project":"Kirchdorf",
-"Version":"22.01.2024 00103",
+"Version":"02.07.2024 00103",
 "printer":1,
 "coinChk":1,
 "mifRd":1,
@@ -23,5 +23,13 @@
 "BattWarn":11800,
 "BattErr":11200,
 "foreign":1,
-"refPrint":0
+"refundPrint":1,
+"billWarnLev":400,
+"billFullLev":500,
+"housing":1,
+"changeCoins":1,
+"dev_aux1":0,
+"dev_aux2":0,
+"dev_aux3":0,
+"dev_aux4":0
 }

etc/psa_tariff/tariff01.json

@@ -1,6 +1,6 @@
 {
   "Project" : "Kirchdorf",
-  "Version" :   "1.1.0",
+  "Version" : "1.1.0-2024-05-14T08:48:13+02:00",
   "Info"    : "",
   "Currency": [
     {

etc/psa_update/opkg_commands

@@ -6,14 +6,11 @@
 # 
 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 remove atb-accountingtool
+opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-dc
-# opkg install atb-accountingtool
+opkg --cache /var/cache/opkg --download-only upgrade atbqt
-opkg --cache /var/cache/opkg --download-only upgrade
+#
-opkg --cache /var/cache/opkg upgrade
+opkg --cache /var/cache/opkg upgrade atb-dc-libraries
-# opkg remove apism
+opkg --cache /var/cache/opkg upgrade atb-plugin-dc
-# opkg install apism
+opkg --cache /var/cache/opkg upgrade atbqt
-opkg info apism
-opkg info atbqt
-opkg info atbupdatetool