GerhardHoffmann/customer_747
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'zg1/zone1'

Browse Source
This commit is contained in:
Siegfried Siegert 2024-06-13 09:06:56 +02:00
commit a0f0d613d0
Signed by untrusted user: SiegfriedSiegert
GPG Key ID: 68371E015E8F0B03
19 changed files with 2970 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
etc/atbapp/ATBAPP.ini Normal file
View File

@ -0,0 +1,99 @@
[ATBDeviceControllerPlugin]
printerEncoding=Windows-1252
serialPort=ttymxc2
[COMMON]
%23alternativeLogoFile=
%23ooo_mode={useDisk|otherMachine}
%23useLanguage=[128+][64+][32+][16]
%23usePayment=[128+][64+][32+][16]
%23useVehicle=[128+][64+][32+][16]
CharacterSet=ISO 8859-15
alternativeLogoFile=/opt/app/ATBAPP/logo
com_baud_rate=9600
com_port_name=/dev/ttyS2
defaultLanguage=1
feature_DBusDisplayControl=on
feature_DBusDisplayDimLow=off
feature_DBusSuspendControl=off
feature_Log=off
feature_ShowParkingTime=off
feature_StartButton=on
feature_TouchFeedback=off
feature_selfOOO=off
lang1=de_AT
lang2=en_GB
lang3=it_IT
lang4=de_DE
lang5=
logfile=/var/log/atbqt.log
ooo_alternativeLocation=
ooo_mode=otherMachine
ooo_serviceEmail=
ooo_serviceNumber=
sellTimeout_time=60
showHelpButton=false
showInfoButton=false
statefile=/etc/atbapp/states/APP_States.xml
textfile=/opt/app/ATBAPP/text/HMI_Texte.xml
touch_feedback_gpio=121
touch_feedback_off_value=0
touch_feedback_on_value=1
useAppStates=1
useLanguage=192
usePayment=96
useProduct=192
useVehicle=192
[IngenicoZVT_CCPlugin]
CurrencyCode=EUR
PortName=/dev/ttyS3
ZVT=AT
dcHours=0
debug=1
sleep=0
[MOBILISIS_CalculatePricePlugin]
tariffFileName=/etc/psa_tariff/tariff01.json
useDebug=1
[PAYMENT]
cashVariant=Coins
currencyISOCode=EUR
currencySymbol=€
paymentPointInTime=poa
useDecimal=yes
useHonestPayment=on
[PLUGINS]
CCPlugin=TCP_ZVT_CCPlugin
CalculatePricePlugin=MOBILISIS_CalculatePricePlugin
DeviceControllerPlugin=ATBDeviceControllerPlugin
[SCREENCONFIG]
sc_31="0,1,0"
sc_33="1,0,1"
sc_35="0,0,0"
sc_3F="1,0,0"
sc_40="1,0,1"
sc_41="1,0,1"
sc_44="1,0,1"
sc_51="1,0,1"
sc_52="1,0,0"
sc_53="1,0,0"
[TCP_CONTROL]
enable=0
[TCP_ZVT_CCPlugin]
CurrencyCode=EUR
IP=192.168.6.242
NumberOfChars=37
Password=835322
Port=22000
SSL=0
ZVT=DE
dcHours=0
debug=1
printIntermediateStatus=1
sleep=1

117
etc/atbapp/states/APP_States.xml Normal file
View File

@ -0,0 +1,117 @@
<?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"/>
<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="SHOW_PAYMENT_INFO" setPaymentType="CARD" setProduct="DAY_TICKET"/>
<EXIT_TASK name="REQUEST_INITIAL_PRICE"/>
</APP_STATE>
<APP_STATE name="SHOW_PAYMENT_INFO">
<ENTRY_TASK name="REQUEST_PARKING_ENDTIME" key="PRICE_INFO_GROSS"/>
<EVENT name="BUTTON_NEXT" resultingState="CARD_PAYMENT"/>
<EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
<SCREEN name="PAYMENT_INFO"/>
</APP_STATE>
<APP_STATE name="CARD_PAYMENT">
<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="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_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>

2592
etc/atbapp/text/HMI_Texte.xml Normal file
View File

File diff suppressed because it is too large Load Diff

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

@ -0,0 +1,12 @@
{
"title":"DC2C_config",
"project":"Pernegg",
"version":"02.05.2024 00001",
"custNum":747,
"machNum":1,
"borough":1,
"zone":1,
"alias":0,
"location":"Standort 1"
}

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

