Time selection: proposal 1 "SimpleSteps"

Add Ostersonntag (2x): not really necessary as it's a sunday.

etc/atb/SystemControl.ini

@@ -0,0 +1,85 @@
+[AT_TASKS]
+1\arguments=restart, atbapp
+1\envs=
+1\hourOfDay=4
+1\id=ATBAPP_RESTART
+1\program=/bin/systemctl
+2\arguments=restart, apism
+2\envs=
+2\hourOfDay=4
+2\id=APISM_RESTART
+2\program=/bin/systemctl
+3\arguments=start, atbupdatetool
+3\envs=
+3\hourOfDay=1
+3\id=PTU5UPDATE
+3\program=/bin/systemctl
+
+#4\arguments=
+#4\envs=
+#4\hourOfDay=0
+#4\id=REBOOT_0
+#4\program=/sbin/reboot
+
+#5\arguments=
+#5\envs=
+#5\hourOfDay=7
+#5\id=REBOOT_7
+#5\program=/sbin/reboot
+
+#6\arguments=
+#6\envs=
+#6\hourOfDay=13
+#6\id=REBOOT_13
+#6\program=/sbin/reboot
+
+size=3
+
+[BACKLIGHT]
+SensorMax=3500
+SensorMin=0
+curve=1
+dimLowValue=499
+dimMax=100
+dimMin=20
+inputBrightness=499
+
+[COMMON]
+startBacklightController=true
+startMQTTController=true
+startMonitoringController=true
+startSuspendController=false
+
+[MONITORING]
+http_dataFormat=HTTP
+http_host=127.0.0.1
+http_ignoreSslErrors=on
+http_port=5000
+http_protocol=http
+http_service=
+monitoring_heartbeatInterval=60
+protocol=mqtt
+useDeviceId=on
+useRingbuffer=on
+
+[MQTT]
+mqtt_QoS=0
+mqtt_TopicDeviceType=MP
+mqtt_TopicPrefix=ATB
+mqtt_TopicScheme=ATB_ISMAS
+mqtt_debug=on
+mqtt_host=mqtt2.atb-comm.de
+mqtt_password=xyz123
+mqtt_port=8883
+mqtt_useSsl=on
+mqtt_username=testuser
+
+[NETWORKCHECK]
+PingHost=google.com
+networkRestart=/sbin/ifup -a
+setOOO=off
+useNetworkCheck=on
+
+[SUSPEND]
+program=/home/root/system_powerdown_wakeup.sh
+suspendLoopTimerValue=8

etc/atbapp/ATBAPP.ini

