Compare commits
84 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 396f20307f | |||
| 043ae67e82 | |||
|
fdf3f30996
|
|||
|
0cae2d556a
|
|||
|
4b81e08ac2
|
|||
| 165db10ed8 | |||
|
f13f3b5bf2
|
|||
|
77b1a77a4d
|
|||
|
466f3d6db5
|
|||
|
430fb7eef9
|
|||
| b22fdf9e4a | |||
| 342e58cbb1 | |||
| a1755d305c | |||
|
04c549baa9
|
|||
| 15c4bbd8a0 | |||
| 2486d71c34 | |||
| 7551b6b969 | |||
|
2184c40256
|
|||
|
b8a4b41818
|
|||
|
0d24a80cb1
|
|||
|
06a92a8330
|
|||
| 0722fd1f13 | |||
|
c019713572
|
|||
|
128e4d9d14
|
|||
|
db907417ef
|
|||
|
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"?>
|
||||
<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,7 +1,7 @@
|
||||
{
|
||||
"Title":"DC2C_device",
|
||||
"title":"DC2C_device",
|
||||
"Project":"Schoenau",
|
||||
"Version":"6.7.1-2024-06-17",
|
||||
"Version":"6.7.1-2025-01-27",
|
||||
"printer":1,
|
||||
"coinChk":3,
|
||||
"mifRd":1,
|
||||
|
||||
@@ -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
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user