Merge branch 'zg1/zone1' of https://ptu-config.atb-comm.de/ATB/customer_335 into zg1/zone1

This reverts commit 0e46dece2b.

etc/atbapp/ATBAPP.ini

@@ -95,8 +95,8 @@ tariffFileName=/etc/psa_tariff/tariff01.json
 
 [ATBDeviceControllerPlugin]
 serialPort=ttymxc2
-printerEncoding="Windows-1252"
-printerLocale="de_DE"
+printerEncoding="Windows-1257"
+printerLocale="lt_LT"
 
 [TCP_ZVT_CCPlugin]
 CurrencyCode=EUR

etc/atbapp/states/APP_States.xml

@@ -0,0 +1,303 @@
+<?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="SELL_DISABLE" resultingState="FREE_PARK"/>
+        <SCREEN name="START"/>
+        <MODE name="IDLE"/>
+    </APP_STATE>
+    <APP_STATE name="FREE_PARK">
+        <EVENT name="SELL_ENABLE" resultingState="IDLE"/>
+        <SCREEN name="START"/>
+        <MODE name="IDLE"/>
+    </APP_STATE>
+    
+    
+    <APP_STATE name="PRODUCT_SELECTION">
+        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
+        <EVENT name="BUTTON_VEHICLE_1" resultingState="LICENSEPLATE_INPUT" setCashInputMode="PAY_UP"   setProduct="SHORT_TERM_PARKING"/>
+        <EVENT name="BUTTON_VEHICLE_2" resultingState="LICENSEPLATE_INPUT_FINE_PAYMENT" setCashInputMode="PAY_DOWN" setProduct="FINE_PAYMENT"/>
+        <SCREEN name="PRODUCT_SELECTION"/>
+    </APP_STATE>
+    
+    <APP_STATE name="LICENSEPLATE_INPUT">
+        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
+        <EVENT name="BUTTON_NEXT" resultingState="PAYMENT_SELECTION_SHORT_TIME"/>
+        <SCREEN name="LICENSEPLATE_INPUT"/>
+    </APP_STATE>
+    
+    <APP_STATE name="LICENSEPLATE_INPUT_FINE_PAYMENT">
+        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
+        <EVENT name="BUTTON_NEXT" resultingState="ENTER_TICKET_NUMBER"/>
+        <SCREEN name="LICENSEPLATE_INPUT"/>
+    </APP_STATE>
+    
+    <!-- ************** FINE PAYMENT *************** -->
+    
+    <APP_STATE name="FINE_PAYMENT_WAIT">
+        <ENTRY_TASK name="REQUEST_INITIAL_PRICE"/>
+        <ENTRY_TASK name="TIMER" timeout="3000"/>
+        <EVENT name="TIMEOUT" resultingState="ENTER_TICKET_NUMBER"/>
+        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
+        <SCREEN name="WAIT_2"/>
+    </APP_STATE>
+    <APP_STATE name="ENTER_TICKET_NUMBER">
+        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
+        <EVENT name="NEW_PIN" resultingState="FINE_PAYMENT_WAIT_2"/>
+        <SCREEN name="RESIDENT"/>
+    </APP_STATE>
+    <APP_STATE name="FINE_PAYMENT_WAIT_2">
+        <ENTRY_TASK name="REQUEST_FINE_PAYMENT_PRICE"/>
+        <ENTRY_TASK name="TIMER" timeout="3000"/>
+        <EVENT name="RECEIVED_FINE_PAYMENT_PRICE_SUCCESS" resultingState="PAYMENT_SELECTION_FINE_PAYMENT"/>
+        <EVENT name="RECEIVED_FINE_PAYMENT_PRICE_ERROR" resultingState="ABORT_FINE_PAYMENT_NOT_AVAILABLE"/>
+        <EVENT name="RECEIVED_FINE_PAYMENT_PRICE_ERROR_BACKEND" resultingState="ABORT_FINE_PAYMENT_NOT_AVAILABLE"/>
+        <EVENT name="RECEIVED_FINE_PAYMENT_PRICE_ERROR_STATUS" resultingState="ABORT_FINE_PAYMENT_STATUS"/>
+        <SCREEN name="WAIT_2"/>
+    </APP_STATE>   
+    
+    <APP_STATE name="PRINT_FINE_PAYMENT_RECEIPT">
+        <ENTRY_TASK name="REQUEST_PRINT_CUSTOMER_TICKET_2"/>
+        <EVENT name="PRINT_TICKET_FINISHED" resultingState="FINE_PAYMENT_SUCCESS"/>
+        <EVENT name="PRINT_TICKET_ERROR" resultingState="PRINT_TICKET_FAILED"/>
+        <SCREEN name="PRINT_RECEIPT_2"/>
+    </APP_STATE>
+    <APP_STATE name="FINE_PAYMENT_SUCCESS">
+        <ENTRY_TASK name="TIMER" timeout="3000"/>
+        <EVENT name="TIMEOUT" resultingState="IDLE"/>
+        <SCREEN name="GOODBYE_3"/>
+    </APP_STATE>
+
+    
+    <!-- ************** FINE PAYMENT: ABORT STATES ************** -->  
+    
+    <APP_STATE name="ABORT_FINE_PAYMENT_NOT_AVAILABLE">
+        <ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
+        <ENTRY_TASK name="TIMER" timeout="3000"/>
+        <EVENT name="TIMEOUT" resultingState="IDLE"/>
+        <SCREEN name="ABORT_8"/>
+    </APP_STATE>   
+    <APP_STATE name="ABORT_NOT_ALLOWED">
+        <ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
+        <ENTRY_TASK name="TIMER" timeout="3000"/>
+        <EVENT name="TIMEOUT" resultingState="IDLE"/>
+        <SCREEN name="ABORT_6"/>
+    </APP_STATE> 
+    <APP_STATE name="ABORT_FINE_PAYMENT_STATUS">
+        <ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
+        <ENTRY_TASK name="TIMER" timeout="3000"/>
+        <EVENT name="TIMEOUT" resultingState="IDLE"/>
+        <SCREEN name="ABORT_7"/>
+    </APP_STATE>
+    
+    
+    <!-- ************** PAYMENT SELECTION ************** -->
+    
+    <APP_STATE name="PAYMENT_SELECTION_SHORT_TIME">
+        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
+        <EVENT name="BUTTON_PAYMETHOD_1" resultingState="IDLE"/>
+        <EVENT name="BUTTON_PAYMETHOD_2" resultingState="CASH_PAYMENT" setPaymentType="CASH"/>
+        <EVENT name="BUTTON_PAYMETHOD_3" resultingState="PARKTIME_SELECTION" setPaymentType="CARD"/>
+        <EVENT name="BUTTON_PAYMETHOD_4" resultingState="IDLE"/>
+        <SCREEN name="PAYMENT_SELECTION"/>
+    </APP_STATE>   
+    <APP_STATE name="PAYMENT_SELECTION_FINE_PAYMENT">
+        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
+        <EVENT name="BUTTON_PAYMETHOD_1" resultingState="IDLE"/>
+        <EVENT name="BUTTON_PAYMETHOD_2" resultingState="CASH_PAYMENT" setPaymentType="CASH"/>
+        <EVENT name="BUTTON_PAYMETHOD_3" resultingState="CARD_PAYMENT" setPaymentType="CARD"/>
+        <EVENT name="BUTTON_PAYMETHOD_4" resultingState="IDLE"/>
+        <SCREEN name="PAYMENT_SELECTION"/>
+    </APP_STATE>  
+    
+    
+    <!-- ************** PARKTIME SELECTION ************** -->
+    
+    <APP_STATE name="PARKTIME_SELECTION">
+        <ENTRY_TASK name="REQUEST_INITIAL_PRICE"/>
+        <EVENT name="BUTTON_PLUS_STEP"  resultingState="PARKTIME_SELECTION_PLUS"/>
+        <EVENT name="BUTTON_MINUS_STEP" resultingState="PARKTIME_SELECTION_MINUS"/>
+        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
+        <EVENT name="BUTTON_BACK" resultingState="PAYMENT_SELECTION"/>
+        <EVENT name="BUTTON_NEXT" resultingState="CARD_PAYMENT"/>
+        <SCREEN name="PARKTIME_SELECTION"/>
+    </APP_STATE>
+    <APP_STATE name="PARKTIME_SELECTION_PLUS">
+        <ENTRY_TASK name="REQUEST_STEP_UP_PRICE"/>
+        <EVENT name="BUTTON_PLUS_STEP"  resultingState="PARKTIME_SELECTION_PLUS"/>
+        <EVENT name="BUTTON_MINUS_STEP" resultingState="PARKTIME_SELECTION_MINUS"/>
+        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
+        <EVENT name="BUTTON_BACK" resultingState="PAYMENT_SELECTION"/>
+        <EVENT name="BUTTON_NEXT" resultingState="CARD_PAYMENT"/>
+    </APP_STATE>
+    <APP_STATE name="PARKTIME_SELECTION_MINUS">
+        <ENTRY_TASK name="REQUEST_STEP_DOWN_PRICE"/>
+        <EVENT name="BUTTON_PLUS_STEP"  resultingState="PARKTIME_SELECTION_PLUS"/>
+        <EVENT name="BUTTON_MINUS_STEP" resultingState="PARKTIME_SELECTION_MINUS"/>
+        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
+        <EVENT name="BUTTON_BACK" resultingState="PAYMENT_SELECTION"/>
+        <EVENT name="BUTTON_NEXT" resultingState="CARD_PAYMENT"/>
+    </APP_STATE>
+    
+    
+    <!-- ************** CASH PAYMENT ************** -->
+    
+    <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_ERROR" resultingState="CASH_PAYMENT_ERROR"/>
+        <EVENT name="BUTTON_CANCEL" resultingState="CASH_PAYMENT_ABORT"/>
+        <SCREEN name="COIN_PAYMENT"/>
+    </APP_STATE>
+    <APP_STATE name="CASH_PAYMENT_INPUT">
+        <ENTRY_TASK name="REQUEST_PARKING_ENDTIME"/>
+        <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"/>
+        <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"/>
+    </APP_STATE>
+    <APP_STATE name="CASH_PAYMENT_ERROR">
+        <ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
+        <ENTRY_TASK name="CASH_ABORT"/>
+        <ENTRY_TASK name="TIMER" timeout="3000"/>
+        <EVENT name="TIMEOUT" resultingState="IDLE"/>
+        <SCREEN name="CASH_PAYMENT_FAILED" note="screennumber 0x39"/>
+    </APP_STATE>
+    
+    <APP_STATE name="CASH_OVERPAYED_ASK">
+        <ENTRY_TASK name="PAYMENT_ACCEPTED"/>
+        <EVENT name="BUTTON_YES" resultingState="PRINT_TICKET_CASH"/>
+        <EVENT name="BUTTON_NO"  resultingState="CASH_OVERPAYED_ABORT"/> 
+        <SCREEN name="CASH_OVERPAYED" note="screennumber 0x3c"/>
+    </APP_STATE>   
+    
+    <APP_STATE name="CASH_OVERPAYED_ABORT">
+        <ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
+        <ENTRY_TASK name="CASH_ABORT"/>
+        <ENTRY_TASK name="TIMER" timeout="3000"/>
+        <EVENT name="TIMEOUT" resultingState="IDLE"/>
+        <SCREEN name="CASH_CHANGE_OVERPAID" note="screennumber 0x8a"/>
+    </APP_STATE>
+    <APP_STATE name="CASH_PAYMENT_ABORT">
+        <ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
+        <ENTRY_TASK name="CASH_ABORT"/>
+        <ENTRY_TASK name="TIMER" timeout="3000"/>
+        <EVENT name="TIMEOUT" resultingState="IDLE"/>
+    </APP_STATE>
+    
+    
+    <!-- ************** CARD PAYMENT ************** -->
+    
+    <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_ERROR" resultingState="CC_PAYMENT_ERROR"/>
+        <EVENT name="BUTTON_CANCEL" resultingState="USER_CC_ABORT"/>
+        <SCREEN name="CC_PAYMENT"/>
+    </APP_STATE>
+    
+    
+    <!-- ************** PRINT TICKET / GOOD ISSUE ************** -->
+    
+    <APP_STATE name="PRINT_TICKET_CASH">
+        <ENTRY_TASK name="REQUEST_PRINT_TICKET"/>
+        <EVENT name="PRINT_TICKET_FINISHED" resultingState="GOODBYE_PAYMENT_OK"/>
+        <EVENT name="PRINT_TICKET_ERROR" resultingState="PRINT_TICKET_FAILED"/>
+        <SCREEN name="SCREEN_WAITFOR"/>
+    </APP_STATE>
+    <APP_STATE name="PRINT_TICKET_CARD">
+        <ENTRY_TASK name="REQUEST_PRINT_TICKET"/>
+        <EVENT name="PRINT_TICKET_FINISHED" resultingState="CARD_PAYMENT_CONFIRM"/>
+        <EVENT name="PRINT_TICKET_ERROR" resultingState="PRINT_TICKET_FAILED"/>
+        <SCREEN name="SCREEN_WAITFOR"/>
+    </APP_STATE>     
+    <APP_STATE name="PRINT_TICKET_FAILED">
+        <ENTRY_TASK name="REQUEST_CC_CANCEL_TRANSACTION"/>
+        <ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
+        <ENTRY_TASK name="CASH_ABORT"/>
+        <ENTRY_TASK name="TIMER" timeout="3000"/>
+        <EVENT name="TIMEOUT" resultingState="IDLE"/>
+        <SCREEN name="PRINT_TICKET_FAILED"/>
+    </APP_STATE>   
+    
+    
+    <!-- ************** CONFIRM CARD PAYMENT ************** -->
+    
+    <APP_STATE name="CARD_PAYMENT_CONFIRM">
+        <ENTRY_TASK name="REQUEST_CC_CONFIRM_TRANSACTION"/>
+        <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="8000"/>
+        <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>   
+    
+    
+    <!-- ************** GOODBYE ************** -->
+    
+    <APP_STATE name="GOODBYE_PAYMENT_OK">
+        <ENTRY_TASK name="CASH_COLLECT"/>
+        <ENTRY_TASK name="REQUEST_ISMAS_TRANSACTION"/>
+        <ENTRY_TASK name="TIMER" timeout="5000"/>
+        <EVENT name="TIMEOUT" resultingState="IDLE"/>
+        <SCREEN name="GOODBYE_PAYMENT_OK"/>
+    </APP_STATE>
+    
+    
+    <!-- ************** CARD PAYMENT ERROR / ABORT ************** -->
+    
+    <APP_STATE name="CC_PAYMENT_ERROR">
+        <ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
+        <ENTRY_TASK name="TIMER" timeout="3000"/>
+        <EVENT name="TIMEOUT" resultingState="IDLE"/>
+        <SCREEN name="CC_PAYMENT_ERROR"/>
+    </APP_STATE>
+    <APP_STATE name="USER_CC_ABORT">
+        <ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
+        <ENTRY_TASK name="REQUEST_CC_CANCEL_TRANSACTION"/>
+        <ENTRY_TASK name="TIMER" timeout="3000"/>
+        <EVENT name="TIMEOUT" resultingState="IDLE"/>
+        <SCREEN name="USER_ABORT"/>
+    </APP_STATE>  
+    
+ 
+    <!-- ************** ABORT STATES ************** -->  
+    
+    <APP_STATE name="ABORT_NOCONNECTION">
+        <ENTRY_TASK name="TIMER" timeout="3000"/>
+        <EVENT name="TIMEOUT" resultingState="IDLE"/>
+        <SCREEN name="ABORT_2"/>
+    </APP_STATE>   
+    <APP_STATE name="ABORT_NOCARD">
+        <ENTRY_TASK name="TIMER" timeout="3000"/>
+        <EVENT name="TIMEOUT" resultingState="IDLE"/>
+        <SCREEN name="ABORT_4"/>
+    </APP_STATE>    
+    <APP_STATE name="ABORT_CARD_DENIED">
+        <ENTRY_TASK name="TIMER" timeout="3000"/>
+        <EVENT name="TIMEOUT" resultingState="IDLE"/>
+        <SCREEN name="ABORT_5"/>
+    </APP_STATE>     
+    <APP_STATE name="ABORT_NOT_ALLOWED">
+        <ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
+        <ENTRY_TASK name="TIMER" timeout="3000"/>
+        <EVENT name="TIMEOUT" resultingState="IDLE"/>
+        <SCREEN name="ABORT_6"/>
+    </APP_STATE>
+    
+    
+</ATB_APP_STATES>