@@ -0,0 +1,107 @@
+[COMMON]
+com_port_name=/dev/ttyS2
+com_baud_rate=9600
+lang1=de_AT
+lang2=en_GB
+lang3=it_IT
+lang4=de_DE
+
+defaultLanguage=1
+
+CharacterSet="ISO 8859-15"
+
+#useLanguage=[128+][64+][32+][16]
+useLanguage=192
+#usePayment=[128+][64+][32+][16]
+usePayment=96
+#useVehicle=[128+][64+][32+][16]
+useVehicle=192
+useProduct=192
+
+showInfoButton=false
+showHelpButton=false
+
+textfile=/opt/app/ATBAPP/text/HMI_Texte.xml
+logfile=/var/log/atbqt.log
+alternativeLogoFile=
+#alternativeLogoFile=
+
+feature_Log=off
+feature_TouchFeedback=off
+feature_StartButton=on
+feature_selfOOO=off
+feature_ShowParkingTime=off
+
+touch_feedback_gpio=121
+touch_feedback_on_value=1
+touch_feedback_off_value=0
+
+#ooo_mode={useDisk|otherMachine}
+ooo_mode=otherMachine
+sellTimeout_time=60
+
+
+useAppStates=1
+statefile=/opt/app/ATBAPP/states/APP_States.xml
+
+[SCREENCONFIG]
+sc_31="0,1,0"
+sc_33="1,0,1"
+sc_3F="1,0,0"
+sc_40="1,0,1"
+sc_41="1,0,1"
+sc_44="1,0,1"
+sc_35="0,0,0"
+sc_51="1,0,1"
+sc_52="1,0,0"
+sc_53="1,0,0"
+
+
+[PLUGINS]
+CCPlugin=TCP_ZVT_CCPlugin
+CalculatePricePlugin=MOBILISIS_CalculatePricePlugin
+DeviceControllerPlugin=ATBDeviceControllerPlugin
+
+[TCP_CONTROL]
+enable=0
+
+[PAYMENT]
+currencySymbol=€
+currencyISOCode=EUR
+cashVariant=Coins
+paymentPointInTime=poa
+useDecimal=yes
+
+[MOBILISIS_CalculatePricePlugin]
+useDebug=1
+tariffFileName=/etc/psa_tariff/tariff01.json
+useSimpleSteps=yes
+plusStep=30
+minusStep=10
+
+
+
+[ATBDeviceControllerPlugin]
+serialPort=ttymxc2
+printerEncoding="Windows-1252"
+
+[IngenicoZVT_CCPlugin]
+debug=1
+PortName=/dev/ttyS3
+ZVT=AT
+sleep=0
+CurrencyCode=EUR
+dcHours="0"
+
+[TCP_ZVT_CCPlugin]
+CurrencyCode=EUR
+debug=1
+IP=192.168.6.242
+Port=22000
+SSL=0
+ZVT=DE
+sleep=1
+printIntermediateStatus=1
+Password=835322
+NumberOfChars=37
+dcHours="0"

etc/atbapp/states/APP_States.xml

@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ATB_APP_STATES version="1.1">
+    <APP_STATE name="IDLE">
+        <EVENT name="BUTTON_START" resultingState="SETUP_SELL_STATE"/>
+        <EVENT name="SELL_DISABLE" resultingState="FREE_PARK"/>
+        <EVENT name="RECEIVED_DC_COIN_ATTACHED" resultingState="SETUP_DIRECT_COIN_INPUT"/>
+        <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="SETUP_DIRECT_COIN_INPUT">
+        <ENTRY_TASK name="TIMER" timeout="500"/>
+        <EVENT name="TIMEOUT" resultingState="CASH_PAYMENT" 
+               setCashInputMode="PAY_UP" 
+               setProduct="SHORT_TERM_PARKING"
+               setPaymentType="CASH"/>
+    </APP_STATE>
+
+    <APP_STATE name="SETUP_SELL_STATE">
+        <ENTRY_TASK name="TIMER" timeout="500"/>
+        <EVENT name="TIMEOUT" resultingState="PARKTIME_SELECTION" setCashInputMode="PAY_DOWN" setProduct="SHORT_TERM_PARKING"/>
+    </APP_STATE>
+    
+    <APP_STATE name="LICENSEPLATE_INPUT">
+        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
+        <EVENT name="BUTTON_NEXT" resultingState="PRODUCT_SELECTION"/>
+        <SCREEN name="LICENSEPLATE_INPUT"/>
+    </APP_STATE>
+   <APP_STATE name="PRODUCT_SELECTION">
+       <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
+       <EVENT name="BUTTON_VEHICLE_1" resultingState="PAYMENT_SELECTION_SHORT_TIME" setCashInputMode="PAY_UP"   setProduct="SHORT_TERM_PARKING"/>
+       <EVENT name="BUTTON_VEHICLE_2" resultingState="PAYMENT_SELECTION_DAY" setCashInputMode="PAY_DOWN" setProduct="DAY_TICKET"/>
+       <SCREEN name="PRODUCT_SELECTION"/>
+   </APP_STATE>
+
+    <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="IDLE"/>
+        <EVENT name="BUTTON_NEXT" resultingState="PAYMENT_SELECTION"/>
+        <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="IDLE"/>
+        <EVENT name="BUTTON_NEXT" resultingState="PAYMENT_SELECTION"/>
+    </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="IDLE"/>
+        <EVENT name="BUTTON_NEXT" resultingState="PAYMENT_SELECTION"/>
+    </APP_STATE>
+    
+    <APP_STATE name="PAYMENT_SELECTION">
+        <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>
+
+    <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>
+    
+    <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_ISAMAS_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>
+
+    <!--
+    <APP_STATE name="PRINT_TICKET_WAIT">
+        <ENTRY_TASK name="TIMER" timeout="2000"/>
+        <EVENT name="TIMEOUT" resultingState="PRINT_TICKET"/>
+        <SCREEN name="BUSY"/>
+    </APP_STATE>
+    -->
+    <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>
+
+    <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>   
+    
+    <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>
+    
+    <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/psa_config/DC2C_cash.json

