3 Commits

Author SHA1 Message Date
0fe79592ee Merge branch 'zg1/zone1' 2023-11-22 17:14:36 +01:00
938bcc0144 Add json-config files for schoenau. 2023-11-20 13:10:20 +01:00
1f9c20f774 Add opkg_commands file. 2023-11-16 09:47:27 +01:00
22 changed files with 113 additions and 3738 deletions

1
README
View File

@@ -1 +0,0 @@
This is a demo/test zone for update tests

View File

@@ -1,244 +0,0 @@
<?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="BUTTON_START" resultingState="SETUP_SELL_STATE"/>
<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="SETUP_SELL_STATE">
<ENTRY_TASK name="TIMER" timeout="500"/>
<EVENT name="TIMEOUT" resultingState="PARKTIME_SELECTION" setProduct="SHORT_TERM_PARKING"/>
</APP_STATE>
<APP_STATE name="PRODUCT_SELECTION">
<EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
<EVENT name="BUTTON_VEHICLE_1" resultingState="LICENSEPLATE_INPUT" setProduct="SHORT_TERM_PARKING" setCheckFeature="SKIP_TICKET_PRINT"/>
<EVENT name="BUTTON_VEHICLE_2" resultingState="PARKTIME_SELECTION" setProduct="SHORT_TERM_PARKING"/>
<SCREEN name="PRODUCT_SELECTION"/>
</APP_STATE>
<!--
<APP_STATE name="SKIP_TICKET_PRINT_TEST">
<ENTRY_TASK name="PRINT_LOG" text="APP_STATE name=SKIP_TICKET_PRINT_TEST"/>
<ENTRY_TASK name="CHECK_FEATURE" checkFeatureName="SKIP_TICKET_PRINT"/>
<EVENT name="CHECK_TRUE" resultingState="LICENSEPLATE_INPUT"/>
<EVENT name="CHECK_FALSE" resultingState="PARKTIME_SELECTION"/>
</APP_STATE>
-->
<APP_STATE name="LICENSEPLATE_INPUT">
<EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
<EVENT name="BUTTON_NEXT" resultingState="PARKTIME_SELECTION" setProduct="SHORT_TERM_PARKING"/>
<SCREEN name="LICENSEPLATE_INPUT"/>
</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" setCashInputMode="PAY_DOWN"/>
<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="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="LICENSEPLATE_INPUT"/>
<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="LICENSEPLATE_INPUT"/>
<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="LICENSEPLATE_INPUT"/>
<EVENT name="BUTTON_NEXT" resultingState="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="CHECK_PAPERLESS_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_OVERPAYED" resultingState="CHECK_PAPERLESS_CASH"/>
<EVENT name="RECEIVED_CASH_INPUT_FINISHED" resultingState="CHECK_PAPERLESS_CASH"/>
<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" key="PRICE_INFO_GROSS"/>
<EVENT name="RECEIVED_CASH_INPUT" resultingState="CASH_PAYMENT_INPUT"/>
<EVENT name="RECEIVED_CASH_INPUT_OVERPAYED" resultingState="CHECK_PAPERLESS_CASH"/>
<EVENT name="RECEIVED_CASH_INPUT_FINISHED" resultingState="CHECK_PAPERLESS_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">
<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>
<!--
<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="CHECK_PAPERLESS_CASH">
<ENTRY_TASK name="CHECK_FEATURE" checkFeatureName="SKIP_TICKET_PRINT"/>
<EVENT name="CHECK_TRUE" resultingState="FINALISE_CASH_PAYMENT" setTransactionDelivery="ONLINE" setTransactionResult="SUCCESS"/>
<EVENT name="CHECK_FALSE" resultingState="PRINT_TICKET_CASH"/>
</APP_STATE>
<APP_STATE name="CHECK_PAPERLESS_CARD">
<ENTRY_TASK name="CHECK_FEATURE" checkFeatureName="SKIP_TICKET_PRINT"/>
<EVENT name="CHECK_TRUE" resultingState="CARD_PAYMENT_CONFIRM" setTransactionDelivery="ONLINE" setTransactionResult="SUCCESS"/>
<EVENT name="CHECK_FALSE" resultingState="PRINT_TICKET_CARD"/>
</APP_STATE>
<APP_STATE name="PRINT_TICKET_CASH">
<ENTRY_TASK name="REQUEST_PRINT_TICKET"/>
<EVENT name="PRINT_TICKET_FINISHED" resultingState="FINALISE_CASH_PAYMENT"/>
<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="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="6000"/>
<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"/>
<SCREEN name="PRINT_RECEIPT"/>
</APP_STATE>
<APP_STATE name="FINALISE_CASH_PAYMENT">
<ENTRY_TASK name="CASH_COLLECT"/>
<EVENT name="RECEIVED_CASH_CHANGE_BACK" resultingState="GIVE_CHANGE"/>
<EVENT name="RECEIVED_CASH_PAYMENT_FINISHED" resultingState="GOODBYE_PAYMENT_OK"/>
<!-- TODO: handle changer Error -->
<!-- no screen change here -->
</APP_STATE>
<APP_STATE name="GIVE_CHANGE">
<EVENT name="RECEIVED_CASH_PAYMENT_FINISHED" resultingState="GOODBYE_PAYMENT_OK"/>
<SCREEN name="SCREEN_CHANGE"/>
</APP_STATE>
<APP_STATE name="GOODBYE_PAYMENT_OK">
<ENTRY_TASK name="REQUEST_ISMAS_TRANSACTION"/>
<ENTRY_TASK name="TIMER" timeout="2000"/>
<EVENT name="TIMEOUT" resultingState="IDLE"/>
<SCREEN name="GOODBYE_3" note="green_hook"/>
</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>