etc/atbapp/text/HMI_Texte.xml

@@ -490,7 +490,7 @@
                         <ru_RU>Максимальная сумма билета</ru_RU>
                 </Text>
 		<Text name="user_message_04" textnr="0x84">
-                        <lt_LT>Minimalus stovėjimo mokėstis</lt_LT>
+                        <lt_LT>Minimalus stovėjimo mokestis</lt_LT>
                         <en_GB>Minimum parking fee</en_GB>
                         <de_DE>Mindestparkgebühr</de_DE>
                         <ru_RU>Минимальная плата за парковку</ru_RU>
@@ -600,7 +600,7 @@
                         <ru_RU>Максимальная сумма билета</ru_RU>
                 </Text>
 		<Text name="user_message_04" textnr="0x84">
-                        <lt_LT>Minimalus stovėjimo mokėstis</lt_LT>
+                        <lt_LT>Minimalus stovėjimo mokestis</lt_LT>
                         <en_GB>Minimum parking fee</en_GB>
                         <de_DE>Mindestparkgebühr</de_DE>
                         <ru_RU>Минимальная плата за парковку</ru_RU>
@@ -782,7 +782,7 @@
                         <ru_RU>Максимальная сумма билета</ru_RU>
                 </Text>
 		<Text name="user_message_04"  textnr="0x84">
