Compare commits
68 Commits
c767849c2c
...
zg1/zone10
Author | SHA1 | Date | |
---|---|---|---|
f91ff63fbf
|
|||
57e6de03a4
|
|||
920d9c9652
|
|||
8a6fb4714b | |||
b4895ef46e
|
|||
fa7ed1e262
|
|||
8775f03b8f
|
|||
f0b5b95a6e
|
|||
5c4fa38b7a
|
|||
5fe227185c
|
|||
ee29bb5c44
|
|||
05845b16da
|
|||
2667955a41 | |||
f56fd7f8f8 | |||
b7d1bebdb8 | |||
03fd98d6e7
|
|||
d07207b659 | |||
c86624c2ac | |||
2218b83896 | |||
7a327382bb | |||
1f809d6027 | |||
4c1f8240eb | |||
f6e3774ea8 | |||
e694ef3567 | |||
2ec9dad2ae | |||
5136871a12 | |||
8dc4985df9 | |||
1f50d2aa0e | |||
5712939d06 | |||
722f503952 | |||
3be4de01f4 | |||
ad111e3edf | |||
3f7e79a4eb | |||
3b52491e7b
|
|||
6f1017e995
|
|||
45a94370d6 | |||
89ea76ee73 | |||
3f3cba534b
|
|||
533973bf30 | |||
4f033fec1e | |||
80ee7e4d0f | |||
52f8368a50 | |||
7d656d5379 | |||
d8dbcdba66 | |||
732e32d83e | |||
24dfc249ec | |||
1c6eea1873 | |||
d7bbf482c4 | |||
e3e161d08d | |||
1cde14926b | |||
85bdd001fa | |||
b909ff0205 | |||
c10741325a | |||
6c49b90bf7 | |||
76c3a0b336 | |||
93bf67135f | |||
8b5586f600 | |||
5ce3f483a2 | |||
b37a620e00 | |||
48000c8010 | |||
f3c8cda2f8 | |||
40f1468f67 | |||
d7ac519c90 | |||
6d43d1255f | |||
c09b626b80 | |||
423c7637d3 | |||
6ef8c3006e | |||
2dec7ec263 |
@@ -1,7 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<ATB_APP_STATES version="1.1">
|
<ATB_APP_STATES version="1.1">
|
||||||
<APP_STATE name="IDLE">
|
<APP_STATE name="IDLE">
|
||||||
<EVENT name="BUTTON_START" resultingState="LICENSEPLATE_INPUT"/>
|
<!-- <EVENT name="BUTTON_START" resultingState="PRODUCT_SELECTION"/> -->
|
||||||
|
<EVENT name="BUTTON_START" resultingState="SETUP_SELL_STATE"/>
|
||||||
<EVENT name="SELL_DISABLE" resultingState="FREE_PARK"/>
|
<EVENT name="SELL_DISABLE" resultingState="FREE_PARK"/>
|
||||||
<SCREEN name="START"/>
|
<SCREEN name="START"/>
|
||||||
<MODE name="IDLE"/>
|
<MODE name="IDLE"/>
|
||||||
@@ -12,17 +13,32 @@
|
|||||||
<MODE name="IDLE"/>
|
<MODE name="IDLE"/>
|
||||||
</APP_STATE>
|
</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">
|
<APP_STATE name="LICENSEPLATE_INPUT">
|
||||||
<EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
|
<EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
|
||||||
<EVENT name="BUTTON_NEXT" resultingState="PARKTIME_SELECTION" setProduct="ShortTimeParking"/>
|
<EVENT name="BUTTON_NEXT" resultingState="PARKTIME_SELECTION" setProduct="SHORT_TERM_PARKING"/>
|
||||||
<SCREEN name="LICENSEPLATE_INPUT"/>
|
<SCREEN name="LICENSEPLATE_INPUT"/>
|
||||||
</APP_STATE>
|
</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="ShortTimeParking"/>
|
|
||||||
<EVENT name="BUTTON_VEHICLE_2" resultingState="PAYMENT_SELECTION_DAY" setCashInputMode="PAY_DOWN" setProduct="DayTicket"/>
|
|
||||||
<SCREEN name="PRODUCT_SELECTION"/>
|
|
||||||
</APP_STATE>
|
|
||||||
|
|
||||||
<APP_STATE name="PAYMENT_SELECTION">
|
<APP_STATE name="PAYMENT_SELECTION">
|
||||||
<EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
|
<EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
|
||||||
@@ -62,7 +78,7 @@
|
|||||||
<APP_STATE name="CARD_PAYMENT">
|
<APP_STATE name="CARD_PAYMENT">
|
||||||
<ENTRY_TASK name="REQUEST_PARKING_ENDTIME" key="PRICE_INFO_GROSS"/>
|
<ENTRY_TASK name="REQUEST_PARKING_ENDTIME" key="PRICE_INFO_GROSS"/>
|
||||||
<ENTRY_TASK name="REQUEST_CC_START_TRANSACTION"/>
|
<ENTRY_TASK name="REQUEST_CC_START_TRANSACTION"/>
|
||||||
<EVENT name="RECEIVED_CARD_TRANSACTION_SUCCESS" resultingState="PRINT_TICKET_CARD"/>
|
<EVENT name="RECEIVED_CARD_TRANSACTION_SUCCESS" resultingState="CHECK_PAPERLESS_CARD"/>
|
||||||
<EVENT name="RECEIVED_CARD_TRANSACTION_ERROR" resultingState="CC_PAYMENT_ERROR"/>
|
<EVENT name="RECEIVED_CARD_TRANSACTION_ERROR" resultingState="CC_PAYMENT_ERROR"/>
|
||||||
<EVENT name="BUTTON_CANCEL" resultingState="USER_CC_ABORT"/>
|
<EVENT name="BUTTON_CANCEL" resultingState="USER_CC_ABORT"/>
|
||||||
<SCREEN name="CC_PAYMENT"/>
|
<SCREEN name="CC_PAYMENT"/>
|
||||||
@@ -71,8 +87,8 @@
|
|||||||
<APP_STATE name="CASH_PAYMENT">
|
<APP_STATE name="CASH_PAYMENT">
|
||||||
<ENTRY_TASK name="REQUEST_CASH_INPUT"/>
|
<ENTRY_TASK name="REQUEST_CASH_INPUT"/>
|
||||||
<EVENT name="RECEIVED_CASH_INPUT" resultingState="CASH_PAYMENT_INPUT"/>
|
<EVENT name="RECEIVED_CASH_INPUT" resultingState="CASH_PAYMENT_INPUT"/>
|
||||||
<EVENT name="RECEIVED_CASH_INPUT_OVERPAYED" resultingState="PRINT_TICKET_CASH"/>
|
<EVENT name="RECEIVED_CASH_INPUT_OVERPAYED" resultingState="CHECK_PAPERLESS_CASH"/>
|
||||||
<EVENT name="RECEIVED_CASH_INPUT_FINISHED" resultingState="PRINT_TICKET_CASH"/>
|
<EVENT name="RECEIVED_CASH_INPUT_FINISHED" resultingState="CHECK_PAPERLESS_CASH"/>
|
||||||
<EVENT name="RECEIVED_CASH_INPUT_ERROR" resultingState="CASH_PAYMENT_ERROR"/>
|
<EVENT name="RECEIVED_CASH_INPUT_ERROR" resultingState="CASH_PAYMENT_ERROR"/>
|
||||||
<EVENT name="BUTTON_CANCEL" resultingState="CASH_PAYMENT_ABORT"/>
|
<EVENT name="BUTTON_CANCEL" resultingState="CASH_PAYMENT_ABORT"/>
|
||||||
<SCREEN name="COIN_PAYMENT"/>
|
<SCREEN name="COIN_PAYMENT"/>
|
||||||
@@ -80,8 +96,8 @@
|
|||||||
<APP_STATE name="CASH_PAYMENT_INPUT">
|
<APP_STATE name="CASH_PAYMENT_INPUT">
|
||||||
<ENTRY_TASK name="REQUEST_PARKING_ENDTIME" key="PRICE_INFO_GROSS"/>
|
<ENTRY_TASK name="REQUEST_PARKING_ENDTIME" key="PRICE_INFO_GROSS"/>
|
||||||
<EVENT name="RECEIVED_CASH_INPUT" resultingState="CASH_PAYMENT_INPUT"/>
|
<EVENT name="RECEIVED_CASH_INPUT" resultingState="CASH_PAYMENT_INPUT"/>
|
||||||
<EVENT name="RECEIVED_CASH_INPUT_OVERPAYED" resultingState="PRINT_TICKET_CASH"/>
|
<EVENT name="RECEIVED_CASH_INPUT_OVERPAYED" resultingState="CHECK_PAPERLESS_CASH"/>
|
||||||
<EVENT name="RECEIVED_CASH_INPUT_FINISHED" resultingState="PRINT_TICKET_CASH"/>
|
<EVENT name="RECEIVED_CASH_INPUT_FINISHED" resultingState="CHECK_PAPERLESS_CASH"/>
|
||||||
<EVENT name="RECEIVED_CASH_INPUT_ERROR" resultingState="CASH_PAYMENT_ERROR"/>
|
<EVENT name="RECEIVED_CASH_INPUT_ERROR" resultingState="CASH_PAYMENT_ERROR"/>
|
||||||
<EVENT name="BUTTON_CANCEL" resultingState="CASH_PAYMENT_ABORT"/>
|
<EVENT name="BUTTON_CANCEL" resultingState="CASH_PAYMENT_ABORT"/>
|
||||||
<EVENT name="BUTTON_NEXT" task="PAYMENT_ACCEPTED" resultingState="CASH_PAYMENT_INPUT"/>
|
<EVENT name="BUTTON_NEXT" task="PAYMENT_ACCEPTED" resultingState="CASH_PAYMENT_INPUT"/>
|
||||||
@@ -94,7 +110,7 @@
|
|||||||
<SCREEN name="CASH_PAYMENT_FAILED" note="screennumber 0x39"/>
|
<SCREEN name="CASH_PAYMENT_FAILED" note="screennumber 0x39"/>
|
||||||
</APP_STATE>
|
</APP_STATE>
|
||||||
<APP_STATE name="CASH_OVERPAYED">
|
<APP_STATE name="CASH_OVERPAYED">
|
||||||
<ENTRY_TASK name="REQUEST_ISAMAS_FAIL_TRANSACTION"/>
|
<ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
|
||||||
<ENTRY_TASK name="CASH_ABORT"/>
|
<ENTRY_TASK name="CASH_ABORT"/>
|
||||||
<ENTRY_TASK name="TIMER" timeout="3000"/>
|
<ENTRY_TASK name="TIMER" timeout="3000"/>
|
||||||
<EVENT name="TIMEOUT" resultingState="IDLE"/>
|
<EVENT name="TIMEOUT" resultingState="IDLE"/>
|
||||||
@@ -114,6 +130,19 @@
|
|||||||
<SCREEN name="BUSY"/>
|
<SCREEN name="BUSY"/>
|
||||||
</APP_STATE>
|
</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">
|
<APP_STATE name="PRINT_TICKET_CASH">
|
||||||
<ENTRY_TASK name="REQUEST_PRINT_TICKET"/>
|
<ENTRY_TASK name="REQUEST_PRINT_TICKET"/>
|
||||||
<EVENT name="PRINT_TICKET_FINISHED" resultingState="FINALISE_CASH_PAYMENT"/>
|
<EVENT name="PRINT_TICKET_FINISHED" resultingState="FINALISE_CASH_PAYMENT"/>
|
||||||
@@ -137,20 +166,28 @@
|
|||||||
|
|
||||||
<APP_STATE name="CARD_PAYMENT_CONFIRM">
|
<APP_STATE name="CARD_PAYMENT_CONFIRM">
|
||||||
<ENTRY_TASK name="REQUEST_CC_CONFIRM_TRANSACTION"/>
|
<ENTRY_TASK name="REQUEST_CC_CONFIRM_TRANSACTION"/>
|
||||||
<EVENT name="RECEIVED_CARD_CONFIRM_TRANSACTION_SUCCESS" resultingState="PRINT_RECEIPT"/>
|
<EVENT name="RECEIVED_CARD_CONFIRM_TRANSACTION_SUCCESS" resultingState="ASK_RECEIPT"/>
|
||||||
<EVENT name="RECEIVED_CARD_CONFIRM_TRANSACTION_ERROR" resultingState="CC_PAYMENT_ERROR"/>
|
<EVENT name="RECEIVED_CARD_CONFIRM_TRANSACTION_ERROR" resultingState="CC_PAYMENT_ERROR"/>
|
||||||
</APP_STATE>
|
</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">
|
<APP_STATE name="PRINT_RECEIPT">
|
||||||
<ENTRY_TASK name="REQUEST_PRINT_RECEIPT"/>
|
<ENTRY_TASK name="REQUEST_PRINT_RECEIPT"/>
|
||||||
<EVENT name="PRINT_RECEIPT_FINISHED" resultingState="GOODBYE_PAYMENT_OK"/>
|
<EVENT name="PRINT_RECEIPT_FINISHED" resultingState="GOODBYE_PAYMENT_OK"/>
|
||||||
<EVENT name="PRINT_RECEIPT_ERROR" resultingState="PRINT_TICKET_FAILED"/>
|
<EVENT name="PRINT_RECEIPT_ERROR" resultingState="PRINT_TICKET_FAILED"/>
|
||||||
|
<SCREEN name="PRINT_RECEIPT"/>
|
||||||
</APP_STATE>
|
</APP_STATE>
|
||||||
|
|
||||||
<APP_STATE name="FINALISE_CASH_PAYMENT">
|
<APP_STATE name="FINALISE_CASH_PAYMENT">
|
||||||
<ENTRY_TASK name="CASH_COLLECT"/>
|
<ENTRY_TASK name="CASH_COLLECT"/>
|
||||||
<EVENT name="RECEIVED_CASH_CHANGE_BACK" resultingState="GIVE_CHANGE"/>
|
<EVENT name="RECEIVED_CASH_CHANGE_BACK" resultingState="GIVE_CHANGE"/>
|
||||||
<EVENT name="RECEIVED_CASH_PAYMENT_FINISHED" resultingState="GOODBYE_PAYMENT_OK"/>
|
<EVENT name="RECEIVED_CASH_PAYMENT_FINISHED" resultingState="GOODBYE_PAYMENT_OK"/>
|
||||||
<!-- TODO: hangle changer Error -->
|
<!-- TODO: handle changer Error -->
|
||||||
<!-- no screen change here -->
|
<!-- no screen change here -->
|
||||||
</APP_STATE>
|
</APP_STATE>
|
||||||
<APP_STATE name="GIVE_CHANGE">
|
<APP_STATE name="GIVE_CHANGE">
|
||||||
@@ -161,7 +198,7 @@
|
|||||||
<ENTRY_TASK name="REQUEST_ISMAS_TRANSACTION"/>
|
<ENTRY_TASK name="REQUEST_ISMAS_TRANSACTION"/>
|
||||||
<ENTRY_TASK name="TIMER" timeout="2000"/>
|
<ENTRY_TASK name="TIMER" timeout="2000"/>
|
||||||
<EVENT name="TIMEOUT" resultingState="IDLE"/>
|
<EVENT name="TIMEOUT" resultingState="IDLE"/>
|
||||||
<SCREEN name="GOODBYE_PAYMENT_OK"/>
|
<SCREEN name="GOODBYE_3" note="green_hook"/>
|
||||||
</APP_STATE>
|
</APP_STATE>
|
||||||
|
|
||||||
<APP_STATE name="CC_PAYMENT_ERROR">
|
<APP_STATE name="CC_PAYMENT_ERROR">
|
||||||
|
2876
etc/atbapp/text/HMI_Texte.xml
Normal file
2876
etc/atbapp/text/HMI_Texte.xml
Normal file
File diff suppressed because it is too large
Load Diff
@@ -1,14 +1,14 @@
|
|||||||
{
|
{
|
||||||
"title":"DC2C_cash ",
|
"title":"DC2C_cash ",
|
||||||
"project":"Schoenau",
|
"project":"Schoenau",
|
||||||
"version":"15.10.2023 14:55 02.00.06",
|
"version":"06.05.2024 02.00.07",
|
||||||
"CoinDenom(15..0)":[200,100,50,0,0,0,0,0,0,255,200,100,50,20,10,5],
|
"CoinDenom(15..0)":[0,0,0,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],
|
"CoinValue(15..0)":[0,0,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],
|
"CoinAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,0],
|
||||||
"ExchangeRate":1,
|
"ExchangeRate":1,
|
||||||
"TokenChannel":6,
|
"TokenChannel":6,
|
||||||
"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
|
"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,5000,2000,1000,500],
|
||||||
"BillAccept(15..0)":[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
|
"BillAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1],
|
||||||
"LocalTaxRate":19,
|
"LocalTaxRate":19,
|
||||||
"ForeignTaxRate":0,
|
"ForeignTaxRate":0,
|
||||||
"Surcharge":0,
|
"Surcharge":0,
|
||||||
|
@@ -1,12 +0,0 @@
|
|||||||
{
|
|
||||||
"title":"DC2C_config",
|
|
||||||
"project":"Schoenau",
|
|
||||||
"version":"15.11.2023 00001",
|
|
||||||
"custNum":332,
|
|
||||||
"machNum":1000,
|
|
||||||
"borough":0,
|
|
||||||
"zone":0,
|
|
||||||
"alias":0,
|
|
||||||
"location":"Vorplatz 1"
|
|
||||||
}
|
|
||||||
|
|
@@ -1,12 +0,0 @@
|
|||||||
{
|
|
||||||
"title":"DC2C_config",
|
|
||||||
"project":"Schoenau",
|
|
||||||
"version":"15.11.2023 00001",
|
|
||||||
"custNum":332,
|
|
||||||
"machNum":21,
|
|
||||||
"borough":0,
|
|
||||||
"zone":0,
|
|
||||||
"alias":0,
|
|
||||||
"location":"Vorplatz 1"
|
|
||||||
}
|
|
||||||
|
|
@@ -1,12 +0,0 @@
|
|||||||
{
|
|
||||||
"title":"DC2C_config",
|
|
||||||
"project":"Schoenau",
|
|
||||||
"version":"15.11.2023 00001",
|
|
||||||
"custNum":332,
|
|
||||||
"machNum":25,
|
|
||||||
"borough":0,
|
|
||||||
"zone":0,
|
|
||||||
"alias":0,
|
|
||||||
"location":"Vorplatz 1"
|
|
||||||
}
|
|
||||||
|
|
@@ -1,12 +0,0 @@
|
|||||||
{
|
|
||||||
"title":"DC2C_config",
|
|
||||||
"project":"Schoenau",
|
|
||||||
"version":"15.11.2023 00001",
|
|
||||||
"custNum":332,
|
|
||||||
"machNum":26,
|
|
||||||
"borough":0,
|
|
||||||
"zone":0,
|
|
||||||
"alias":0,
|
|
||||||
"location":"Vorplatz 1"
|
|
||||||
}
|
|
||||||
|
|
@@ -23,5 +23,9 @@
|
|||||||
"BattWarn":11800,
|
"BattWarn":11800,
|
||||||
"BattErr":11200,
|
"BattErr":11200,
|
||||||
"foreign":1,
|
"foreign":1,
|
||||||
"refPrint":1
|
"refundPrint":1,
|
||||||
|
"billWarnLev":300,
|
||||||
|
"billFullLev":380,
|
||||||
|
"housing":1
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"title":"DC2C_pri03",
|
"title":"DC2C_pri03",
|
||||||
"project":"Schoenau",
|
"project":"Schoenau",
|
||||||
"Version":"05.04.2024 00001",
|
"Version":"09.04.2024 00001",
|
||||||
"feed":"nl",
|
"feed":"nl",
|
||||||
"styl":"size 00",
|
"styl":"size 00",
|
||||||
"text":"Automat: ",
|
"text":"Automat: ",
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"title":"DC2C_pri07",
|
"title":"DC2C_pri07",
|
||||||
"project":"Schoenau",
|
"project":"Schoenau",
|
||||||
"Version":"05.04.2024 00001",
|
"Version":"09.04.2024 00001",
|
||||||
"feed":"nl",
|
"feed":"nl",
|
||||||
"styl":"size 00",
|
"styl":"size 00",
|
||||||
"text":"Automat: ",
|
"text":"Automat: ",
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"title":"DC2C_pri32",
|
"title":"DC2C_pri32",
|
||||||
"project":"refund reciept",
|
"project":"refund reciept",
|
||||||
"Version":"15.11.2023 00002",
|
"Version":"01.12.2023 00007",
|
||||||
"styl":"font 08",
|
"styl":"font 08",
|
||||||
"styl":"size 10",
|
"styl":"size 10",
|
||||||
"feed":"margin02",
|
"feed":"margin02",
|
||||||
|
177
etc/psa_tariff/tariff100.json
Normal file
177
etc/psa_tariff/tariff100.json
Normal file
@@ -0,0 +1,177 @@
|
|||||||
|
{
|
||||||
|
"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
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
177
etc/psa_tariff/tariff101.json
Normal file
177
etc/psa_tariff/tariff101.json
Normal file
@@ -0,0 +1,177 @@
|
|||||||
|
{
|
||||||
|
"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
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
@@ -6,9 +6,21 @@
|
|||||||
#
|
#
|
||||||
opkg update
|
opkg update
|
||||||
opkg install prepare-update
|
opkg install prepare-update
|
||||||
opkg install atbupdatetool
|
#
|
||||||
opkg install mxt-touch-reset
|
opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-dc
|
||||||
opkg install apism
|
opkg --cache /var/cache/opkg upgrade atb-plugin-dc
|
||||||
opkg install tariff-config-332
|
#
|
||||||
opkg --cache /var/cache/opkg --download-only upgrade ptu5-systemcontroller
|
opkg --cache /var/cache/opkg --download-only upgrade apism
|
||||||
opkg --cache /var/cache/opkg upgrade ptu5-systemcontroller
|
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
|
||||||
|
Reference in New Issue
Block a user