Merge branch 'zg1/zone1'

This commit is contained in:
Siegfried Siegert 2024-02-28 14:27:26 +01:00
commit a19c739897
Signed by untrusted user: SiegfriedSiegert
GPG Key ID: 68371E015E8F0B03
14 changed files with 302 additions and 2 deletions

View File

@ -48,7 +48,7 @@
<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"/>
<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"/>
@ -61,13 +61,22 @@
<EVENT name="TIMEOUT" resultingState="IDLE"/>
<SCREEN name="CASH_PAYMENT_FAILED" note="screennumber 0x39"/>
</APP_STATE>
<APP_STATE name="CASH_OVERPAYED">
<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"/>

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

@ -0,0 +1,18 @@
"title":"DC2C_cash ",
"project":"NVT NAZ",
"Version":"28.02.2024 00103",
"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)":[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0],
"ExchangeRate":1,
"TokenChannel":6,
"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":"NVT NAZ",
"version":"28.02.2024 00001",
"custNum":744,
"machNum":1,
"borough":1,
"zone":1,
"alias":0,
"location":"NAZ Parkplatz"
}

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

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

View File

@ -0,0 +1,42 @@
{
"title":"DC2C_pri01",
"project":"NVT NAZ",
"Version":"28.02.2024 00103",
"styl":"font 08",
"feed":"margin05",
"feed":"rim02",
"styl":"size 00",
"graf":"logo1",
"styl":"font 10",
"styl":"size 11",
"styl":"align c",
"feed":"margin02",
"feed":"rim02",
"feed":"nl"
"text":"Nordisches Ausbildungszentrum",
"feed":"nl",
"text":" Eintritt Erwachsener",
"feed":"nl",
"text":"bezaht: 8,00€",
"feed":"nl",
"styl":"size 11",
"text":"am: ",
"vari":"wday deu short",
"feed":"nl",
"text":"den ",
"vari":"date ge",
"feed":"nl",
"feed":"eject"
}

View File

@ -0,0 +1,21 @@
{
"title":"DC2C_pri02",
"project":"NVT NAZ",
"Version":"28.02.2024 00103",
"issued":"22.01.2024 01.01",
"feed":"nl",
}

View File

@ -0,0 +1,18 @@
{
"title":"DC2C_pri03",
"project":"NVT NAZ",
"Version":"28.02.2024 00103",
"text":"";
}

View File

@ -0,0 +1,6 @@
{
"title":"DC2C_pri04",
"project":"NVT NAZ",
"Version":"28.02.2024 00103",
"text":"";
}

View File

@ -0,0 +1,42 @@
{
"title":"DC2C_pri05",
"project":"NVT NAZ",
"Version":"28.02.2024 00103",
"styl":"font 08",
"feed":"margin05",
"feed":"rim02",
"styl":"size 00",
"graf":"logo1",
"styl":"font 10",
"styl":"size 11",
"styl":"align c",
"feed":"margin02",
"feed":"rim02",
"feed":"nl"
"text":"Nordisches Ausbildungszentrum",
"feed":"nl",
"text":" Eintritt Jugendlicher",
"feed":"nl",
"text":"bezaht: 4,00€",
"feed":"nl",
"styl":"size 11",
"text":"am: ",
"vari":"wday deu short",
"feed":"nl",
"text":"den ",
"vari":"date ge",
"feed":"nl",
"feed":"eject"
}

View File

@ -0,0 +1,18 @@
{
"title":"DC2C_pri06",
"project":"NVT NAZ",
"Version":"28.02.2024 00103",
"text":""
}

View File

@ -0,0 +1,18 @@
{
"title":"DC2C_pri07",
"project":"NVT NAZ",
"Version":"28.02.2024 00103",
"text":""
}

View File

@ -0,0 +1,6 @@
{
"title":"DC2C_pri08",
"project":"NVT NAZ",
"Version":"28.02.2024 00103",
"text":""
}

View File

@ -0,0 +1,21 @@
{
"title":"DC2C_pri31",
"project":"door close print",
"Version":"15.11.2023 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",
"feed":"eject"
}

View File

@ -0,0 +1,42 @@
{
"title":"DC2C_pri32",
"project":"refund reciept",
"Version":"15.11.2023 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"
}