Compare commits
53 Commits
master
...
zg1/zone10
Author | SHA1 | Date | |
---|---|---|---|
b404fc5729 | |||
9f3e01ce9e | |||
f31dcb6aee | |||
9e4808893e | |||
459244226e | |||
e54a9a9a38 | |||
0fa851e2b1 | |||
6510c0b932 | |||
8f944a41d7 | |||
49827c1887 | |||
96204fc048 | |||
23c7e92cb8 | |||
1f9a861781 | |||
afb91a5e86 | |||
d582a0eb2b | |||
d74b9284ca | |||
ec8d05ef74 | |||
98527ac0a9 | |||
fc7f0b49a1 | |||
a439d98e30 | |||
a0dcee6c0d | |||
8908ab6a8a | |||
4d30cab52a | |||
f7d34c852c | |||
63342a73fa | |||
98139519d3 | |||
52de7318dd | |||
a5ce1dae97 | |||
bcf680cb85 | |||
242cb32d02 | |||
a9cb491e09 | |||
c4b7fef7d4 | |||
b5e5fd0a70 | |||
b5a8cc493c | |||
c14fe5108b | |||
8d20c3dbd6 | |||
8a6f71bf13 | |||
d804da3d03 | |||
2a2c7754e3 | |||
605e7d2333 | |||
b51fc3ec7b | |||
470daee68c | |||
0112628a95 | |||
300e8e7b10 | |||
f4903788f5 | |||
5105dfe498 | |||
4735ba928a | |||
e5ca24c457 | |||
ceedb0fe12 | |||
77e47b73bf | |||
79ad353f5b | |||
e41bd88914 | |||
42d82f2380 |
@ -34,7 +34,7 @@ inputBrightness=499
|
||||
startBacklightController=true
|
||||
startMQTTController=false
|
||||
startMonitoringController=false
|
||||
startSuspendController=false
|
||||
startSuspendController=true
|
||||
|
||||
[MONITORING]
|
||||
http_dataFormat=HTTP
|
||||
|
@ -1,7 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ATB_APP_STATES version="1.1">
|
||||
<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"/>
|
||||
<SCREEN name="START"/>
|
||||
<MODE name="IDLE"/>
|
||||
@ -12,17 +13,32 @@
|
||||
<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="ShortTimeParking"/>
|
||||
<EVENT name="BUTTON_NEXT" resultingState="PARKTIME_SELECTION" setProduct="SHORT_TERM_PARKING"/>
|
||||
<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="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">
|
||||
<EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
|
||||
@ -62,7 +78,7 @@
|
||||
<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_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"/>
|
||||
@ -71,8 +87,8 @@
|
||||
<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="PRINT_TICKET_CASH"/>
|
||||
<EVENT name="RECEIVED_CASH_INPUT_FINISHED" resultingState="PRINT_TICKET_CASH"/>
|
||||
<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"/>
|
||||
@ -80,8 +96,8 @@
|
||||
<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="PRINT_TICKET_CASH"/>
|
||||
<EVENT name="RECEIVED_CASH_INPUT_FINISHED" resultingState="PRINT_TICKET_CASH"/>
|
||||
<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"/>
|
||||
@ -94,7 +110,7 @@
|
||||
<SCREEN name="CASH_PAYMENT_FAILED" note="screennumber 0x39"/>
|
||||
</APP_STATE>
|
||||
<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="TIMER" timeout="3000"/>
|
||||
<EVENT name="TIMEOUT" resultingState="IDLE"/>
|
||||
@ -114,6 +130,19 @@
|
||||
<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"/>
|
||||
@ -137,20 +166,28 @@
|
||||
|
||||
<APP_STATE name="CARD_PAYMENT_CONFIRM">
|
||||
<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"/>
|
||||
</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">
|
||||
<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>
|
||||
<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: hangle changer Error -->
|
||||
<!-- TODO: handle changer Error -->
|
||||
<!-- no screen change here -->
|
||||
</APP_STATE>
|
||||
<APP_STATE name="GIVE_CHANGE">
|
||||
@ -161,8 +198,8 @@
|
||||
<ENTRY_TASK name="REQUEST_ISMAS_TRANSACTION"/>
|
||||
<ENTRY_TASK name="TIMER" timeout="2000"/>
|
||||
<EVENT name="TIMEOUT" resultingState="IDLE"/>
|
||||
<SCREEN name="GOODBYE_PAYMENT_OK"/>
|
||||
</APP_STATE>
|
||||
<SCREEN name="GOODBYE_3" note="green_hook"/>
|
||||
</APP_STATE>
|
||||
|
||||
<APP_STATE name="CC_PAYMENT_ERROR">
|
||||
<ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
|
||||
|
0
etc/psa_config/DC2C_conf.json
Executable file → Normal file
0
etc/psa_config/DC2C_conf.json
Executable file → Normal file
@ -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"
|
||||
}
|
||||
|
@ -1,11 +1,11 @@
|
||||
{
|
||||
"Title":"DC2C_device",
|
||||
"title":"DC2C_device",
|
||||
"Project":"Schoenau",
|
||||
"Version":"6.7.1-2024-06-17",
|
||||
"Version":"6.7.2-2024-06-17",
|
||||
"printer":1,
|
||||
"coinChk":3,
|
||||
"mifRd":1,
|
||||
"solarPwr":0,
|
||||
"solarPwr":1,
|
||||
"modem":1,
|
||||
"creditCard":1,
|
||||
"escrow":0,
|
||||
|
@ -1,31 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_device",
|
||||
"Project":"Schoenau",
|
||||
"Version":"6.7.1-2024-06-17",
|
||||
"printer":1,
|
||||
"coinChk":3,
|
||||
"mifRd":1,
|
||||
"solarPwr":0,
|
||||
"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,
|
||||
"refundPrint":1,
|
||||
"billWarnLev":300,
|
||||
"billFullLev":380,
|
||||
"housing":1
|
||||
|
||||
}
|
@ -1,31 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_device",
|
||||
"Project":"Schoenau",
|
||||
"Version":"6.7.2-2024-06-17",
|
||||
"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,
|
||||
"refundPrint":1,
|
||||
"billWarnLev":300,
|
||||
"billFullLev":380,
|
||||
"housing":1
|
||||
|
||||
}
|
@ -3,6 +3,7 @@
|
||||
"Project":"Schoenau",
|
||||
"Version":"6.7.1-2024-06-17",
|
||||
"styl":"font 10",
|
||||
"styl":"csiz 10",
|
||||
"styl":"size 11",
|
||||
"styl":"align c",
|
||||
"feed":"margin02",
|
||||
|
@ -3,6 +3,7 @@
|
||||
"Project":"Schoenau",
|
||||
"Version":"6.7.1-2024-06-17",
|
||||
"styl":"font 10",
|
||||
"styl":"csiz 10",
|
||||
"styl":"size 11",
|
||||
"styl":"align c",
|
||||
"feed":"margin02",
|
||||
|
@ -1,82 +0,0 @@
|
||||
{
|
||||
"Project" : "Schoenau",
|
||||
"Version" : "1.3.0",
|
||||
"Info" : "<<Tariff for Zone 4>> (Bus)",
|
||||
"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 4",
|
||||
"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": 1440,
|
||||
"pop_min_price": 500,
|
||||
"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": 1000
|
||||
},
|
||||
{
|
||||
"pra_payment_option_id": 1099,
|
||||
"pra_payment_unit_id": 6,
|
||||
"pra_price": 2000
|
||||
},
|
||||
{
|
||||
"pra_payment_option_id": 1099,
|
||||
"pra_payment_unit_id": 5,
|
||||
"pra_price": 2500
|
||||
}
|
||||
],
|
||||
"Duration": [
|
||||
{
|
||||
"pun_id": 1,
|
||||
"pun_label": "1h",
|
||||
"pun_duration": 60
|
||||
},
|
||||
{
|
||||
"pun_id": 5,
|
||||
"pun_label": "24h",
|
||||
"pun_duration": 1440
|
||||
},
|
||||
{
|
||||
"pun_id": 6,
|
||||
"pun_label": "5h",
|
||||
"pun_duration": 300
|
||||
}
|
||||
]
|
||||
}
|
@ -5,10 +5,12 @@
|
||||
###############################################################################
|
||||
#
|
||||
opkg update
|
||||
# opkg install prepare-update
|
||||
# opkg install atbupdatetool
|
||||
# opkg install mxt-touch-reset
|
||||
# opkg install apism
|
||||
# opkg install tariff-config-332
|
||||
# opkg --cache /var/cache/opkg --download-only upgrade ptu5-systemcontroller
|
||||
# opkg --cache /var/cache/opkg upgrade ptu5-systemcontroller
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user