@@ -2,17 +2,18 @@
 "title":"DC2C_cash  ",
 "project":"Korneuburg",
 "version":"15.10.2023 14:55 02.00.06",
-"CoinDenom(15..0)":[200,100,50,20,10,5,0,0,0,255,200,100,50,20,10,5],
+"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,3,200,100,50,20,10,5],
+"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,0,0,0,0,0,1,1,1,1,1,0],
+"CoinAccept(15..0)":[1,1,1,1,1,0,1,1,1,1,1,1,1,1,1,0],
 "ExchangeRate":1,
 "TokenChannel":6,
 "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,1,1,1],
+"BillAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
 "LocalTaxRate":19,
 "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

@@ -3,10 +3,11 @@
 "project":"Korneuburg",
 "version":"15.11.2023 00001",
 "custNum":714,
-"machNum":1000,
+"machNum":8,
 "borough":1,
 "zone":1,
 "alias":0,
-"location":"Vorplatz 1"
+"location":"Hauptplatz 39 Gericht"
 }
-
+#
+#

etc/psa_config/DC2C_device.json

@@ -10,7 +10,7 @@
 "creditCard":1,
 "escrow":1,
 "RejMotor":0,
-"shutter":1,
+"shutter":2,
 "billRd":0,
 "vaultLock":0,
 "autoAlarm":1,
@@ -25,3 +25,6 @@
 "foreign":1,
 "refPrint":0
 }
+#
+#
+#

etc/psa_config/DC2C_print01.json

@@ -7,24 +7,18 @@
 "styl":"align c",
 "feed":"margin02",
 "feed":"rim02",
-"text":"PARKTICKET",
+"text":"Korneuburg",
+"feed":"nl"
+"feed":"nl"
+"text":"Parkschein",
+"feed":"nl",
+"feed":"nl",
 "styl":"size 00",
-"feed":"nl",
-"text":"Bitte gut sichtbar",
-"feed":"nl",
-"text":"hinter die Scheibe",
-"feed":"nl",
-"text":"legen",
-"feed":"nl",
-"feed":"nl",
 "styl":"align l",
-"text":"Ihr Kennzeichen: ",
-"feed":"nl",
 "styl":"size 11",
 "vari":"Dynamic01",
 "styl":"size 00",
-"feed":"nl",
+"text":"Parkzeit bezahlt bis: ",
-"text":"Parkende: ",
 "feed":"nl",
 "styl":"size 11",
 "vari":"Dynamic04",
@@ -32,6 +26,7 @@
 "styl":"size 00",
 "feed":"nl"
 }
+#
 
 
 
@@ -44,3 +39,5 @@
 
 
 
+#
+#

etc/psa_config/DC2C_print02.json

@@ -1,32 +1,16 @@
-{
+{
 "title":"DC2C_pri02",
 "project":"Korneuburg",
 "Version":"15.11.2023 00001",
 "issued":"13.11.2023 01.01",
-"text":"Standort: ",
-"feed":"nl",
-"vari":"location",
 "feed":"nl",
 "text":"Bezahlt: ",
 "styl":"size 11",
 "vari":"Dynamic07",
 "text":"",
 "feed":"nl",
-"styl":"size 00",
+"styl":"size 00"
-"text":"Gedruckt am: ",
+}
-"vari":"wday deu short",
+#
-"vari":"date ge",	
+#
-"vari":"time long"
+#
-}
-
-
-
-
-
-
-
-
-
-
-
-