-                        <lt_LT>Minimalus stovėjimo mokėstis</lt_LT>
+                        <lt_LT>Minimalus stovėjimo mokestis</lt_LT>
                         <en_GB>Minimum parking fee</en_GB>
                         <de_DE>Mindestparkgebühr</de_DE>
                         <ru_RU>Минимальная плата за парковку</ru_RU>
@@ -846,7 +846,7 @@
             <ru_RU>Максимальная сумма билета</ru_RU>
         </Text>
 		<Text name="user_message_04"  textnr="0x84">
-            <lt_LT>Minimalus stovėjimo mokėstis</lt_LT>
+            <lt_LT>Minimalus stovėjimo mokestis</lt_LT>
             <en_GB>Minimum parking fee</en_GB>
             <de_DE>Mindestparkgebühr</de_DE>
             <ru_RU>Минимальная плата за парковку</ru_RU>
@@ -898,10 +898,10 @@
 	      <ru_RU> </ru_RU>
 	  </Text>
 	  <Text textnr="0x34">
-	      <lt_LT>Spausdinti bilietą</lt_LT>
-	      <en_GB>Request Ticket?</en_GB>
-	      <de_DE>Parkschein anfordern?</de_DE>
-	      <ru_RU>Заказ билета</ru_RU>
+          <lt_LT>Spausdinti kvitą?</lt_LT>
+          <en_GB>Print receipt?</en_GB>
+          <de_DE>Quittung drucken?</de_DE>
+          <ru_RU>Распечатать квитанцию?</ru_RU>
 	  </Text>
 	  <Text textnr="0x35">
 	      <lt_LT>ATŠAUKTI</lt_LT>
