Merge branch 'master' into zg1/zone1
This commit is contained in:
commit
e8aae95f6c
GPG Key ID:
68371E015E8F0B03
102
etc/atbapp/ATBAPP.ini
Normal file
102
etc/atbapp/ATBAPP.ini
Normal file
@ -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=otherMachine
|
||||
sellTimeout_time=60
|
||||
|
||||
|
||||
useAppStates=1
|
||||
statefile=/opt/app/ATBAPP/states/APP_States.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"
|
||||
217
etc/atbapp/states/APP_States.xml
Normal file
217
etc/atbapp/states/APP_States.xml
Normal file
@ -0,0 +1,217 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ATB_APP_STATES version="1.1">
|
||||
<APP_STATE name="IDLE">
|
||||
<EVENT name="BUTTON_START" resultingState="SETUP_SELL_STATE"/>
|
||||
<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="SETUP_SELL_STATE">
|
||||
<ENTRY_TASK name="TIMER" timeout="500"/>
|
||||
<EVENT name="TIMEOUT" resultingState="PARKTIME_SELECTION" setCashInputMode="PAY_DOWN" setProduct="SHORT_TERM_PARKING"/>
|
||||
</APP_STATE>
|
||||
|
||||
<APP_STATE name="LICENSEPLATE_INPUT">
|
||||
<EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
|
||||
<EVENT name="BUTTON_NEXT" resultingState="PRODUCT_SELECTION"/>
|
||||
<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="SHORT_TERM_PARKING"/>
|
||||
<EVENT name="BUTTON_VEHICLE_2" resultingState="PAYMENT_SELECTION_DAY" setCashInputMode="PAY_DOWN" setProduct="DAY_TICKET"/>
|
||||
<SCREEN name="PRODUCT_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="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="IDLE"/>
|
||||
<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="IDLE"/>
|
||||
<EVENT name="BUTTON_NEXT" resultingState="PAYMENT_SELECTION"/>
|
||||
</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"/>
|
||||
<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="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"/>
|
||||
<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>
|
||||
2585
etc/atbapp/text/HMI_Texte.xml
Normal file
2585
etc/atbapp/text/HMI_Texte.xml
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user