etc/psa_config/DC2C_print03.json

@@ -1,35 +1,24 @@
-{
+{
 "title":"DC2C_pri03",
 "project":"Korneuburg",
 "Version":"15.11.2023 00001",
 "feed":"nl",
 "styl":"size 00",
+"text":"Standort: ",
+"feed":"nl",
+"vari":"location",
 "text":"Automat: ",
 "vari":"manu",	
-"text":"Gruppe: ",
-"vari":"group",	
-"text":"Zone: ",
-"vari":"zone",	
 "feed":"nl",
-"text":"Ort: ",
-"vari":"location",	
 "styl":"align c",
-"text":"Korneuburg",
+"text":"Bitte gut sichtbar",
 "feed":"nl",
-"text":"Automatentechnik ",
+"text":"hinter die Scheibe",
+"feed":"nl",
+"text":"legen",
 "feed":"nl",
-"text":"Baumann GmbH",
 "feed":"eject"
-}
+}
-
+#
-
+#
-
+#
-
-
-
-
-
-
-
-
-

etc/psa_config/DC2C_print04.json

@@ -3,4 +3,6 @@
 "project":"Korneuburg",
 "Version":"15.11.2023 01.01",
 "text":"";
-}
+}#
+#
+#

etc/psa_config/DC2C_print05.json

@@ -7,24 +7,18 @@
 "styl":"align c",
 "feed":"margin02",
 "feed":"rim02",
-"text":"PARKTICKET",
+"text":"Korneuburg",
+"feed":"nl"
+"feed":"nl"
+"text":"Parkschein",
+"feed":"nl",
+"feed":"nl",
 "styl":"size 00",
-"feed":"nl",
-"text":"Bitte gut sichtbar",
-"feed":"nl",
-"text":"hinter die Scheibe",
-"feed":"nl",
-"text":"legen",
-"feed":"nl",
-"feed":"nl",
 "styl":"align l",
-"text":"Ihr Kennzeichen: ",
-"feed":"nl",
 "styl":"size 11",
 "vari":"Dynamic01",
 "styl":"size 00",
-"feed":"nl",
+"text":"Parkzeit bezahlt bis: ",
-"text":"Parkende: ",
 "feed":"nl",
 "styl":"size 11",
 "vari":"Dynamic04",
@@ -44,3 +38,6 @@
 
 
 
+#
+#
+#

etc/psa_config/DC2C_print06.json

@@ -3,20 +3,14 @@
 "project":"Korneuburg",
 "Version":"15.11.2023 00001",
 "issued":"13.11.2023 01.01",
-"text":"Standort: ",
-"feed":"nl",
-"vari":"location",
 "feed":"nl",
 "text":"Bezahlt: ",
 "styl":"size 11",
 "vari":"Dynamic07",
-"text":"€",
+"text":"",
 "feed":"nl",
-"styl":"size 00",
+"styl":"size 00"
-"text":"Gedruckt am: ",
+
-"vari":"wday deu short",
-"vari":"date ge",	
-"vari":"time long"
 }
 
 
@@ -30,3 +24,6 @@
 
 
 
+#
+#
+#

etc/psa_config/DC2C_print07.json

@@ -4,21 +4,19 @@
 "Version":"15.11.2023 00001",
 "feed":"nl",
 "styl":"size 00",
+"text":"Standort: ",
+"feed":"nl",
+"vari":"location",
 "text":"Automat: ",
 "vari":"manu",	
-"text":"Gruppe: ",
-"vari":"group",	
-"text":"Zone: ",
-"vari":"zone",	
 "feed":"nl",
-"text":"Ort: ",
-"vari":"location",	
 "styl":"align c",
-"text":"Korneuburg",
+"text":"Bitte gut sichtbar",
 "feed":"nl",
