Copied from Palanga (336)

Merge branch 'pu/ask_for_receipt'
Text: screen 0x3c ASC_RECEIPT
2024-11-15 12:43:25 +01:00 · 2024-11-05 16:34:55 +01:00 · 2024-11-05 16:33:34 +01:00 · 2024-11-05 16:09:07 +01:00 · 2024-11-05 15:50:04 +01:00 · 2024-11-05 15:38:33 +01:00
45 changed files with 12177 additions and 1360 deletions
--- a/etc/atbapp/ATBAPP.ini
+++ b/etc/atbapp/ATBAPP.ini
@ -0,0 +1,124 @@
+[COMMON]
+com_port_name=/dev/ttyS1
+com_baud_rate=9600
+lang1=lt_LT
+lang2=en_GB
+lang3=de_DE
+lang4=ru_RU
+lang5=
+
+defaultLanguage=1
+CharacterSet="ISO 8859-13"
+
+showInfoButton=false
+showHelpButton=false
+
+#useLanguage=[128+][64+][32+][16]
+useLanguage=240
+#usePayment=[128+][64+][32+][16]
+usePayment=96
+#useVehicle=[128+][64+][32+][16+][8]
+useVehicle=192
+#useProduct=[128+][64+][32+][16+][8]
+useProduct=192
+
+textfile=/opt/app/ATBAPP/text/HMI_Texte.xml
+logfile=/var/log/atbqt.log
+alternativeLogoFile=/opt/app/ATBAPP/logo/logo_klaipeda2.png
+
+feature_Log=off
+feature_TouchFeedback=off
+feature_StartButton=on
+feature_selfOOO=off
+feature_ShowParkingTime=off
+
+suspend_methode=sysfs
+suspend_program=
+suspend_time=8
+
+touch_feedback_gpio=121
+touch_feedback_on_value=1
+touch_feedback_off_value=0
+
+#ooo_mode={useDisk|otherMachine}
+ooo_mode=otherMachine
+sellTimeout_time=60
+
+showInfoButton=false
+showHelpButton=false
+
+useAppStates=1
+statefile=/opt/app/ATBAPP/states/APP_States.xml
+
+[SCREENCONFIG]
+sc_31="1,1,0"
+sc_33="1,0,1"
+sc_3F="1,0,0"
+sc_40="1,0,1"
+sc_41="1,0,0"
+sc_35="0,0,0"
+sc_51="1,0,1"
+sc_52="1,0,0"
+sc_53="1,0,0"
+
+
+[PLUGINS]
+CCPlugin=AsyncPOS_CCPlugin
+CalculatePricePlugin=MOBILISIS_CalculatePricePlugin
+DeviceControllerPlugin=ATBDeviceControllerPlugin
+
+
+[IngenicoISelf_CCPlugin]
+debug=1
+PortName=/dev/ttymxc0
+ZVT=DE
+sleep=1
+sleepExtended=1
+Currency=HUF
+
+
+[TCP_CONTROL]
+enable=1
+
+
+[PAYMENT]
+currencySymbol=€
+currencyISOCode=EUR
+cashVariant=CoinsAndNotes
+paymentPointInTime=poa
+useDecimal=yes
+
+
+[MOBILISIS_CalculatePricePlugin]
+useDebug=1
+tariffFileName=/etc/psa_tariff/tariff01.json
+
+[ATBDeviceControllerPlugin]
+serialPort=ttymxc2
+printerEncoding="Windows-1257"
+printerLocale="lt_LT"
+
+[TCP_ZVT_CCPlugin]
+CurrencyCode=EUR
+debug=1
+IP=192.168.6.242
+Port=22000
+SSL=0
+ZVT=DE
+sleep=1
+printIntermediateStatus=1
+Password=277296
+NumberOfChars=37
+dcHours="0"
+
+[AsyncPOS_CCPlugin]
+APAK=8AC304380E0E476BA2558B75DB9E2516
+POSID=T-TPS-SELF2002in
+PortName=/dev/ttymxc0
+baudrate=19200
+dataBits=8
+dcHours=0
+debug=1
+parity=0
+sleep=0
+stopBits=1
--- a/etc/atbapp/states/APP_States.xml
+++ b/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>
--- a/etc/atbapp/text/HMI_Texte.xml
+++ b/etc/atbapp/text/HMI_Texte.xml
--- a/etc/psa_config/DC2C_cash.json
+++ b/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],

