Compare commits

...

25 Commits

Author SHA1 Message Date
2840749da3 Fix: portnumber for ingenico 2024-07-15 16:31:51 +02:00
e2bf587e1d Merge branch 'master' of git.mimbach49.de:GerhardHoffmann/customer_747 2024-07-15 16:30:58 +02:00
d4ae6e5791 New logos (Dennis) 2024-07-11 08:42:01 +02:00
a0f0d613d0 Merge branch 'zg1/zone1' 2024-06-13 09:06:56 +02:00
c36b251faa Merge branch 'master' of git.mimbach49.de:GerhardHoffmann/customer_747 2024-06-13 08:55:43 +02:00
557f43dc30 Add DC configuration files (aka "json-files") 2024-06-13 08:53:24 +02:00
4dd310c8d8 Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_747 into zg1/zone1 2024-06-12 14:43:02 +02:00
98f4f311ea Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_747 into zg1/zone1 2024-05-17 08:24:37 +02:00
b0b3d24fa2 Add new products, so it is possible to buy a ticket for the next day. Price: 600. 2024-05-17 08:24:07 +02:00
95ff0df6a3 Add new products, so it is possible to buy a ticket for the next day. Price: 600. 2024-05-17 08:21:35 +02:00
a06bbe25f0 ATBAPP: textupdate screen 0x34 2024-05-16 17:59:34 +02:00
a9bece9248 Update ATBAPP config (states, texts) 2024-05-15 18:01:03 +02:00
dd5f3c1c74 Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_747 into zg1/zone1 2024-05-15 17:03:43 +02:00
e18708da81 Set inital config for PTU5 customer application 2024-05-03 12:52:24 +02:00
4be8119809 Add JSON files as provided by Thomas 2024-05-02 15:25:48 +02:00
962f3a6116 Add JSON files as provided by Thomas 2024-05-02 15:24:13 +02:00
0d7d697fd2 deleted: wrong directory structure 2024-05-02 10:15:19 +02:00
6ce8bc8516 Provide dummy opkg-file 2024-05-02 10:14:12 +02:00
9ca4747358 Provide dummy opkg-file 2024-05-02 10:11:39 +02:00
24851b6646 clean directory structure 2024-05-02 10:09:29 +02:00
142a25f71c Minor: add comment 2024-05-02 10:06:58 +02:00
1b4e13f070 Minor: add comment 2024-05-02 10:06:03 +02:00
54e71bd9d6 deleted -> wrong parent directory 2024-05-02 10:02:53 +02:00
9cb28489b1 first draft for pernegg-an-der-mur 2024-04-16 11:58:38 +02:00
babc61df9d start tariff file 2024-04-11 12:06:09 +02:00
26 changed files with 3261 additions and 5 deletions

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=20007
SSL=0
ZVT=DE
dcHours=0
debug=1
printIntermediateStatus=1
sleep=1

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>

File diff suppressed because it is too large Load Diff

17
etc/psa_config/DC2C_cash.json Executable file
View File

@@ -0,0 +1,17 @@
{
"title":"DC2C_cash ",
"project":"Pernegg",
"version":"02.05.2024 00001",
"CoinDenom(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,0,1],
"CoinValue(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,0,3],
"CoinAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
"ExchangeRate":1,
"TokenChannel":0,
"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
"BillAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
"LocalTaxRate":19,
"ForeignTaxRate":0,
"Surcharge":0,
"Discount":0
}

12
etc/psa_config/DC2C_conf.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"
}

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"
}

27
etc/psa_config/DC2C_device.json Executable file
View File

@@ -0,0 +1,27 @@
{
"title":"DC2C_device",
"project":"Pernegg",
"version":"02.05.2024 00001",
"printer":1,
"coinChk":0,
"mifRd":2,
"solarPwr":0,
"modem":1
"creditCard":1,
"escrow":0
"RejMotor":0,
"shutter":0,
"billRd":0,
"vaultLock":0,
"autoAlarm":1,
"autoOpen":1,
"AccPrint":0,
"DorPrint":1,
"TokPrint":0,
"CBwarnLev":1600,
"CBerrLev":1900,
"BattWarn":11800,
"BattErr":11200,
"foreign":1,
"refPrint":0
}

View File

@@ -0,0 +1,47 @@
{
"title":"DC2C_pri01",
"project":"Pernegg",
"Version":"10.07.2024 00001",
"styl":"font 10",
"styl":"size 11",
"styl":"align c",
"feed":"margin02",
"graf":"logo1",
"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",
"feed":"nl",
"styl":"align l",
"text":"Ihr Kennzeichen: ",
"feed":"nl",
"styl":"size 11",
"vari":"Dynamic01",
"styl":"size 00",
"feed":"nl",
"text":"Parkende: ",
"feed":"nl",
"styl":"size 11",
"vari":"Dynamic04",
"vari":"Dynamic03",
"styl":"size 00",
"feed":"nl"
}

View File

@@ -0,0 +1,31 @@
{
"title":"DC2C_pri02",
"project":"Pernegg",
"Version":"02.05.2024 00001",
"issued":"13.11.2023 01.01",
"text":"Standort: ",
"feed":"nl",
"vari":"location",
"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"
}

View File

