smd 08-20 only with CP1257

Add settinge time-step-config and pop-allow-overpay
Merge branch 'zg1/zone2' of https://ptu-config.atb-comm.de/ATB/customer_335 into zg1/zone2
2024-08-22 08:20:31 +02:00 · 2024-08-21 18:02:48 +02:00 · 2024-08-21 17:54:37 +02:00 · 2024-08-21 17:52:58 +02:00 · 2024-08-09 14:00:32 +02:00 · 2024-08-09 13:46:02 +02:00
14 changed files with 332 additions and 28 deletions
--- a/etc/atbapp/ATBAPP.ini
+++ b/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
--- a/etc/atbapp/states/APP_States.xml
+++ b/etc/atbapp/states/APP_States.xml
@ -0,0 +1,294 @@
+<?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="GOODBYE_PAYMENT_OK"/>
+        <EVENT name="RECEIVED_CARD_CONFIRM_TRANSACTION_ERROR"   resultingState="CC_PAYMENT_ERROR"/>
+    </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>
--- a/etc/atbapp/text/HMI_Texte.xml
+++ b/etc/atbapp/text/HMI_Texte.xml
@ -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>Permoka!</lt_LT>
+          <en_GB>Overpaid!</en_GB>
+          <de_DE>Überbezahlt!</de_DE>
+          <ru_RU>Переплата!</ru_RU>
 	  </Text>
 	  <Text name="user_message_01" textnr="0x81">	      
 	      <lt_LT>Permoka!</lt_LT>
@ -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">
@ -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">
--- a/etc/psa_config/DC2C_device.json
+++ b/etc/psa_config/DC2C_device.json
@ -1,7 +1,7 @@
 {
 "title":"DC2C_device",
-"Project":"Schoenau",
-"Version":"6.7.2-2024-06-17",
+"Project":"Klaipeda",
+"Version":"7.2.2-2024-08-20",
 "printer":1,
 "coinChk":1,
 "mifRd":1,
@ -22,7 +22,7 @@
 "CBerrLev":1900,
 "BattWarn":11800,
 "BattErr":11200,
-"foreign":3,
+"foreign":5,
 "refundPrint":1,
 "billWarnLev":300,
 "billFullLev":380,
--- a/etc/psa_config/DC2C_print01.json
+++ b/etc/psa_config/DC2C_print01.json
@ -4,6 +4,7 @@
 "Version":"1.1.3-2024-08-08",
 "text":"",
 "styl":"font 23",
+"styl":"csiz 08",
 "styl":"size 00",
 "styl":"align c",
 "feed":"margin02",
--- a/etc/psa_config/DC2C_print02.json
+++ b/etc/psa_config/DC2C_print02.json
@ -3,16 +3,13 @@
 "Project":"Klaipeda",
 "Version":"1.1.3-2024-08-08",
 "feed":"nl",
-"styl":"font 23",
 "text":"Automobilio valstybinis",
 "feed":"nl",
 "text":" numeris:",
 "feed":"nl",
-"styl":"font 10",
 "styl":"size 22",
 "vari":"Dynamic01",
 "feed":"nl",
-"styl":"font 23",
 "styl":"size 00",
 "text":"Apmokėta iki:",
 "feed":"nl",
--- a/etc/psa_config/DC2C_print05.json
+++ b/etc/psa_config/DC2C_print05.json
@ -4,6 +4,7 @@
 "Version":"1.1.3-2024-08-08",
 "text":"",
 "styl":"font 23",
+"styl":"csiz 08",
 "styl":"size 00",
 "styl":"align c",
 "feed":"margin02",
--- a/etc/psa_config/DC2C_print06.json
+++ b/etc/psa_config/DC2C_print06.json
@ -3,16 +3,13 @@
 "Project":"Klaipeda",
 "Version":"1.1.3-2024-08-08",
 "feed":"nl",
-"styl":"font 23",
 "text":"Automobilio valstybinis",
 "feed":"nl",
 "text":" numeris:",
 "feed":"nl",
-"styl":"font 10",
 "styl":"size 22",
 "vari":"Dynamic01",
 "feed":"nl",
-"styl":"font 23",
 "styl":"size 00",
 "text":"Apmokėta iki:",
 "feed":"nl",
--- a/etc/psa_config/DC2C_print24.json
+++ b/etc/psa_config/DC2C_print24.json
--- a/etc/psa_config/DC2C_print25.json
+++ b/etc/psa_config/DC2C_print25.json
--- a/etc/psa_config/DC2C_print26.json
+++ b/etc/psa_config/DC2C_print26.json
--- a/etc/psa_tariff/tariff01.json
+++ b/etc/psa_tariff/tariff01.json
@ -219,6 +219,9 @@
      "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": false,
      "pop_carry_over": 1,
      "pop_carry_over_option_id": 1,
      "pop_prepaid_option_id" : 3,
--- a/etc/psa_tariff/tariff02.json
+++ b/etc/psa_tariff/tariff02.json
@ -62,6 +62,9 @@
      "pop_max_price": 840,
      "pop_plus_steps": 10,
      "pop_minus_steps": 1,
+      "pop_time_step_config": 1,
+      "pop_time_step_config_comment": "STATIC",
+      "pop_allow_overpay": false,
      "pop_carry_over": 1,
      "pop_carry_over_option_id": 1,
      "pop_prepaid_option_id" : 3,
--- a/etc/psa_update/opkg_commands
+++ b/etc/psa_update/opkg_commands
@ -4,13 +4,15 @@
 # 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-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 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-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
Author	SHA1	Message	Date
Gerhard Hoffmann	f887e12076	smd 08-20 only with CP1257	2024-08-22 08:20:31 +02:00
Gerhard Hoffmann	d677c12ad9	Add settinge time-step-config and pop-allow-overpay	2024-08-21 18:02:48 +02:00
Gerhard Hoffmann	ff78bf1411	Merge branch 'zg1/zone2' of https://ptu-config.atb-comm.de/ATB/customer_335 into zg1/zone2	2024-08-21 17:54:37 +02:00
Gerhard Hoffmann	21512f927e	Add settings: + "pop_time_step_config": 1 -> STATIC + "pop_allow_overpay": false	2024-08-21 17:52:58 +02:00
Siegfried Siegert	1b85f4ac03	HMI: Textupdate	2024-08-09 14:00:32 +02:00
Siegfried Siegert	7e6f5e8283	Textupdate: screen Overpaid	2024-08-09 13:46:02 +02:00
Siegfried Siegert	4dbe681477	ATBAPP: states: request for overpayment	2024-08-09 11:47:50 +02:00
Siegfried Siegert	690f60b63d	Update text: "Wait for card terminal"	2024-08-08 17:03:21 +02:00
Siegfried Siegert	ad23378439	Merge branch 'zg1/zone2' of ptu-config.atb-comm.de:ATB/customer_335 into zg1/zone2	2024-08-08 17:03:09 +02:00
Gerhard Hoffmann	5d51847b24	Merge branch 'zg1/zone2' of https://ptu-config.atb-comm.de/ATB/customer_335 into zg1/zone2	2024-08-08 10:30:22 +02:00
Siegfried Siegert	88468a9d2a	Setup opkg-commands	2024-08-07 17:16:46 +02:00
Siegfried Siegert	8a3ed1ff11	ATBAPP: states: skip printing bank receipt	2024-08-07 16:45:44 +02:00
Siegfried Siegert	59e020c60b	ATBAPP: add current states	2024-08-07 16:45:40 +02:00
Siegfried Siegert	ce6053f435	ATBAPP: setPrinterEncoding and printerLocale	2024-08-07 16:40:28 +02:00