-"text":"Automatentechnik ",
+"text":"hinter die Scheibe",
+"feed":"nl",
+"text":"legen",
 "feed":"nl",
-"text":"Baumann GmbH",
 "feed":"eject"
 }
 
@@ -33,3 +31,6 @@
 
 
 
+#
+#
+#

etc/psa_config/DC2C_print08.json

@@ -3,4 +3,6 @@
 "project":"Korneuburg",
 "Version":"15.11.2023 01.01",
 "text":"";
-}
+}#
+#
+#

etc/psa_config/DC2C_print31.json

@@ -15,26 +15,10 @@
 "vari":"date ge",
 "vari":"time long",
 "feed":"nl",
-"text":"KuNu: ",
-"vari":"cunu",	
-"text":"MaNu: ",
-"vari":"manu",	
-"text":"Ort: ",
-"vari":"location",	
-"text":"Gruppe: ",
-"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

@@ -40,3 +40,6 @@
 }
 
 
+#
+#
+#

etc/psa_tariff/tariff01.json

@@ -49,6 +49,11 @@
       "pra_payment_option_id": 1049,
       "pra_payment_unit_id": 1,
       "pra_price": 10
+    },
+    {
+      "pra_payment_option_id": 1049,
+      "pra_payment_unit_id": 2,
+      "pra_price": 120
     }
   ],
   "Duration": [
@@ -211,6 +216,13 @@
       "pedwt_time_to": "00:00:00",
       "pedwt_price": 0
     },
+    {
+      "pedwt_id": 2177,
+      "pedwt_period_exc_day_id": 2023,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
     {
       "pedwt_id": 2178,
       "pedwt_period_exc_day_id": 2022,
@@ -260,6 +272,13 @@
       "pedwt_time_to": "00:00:00",
       "pedwt_price": 0
     },
+    {
+      "pedwt_id": 2201,
+      "pedwt_period_exc_day_id": 2039,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
     {
       "pedwt_id": 2202,
       "pedwt_period_exc_day_id": 2038,
@@ -410,8 +429,16 @@
     {
       "ped_id": 2022,
       "ped_label": "Ostermontag",
-      "ped_date_start": "2024-01-04",
+      "ped_date_start": "2024-04-01",
-      "ped_date_end": "2024-01-04",
+      "ped_date_end": "2024-04-01",
+      "ped_period_special_day_id": 1,
+      "ped_year": 2024
+    },
+    {
+      "ped_id": 2023,
+      "ped_label": "Ostersonntag",
+      "ped_date_start": "2024-03-31",
+      "ped_date_end": "2024-03-31",
       "ped_period_special_day_id": 1,
       "ped_year": 2024
     },
@@ -519,6 +546,14 @@
       "ped_period_special_day_id": 1,
       "ped_year": 2025
     },
+    {
+      "ped_id": 2039,
+      "ped_label": "Ostersonntag",
+      "ped_date_start": "2025-04-20",
+      "ped_date_end": "2025-04-20",
+      "ped_period_special_day_id": 1,
+      "ped_year": 2025
+    },
     {
       "ped_id": 2038,
       "ped_label": "Staatsfeiertag",

etc/psa_update/opkg_commands

@@ -4,15 +4,17 @@
 # opkg-commands added to this file will be executed by ATBUpdateTool.          
 ###############################################################################
 # 
-opkg info atbqt
-opkg info atbupdatetool
 opkg update
 opkg install prepare-update
 opkg install atbupdatetool
+opkg install mxt-touch-reset
+opkg install atb-dc-libraries
+opkg install ptu5-systemcontroller
+opkg install atb-modemtools
 # opkg remove atb-accountingtool
 # opkg install atb-accountingtool
-opkg --cache /var/cache/opkg --download-only upgrade
+#opkg --cache /var/cache/opkg --download-only upgrade
-opkg --cache /var/cache/opkg upgrade
+#opkg --cache /var/cache/opkg upgrade
 # opkg remove apism
 # opkg install apism
 opkg info apism