@@ -0,0 +1,38 @@
{
"title":"DC2C_pri03",
"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",
"styl":"align c",
"text":"Schönau am Königssee",
"feed":"nl",
"text":"Ticket-Nr. ",
"vari":"TickCtr",
"feed":"nl",
"text":"Automatentechnik ",
"feed":"nl",
"text":"Baumann GmbH",
"feed":"eject"
}

View File

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

View File

@@ -0,0 +1,41 @@
{
"title":"DC2C_pri13",
"project":"Pernegg",
"Version":"10.07.2024 00001",
"styl":"font 10",
"styl":"size 11",
"styl":"align c",
"feed":"margin02",
"graf":"logo1",
"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"
}

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"
}

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"
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -0,0 +1,40 @@
{
"title":"DC2C_pri31",
"project":"Pernegg",
"Version":"02.05.2024 00001",
"styl":"font 08",
"styl":"size 10",
"feed":"margin02",
"feed":"rim02",
"feed":"speed10",
"styl":"size 11",
"feed":"nl",
"text":"Türöffnung um:",
"feed":"nl",
"styl":"size 00",
"vari":"date ge",
"vari":"time long",
"feed":"nl",
"text":"KuNu: ",
"vari":"cunu",
"text":"MaNu: ",
"vari":"manu",
"text":"Ort: ",
"vari":"location",
"text":"Gruppe: ",
"vari":"group",
"text":"Zone: ",
"vari":"zone",
"text":"Name: ",
"vari":"alias",
"feed":"nl",
"text":"**Automatentechnik ",
"feed":"nl",
"text":" Baumann GmbH ***",
"feed":"nl",
"text":" * * * * * * * * * ",
"feed":"nl",
"feed":"eject"
}

View File

@@ -0,0 +1,42 @@
{
"title":"DC2C_pri32",
"project":"Pernegg",
"Version":"02.05.2024 00001",
"styl":"font 08",
"styl":"size 10",
"feed":"margin02",
"feed":"rim02",
"feed":"speed10",
"styl":"size 11",
"text":"Ersatzbeleg",
"feed":"nl",
"styl":"size 00",
"text":"Erstattungsbetrag: ",
"feed":"nl",
"vari":"Dynamic07",
"text":"€",
"feed":"nl",
"text":"KuNu: ",
"vari":"cunu",
"text":"MaNu: ",
"vari":"manu",
"text":"Ort: ",
"vari":"location",
"text":"Gruppe: ",
"vari":"group",
"text":"Zone: ",
"vari":"zone",
"text":"Name: ",
"vari":"alias",
"text":"Am: ",
"vari":"date us",
"text":"Um: ",
"vari":"time long",
"feed":"nl",
"text":" * * * * * * * * ",
"feed":"nl",
"feed":"nl",
"feed":"eject"
}

View File

@@ -1,7 +1,8 @@
{ {
"Project" : "Pernegg an der Mur (TODO)", "Project" : "Pernegg an der Mur",
"Version" : "1.0.0", "Version" : "1.0.0",
"Info" : "Tariff for Zone 1", "Info" : "Tariff for Zone 1",
"comment_info": "Two locations: Baerenschuetzklamm, Nauturwelten Auweg",
"Currency": [ "Currency": [
{ {
"pcu_id": 1, "pcu_id": 1,
@@ -160,11 +161,21 @@
"tariff_product_to_in_minutes_from_start": 0 "tariff_product_to_in_minutes_from_start": 0
}, },
{ {
"tariff_product_id": 8, "tariff_product_id": 1,
"tariff_product_permit_type": 8, "tariff_product_permit_type": 1,
"tariff_product_price": 0, "tariff_product_price": 600,
"tariff_product_name": "INVALID", "tariff_product_name": "DAY_TICKET",
"tariff_product_start": "17:00:00", "tariff_product_start": "17:00:00",
"tariff_product_end": "23:59:59",
"tariff_product_from_in_minutes_from_start": 0,
"tariff_product_to_in_minutes_from_start": 0
},
{
"tariff_product_id": 1,
"tariff_product_permit_type": 1,
"tariff_product_price": 600,
"tariff_product_name": "DAY_TICKET",
"tariff_product_start": "00:00:00",
"tariff_product_end": "06:00:00", "tariff_product_end": "06:00:00",
"tariff_product_from_in_minutes_from_start": 0, "tariff_product_from_in_minutes_from_start": 0,
"tariff_product_to_in_minutes_from_start": 0 "tariff_product_to_in_minutes_from_start": 0

21
etc/psa_update/opkg_commands Normal file → Executable file
View File

@@ -0,0 +1,21 @@
###############################################################################
# !!! NOTE !!!
###############################################################################
# opkg-commands added to this file will be executed by ATBUpdateTool.
###############################################################################
# #
# opkg info atbqt
# opkg info atbupdatetool
# opkg update
# opkg install prepare-update
# opkg install libmobilisis-calc2
# opkg install atbupdatetool
# opkg remove atb-accountingtool
# opkg install atb-accountingtool
# opkg --cache /var/cache/opkg --download-only upgrade
# opkg --cache /var/cache/opkg upgrade
# opkg remove apism
# opkg install apism
# opkg info apism
# opkg info atbqt
# opkg info atbupdatetool