@ -0,0 +1,12 @@
{
"title":"DC2C_config",
"project":"Pernegg",
"version":"02.05.2024 00001",
"custNum":747,
"machNum":2,
"borough":1,
"zone":1,
"alias":0,
"location":"Standort 2"
}

2
etc/psa_config/DC2C_print01.json
View File

@ -1,7 +1,7 @@
{
"title":"DC2C_pri01",
"project":"Pernegg",
"version":"02.05.2024 00001",
"Version":"02.05.2024 00001",
"styl":"font 10",
"styl":"size 11",
"styl":"align c",

2
etc/psa_config/DC2C_print02.json
View File

@ -1,7 +1,7 @@
{
"title":"DC2C_pri02",
"project":"Pernegg",
"version":"02.05.2024 00001",
"Version":"02.05.2024 00001",
"issued":"13.11.2023 01.01",
"text":"Standort: ",
"feed":"nl",

2
etc/psa_config/DC2C_print03.json
View File

@ -1,7 +1,7 @@
{
"title":"DC2C_pri03",
"project":"Pernegg",
"version":"02.05.2024 00001",
"Version":"02.05.2024 00001",
"feed":"nl",
"styl":"size 00",
"text":"Automat: ",

2
etc/psa_config/DC2C_print04.json
View File

@ -1,6 +1,6 @@
{
"title":"DC2C_pri04",
"project":"Pernegg",
"version":"02.05.2024 00001",
"Version":"02.05.2024 00001",
"text":""
}

40
etc/psa_config/DC2C_print13.json Executable file
View File

@ -0,0 +1,40 @@
{
"title":"DC2C_pri13",
"project":"Pernegg",
"Version":"02.05.2024 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",
"styl":"size 00",
"feed":"nl",
"text":"Parkende: ",
"feed":"nl",
"styl":"size 11",
"vari":"Dynamic04",
"vari":"Dynamic03",
"styl":"size 00",
"feed":"nl"
}

28
etc/psa_config/DC2C_print14.json Executable file
View File

@ -0,0 +1,28 @@
{
"title":"DC2C_pri14",
"project":"Pernegg",
"Version":"02.05.2024 00001",
"issued":"13.11.2023 01.01",
"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"
}

33
etc/psa_config/DC2C_print15.json Executable file
View File

@ -0,0 +1,33 @@
{
"title":"DC2C_pri15",
"project":"Pernegg",
"Version":"02.05.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",
"feed":"nl",
"text":"Ticket-Nr. ",
"vari":"TickCtr",
"feed":"nl",
"feed":"eject"
}

6
etc/psa_config/DC2C_print16.json Executable file
View File

@ -0,0 +1,6 @@
{
"title":"DC2C_pri16",
"project":"Pernegg",
"Version":"02.05.2024 00001",
"text":""
}

6
etc/psa_config/DC2C_print17.json Executable file
View File

@ -0,0 +1,6 @@
{
"title":"DC2C_pri17",
"project":"Pernegg",
"Version":"02.05.2024 00001",
"text":""
}

6
etc/psa_config/DC2C_print18.json Executable file
View File

@ -0,0 +1,6 @@
{
"title":"DC2C_pri18",
"project":"Pernegg",
"Version":"02.05.2024 00001",
"text":""
}

6
etc/psa_config/DC2C_print19.json Executable file
View File

@ -0,0 +1,6 @@
{
"title":"DC2C_pri19",
"project":"Pernegg",
"Version":"02.05.2024 00001",
"text":""
}

6
etc/psa_config/DC2C_print20.json Executable file
View File

@ -0,0 +1,6 @@
{
"title":"DC2C_pri20",
"project":"Pernegg",
"Version":"02.05.2024 00001",
"text":""
}

2
etc/psa_config/DC2C_print31.json
View File

@ -1,7 +1,7 @@
{
"title":"DC2C_pri31",
"project":"Pernegg",
"version":"02.05.2024 00001",
"Version":"02.05.2024 00001",
"styl":"font 08",
"styl":"size 10",
"feed":"margin02",

2
etc/psa_config/DC2C_print32.json
View File

@ -1,7 +1,7 @@
{
"title":"DC2C_pri32",
"project":"Pernegg",
"version":"02.05.2024 00001",
"Version":"02.05.2024 00001",
"styl":"font 08",
"styl":"size 10",
"feed":"margin02",