@@ -916,10 +916,10 @@
 	      <ru_RU>ДА</ru_RU>
 	  </Text>
 	  <Text textnr="0x37">
-	      <lt_LT>Pasiektas maksimalus monetų kiekis!</lt_LT>
-	      <en_GB>Reached maximum number of coins.!</en_GB>
-	      <de_DE>Maximalanzahl der Münzen erreicht!</de_DE>
-	      <ru_RU>Достигнуто максимальное количество монет!</ru_RU>
+          <lt_LT> </lt_LT>
+          <en_GB> </en_GB>
+          <de_DE> </de_DE>
+          <ru_RU> </ru_RU>
 	  </Text>
 	  <Text name="user_message_01" textnr="0x81">	      
 	      <lt_LT>Permoka!</lt_LT>
@@ -934,7 +934,7 @@
 	      <ru_RU>Достигнуто максимальное количество монет!</ru_RU>
 	  </Text>
 	  <Text name="user_message_04"  textnr="0x84">
-	      <lt_LT>Minimalus stovėjimo mokėstis</lt_LT>
+	      <lt_LT>Minimalus stovėjimo mokestis</lt_LT>
 	      <en_GB>Minimum parking fee</en_GB>
 	      <de_DE>Mindestparkgebühr</de_DE>
 	      <ru_RU>Минимальная плата за парковку</ru_RU>
@@ -1438,11 +1438,11 @@
                         <ru_RU>Переплата!</ru_RU>
                 </Text>
 		<Text name="user_message_08"  textnr="0x88">
-                    <lt_LT>Minimalus stovėjimo mokėstis</lt_LT>
-                        <en_GB>Minimum parking fee</en_GB>
-                        <de_DE>Mindestparkgebühr</de_DE>
-                        <ru_RU>Минимальная плата за парковку</ru_RU>
-                </Text>
+            <lt_LT>SUTEIKITE TIKSLIĄ SUMĄ…</lt_LT>
+            <en_GB>PLEASE, PAY APPROPRIATELY</en_GB>
+            <de_DE>BITTE PASSEND ZAHLEN</de_DE>
+            <ru_RU>ПРЕДОСТАВЬТЕ ТОЧНУЮ СУММУ…</ru_RU>
+        </Text>
 	</Screen>
 	<Screen name="PayMethod3" screennr="0x41">
                 <Text textnr="0x30">
@@ -2219,7 +2219,7 @@
                         <ru_RU>Принимаются только платежные карточки…</ru_RU>
                 </Text>
 		<Text name="user_message_04"  textnr="0x84">
-                        <lt_LT>Minimalus stovėjimo mokėstis</lt_LT>
+                        <lt_LT>Minimalus stovėjimo mokestis</lt_LT>
                         <en_GB>Minimum parking fee</en_GB>
                         <de_DE>Mindestparkgebühr</de_DE>
                         <ru_RU>Минимальная плата за парковку</ru_RU>
@@ -2280,6 +2280,12 @@
                         <de_DE>Fehler Kartenleser</de_DE>
                         <ru_RU>Ошибка считывающего устройства</ru_RU>
                 </Text>
+                <Text textnr="0x88">
+                    <lt_LT>Laukiama kortelių terminalo…</lt_LT>
+                    <en_GB>Waiting for card reader…</en_GB>
+                    <de_DE>Warte auf Kartenterminal…</de_DE>
+                    <ru_RU>Ожидание терминала для карт…</ru_RU>
+                </Text>
 	</Screen>
 	<Screen name="CreditCard3" screennr="0x53">
                 <Text textnr="0x30">
@@ -2419,7 +2425,7 @@
 	      <ru_RU>Достигнуто максимальное количество монет!</ru_RU>
 	  </Text>
 	  <Text name="user_message_04"  textnr="0x84">
-	      <lt_LT>Minimalus stovėjimo mokėstis</lt_LT>
+	      <lt_LT>Minimalus stovėjimo mokestis</lt_LT>
 	      <en_GB>Minimum parking fee</en_GB>
 	      <de_DE>Mindestparkgebühr</de_DE>
 	      <ru_RU>Минимальная плата за парковку</ru_RU>

etc/psa_config/DC2C_cash.json

@@ -1,18 +1,17 @@
 {	     
 "title":"DC2C_cash  ",
-"project":"Klaipeda",
-"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],
-"CoinValue(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,0,3],
-"CoinAccept(15..0)":[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0],
+"Project":"Klaipeda, Palanga",
+"Version":"1.0.0-2024-10-11",
+"CoinDenom(15..0)":[200,100,50,20,10,0,0,0,0,0,0,0,0,0,0,3],
+"CoinValue(15..0)":[200,100,50,20,10,0,0,0,0,0,0,0,0,0,0,3],
+"CoinAccept(15..0)":[1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,1],
 "ExchangeRate":1,
-"TokenChannel":6,
+"TokenChannel":1,
 "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,
+"LocalTaxRate":21,
 "ForeignTaxRate":0,
 "Surcharge":0,	
 "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":"Klaipeda",
-"version":"15.11.2023 00001",
-"custNum":335,
-"machNum":1000,
-"borough":1,
-"zone":1,
-"alias":0,
-"location":"Lebzeltergasse 4-12"
-}
-

etc/psa_config/DC2C_device.json