--- a/etc/psa_config/DC2C_conf.json
+++ b/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"
-}
-
--- a/etc/psa_config/DC2C_device.json
+++ b/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
 }
--- a/etc/psa_config/DC2C_print01.json
+++ b/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"
 }

--- a/etc/psa_config/DC2C_print02.json
+++ b/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"
 }


--- a/etc/psa_config/DC2C_print03.json
+++ b/etc/psa_config/DC2C_print03.json
@ -1,23 +1,24 @@
 {
 "title":"DC2C_pri03",
-"project":"Klaipeda",
-"Version":"15.11.2023 00001",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"styl":"size 00",
+"text":"Sumokėta:", 
+"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"
 }


--- a/etc/psa_config/DC2C_print03_red.json
+++ b/etc/psa_config/DC2C_print03_red.json
@ -0,0 +1,40 @@
+{
+"title":"DC2C_pri03",
+"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",
+"feed":"nl",
+"text":"Bilieto nr.:",
+"vari":"Dynamic08",
+"feed":"nl",
+"text":"Automato nr.:",
+"vari":"manu",
+"feed":"nl"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print03_yellow.json
+++ b/etc/psa_config/DC2C_print03_yellow.json
@ -0,0 +1,39 @@
+{
+"title":"DC2C_pri03",
+"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 grynais:", 
+"vari":"Dynamic02",
+"styl":"size 21",
+"text":"Geltonoji zona",
+"feed":"nl",
+"styl":"size 10",
+"text":"tarifas 60 ct/h",
+"feed":"nl",
+"styl":"size 00",
+"feed":"nl",
+"text":"Bilieto nr.:",
+"vari":"Dynamic08",
+"feed":"nl",
+"text":"Automato nr.:",
+"vari":"manu",
+"feed":"nl"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print04.json
+++ b/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"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print05.json
+++ b/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"
 }

--- a/etc/psa_config/DC2C_print06.json
+++ b/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"
 }


--- a/etc/psa_config/DC2C_print07.json
+++ b/etc/psa_config/DC2C_print07.json
@ -1,23 +1,24 @@
 {
 "title":"DC2C_pri07",
-"project":"Klaipeda",
-"Version":"15.11.2023 00001",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"styl":"size 00",
+"text":"Sumokėta:", 
+"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"
 }


