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

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=useDisk
+sellTimeout_time=60
+
+
+useAppStates=1
+statefile=/opt/app/ATBAPP/states/APP_States_743_Kirchdorf.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"

etc/atbapp/states/APP_States_743_Kirchdorf.xml

@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ATB_APP_STATES version="1.1">
+    <APP_STATE name="IDLE">
+        <EVENT name="BUTTON_START" resultingState="PAYMENT_SELECTION"/>
+        <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="PAYMENT_SELECTION">
+        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
+        <EVENT name="BUTTON_PAYMETHOD_1" resultingState="IDLE"/>
+        <EVENT name="BUTTON_PAYMETHOD_2" resultingState="CASH_PAYMENT" setCashInputMode="PAY_UP" 
+                                                                       setProduct="SHORT_TERM_PARKING"
+                                                                       setPaymentType="CASH"/>
+        <EVENT name="BUTTON_PAYMETHOD_3" resultingState="PARKTIME_SELECTION" setProduct="SHORT_TERM_PARKING"      
+                                                                             setPaymentType="CARD"/>
+        <EVENT name="BUTTON_PAYMETHOD_4" resultingState="IDLE"/>
+        <SCREEN name="PAYMENT_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="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="IDLE"/>
+        <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="IDLE"/>
+        <EVENT name="BUTTON_NEXT" resultingState="CARD_PAYMENT"/>
+    </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"/>
+        <!-- AUTO-TICKET on PayUp: accept payment -->
+        <EVENT name="RECEIVED_CALCULATE_TIME_OVERPAID" task="PAYMENT_ACCEPTED" resultingState="CASH_PAYMENT_INPUT"/>
+        <EVENT name="RECEIVED_CALCULATE_TIME_MAX"      task="PAYMENT_ACCEPTED" resultingState="CASH_PAYMENT_INPUT"/>
+        <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,11 +2,11 @@
 "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],
+"CoinDenom(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,40,1],
-"CoinValue(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,0,3],
+"CoinValue(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,40,3],
 "CoinAccept(15..0)":[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0],
 "ExchangeRate":1,
-"TokenChannel":6,
+"TokenChannel":0,
 "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,
@@ -14,5 +14,4 @@
 "Surcharge":0,	
 "Discount":0
 }
-#"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,10000,5000,2000,1000,500],
+#"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,10000,5000,2000,1000,500],
-

etc/psa_config/DC2C_conf.json

@@ -1,12 +0,0 @@
-{ 
-"title":"DC2C_config",
-"project":"Kirchdorf",
-"version":"22.01.2024 00001",
-"custNum":743,
-"machNum":1000,
-"borough":1,
-"zone":1,
-"alias":0,
-"location":""
-}
-

etc/psa_config/DC2C_device.json

@@ -1,7 +1,7 @@
 {
 "title":"DC2C_device",
-"project":"Galltuer",
+"project":"Kirchdorf",
-"Version":"22.01.2024 00103",
+"Version":"02.07.2024 00103",
 "printer":1,
 "coinChk":1,
 "mifRd":1,
@@ -23,5 +23,13 @@
 "BattWarn":11800,
 "BattErr":11200,
 "foreign":1,
-"refPrint":0
+"refundPrint":1,
+"billWarnLev":400,
+"billFullLev":500,
+"housing":1,
+"changeCoins":1,
+"dev_aux1":0,
+"dev_aux2":0,
+"dev_aux3":0,
+"dev_aux4":0
 }

etc/psa_tariff/tariff01.json