@@ -1,11 +1,11 @@
 {
 "title":"DC2C_device",
-"project":"Klaipeda",
-"Version":"04.12.2023 00103",
+"Project":"Klaipeda",
+"Version":"7.2.3-2024-08-22",
 "printer":1,
 "coinChk":1,
 "mifRd":1,
-"solarPwr":0,
+"solarPwr":1,
 "modem":1,
 "creditCard":1,
 "escrow":1,
@@ -16,15 +16,20 @@
 "autoAlarm":1,
 "autoOpen":1,
 "AccPrint":1,
-"DorPrint":1,
-"TokPrint":1,
+"DorPrint":0,
+"TokPrint":2,
 "CBwarnLev":1600,
 "CBerrLev":1900,
 "BattWarn":11800,
 "BattErr":11200,
-"foreign":1,
+"foreign":5,
 "refundPrint":1,
-"billWarnLev":400,
-"billFullLev":500,
-"housing":1
+"billWarnLev":300,
+"billFullLev":380,
+"housing":1,
+"changeCoins":1,
+"dev_aux1":0,
+"dev_aux2":0,
+"dev_aux3":0,
+"dev_aux4":0
 }

etc/psa_config/DC2C_print01.json

@@ -1,30 +1,24 @@
 {
 "title":"DC2C_pri01",
-"project":"Klaipeda",
-"Version":"15.11.2023 00001",
-"styl":"font 10",
-"styl":"size 11",
+"Project":"Klaipeda",
+"Version":"1.1.4-2024-08-22",
+"text":"",
+"styl":"font 24",
+"styl":"csiz 08",
+"styl":"size 00",
 "styl":"align c",
 "feed":"margin02",
 "feed":"rim02",
-"graf":"logo1",
-"text":"Klaipeda",
-"feed":"nl"
-"feed":"nl"
-"text":"Parkschein",
+"text":"Privaloma įmoka - vietinė rinkliava.",
+"feed":"nl",
+"text":"Bilietą padėkite už priekinio stiklo",
+"feed":"nl",
+"text":"ant prietaisų skydelio, kad būtų",
+"feed":"nl",
+"text":"lengvai įskaitomi bilieto duomenys.",
 "feed":"nl",
 "feed":"nl",
-"styl":"size 00",
-"styl":"align l",
-"styl":"size 11",
-"vari":"Dynamic01",
-"styl":"size 00",
-"text":"Parkzeit bezahlt bis: ",
-"feed":"nl",
-"styl":"size 11",
-"vari":"Dynamic04",
-"vari":"Dynamic03",
-"styl":"size 00",
+"text":"Galioja šia puse į viršų.",
 "feed":"nl"
 }
 

etc/psa_config/DC2C_print02.json

@@ -1,15 +1,36 @@
 {
 "title":"DC2C_pri02",
-"project":"Klaipeda",
-"Version":"15.11.2023 00001",
-"issued":"13.11.2023 01.01",
+"Project":"Klaipeda",
+"Version":"1.1.4-2024-08-22",
+"styl":"font 24",
+"styl":"csiz 08",
+"styl":"size 00",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
 "feed":"nl",
-"text":"Bezahlt: ",
-"styl":"size 11",
-"vari":"Dynamic07",
-"text":"",
+"text":"Automobilio valstybinis",
 "feed":"nl",
-"styl":"size 00"
+"text":" numeris:",
+"feed":"nl",
+"styl":"size 22",
+"vari":"Dynamic01",
+"styl":"size 00",
+"feed":"nl",
+"text":"Apmokėta iki:",
+"feed":"nl",
+"styl":"size 32",
+"vari":"Dynamic03",
+"styl":"size 00",
+"text":"Data: ",
+"styl":"size 32",
+"vari":"Dynamic04",
+"styl":"size 00",
+"text":"Mokėjimo data ir laikas:",
+"feed":"nl",
+"vari":"date us",	
+"vari":"time long",
+"feed":"nl"
 }
 
 

etc/psa_config/DC2C_print03.json

@@ -1,23 +1,30 @@
 {
 "title":"DC2C_pri03",
-"project":"Klaipeda",
-"Version":"15.11.2023 00001",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"styl":"font 24",
+"styl":"csiz 08",
+"styl":"size 00",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
+"styl":"size 00",
+"text":"Sumokėta grynais:", 
+"vari":"Dynamic02",
+"styl":"size 21",
+"text":"Raudonoji zona",
+"feed":"nl",
+"styl":"size 10",
+"text":"tarifas 1,50Eur/h",
 "feed":"nl",
 "styl":"size 00",
-"text":"Standort: ",
 "feed":"nl",
-"vari":"location",
-"text":"Automat: ",
-"vari":"manu",	
+"text":"Bilieto nr.:",
+"vari":"Dynamic08",
 "feed":"nl",
-"styl":"align c",
-"text":"Bitte gut sichtbar",
-"feed":"nl",
-"text":"hinter die Scheibe",
-"feed":"nl",
-"text":"legen",
-"feed":"nl",
-"feed":"eject"
+"text":"Automato nr.:",
+"vari":"manu",
+"feed":"nl"
 }
 
 

etc/psa_config/DC2C_print04.json

@@ -1,6 +1,38 @@
 {
 "title":"DC2C_pri04",
-"project":"Klaipeda",
-"Version":"15.11.2023 01.01",
-"text":"";
-}
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"styl":"font 24",
+"styl":"csiz 08",
+"styl":"size 00",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
+"text":"Klaipėdos miesto",
+"feed":"nl",
+"text":"savivaldybė",
+"feed":"nl",
+"text":"Liepų g. 11, LT-92138",
+"feed":"nl",
+"text":" Klaipėda,",
+"feed":"nl",
+"text":"Įm.k. 188710823",
+"feed":"nl",
+"text":"Informacija tel.:",
+"feed":"nl",
+"text":" +370 800 12344 "
+"feed":"nl",
+"feed":"eject"
+}
+
+
+
+
+
+
+
+
+
+
+
+

etc/psa_config/DC2C_print05.json