--- a/etc/psa_config/DC2C_print07_red.json
+++ b/etc/psa_config/DC2C_print07_red.json
@ -0,0 +1,39 @@
+{
+"title":"DC2C_pri07",
+"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",
+"feed":"nl",
+"text":"Bilieto nr.:",
+"vari":"Dynamic08",
+"feed":"nl",
+"text":"Automato nr.:",
+"vari":"manu",
+"feed":"nl"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print07_yellow.json
+++ b/etc/psa_config/DC2C_print07_yellow.json
@ -0,0 +1,39 @@
+{
+"title":"DC2C_pri07",
+"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":"Sumokėta kortele:", 
+"vari":"Dynamic02",
+"styl":"size 21",
+"text":"Geltonoji zona",
+"feed":"nl",
+"styl":"size 10",
+"text":"tarifas 60 ct/h",
+"feed":"nl",
+"styl":"size 00",
+"feed":"nl",
+"text":"Bilieto nr.:",
+"vari":"Dynamic08",
+"feed":"nl",
+"text":"Automato nr.:",
+"vari":"manu",
+"feed":"nl"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print08.json
+++ b/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"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print09.json
+++ b/etc/psa_config/DC2C_print09.json
@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri09",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print10.json
+++ b/etc/psa_config/DC2C_print10.json
@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri10",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print11.json
+++ b/etc/psa_config/DC2C_print11.json
@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri11",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print12.json
+++ b/etc/psa_config/DC2C_print12.json
@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri12",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print13.json
+++ b/etc/psa_config/DC2C_print13.json
@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri13",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print14.json
+++ b/etc/psa_config/DC2C_print14.json
@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri14",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print15.json
+++ b/etc/psa_config/DC2C_print15.json
@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri15",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print16.json
+++ b/etc/psa_config/DC2C_print16.json
@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri16",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print17.json
+++ b/etc/psa_config/DC2C_print17.json
@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri17",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print18.json
+++ b/etc/psa_config/DC2C_print18.json
@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri18",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print19.json
+++ b/etc/psa_config/DC2C_print19.json
@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri19",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print20.json
+++ b/etc/psa_config/DC2C_print20.json
@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri20",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print21.json
+++ b/etc/psa_config/DC2C_print21.json
@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri21",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print22.json
+++ b/etc/psa_config/DC2C_print22.json
@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri22",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print23.json
+++ b/etc/psa_config/DC2C_print23.json
@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri23",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print24.json
+++ b/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"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print25.json
+++ b/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"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print26.json
+++ b/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"
+
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print27.json
+++ b/etc/psa_config/DC2C_print27.json
@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri27",
+"Project":"Klaipeda",
+"Version":"1.1.3-2024-08-08",
+"text":"" 
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print30.json
+++ b/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"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print31.json
+++ b/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"
 }

--- a/etc/psa_config/DC2C_print32.json
+++ b/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"
 }
--- a/etc/psa_tariff/tariff01.json
+++ b/etc/psa_tariff/tariff01.json
--- a/etc/psa_tariff/tariff02.json
+++ b/etc/psa_tariff/tariff02.json
--- a/etc/psa_tariff/tariff03.json
+++ b/etc/psa_tariff/tariff03.json
--- a/etc/psa_tariff/tariff04.json
+++ b/etc/psa_tariff/tariff04.json
--- a/etc/psa_update/opkg_commands
+++ b/etc/psa_update/opkg_commands
@ -7,10 +7,20 @@
 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