File diff suppressed because it is too large Load Diff

View File

@@ -1,14 +1,14 @@
{
"title":"DC2C_cash ",
"project":"Schoenau",
"version":"06.05.2024 02.00.07",
"CoinDenom(15..0)":[0,0,0,0,0,0,0,0,0,255,200,100,50,20,10,5],
"CoinValue(15..0)":[0,0,0,0,0,0,0,0,0,3,200,100,50,20,10,5],
"CoinAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,0],
"version":"15.10.2023 14:55 02.00.06",
"CoinDenom(15..0)":[200,100,50,0,0,0,0,0,0,255,200,100,50,20,10,5],
"CoinValue(15..0)":[0,380,0,0,0,0,0,0,0,3,200,100,50,20,10,5],
"CoinAccept(15..0)":[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
"ExchangeRate":1,
"TokenChannel":6,
"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,5000,2000,1000,500],
"BillAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1],
"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
"BillAccept(15..0)":[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
"LocalTaxRate":19,
"ForeignTaxRate":0,
"Surcharge":0,

12
etc/psa_config/DC2C_conf.json Executable file
View File

@@ -0,0 +1,12 @@
{
"title":"DC2C_config",
"project":"Schoenau",
"version":"15.11.2023 00001",
"custNum":332,
"machNum":1000,
"borough":0,
"zone":0,
"alias":0,
"location":"Vorplatz 1"
}

View File

@@ -0,0 +1,27 @@
{
"title":"DC2C_device",
"project":"Schoenau",
"Version":"15.11.2023 00102",
"printer":1,
"coinChk":3,
"mifRd":1,
"solarPwr":0,
"modem":0,
"creditCard":1,
"escrow":0,
"RejMotor":0,
"shutter":1,
"billRd":1,
"vaultLock":0,
"autoAlarm":1,
"autoOpen":1,
"AccPrint":1,
"DorPrint":1,
"TokPrint":1,
"CBwarnLev":1600,
"CBerrLev":1900,
"BattWarn":11800,
"BattErr":11200,
"foreign":1,
"refPrint":1
}

View File

@@ -0,0 +1,27 @@
{
"title":"DC2C_device",
"project":"Schoenau",
"Version":"15.11.2023 00102",
"printer":1,
"coinChk":3,
"mifRd":1,
"solarPwr":1,
"modem":1,
"creditCard":1,
"escrow":0,
"RejMotor":0,
"shutter":1,
"billRd":1,
"vaultLock":0,
"autoAlarm":1,
"autoOpen":1,
"AccPrint":1,
"DorPrint":1,
"TokPrint":1,
"CBwarnLev":1600,
"CBerrLev":1900,
"BattWarn":11800,
"BattErr":11200,
"foreign":1,
"refPrint":1
}

View File

@@ -23,9 +23,5 @@
"BattWarn":11800,
"BattErr":11200,
"foreign":1,
"refundPrint":1,
"billWarnLev":300,
"billFullLev":380,
"housing":1
"refPrint":1
}

View File

@@ -1,7 +1,7 @@
{
"title":"DC2C_pri01",
"project":"Schoenau",
"Version":"15.11.2023 00001",
"Version":"15.11.2023 00003",
"styl":"font 10",
"styl":"size 11",
"styl":"align c",

View File

@@ -1,7 +1,7 @@
{
"title":"DC2C_pri02",
"project":"Schoenau",
"Version":"01.12.2023 00008",
"Version":"15.11.2023 00001",
"issued":"13.11.2023 01.01",
"text":"Standort: ",
"feed":"nl",
@@ -10,6 +10,7 @@
"text":"Bezahlt: ",
"styl":"size 11",
"vari":"Dynamic07",
"text":"€",
"feed":"nl",
"styl":"size 00",
"text":"Gedruckt am: ",

View File

@@ -1,7 +1,7 @@
{
"title":"DC2C_pri03",
"project":"Schoenau",
"Version":"09.04.2024 00001",
"Version":"15.11.2023 00001",
"feed":"nl",
"styl":"size 00",
"text":"Automat: ",
@@ -14,7 +14,7 @@
"text":"Ort: ",
"vari":"location",
"styl":"align c",
"text":"Schönau am Königssee",
"text":"Schönau am Königsee",
"feed":"nl",
"text":"Automatentechnik ",
"feed":"nl",

View File

@@ -1,46 +0,0 @@
{
"title":"DC2C_pri05",
"project":"Schoenau",
"Version":"15.11.2023 00001",
"styl":"font 10",
"styl":"size 11",
"styl":"align c",
"feed":"margin02",
"feed":"rim02",
"text":"PARKTICKET",
"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":"Parkende: ",
"feed":"nl",
"styl":"size 11",
"vari":"Dynamic04",
"vari":"Dynamic03",
"styl":"size 00",
"feed":"nl"
}

View File

@@ -1,31 +0,0 @@
{
"title":"DC2C_pri06",
"project":"Schoenau",
"Version":"15.11.2023 00002",
"issued":"13.11.2023 01.01",
"text":"Standort: ",
"feed":"nl",
"vari":"location",
"feed":"nl",
"text":"Bezahlt: ",
"styl":"size 11",
"vari":"Dynamic07",
"feed":"nl",
"styl":"size 00",
"text":"Gedruckt am: ",
"vari":"wday deu short",
"vari":"date ge",
"vari":"time long"
}

View File

@@ -1,35 +0,0 @@
{
"title":"DC2C_pri07",
"project":"Schoenau",
"Version":"09.04.2024 00001",
"feed":"nl",
"styl":"size 00",
"text":"Automat: ",
"vari":"manu",
"text":"Gruppe: ",
"vari":"group",
"text":"Zone: ",
"vari":"zone",
"feed":"nl",
"text":"Ort: ",
"vari":"location",
"styl":"align c",
"text":"Schönau am Königssee",
"feed":"nl",
"text":"Automatentechnik ",
"feed":"nl",
"text":"Baumann GmbH",
"feed":"eject"
}

View File

@@ -1,6 +0,0 @@
{
"title":"DC2C_pri08",
"project":"Schoenau",
"Version":"15.11.2023 01.01",
"text":"";
}

View File

@@ -1,7 +1,7 @@
{
"title":"DC2C_pri32",
"project":"refund reciept",
"Version":"01.12.2023 00007",
"Version":"15.11.2023 00001",
"styl":"font 08",
"styl":"size 10",
"feed":"margin02",
@@ -14,6 +14,7 @@
"text":"Erstattungsbetrag: ",
"feed":"nl",
"vari":"Dynamic07",
"text":"€",
"feed":"nl",
"text":"KuNu: ",
"vari":"cunu",

View File

@@ -1,7 +1,7 @@
{
"Project" : "Schoenau",
"Version" : "1.2.0",
"Info" : "<<Tariff for Zone 1>>",
"Version" : "1.0.0",
"Info" : "",
"Currency": [
{
"pcu_id": 1,
@@ -38,7 +38,7 @@
"pop_day_night_end_time": "15:20:00",
"pop_price_night": 0,
"pop_min_time": 60,
"pop_max_time": 14400,
"pop_max_time": 10080,
"pop_min_price": 300,
"pop_carry_over": 1,
"pop_daily_card_price": 0,
@@ -59,52 +59,37 @@
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 5,
"pra_price": 900
"pra_price": 800
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 7,
"pra_price": 1800
"pra_price": 1600
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 8,
"pra_price": 2700
"pra_price": 2400
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 9,
"pra_price": 3600
"pra_price": 3200
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 10,
"pra_price": 4500
"pra_price": 4000
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 11,
"pra_price": 5400
"pra_price": 4800
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 12,
"pra_price": 6300
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 13,
"pra_price": 7200
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 14,
"pra_price": 8100
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 15,
"pra_price": 9000
"pra_price": 5600
}
],
"Duration": [
@@ -141,7 +126,7 @@
{
"pun_id": 9,
"pun_label": "96h",
"pun_duration": 5760
"pun_duration": 5670
},
{
"pun_id": 10,
@@ -157,21 +142,6 @@
"pun_id": 12,
"pun_label": "168h",
"pun_duration": 10080
},
{
"pun_id": 13,
"pun_label": "192h",
"pun_duration": 11520
},
{
"pun_id": 14,
"pun_label": "216h",
"pun_duration": 12960
},
{
"pun_id": 15,
"pun_label": "240h",
"pun_duration": 14400
}
]
}

View File

@@ -1,7 +1,7 @@
{
"Project" : "Schoenau",
"Version" : "1.2.0",
"Info" : "<<<Tariff for zone 2>>>",
"Version" : "1.0.0",
"Info" : "",
"Currency": [
{
"pcu_id": 1,
@@ -38,73 +38,28 @@
"pop_day_night_end_time": "15:07:00",
"pop_price_night": 0,
"pop_min_time": 60,
"pop_max_time": 14400,
"pop_min_price": 300,
"pop_max_time": 1440,
"pop_min_price": 200,
"pop_carry_over": 1,
"pop_daily_card_price": 0,
"pop_multi_hour_price": 8
"pop_multi_hour_price": 5
}
],
"PaymentRate": [
{
"pra_payment_option_id": 1100,
"pra_payment_unit_id": 1,
"pra_price": 300
"pra_price": 200
},
{
"pra_payment_option_id": 1100,
"pra_payment_unit_id": 6,
"pra_price": 500
"pra_price": 400
},
{
"pra_payment_option_id": 1100,
"pra_payment_unit_id": 5,
"pra_price": 600
},
{
"pra_payment_option_id": 1100,
"pra_payment_unit_id": 7,
"pra_price": 1200
},
{
"pra_payment_option_id": 1100,
"pra_payment_unit_id": 8,
"pra_price": 1800
},
{
"pra_payment_option_id": 1100,
"pra_payment_unit_id": 9,
"pra_price": 2400
},
{
"pra_payment_option_id": 1100,
"pra_payment_unit_id": 10,
"pra_price": 3000
},
{
"pra_payment_option_id": 1100,
"pra_payment_unit_id": 11,
"pra_price": 3600
},
{
"pra_payment_option_id": 1100,
"pra_payment_unit_id": 12,
"pra_price": 4200
},
{
"pra_payment_option_id": 1100,
"pra_payment_unit_id": 13,
"pra_price": 4800
},
{
"pra_payment_option_id": 1100,
"pra_payment_unit_id": 14,
"pra_price": 5400
},
{
"pra_payment_option_id": 1100,
"pra_payment_unit_id": 15,
"pra_price": 6000
"pra_price": 500
}
],
"Duration": [
@@ -141,7 +96,7 @@
{
"pun_id": 9,
"pun_label": "96h",
"pun_duration": 5760
"pun_duration": 5670
},
{
"pun_id": 10,
@@ -157,21 +112,6 @@
"pun_id": 12,
"pun_label": "168h",
"pun_duration": 10080
},
{
"pun_id": 13,
"pun_label": "192h",
"pun_duration": 11520
},
{
"pun_id": 14,
"pun_label": "216h",
"pun_duration": 12960
},
{
"pun_id": 15,
"pun_label": "240h",
"pun_duration": 14400
}
]
}

View File

@@ -96,7 +96,7 @@
{
"pun_id": 9,
"pun_label": "96h",
"pun_duration": 5760
"pun_duration": 5670
},
{
"pun_id": 10,

View File

@@ -1,177 +0,0 @@
{
"Project" : "Schoenau",
"Version" : "1.2.0",
"Info" : "<<Tariff for Zone 1>>",
"Currency": [
{
"pcu_id": 1,
"pcu_sign": "€",
"pcu_major": "Euro",
"pcu_minor": "Cent",
"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"
}
],
"PaymentOption": [
{
"pop_id": 1099,
"pop_label": "Zone 1",
"pop_payment_method_id": 4,
"pop_day_end_time": "15:20:00",
"pop_day_night_end_time": "15:20:00",
"pop_price_night": 0,
"pop_min_time": 60,
"pop_max_time": 14400,
"pop_min_price": 300,
"pop_carry_over": 1,
"pop_daily_card_price": 0,
"pop_multi_hour_price": 8
}
],
"PaymentRate": [
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 1,
"pra_price": 300
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 6,
"pra_price": 700
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 5,
"pra_price": 900
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 7,
"pra_price": 1800
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 8,
"pra_price": 2700
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 9,
"pra_price": 3600
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 10,
"pra_price": 4500
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 11,
"pra_price": 5400
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 12,
"pra_price": 6300
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 13,
"pra_price": 7200
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 14,
"pra_price": 8100
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 15,
"pra_price": 9000
}
],
"Duration": [
{
"pun_id": 1,
"pun_label": "1h",
"pun_duration": 60
},
{
"pun_id": 3,
"pun_label": "15 min",
"pun_duration": 15
},
{
"pun_id": 5,
"pun_label": "24h",
"pun_duration": 1440
},
{
"pun_id": 6,
"pun_label": "3h",
"pun_duration": 180
},
{
"pun_id": 7,
"pun_label": "48h",
"pun_duration": 2880
},
{
"pun_id": 8,
"pun_label": "72h",
"pun_duration": 4320
},
{
"pun_id": 9,
"pun_label": "96h",
"pun_duration": 5760
},
{
"pun_id": 10,
"pun_label": "120h",
"pun_duration": 7200
},
{
"pun_id": 11,
"pun_label": "144h",
"pun_duration": 8640
},
{
"pun_id": 12,
"pun_label": "168h",
"pun_duration": 10080
},
{
"pun_id": 13,
"pun_label": "192h",
"pun_duration": 11520
},
{
"pun_id": 14,
"pun_label": "216h",
"pun_duration": 12960
},
{
"pun_id": 15,
"pun_label": "240h",
"pun_duration": 14400
}
]
}

View File

@@ -1,177 +0,0 @@
{
"Project" : "Schoenau",
"Version" : "1.2.1",
"Info" : "<<Tariff for Zone 1>>",
"Currency": [
{
"pcu_id": 1,
"pcu_sign": "€",
"pcu_major": "Euro",
"pcu_minor": "Cent",
"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"
}
],
"PaymentOption": [
{
"pop_id": 1099,
"pop_label": "Zone 1",
"pop_payment_method_id": 4,
"pop_day_end_time": "15:20:00",
"pop_day_night_end_time": "15:20:00",
"pop_price_night": 0,
"pop_min_time": 60,
"pop_max_time": 14400,
"pop_min_price": 300,
"pop_carry_over": 1,
"pop_daily_card_price": 0,
"pop_multi_hour_price": 8
}
],
"PaymentRate": [
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 1,
"pra_price": 300
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 6,
"pra_price": 700
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 5,
"pra_price": 900
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 7,
"pra_price": 1800
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 8,
"pra_price": 2700
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 9,
"pra_price": 3600
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 10,
"pra_price": 4500
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 11,
"pra_price": 5400
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 12,
"pra_price": 6300
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 13,
"pra_price": 7200
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 14,
"pra_price": 8100
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 15,
"pra_price": 9000
}
],
"Duration": [
{
"pun_id": 1,
"pun_label": "1h",
"pun_duration": 60
},
{
"pun_id": 3,
"pun_label": "15 min",
"pun_duration": 15
},
{
"pun_id": 5,
"pun_label": "24h",
"pun_duration": 1440
},
{
"pun_id": 6,
"pun_label": "3h",
"pun_duration": 180
},
{
"pun_id": 7,
"pun_label": "48h",
"pun_duration": 2880
},
{
"pun_id": 8,
"pun_label": "72h",
"pun_duration": 4320
},
{
"pun_id": 9,
"pun_label": "96h",
"pun_duration": 5760
},
{
"pun_id": 10,
"pun_label": "120h",
"pun_duration": 7200
},
{
"pun_id": 11,
"pun_label": "144h",
"pun_duration": 8640
},
{
"pun_id": 12,
"pun_label": "168h",
"pun_duration": 10080
},
{
"pun_id": 13,
"pun_label": "192h",
"pun_duration": 11520
},
{
"pun_id": 14,
"pun_label": "216h",
"pun_duration": 12960
},
{
"pun_id": 15,
"pun_label": "240h",
"pun_duration": 14400
}
]
}

View File

@@ -4,23 +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 --cache /var/cache/opkg --download-only upgrade atb-plugin-dc
opkg --cache /var/cache/opkg upgrade atb-plugin-dc
#
opkg --cache /var/cache/opkg --download-only upgrade apism
opkg --cache /var/cache/opkg upgrade apism
#
opkg --cache /var/cache/opkg --download-only upgrade atb-dc-libraries
opkg --cache /var/cache/opkg upgrade atb-dc-libraries
#
opkg --cache /var/cache/opkg --download-only upgrade atbupdatetool
opkg --cache /var/cache/opkg upgrade atbupdatetool
#
opkg --cache /var/cache/opkg --download-only upgrade apconfig
opkg --cache /var/cache/opkg upgrade apconfig
#
opkg --cache /var/cache/opkg --download-only upgrade atbqt
opkg --cache /var/cache/opkg upgrade atbqt
opkg install atbupdatetool
# opkg remove atb-accountingtool
# opkg install atb-accountingtool
opkg --cache /var/cache/opkg --download-only upgrade
opkg --cache /var/cache/opkg upgrade
# opkg remove apism
# opkg install apism
opkg info apism
opkg info atbqt
opkg info atbupdatetool