@@ -1,30 +1,24 @@
 {
 "title":"DC2C_pri05",
-"project":"Klaipeda",
-"Version":"15.11.2023 00001",
-"styl":"font 10",
-"styl":"size 11",
+"Project":"Klaipeda",
+"Version":"1.1.4-2024-08-22",
+"text":"",
+"styl":"font 24",
+"styl":"csiz 08",
+"styl":"size 00",
 "styl":"align c",
 "feed":"margin02",
 "feed":"rim02",
-"graf":"logo1",
-"text":"Klaipeda",
-"feed":"nl"
-"feed":"nl"
-"text":"Parkschein",
+"text":"Privaloma įmoka - vietinė rinkliava.",
+"feed":"nl",
+"text":"Bilietą padėkite už priekinio stiklo",
+"feed":"nl",
+"text":"ant prietaisų skydelio, kad būtų",
+"feed":"nl",
+"text":"lengvai įskaitomi bilieto duomenys.",
 "feed":"nl",
 "feed":"nl",
-"styl":"size 00",
-"styl":"align l",
-"styl":"size 11",
-"vari":"Dynamic01",
-"styl":"size 00",
-"text":"Parkzeit bezahlt bis: ",
-"feed":"nl",
-"styl":"size 11",
-"vari":"Dynamic04",
-"vari":"Dynamic03",
-"styl":"size 00",
+"text":"Galioja šia puse į viršų.",
 "feed":"nl"
 }
 

etc/psa_config/DC2C_print06.json

@@ -1,16 +1,36 @@
 {
 "title":"DC2C_pri06",
-"project":"Klaipeda",
-"Version":"15.11.2023 00001",
-"issued":"13.11.2023 01.01",
+"Project":"Klaipeda",
+"Version":"1.1.4-2024-08-22",
+"styl":"font 24",
+"styl":"csiz 08",
+"styl":"size 00",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
 "feed":"nl",
-"text":"Bezahlt: ",
-"styl":"size 11",
-"vari":"Dynamic07",
-"text":"",
+"text":"Automobilio valstybinis",
 "feed":"nl",
-"styl":"size 00"
-
+"text":" numeris:",
+"feed":"nl",
+"styl":"size 22",
+"vari":"Dynamic01",
+"styl":"size 00",
+"feed":"nl",
+"text":"Apmokėta iki:",
+"feed":"nl",
+"styl":"size 32",
+"vari":"Dynamic03",
+"styl":"size 00",
+"text":"Data: ",
+"styl":"size 32",
+"vari":"Dynamic04",
+"styl":"size 00",
+"text":"Mokėjimo data ir laikas:",
+"feed":"nl",
+"vari":"date us",	
+"vari":"time long",
+"feed":"nl"
 }
 
 

etc/psa_config/DC2C_print07.json

@@ -1,23 +1,29 @@
 {
 "title":"DC2C_pri07",
-"project":"Klaipeda",
-"Version":"15.11.2023 00001",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"styl":"font 24",
+"styl":"csiz 08",
+"styl":"size 00",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
+"text":"Sumokėta kortele:", 
+"vari":"Dynamic02",
+"styl":"size 21",
+"text":"Raudonoji zona",
+"feed":"nl",
+"styl":"size 10",
+"text":"tarifas 1,50Eur/h",
 "feed":"nl",
 "styl":"size 00",
-"text":"Standort: ",
 "feed":"nl",
-"vari":"location",
-"text":"Automat: ",
-"vari":"manu",	
+"text":"Bilieto nr.:",
+"vari":"Dynamic08",
 "feed":"nl",
-"styl":"align c",
-"text":"Bitte gut sichtbar",
-"feed":"nl",
-"text":"hinter die Scheibe",
-"feed":"nl",
-"text":"legen",
-"feed":"nl",
-"feed":"eject"
+"text":"Automato nr.:",
+"vari":"manu",
+"feed":"nl"
 }
 
 

etc/psa_config/DC2C_print08.json

@@ -1,6 +1,38 @@
 {
 "title":"DC2C_pri08",
-"project":"Klaipeda",
-"Version":"15.11.2023 01.01",
-"text":"";
-}
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"styl":"font 24",
+"styl":"csiz 08",
+"styl":"size 00",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
+"text":"Klaipėdos miesto",
+"feed":"nl",
+"text":"savivaldybė",
+"feed":"nl",
+"text":"Liepų g. 11, LT-92138",
+"feed":"nl",
+"text":" Klaipėda,",
+"feed":"nl",
+"text":"Įm.k. 188710823",
+"feed":"nl",
+"text":"Informacija tel.:",
+"feed":"nl",
+"text":" +370 800 12344 "
+"feed":"nl",
+"feed":"eject"
+}
+
+
+
+
+
+
+
+
+
+
+
+

etc/psa_config/DC2C_print09.json

@@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri09",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+

etc/psa_config/DC2C_print10.json

@@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri10",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+

etc/psa_config/DC2C_print11.json

@@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri11",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+

etc/psa_config/DC2C_print12.json

@@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri12",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+

etc/psa_config/DC2C_print13.json

@@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri13",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+

etc/psa_config/DC2C_print14.json

@@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri14",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+

etc/psa_config/DC2C_print15.json

@@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri15",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+

etc/psa_config/DC2C_print16.json

@@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri16",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+

etc/psa_config/DC2C_print17.json

@@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri17",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+

etc/psa_config/DC2C_print18.json

@@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri18",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+

etc/psa_config/DC2C_print19.json

@@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri19",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+

etc/psa_config/DC2C_print20.json

@@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri20",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+

etc/psa_config/DC2C_print21.json

@@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri21",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+

etc/psa_config/DC2C_print22.json

@@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri22",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+

etc/psa_config/DC2C_print23.json

@@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri23",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+

etc/psa_config/DC2C_print24.json

@@ -0,0 +1,33 @@
+{
+"title":"DC2C_pri24",
+"Project":"Klaipeda",
+"Version":"1.1.4-2024-08-22",
+"text":"",
+"styl":"font 24",
+"styl":"csiz 08",
+"styl":"size 00",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
+"text":"Privaloma įmoka - vietinė rinkliava.",
+"feed":"nl",
+"text":"Vietinė rinkliava",
+"feed":"nl",
+"text":"pagal pranešimą Nr.",
+"feed":"nl",
+"styl":"size 11",
+"vari":"Dynamic08",
+"styl":"size 00"
+}
+
+
+
+
+
+
+
+
+
+
+
+

