Acivate Sunday in business_hours.

Fix: tarif max_price
Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_745 into zg1/zone1
2024-10-16 15:21:02 +02:00 · 2024-08-08 14:30:20 +02:00 · 2024-07-03 18:15:19 +02:00 · 2024-07-03 17:22:41 +02:00 · 2024-07-03 16:23:21 +02:00 · 2024-07-03 16:22:03 +02:00
17 changed files with 3480 additions and 0 deletions
--- a/etc/atbapp/ATBAPP.ini
+++ b/etc/atbapp/ATBAPP.ini
@@ -0,0 +1,102 @@
+[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
+
+[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"
--- a/etc/atbapp/states/APP_States.xml
+++ b/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>
--- 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
@@ -0,0 +1,18 @@
+{	     
+"title":"DC2C_cash  ",
+"project":"Galltuer",
+"version":"15.10.2023 14:55 02.00.06",
+"CoinDenom(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,0,1],
+"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],
+"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,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],
+
--- a/etc/psa_config/DC2C_device.json
+++ b/etc/psa_config/DC2C_device.json
@@ -0,0 +1,35 @@
+{
+"title":"DC2C_device",
+"project":"Galltuer",
+"Version":"03.07.2024 00103",
+"printer":1,
+"coinChk":1,
+"mifRd":1,
+"solarPwr":0,
+"modem":0,
+"creditCard":1,
+"escrow":1,
+"RejMotor":0,
+"shutter":1,
+"billRd":0,
+"vaultLock":0,
+"autoAlarm":1,
+"autoOpen":1,
+"AccPrint":1,
+"DorPrint":1,
+"TokPrint":1,
+"CBwarnLev":1600,
+"CBerrLev":1900,
+"BattWarn":11800,
+"BattErr":11200,
+"foreign":1,
+"refundPrint":0,
+"billWarnLev":4,
+"billFullLev":7,
+"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
@@ -0,0 +1,43 @@
+{
+"title":"DC2C_pri01",
+"project":"Galtuer",
+"Version":"22.01.2024 00001",
+"styl":"font 08",
+"feed":"margin05",
+"feed":"rim02",
+"styl":"size 00",
+"graf":"logo1",
+"styl":"font 10",
+"styl":"size 11",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
+"text":"Galtür",
+"feed":"nl"
+"feed":"nl"
+"text":"Parkschein",
+"feed":"nl",
+"feed":"nl",
+"styl":"size 00",
+"styl":"align l",
+"styl":"size 00",
+"text":"Parkzeit bezahlt bis: ",
+"feed":"nl",
+"styl":"size 11",
+"vari":"Dynamic04",
+"vari":"Dynamic03",
+"styl":"size 00",
+"feed":"nl"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print02.json
+++ b/etc/psa_config/DC2C_print02.json
@@ -0,0 +1,25 @@
+{
+"title":"DC2C_pri02",
+"project":"Galtuer",
+"Version":"22.01.2024 00001",
+"issued":"22.01.2024 01.01",
+"feed":"nl",
+"text":"Bezahlt: ",
+"styl":"size 11",
+"vari":"Dynamic07",
+"text":"",
+"feed":"nl",
+"styl":"size 00"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print03.json
+++ b/etc/psa_config/DC2C_print03.json
@@ -0,0 +1,30 @@
+{
+"title":"DC2C_pri03",
+"project":"Galtuer",
+"Version":"15.11.2023 00001",
+"feed":"nl",
+"styl":"size 00",
+"text":"Automat: ",
+"vari":"manu",	
+"feed":"nl",
+"styl":"align c",
+"text":"Bitte gut sichtbar",
+"feed":"nl",
+"text":"hinter die Scheibe",
+"feed":"nl",
+"text":"legen",
+"feed":"nl",
+"feed":"eject"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print04.json
+++ b/etc/psa_config/DC2C_print04.json
@@ -0,0 +1,6 @@
+{
+"title":"DC2C_pri04",
+"project":"Galtuer",
+"Version":"15.11.2023 01.01",
+"text":"";
+}
--- a/etc/psa_config/DC2C_print05.json
+++ b/etc/psa_config/DC2C_print05.json
@@ -0,0 +1,43 @@
+{
+"title":"DC2C_pri05",
+"project":"Galtuer",
+"Version":"15.11.2023 00001",
+"styl":"font 08",
+"feed":"margin05",
+"feed":"rim02",
+"styl":"size 00",
+"graf":"logo1",
+"styl":"font 10",
+"styl":"size 11",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
+"text":"Galtür",
+"feed":"nl"
+"feed":"nl"
+"text":"Parkschein",
+"feed":"nl",
+"feed":"nl",
+"styl":"size 00",
+"styl":"align l",
+"styl":"size 00",
+"text":"Parkzeit bezahlt bis: ",
+"feed":"nl",
+"styl":"size 11",
+"vari":"Dynamic04",
+"vari":"Dynamic03",
+"styl":"size 00",
+"feed":"nl"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print06.json
+++ b/etc/psa_config/DC2C_print06.json
@@ -0,0 +1,26 @@
+{
+"title":"DC2C_pri06",
+"project":"Galtuer",
+"Version":"15.11.2023 00001",
+"issued":"13.11.2023 01.01",
+"feed":"nl",
+"text":"Bezahlt: ",
+"styl":"size 11",
+"vari":"Dynamic07",
+"text":"",
+"feed":"nl",
+"styl":"size 00"
+
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print07.json
+++ b/etc/psa_config/DC2C_print07.json
@@ -0,0 +1,30 @@
+{
+"title":"DC2C_pri07",
+"project":"Galtuer",
+"Version":"15.11.2023 00001",
+"feed":"nl",
+"styl":"size 00",
+"text":"Automat: ",
+"vari":"manu",	
+"feed":"nl",
+"styl":"align c",
+"text":"Bitte gut sichtbar",
+"feed":"nl",
+"text":"hinter die Scheibe",
+"feed":"nl",
+"text":"legen",
+"feed":"nl",
+"feed":"eject"
+}
+
+
+
+
+
+
+
+
+
+
+
+
--- a/etc/psa_config/DC2C_print08.json
+++ b/etc/psa_config/DC2C_print08.json
@@ -0,0 +1,6 @@
+{
+"title":"DC2C_pri08",
+"project":"Galtuer",
+"Version":"15.11.2023 01.01",
+"text":"";
+}
--- a/etc/psa_config/DC2C_print31.json
+++ b/etc/psa_config/DC2C_print31.json
@@ -0,0 +1,21 @@
+{
+"title":"DC2C_pri31",
+"project":"door close print",
+"Version":"15.11.2023 00001",
+"styl":"font 08",
+"styl":"size 10",
+"feed":"margin02",
+"feed":"rim02",
+"feed":"speed10",
+"styl":"size 11",
+"feed":"nl",
+"text":"Türöffnung um:",
+"feed":"nl",
+"styl":"size 00",
+"vari":"date ge",
+"vari":"time long",
+"feed":"nl",
+"feed":"eject"
+}
+
+
--- a/etc/psa_config/DC2C_print32.json
+++ b/etc/psa_config/DC2C_print32.json
@@ -0,0 +1,42 @@
+{
+"title":"DC2C_pri32",
+"project":"refund reciept",
+"Version":"15.11.2023 00001",
+"styl":"font 08",
+"styl":"size 10",
+"feed":"margin02",
+"feed":"rim02",
+"feed":"speed10",
+"styl":"size 11",
+"text":"Ersatzbeleg",
+"feed":"nl",
+"styl":"size 00",
+"text":"Erstattungsbetrag: ",
+"feed":"nl",
+"vari":"Dynamic07",
+"text":"€",
+"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",	
+"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
@@ -0,0 +1,235 @@
+{
+  "Project" :   "Bilexa Galtuer",
+  "Version" :   "1.0.0",
+  "Info"    :   "",
+  "Currency": [
+    {
+      "pcu_id": 1,
+      "pcu_sign": "€",
+      "pcu_major": "Euro",
+      "pcu_minor": "Cent",
+      "pcu_active": true
+    }
+  ],
+  "TimeStepConfig" : [
+    {	
+      "tsconfig_id" : 1,
+      "tsconfig_label" : "static",
+      "tsconfig_comment" : "read time steps as given in jsonfiles"		
+    },
+    {
+      "tsconfig_id" : 2,
+      "tsconfig_label" : "dynamic",
+      "tsconfig_comment" : "determine timesteps at runtime"		
+    }
+  ],
+  "PaymentMethod": [
+    {
+      "pme_id": 1,
+      "pme_label": "progressive"
+    },
+    {
+      "pme_id": 2,
+      "pme_label": "degressive"
+    },
+    {
+      "pme_id": 3,
+      "pme_label": "linear"
+    },
+    {
+      "pme_id": 4,
+      "pme_label": "steps"
+    }
+  ],
+  "PaymentOption": [
+    {
+      "pop_id": 1099,
+      "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_min_time": 1,
+      "pop_max_time": 10080,
+      "pop_max_price": 4900,
+      "pop_min_price": 700,
+      "pop_carry_over": 1,
+      "pop_carry_over_time_range_id": 1,
+      "pop_daily_card_price": 0,
+      "pop_business_hours": 32512,
+      "comment_pop_business_hours": "0x3F00 -> MON-SUN",
+      "pop_time_step_config": 2
+    }
+  ],
+  "TimeBase": [
+    {
+      "tbase_id": 0,
+      "tbase_type": 0,
+      "tbase_type_comment": "time is given as starting from some wall-clock-time",
+      "tbase_label": "absolute time"
+    },
+    {
+      "tbase_id": 1,
+      "tbase_type": 1,
+      "tbase_type_comment": "time is given as starting from 0 minutes",
+      "tbase_label": "relative time"
+    }
+  ],
+  "TimeRange" : [
+    {
+      "time_range_id": 1,
+      "time_range_from": "00:00:00",
+      "time_range_to": "00:01:00",
+      "time_range_comment": "<from>-<to> <= 60secs -> time range is time point <from>"
+    }
+  ],
+  "PaymentRate": [
+    {
+      "pra_payment_option_id": 1099,
+      "pra_payment_unit_id": 1,
+      "pra_price": 700
+    },
+    {
+      "pra_payment_option_id": 1099,
+      "pra_payment_unit_id": 2,
+      "pra_price": 1400
+    },
+    {
+      "pra_payment_option_id": 1099,
+      "pra_payment_unit_id": 3,
+      "pra_price": 2100
+    },
+    {
+      "pra_payment_option_id": 1099,
+      "pra_payment_unit_id": 4,
+      "pra_price": 2800
+    },
+    {
+      "pra_payment_option_id": 1099,
+      "pra_payment_unit_id": 5,
+      "pra_price": 3500
+    },
+    {
+      "pra_payment_option_id": 1099,
+      "pra_payment_unit_id": 6,
+      "pra_price": 4200
+    },
+    {
+      "pra_payment_option_id": 1099,
+      "pra_payment_unit_id": 7,
+      "pra_price": 4900
+    }
+  ],
+  "Duration": [
+    {
+      "pun_id": 1,
+      "pun_label": "Day 1",
+      "pun_duration_min": 1,
+      "pun_duration_max": 1440,
+      "pun_duration": 0
+    },
+    {
+      "pun_id": 2,
+      "pun_label": "Day 2",
+      "pun_duration_min": 2880,
+      "pun_duration_max": 2880,
+      "pun_duration": 2880
+    },
+    {
+      "pun_id": 3,
+      "pun_label": "Day 3",
+      "pun_duration_min": 4320,
+      "pun_duration_max": 4320,
+      "pun_duration": 4320
+    },
+    {
+      "pun_id": 4,
+      "pun_label": "Day 4",
+      "pun_duration_min": 5760,
+      "pun_duration_max": 5760,
+      "pun_duration": 5760
+    },
+    {
+      "pun_id": 5,
+      "pun_label": "Day 5",
+      "pun_duration_min": 7200,
+      "pun_duration_max": 7200,
+      "pun_duration": 7200
+    },
+    {
+      "pun_id": 6,
+      "pun_label": "Day 6",
+      "pun_duration_min": 8640,
+      "pun_duration_max": 8640,
+      "pun_duration": 8640
+    },
+    {
+      "pun_id": 7,
+      "pun_label": "Day 7",
+      "pun_duration_min": 10080,
+      "pun_duration_max": 10080,
+      "pun_duration": 10080
+    }
+  ],
+  "WeekDaysWorktime": [
+    {
+      "pwd_id": 621,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 1,
+      "pwd_time_from": "00:00:00",
+      "pwd_time_to": "23:59:00"
+    },
+    {
+      "pwd_id": 622,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 2,
+      "pwd_time_from": "00:00:00",
+      "pwd_time_to": "23:59:00"
+    },
+    {
+      "pwd_id": 623,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 3,
+      "pwd_time_from": "00:00:00",
+      "pwd_time_to": "23:59:00"
+    },
+    {
+      "pwd_id": 624,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 4,
+      "pwd_time_from": "00:00:00",
+      "pwd_time_to": "23:59:00"
+    },
+    {
+      "pwd_id": 625,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 5,
+      "pwd_time_from": "00:00:00",
+      "pwd_time_to": "23:59:00"
+    },
+    {
+      "pwd_id": 626,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 6,
+      "pwd_time_from": "00:00:00",
+      "pwd_time_to": "23:59:00"
+    },
+    {
+      "pwd_id": 627,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 7,
+      "pwd_time_from": "00:00:00",
+      "pwd_time_to": "23:59: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
+    }
+  ]
+}
--- a/etc/psa_update/opkg_commands
+++ b/etc/psa_update/opkg_commands
@@ -0,0 +1,16 @@
+###############################################################################
+#                          !!! NOTE !!!
+###############################################################################
+# opkg-commands added to this file will be executed by ATBUpdateTool.          
+###############################################################################
+# 
+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 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	09d2e42469	Acivate Sunday in business_hours.	2024-10-16 15:21:02 +02:00
Siegfried Siegert	ea74c5721a	Fix: tarif max_price	2024-08-08 14:30:20 +02:00
Siegfried Siegert	2a57f7f689	Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_745 into zg1/zone1	2024-07-03 18:15:19 +02:00
Gerhard Hoffmann	fa6ae87dcb	Add WorkDaysWeekTime	2024-07-03 17:22:41 +02:00
Gerhard Hoffmann	a986a40d42	delete conf file	2024-07-03 16:23:21 +02:00
Gerhard Hoffmann	f09ed06488	Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_745 into zg1/zone1	2024-07-03 16:22:03 +02:00
Gerhard Hoffmann	b0ce5aa86a	Update as provided by Dennis	2024-07-03 16:19:12 +02:00
Siegfried Siegert	a58bd4015a	opkg install release 2024-06-18	2024-07-03 12:40:31 +02:00
Siegfried Siegert	852e5552a0	Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_745 into zg1/zone1	2024-07-03 12:39:05 +02:00
Gerhard Hoffmann	86f2dfe862	Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_745 into zg1/zone1	2024-04-24 12:41:31 +02:00
Gerhard Hoffmann	44705ef7c6	Set businesshours = 16128 (because of backward-compatiblity to bad-neuenahr)	2024-04-24 12:40:25 +02:00
Siegfried Siegert	e8aae95f6c	Merge branch 'master' into zg1/zone1	2024-04-11 09:43:30 +02:00
Siegfried Siegert	b87eb8d98d	Add ATBAPP ini/states/texts States: Galtuer does not have direct coin input	2024-04-11 09:41:46 +02:00
Siegfried Siegert	b616170d4f	Merge branch 'master' of git.mimbach49.de:GerhardHoffmann/customer_745	2024-04-11 09:35:51 +02:00
Gerhard Hoffmann	b52a948144	Added ptu5-systemcontroller	2024-04-10 14:13:10 +02:00
Gerhard Hoffmann	c72dadf28c	Added ptu5-systemcontroller	2024-04-10 14:12:25 +02:00
Gerhard Hoffmann	083d86b6d5	Add files included from at-dat	2024-04-10 14:09:39 +02:00
Gerhard Hoffmann	f613f228b2	Add files included from at-dat	2024-04-10 14:08:47 +02:00
Gerhard Hoffmann	8e7c311776	Add atb-dc-libraries and comment out upgrading	2024-03-07 08:30:06 +01:00
Gerhard Hoffmann	b974530c15	Add atb-dc-libraries and comment out upgrading	2024-03-07 08:29:28 +01:00
Gerhard Hoffmann	29b3558955	Add cash file for galtuer as in branch zg1/zone1	2024-02-16 13:23:31 +01:00
Gerhard Hoffmann	6a989c2f01	Add cash file for galtuer	2024-02-16 13:22:30 +01:00
Gerhard Hoffmann	6fc9a78243	Use opkg_commnds file as for 714 (korneuburg)	2024-01-18 15:12:01 +01:00
Gerhard Hoffmann	259cbad901	Add tariff-file for nauhauser brilaexa galtuer	2024-01-18 15:10:38 +01:00