Author	SHA1	Message	Date
Gerhard Hoffmann	689ae2964f	Copied from Palanga (336)	2024-11-15 12:43:25 +01:00
Siegfried Siegert	60fccdc917	Merge branch 'pu/ask_for_receipt'	2024-11-05 16:34:55 +01:00
Siegfried Siegert	5285eb5c05	Text: screen 0x3c ASC_RECEIPT	2024-11-05 16:33:34 +01:00
Siegfried Siegert	6ca423b293	Text: Fix typo	2024-11-05 16:09:07 +01:00
Siegfried Siegert	dd2d554d01	Selling process / Card payment: ask for printing receipt	2024-11-05 15:50:04 +01:00
Siegfried Siegert	0f06e63826	Merge branch 'master' of ptu-config.atb-comm.de:ATB/customer_335	2024-11-05 15:38:33 +01:00
Gerhard Hoffmann	dabd44197d	Update files (provided by Thomas)	2024-10-31 12:09:39 +01:00
Gerhard Hoffmann	80093de987	Add libmobilisis for download/update	2024-10-08 12:50:45 +02:00
Gerhard Hoffmann	8e5de08bd0	Update tariff-files for winter term	2024-10-02 15:59:02 +02:00
Gerhard Hoffmann	295dc4badc	tariff-files for winter-term	2024-10-01 14:21:04 +02:00
Gerhard Hoffmann	93de81b036	tariff-files for winter-term	2024-10-01 12:42:24 +02:00
Gerhard Hoffmann	b9a65a865e	Merge branch 'master' of https://ptu-config.atb-comm.de/ATB/customer_335	2024-09-13 10:13:16 +02:00
Gerhard Hoffmann	6f051a6cbc	First step for new tariffs: Change times (carry-over-limts).	2024-09-13 10:10:27 +02:00
Gerhard Hoffmann	11e0374581	Change tariff files according to new settings sent from Eugenijus	2024-09-12 15:37:52 +02:00
Gerhard Hoffmann	307503e402	Updated as provided by t.Sax	2024-09-05 08:09:30 +02:00
Gerhard Hoffmann	82e21f98f6	Add atb-plugin-calculateprice-mobilisis.	2024-08-30 11:26:40 +02:00
Gerhard Hoffmann	b90be66e36	Update jsons as provided by T.Sax	2024-08-27 16:21:56 +02:00
Gerhard Hoffmann	f5297f8fcf	Set DorPrint=0	2024-08-27 08:45:54 +02:00
Gerhard Hoffmann	5976a30ea3	updated by th.sax	2024-08-22 15:33:42 +02:00
Gerhard Hoffmann	943c62a25a	checking new file 22.08.2024	2024-08-22 13:25:37 +02:00
Gerhard Hoffmann	56852fc116	smd-2024.08.20 only with CP1257	2024-08-22 08:27:31 +02:00
Gerhard Hoffmann	2702a71343	Add settinge time-step-config and pop-allow-overpay	2024-08-21 18:00:10 +02:00
Gerhard Hoffmann	95c2500bdb	Add settinge time-step-config and pop-allow-overpay	2024-08-21 17:56:53 +02:00
Siegfried Siegert	b09f81692c	HMI: Textupdate	2024-08-09 14:01:43 +02:00
Siegfried Siegert	bbd31a5f2e	Textupdate: screen Overpaid	2024-08-09 13:40:48 +02:00
Siegfried Siegert	dc4c53ae4a	ATBAPP: states: request for overpayment	2024-08-09 11:49:31 +02:00
Siegfried Siegert	a21945ae8c	Update text: "Wait for card terminal"	2024-08-08 17:02:42 +02:00
Siegfried Siegert	405394f08c	Merge branch 'master' of ptu-config.atb-comm.de:ATB/customer_335	2024-08-08 17:02:23 +02:00
Gerhard Hoffmann	384efce14b	Update jsons-files as provided by Thomas	2024-08-08 10:34:04 +02:00
Siegfried Siegert	0f7ddce50a	Setup opkg-commands	2024-08-07 17:16:16 +02:00
Siegfried Siegert	916facb9f7	ATBAPP: states: skip printing bank receipt	2024-08-07 16:44:37 +02:00
Siegfried Siegert	c7a2b326fe	ATBAPP: add current states	2024-08-07 16:42:46 +02:00
Siegfried Siegert	d3adea9018	ATBAPP: setPrinterEncoding and printerLocale	2024-08-07 16:39:10 +02:00
Siegfried Siegert	d01525264c	Merge branch 'master' of ptu-config.atb-comm.de:ATB/customer_335	2024-08-07 16:37:13 +02:00
Gerhard Hoffmann	f8b00f5fb8	Tariff for Zone 2 (Yellow) in Kleipeda	2024-08-01 17:20:23 +02:00
Gerhard Hoffmann	1cd03956cf	Tariff for Zone 1 (Red) in Kleipeda	2024-08-01 17:09:47 +02:00
Gerhard Hoffmann	4c2b34a0bd	Add JSON files as saved on ATB server	2024-07-19 10:34:01 +02:00
Siegfried Siegert	518817f400	Merge branch 'master' of ptu-config.atb-comm.de:ATB/customer_335	2024-07-19 09:58:23 +02:00
Siegfried Siegert	5c0fb02903	Add PTU5 configuration	2024-07-19 09:57:47 +02:00
Gerhard Hoffmann	251ef75027	Add tariff for Yellow Zone	2024-07-18 15:36:42 +02:00
Gerhard Hoffmann	6475afa172	Provide empty file as start	2024-07-17 14:47:32 +02:00
Gerhard Hoffmann	2808d340bc	Merge branch 'master' of https://ptu-config.atb-comm.de/ATB/customer_335	2024-07-03 13:08:51 +02:00
Gerhard Hoffmann	17357ab472	Sync with zg1/zone1	2024-07-03 13:07:31 +02:00