etc/psa_config/DC2C_print25.json

@@ -0,0 +1,41 @@
+{
+"title":"DC2C_pri25",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"styl":"font 24",
+"styl":"csiz 08",
+"styl":"size 00",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
+"feed":"nl",
+"text":"Automobilio valstybinis numeris:",
+"feed":"nl",
+"styl":"size 22",
+"vari":"Dynamic01",
+"styl":"size 00",
+"feed":"nl",
+"text":"Sumokėta:", 
+"feed":"nl",
+"styl":"size 11",
+"vari":"Dynamic02",
+"styl":"size 00",
+"feed":"nl",
+"text":"Mokėjimo data ir laikas:", 
+"feed":"nl",
+"styl":"size 11",
+"vari":"date us",	
+"vari":"time long"
+}
+
+
+
+
+
+
+
+
+
+
+
+

etc/psa_config/DC2C_print26.json

@@ -0,0 +1,42 @@
+{
+"title":"DC2C_pri26",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"styl":"font 24",
+"styl":"csiz 08",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
+"styl":"size 00",
+"text":"Parkomato numeris:", 
+"vari":"manu",	
+"feed":"nl",
+"text":"Klaipėdos miesto",
+"feed":"nl",
+"text":"savivaldybė",
+"feed":"nl",
+"text":"Liepų g. 11, LT-92138",
+"feed":"nl",
+"text":" Klaipėda,",
+"feed":"nl",
+"text":"Įm.k. 188710823",
+"feed":"nl",
+"text":"Informacija tel.:",
+"feed":"nl",
+"text":" +370 800 12344 "
+"feed":"nl",
+"feed":"eject"
+
+}
+
+
+
+
+
+
+
+
+
+
+
+

etc/psa_config/DC2C_print27.json

@@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri27",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+

etc/psa_config/DC2C_print30.json

@@ -0,0 +1,44 @@
+{
+"title":"DC2C_pri30",
+"Project":"Klaipeda",
+"Version":"1.0.0-2024-10-11",
+"text":"",
+"styl":"font 24",
+"styl":"csiz 08",
+"styl":"size 00",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
+"styl":"size 11",
+"feed":"nl",
+"text":"TestTicket:",
+"feed":"nl",
+"styl":"size 00",
+"vari":"date ge",
+"vari":"time long",
+"feed":"nl",
+"text":"CustomerNr.: ",
+"vari":"cunu",	
+"text":"MachineNr: ",
+"vari":"manu",	
+"text":"Adresas: ",
+"vari":"location",	
+"feed":"nl",
+"text":"**Klaipėdos keleivinis transportas ",
+"feed":"nl",
+"text":" * * * * * * * * * ",
+"feed":"nl",
+"feed":"eject"
+}
+
+
+
+
+
+
+
+
+
+
+
+

etc/psa_config/DC2C_print31.json

@@ -1,20 +1,41 @@
 {
 "title":"DC2C_pri31",
-"project":"door close print",
-"Version":"15.11.2023 00001",
-"styl":"font 08",
-"styl":"size 10",
+"Project":"door close print",
+"Version":"6.7.2-2024-08-22",
+"text":"",
+"styl":"font 24",
+"styl":"csiz 08",
+"styl":"size 00",
+"styl":"align c",
 "feed":"margin02",
 "feed":"rim02",
-"feed":"speed10",
 "styl":"size 11",
 "feed":"nl",
-"text":"Türöffnung um:",
+"text":"Door closed at:",
 "feed":"nl",
 "styl":"size 00",
 "vari":"date ge",
 "vari":"time long",
 "feed":"nl",
+"text":"CustomerNr.: ",
+"vari":"cunu",	
+"text":"MachineNr: ",
+"vari":"manu",	
+"text":"Place: ",
+"vari":"location",	
+"text":"Group: ",
+"vari":"group",	
+"text":"Zone: ",
+"vari":"zone",	
+"text":"Name: ",
+"vari":"alias",	
+"feed":"nl",
+"text":"**Automatentechnik ",
+"feed":"nl",
+"text":"   Baumann GmbH ***",
+"feed":"nl",
+"text":" * * * * * * * * * ",
+"feed":"nl",
 "feed":"eject"
 }
 

etc/psa_config/DC2C_print32.json

@@ -1,40 +1,38 @@
 {
 "title":"DC2C_pri32",
-"project":"refund reciept",
-"Version":"15.11.2023 00001",
+"Project":"refund reciept",
+"Version":"6.7.1-2024-06-17",
 "styl":"font 08",
 "styl":"size 10",
 "feed":"margin02",
 "feed":"rim02",
 "feed":"speed10",
 "styl":"size 11",
-"text":"Ersatzbeleg",
+"text":"Refund Receipt",
 "feed":"nl",
 "styl":"size 00",
-"text":"Erstattungsbetrag: ",
+"text":"Amount to be refunded: ",
 "feed":"nl",
 "vari":"Dynamic07",
-"text":"€",
 "feed":"nl",
-"text":"KuNu: ",
+"styl":"size 00",
+"text":"Printed at:",
+"feed":"nl",
+"vari":"date us",
+"vari":"time long",
+"feed":"nl",
+"text":"CustomerNr.: ",
 "vari":"cunu",	
-"text":"MaNu: ",
+"text":"MachineNr: ",
 "vari":"manu",	
-"text":"Ort: ",
+"text":"Place: ",
 "vari":"location",	
-"text":"Gruppe: ",
+"text":"Group: ",
 "vari":"group",	
 "text":"Zone: ",
 "vari":"zone",	
 "text":"Name: ",
 "vari":"alias",	
-"text":"Am: ",
-"vari":"date us",
-"text":"Um: ",
-"vari":"time long",
-"feed":"nl",
-"text":" * * * * * * * * ",
-"feed":"nl",
 "feed":"nl",
 "feed":"eject"
 }

etc/psa_tariff/tariff01.json