@@ -1,7 +1,7 @@
 {
-  "Project" :   "Kirchdorf",
+  "Project" : "Kirchdorf",
-  "Version" :   "1.1.0",
+  "Version" : "1.1.0-2024-05-14T08:48:13+02:00",
-  "Info"    :   "",
+  "Info"    : "",
   "Currency": [
     {
       "pcu_id": 2,

etc/psa_tariff/tariff02.json

@@ -0,0 +1,724 @@
+{
+  "Project" : "Neuhauser Kirchdorf",
+  "Version" : "1.1.0-2024-10-31T09:00:00+02:00",
+  "Info"    : "Zone 1",
+  "Currency": [
+    {
+      "pcu_id": 2,
+      "pcu_sign": "€",
+      "pcu_major": "EUR",
+      "pcu_minor": "",
+      "pcu_active": true
+    }
+  ],
+  "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"
+    },
+    {
+      "pme_id": 5,
+      "pme_label": "unified",
+      "comment": "deprecated"
+    }
+  ],
+  "TimeRange" : [
+    {
+      "time_range_id": 1,
+      "time_range_from": "20:00:00",
+      "time_range_to": "08:00:00"
+    },
+    {
+      "time_range_id": 2,
+      "time_range_from": "08:00:00",
+      "time_range_to": "20:00:00"
+    },
+    {
+      "time_range_id": 3,
+      "time_range_from": "00:00:00",
+      "time_range_to": "08:00:00"
+    }
+  ],
+  "PaymentOption": [
+    {
+      "pop_id": 1049,
+      "pop_label": "Zone 1",
+      "pop_payment_method_id": 5,
+      "pop_min_time": 30,
+      "comment_pop_min_time": "30mins -> 30 cent",
+      "pop_max_time": 90,
+      "pop_min_price": 30,
+      "pop_max_price": 150,
+      "pop_plus_steps": 1,
+      "pop_minus_steps": 1,
+      "pop_time_step_config": 1,
+      "pop_time_step_config_comment": "STATIC",
+      "pop_allow_overpay": true,
+      "pop_carry_over": 1,
+      "pop_business_hours": 0
+    }
+  ],
+  "PaymentRate": [
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 0,
+        "pra_price": 0
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 1,
+        "pra_price": 30
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 2,
+        "pra_price": 40
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 3,
+        "pra_price": 50
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 4,
+        "pra_price": 60
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 5,
+        "pra_price": 70
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 6,
+        "pra_price": 80
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 7,
+        "pra_price": 90
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 8,
+        "pra_price": 100
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 9,
+        "pra_price": 110
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 10,
+        "pra_price": 120
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 11,
+        "pra_price": 130
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 12,
+        "pra_price": 140
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 13,
+        "pra_price": 150
+    }
+  ],
+  "Duration": [
+    {
+        "pun_duration": 0,
+        "pun_id": 0,
+        "pun_label": "0 min"
+    },
+    {
+        "pun_duration": 30,
+        "pun_id": 1
+    },
+    {
+        "pun_duration": 35,
+        "pun_id": 2
+    },
+    {
+        "pun_duration": 40,
+        "pun_id": 3
+    },
+    {
+        "pun_duration": 45,
+        "pun_id": 4
+    },
+    {
+        "pun_duration": 50,
+        "pun_id": 5
+    },
+    {
+        "pun_duration": 55,
+        "pun_id": 6
+    },
+    {
+        "pun_duration": 60,
+        "pun_id": 7
+    },
+    {
+        "pun_duration": 65,
+        "pun_id": 8
+    },
+    {
+        "pun_duration": 70,
+        "pun_id": 9
+    },
+    {
+        "pun_duration": 75,
+        "pun_id": 10
+    },
+    {
+        "pun_duration": 80,
+        "pun_id": 11
+    },
+    {
+        "pun_duration": 85,
+        "pun_id": 12
+    },
+    {
+        "pun_duration": 90,
+        "pun_id": 13
+    }
+  ],
+    "Monday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 30,
+                    "max_time" : 90,
+                    "max_price": 150,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
+                            "prepaid_duration": 360,
+                            "prepaid_start" : "18:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 360,
+                            "carry_over_start" : "18:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 240,
+                            "service_start" : "14:00:00",
+                            "service_end": "18:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Tuesday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 30,
+                    "max_time" : 90,
+                    "max_price": 150,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
+                            "prepaid_duration": 360,
+                            "prepaid_start" : "18:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 360,
+                            "carry_over_start" : "18:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 240,
+                            "service_start" : "14:00:00",
+                            "service_end": "18:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Wednesday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 30,
+                    "max_time" : 90,
+                    "max_price": 150,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
+                            "prepaid_duration": 360,
+                            "prepaid_start" : "18:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 360,
+                            "carry_over_start" : "18:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 240,
+                            "service_start" : "14:00:00",
+                            "service_end": "18:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Thursday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 30,
+                    "max_time" : 90,
+                    "max_price": 150,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
+                            "prepaid_duration": 360,
+                            "prepaid_start" : "18:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 360,
+                            "carry_over_start" : "18:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 240,
+                            "service_start" : "14:00:00",
+                            "service_end": "18:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Friday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 30,
+                    "max_time" : 90,
+                    "max_price": 150,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
+                            "prepaid_duration": 360,
+                            "prepaid_start" : "18:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 360,
+                            "carry_over_start" : "18:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 240,
+                            "service_start" : "14:00:00",
+                            "service_end": "18:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Saturday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 30,
+                    "max_time" : 840,
+                    "max_price": 1400,
+                    "min_price": 50
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 720,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 720,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Sunday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 30,
+                    "max_time" : 840,
+                    "max_price": 1400,
+                    "min_price": 50
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 1440,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 1440,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }]
+}

etc/psa_update/opkg_commands

@@ -6,14 +6,11 @@
 # 
 opkg update
 opkg install prepare-update
-# opkg install atbupdatetool
+#
-# opkg install mxt-touch-reset
+opkg --cache /var/cache/opkg --download-only upgrade atb-dc-libraries
-# opkg remove atb-accountingtool
+opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-dc
-# opkg install atb-accountingtool
+opkg --cache /var/cache/opkg --download-only upgrade atbqt
-opkg --cache /var/cache/opkg --download-only upgrade
+#
-opkg --cache /var/cache/opkg upgrade
+opkg --cache /var/cache/opkg upgrade atb-dc-libraries
-# opkg remove apism
+opkg --cache /var/cache/opkg upgrade atb-plugin-dc
-# opkg install apism
+opkg --cache /var/cache/opkg upgrade atbqt
-opkg info apism
-opkg info atbqt
-opkg info atbupdatetool