@@ -1,7 +1,7 @@
 {
   "Project" : "Kleipeda",
-  "Version" : "1.0.0-2024-06-06T14:56:00+02:00",
-  "Info"    : "",
+  "Version" : "2.0.0-2024-10-01T09:32:12+02:00",
+  "Info"    : "Red Zone (center)",
   "Currency": [
     {
       "pcu_id": 2,
@@ -27,18 +27,23 @@
     {
       "pme_id": 4,
       "pme_label": "steps"
+    },
+    {
+      "pme_id": 5,
+      "pme_label": "unified",
+      "comment": "deprecated"
     }
   ],
   "TimeRange" : [
     {
       "time_range_id": 1,
-      "time_range_from": "22:00:00",
+      "time_range_from": "20:00:00",
       "time_range_to": "08:00:00"
     },
     {
       "time_range_id": 2,
       "time_range_from": "08:00:00",
-      "time_range_to": "22:00:00"
+      "time_range_to": "20:00:00"
     },
     {
       "time_range_id": 3,
@@ -50,25 +55,28 @@
     {
       "pop_id": 1049,
       "pop_label": "Zone 1",
-      "pop_payment_method_id": 4,
-      "pop_day_end_time": "00:00:00",
-      "pop_day_night_end_time": "00:00:00",
-      "pop_price_night": 0,
+      "pop_payment_method_id": 5,
       "pop_min_time": 12,
       "comment_pop_min_time": "12mins -> 30 cent",
       "pop_max_time": 840,
       "comment_pop_max_time": "840mins = 14h -> 21 euros",
       "pop_min_price": 30,
       "pop_max_price": 2100,
+      "pop_plus_steps": 10,
+      "pop_minus_steps": 1,
+      "pop_time_step_config": 1,
+      "pop_time_step_config_comment": "STATIC",
+      "pop_allow_overpay": true,
       "pop_carry_over": 1,
-      "pop_carry_over_time_range": 1,
-      "pop_carry_over_start_time_range": 2,
-      "pop_carry_over_end_time_range": 3,
-      "pop_business_hours": 163584,
-      "comment_1": "163584 = 0x27F00 = 10|0011|1111|0000|0000 -> all days with restricted hours"
+      "pop_business_hours": 0
     }
   ],
   "PaymentRate": [
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 0,
+        "pra_price": 0
+    },
     {
         "pra_payment_option_id": 1049,
         "pra_payment_unit_id": 1,
@@ -1121,6 +1129,11 @@
     }
   ],
   "Duration": [
+    {
+	"pun_duration": 0,
+	"pun_id": 0,
+	"pun_label": "0 min"
+    },
     {
 	"pun_duration": 4,
 	"pun_id": 1,
@@ -2172,65 +2185,452 @@
 	"pun_label": "840 min"
     }
   ],
-  "WeekDaysWorktime": [
-    {
-      "pwd_id": 621,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 1,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "22:00:00"
-    },
-    {
-      "pwd_id": 622,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 2,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "22:00:00"
-    },
-    {
-      "pwd_id": 623,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 3,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "22:00:00"
-    },
-    {
-      "pwd_id": 624,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 4,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "22:00:00"
-    },
-    {
-      "pwd_id": 625,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 5,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "22:00:00"
-    },
-    {
-      "pwd_id": 626,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 6,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "22:00:00"
-    },
-    {
-      "pwd_id": 626,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 7,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "22:00:00"
-    }
-  ],
-  "PeriodYear": [
-    {
-      "pye_id": 8,
-      "pye_label": "Whole year",
-      "pye_start_month": 1,
-      "pye_start_day": 1,
-      "pye_end_month": 12,
-      "pye_end_day": 31
-    }
-  ]
+    "Monday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 12,
+                    "max_time" : 840,
+                    "max_price": 2100,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 240,
+                            "prepaid_start" : "20:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 240,
+                            "carry_over_start" : "20:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 720,
+                            "service_start" : "08:00:00",
+                            "service_end": "20:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Tuesday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 12,
+                    "max_time" : 840,
+                    "max_price": 2100,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 240,
+                            "prepaid_start" : "20:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 240,
+                            "carry_over_start" : "20:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 720,
+                            "service_start" : "08:00:00",
+                            "service_end": "20:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Wednesday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 12,
+                    "max_time" : 840,
+                    "max_price": 2100,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 240,
+                            "prepaid_start" : "20:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 240,
+                            "carry_over_start" : "20:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 720,
+                            "service_start" : "08:00:00",
+                            "service_end": "20:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Thursday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 12,
+                    "max_time" : 840,
+                    "max_price": 2100,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 240,
+                            "prepaid_start" : "20:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 240,
+                            "carry_over_start" : "20:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 720,
+                            "service_start" : "08:00:00",
+                            "service_end": "20:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Friday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 12,
+                    "max_time" : 840,
+                    "max_price": 2100,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 240,
+                            "prepaid_start" : "20:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 240,
+                            "carry_over_start" : "20:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 720,
+                            "service_start" : "08:00:00",
+                            "service_end": "20:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Saturday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 12,
+                    "max_time" : 840,
+                    "max_price": 2100,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 240,
+                            "prepaid_start" : "20:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 240,
+                            "carry_over_start" : "20:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 720,
+                            "service_start" : "08:00:00",
+                            "service_end": "20:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Sunday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 12,
+                    "max_time" : 840,
+                    "max_price": 2100,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 240,
+                            "prepaid_start" : "20:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 240,
+                            "carry_over_start" : "20:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 720,
+                            "service_start" : "08:00:00",
+                            "service_end": "20:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }]
 }

etc/psa_update/opkg_commands

@@ -4,13 +4,23 @@
 # opkg-commands added to this file will be executed by ATBUpdateTool.          
 ###############################################################################
 # 
-#opkg update
-#opkg install prepare-update
+opkg 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-plugin-dc
-#opkg --cache /var/cache/opkg --download-only upgrade atbqt
+opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-calculateprice-mobilisis
+opkg --cache /var/cache/opkg --download-only upgrade libmobilisis-calc
+opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-cc-asyncpos
+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 --download-only upgrade ptu5-systemcontroller
+opkg --cache /var/cache/opkg --download-only upgrade ptu-package-versions
 #
-#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
+opkg --cache /var/cache/opkg upgrade atb-plugin-calculateprice-mobilisis
+opkg --cache /var/cache/opkg upgrade libmobilisis-calc
+opkg --cache /var/cache/opkg upgrade atb-plugin-cc-asyncpos
+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
+opkg --cache /var/cache/opkg upgrade ptu5-systemcontroller
+opkg --cache /var/cache/opkg upgrade ptu-package-versions