Compare commits

...

44 Commits

Author SHA1 Message Date
afe57d5c5f
Textupdate: "Wait for Terminal" 2024-08-02 10:29:52 +02:00
5ca70dec85 Fix (Thomas): Title -> title 2024-06-17 15:47:20 +02:00
b7f7445dd9 Update Jsons for Schoenau as provided by Thomas 2024-06-17 11:56:59 +02:00
7529ce31bc
Update release 2024-06-17 2024-06-17 09:58:44 +02:00
208abb072e
Update release 2024-06-10 2024-06-10 12:53:06 +02:00
99711cf6e9
Merge branch 'zg1/zone2' of git.mimbach49.de:GerhardHoffmann/customer_332 into zg1/zone2 2024-05-28 08:25:13 +02:00
113fbf76a3
Update release 20240521 2024-05-27 16:36:04 +02:00
fe0f8bcb7a Use cent-values: 5000,2000,1000,500 instead of euro-values. 2024-05-07 13:25:51 +02:00
275f1c734a
Fix: remove unused DC json files 2024-05-07 12:35:39 +02:00
a90ec96175
Fix: opkg commands 2024-05-07 11:57:55 +02:00
b1e86edef8
OPKG: release 20240506 2024-05-07 11:57:22 +02:00
c747a199f4
Update ATBQT/States: skip LicencePlate input 2024-05-06 15:34:15 +02:00
641bffabd0
Update ATBQT/States:
- product selection: with licenscplate results in paperless ticket
 - ask for printing bank receipt
2024-05-06 12:43:24 +02:00
767baa7dec
Merge branch 'zg1/zone2' of git.mimbach49.de:GerhardHoffmann/customer_332 into zg1/zone2 2024-05-06 12:43:05 +02:00
b08b0fabb3 keep only 'opkg update' 2024-05-06 12:23:37 +02:00
d23af48325 Update DC2C_cash/device.json as provided by Thomas 2024-05-06 11:09:11 +02:00
3b703a56bf Set version date (23/04) -> trigger git 2024-04-23 12:36:44 +02:00
472e605ceb sync with master 2024-04-12 09:14:35 +02:00
4cd5a889df add tariff101.json for zone101 (solar) 2024-04-10 10:29:08 +02:00
bcf680cb85 Add ptu5-systemcontroller using upgrade 2024-04-10 10:13:05 +02:00
242cb32d02 Added opkg install tariff-config-332 2024-04-09 17:01:49 +02:00
a9cb491e09 Update tariff-info to trigger new download 2024-04-09 15:10:12 +02:00
c4b7fef7d4 update tariff for zone1 and zone2: new prices and extension of parking times 2024-04-08 16:25:04 +02:00
b5e5fd0a70 update version to 05.04.2024 2024-04-05 13:51:38 +02:00
b5a8cc493c Fix typo: Koenigssee 2024-03-28 09:16:43 +01:00
c14fe5108b
ATBAPP: vending process: set product names 2024-03-19 11:11:20 +01:00
8d20c3dbd6 Set version to 1.1.1 for testing. 2024-03-15 11:32:34 +01:00
8a6f71bf13 Set pop_max_time: 10080, pop_multi_hour_price: 8 2024-03-15 10:38:22 +01:00
d804da3d03 Merge branch 'zg1/zone2' of https://git.mimbach49.de/GerhardHoffmann/customer_332 into zg1/zone2 2024-03-15 09:49:13 +01:00
2a2c7754e3 renamed DC2C_device netz.json -> DC2C_device.json-netz, DC2C_device solar.json -> DC2C_device.json-solar 2024-03-15 09:48:32 +01:00
605e7d2333
ATBAPP: Add customer vending process description (states) 2024-03-13 14:00:30 +01:00
b51fc3ec7b sync with master-branch 2024-03-13 13:12:16 +01:00
470daee68c sync with tariff01.json in zg1/zone1 -> Minor: version from 1.0.0 to 1.0.15 2024-01-25 11:40:43 +01:00
0112628a95 Do not upgrade, but install packages only directly.
opkg update
opkg install prepare-update
opkg install atbupdatetool
opkg install mxt-touch-reset
opkg install apism
opkg info apism
opkg info atbupdatetool
2024-01-24 14:51:57 +01:00
300e8e7b10 Add opkg install mxt-touch-reset to fix touch-screen issues 2024-01-24 12:43:03 +01:00
f4903788f5 sync with branch zg1/zone1 2024-01-24 12:30:31 +01:00
5105dfe498 Set version to 00005 for testing 2023-12-01 10:13:43 +01:00
4735ba928a Sync with branch zg1/zone1 2023-11-29 09:34:27 +01:00
e5ca24c457 Fix typo: 5670 -> 5760 2023-11-28 10:27:39 +01:00
ceedb0fe12 Add new files (used for new templates) 2023-11-24 13:43:18 +01:00
77e47b73bf Remove euro sign 2023-11-24 09:36:37 +01:00
79ad353f5b
Price in cents 2023-11-22 17:12:24 +01:00
e41bd88914 Add json-config files for schoanau. 2023-11-20 13:10:51 +01:00
42d82f2380 Add opkg_commands file. 2023-11-16 09:49:19 +01:00
22 changed files with 3869 additions and 28 deletions

View File

@ -0,0 +1,244 @@
<?xml version="1.0" encoding="UTF-8"?>
<ATB_APP_STATES version="1.1">
<APP_STATE name="IDLE">
<!-- <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"/>
</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="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="SHORT_TERM_PARKING"/>
<SCREEN name="LICENSEPLATE_INPUT"/>
</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" setCashInputMode="PAY_DOWN"/>
<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="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="LICENSEPLATE_INPUT"/>
<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="LICENSEPLATE_INPUT"/>
<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="LICENSEPLATE_INPUT"/>
<EVENT name="BUTTON_NEXT" resultingState="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="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"/>
</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_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"/>
</APP_STATE>
<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="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"/>
</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">
<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_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="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"/>
<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="ASK_RECEIPT"/>
<EVENT name="RECEIVED_CARD_CONFIRM_TRANSACTION_ERROR" resultingState="CC_PAYMENT_ERROR"/>
</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"/>
<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: handle changer Error -->
<!-- no screen change here -->
</APP_STATE>
<APP_STATE name="GIVE_CHANGE">
<EVENT name="RECEIVED_CASH_PAYMENT_FINISHED" resultingState="GOODBYE_PAYMENT_OK"/>
<SCREEN name="SCREEN_CHANGE"/>
</APP_STATE>
<APP_STATE name="GOODBYE_PAYMENT_OK">
<ENTRY_TASK name="REQUEST_ISMAS_TRANSACTION"/>
<ENTRY_TASK name="TIMER" timeout="2000"/>
<EVENT name="TIMEOUT" resultingState="IDLE"/>
<SCREEN name="GOODBYE_3" note="green_hook"/>
</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

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

@ -0,0 +1,18 @@
{
"title":"DC2C_cash ",
"Project":"Schoenau",
"Version":"6.7.1-2024-06-17",
"CoinDenom(15..0)":[0,0,0,0,0,0,0,0,0,255,200,100,50,20,10,5],
"CoinValue(15..0)":[0,0,0,0,0,0,0,0,0,3,200,100,50,20,10,5],
"CoinAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,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,5000,2000,1000,500],
"BillAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1],
"LocalTaxRate":19,
"ForeignTaxRate":0,
"Surcharge":0,
"Discount":0
}
#"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,10000,5000,2000,1000,500],

View File

@ -0,0 +1,12 @@
{
"Title":"DC2C_config",
"Project":"Schoenau",
"Version":"6.7.1-2024-06-17",
"custNum":332,
"machNum":99,
"borough":101,
"zone":1,
"alias":0,
"location":"Atb Buero Gerhardt"
}

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

@ -0,0 +1,31 @@
{
"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
}

View File

@ -0,0 +1,27 @@
{
"title":"DC2C_device",
"project":"Schoenau",
"Version":"15.11.2023 00102",
"printer":1,
"coinChk":3,
"mifRd":1,
"solarPwr":0,
"modem":0,
"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,
"refPrint":1
}

View File

@ -0,0 +1,27 @@
{
"title":"DC2C_device",
"project":"Schoenau",
"Version":"15.11.2023 00102",
"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,
"refPrint":1
}

View File

@ -0,0 +1,46 @@
{
"title":"DC2C_pri01",
"Project":"Schoenau",
"Version":"6.7.1-2024-06-17",
"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",
"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,30 @@
{
"title":"DC2C_pri02",
"Project":"Schoenau",
"Version":"6.7.1-2024-06-17",
"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":"Schoenau",
"Version":"6.7.1-2024-06-17",
"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":"Schoenau",
"Version":"6.7.1-2024-06-17",
"text":"";
}

View File

@ -0,0 +1,46 @@
{
"title":"DC2C_pri05",
"Project":"Schoenau",
"Version":"6.7.1-2024-06-17",
"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",
"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_pri06",
"Project":"Schoenau",
"Version":"6.7.1-2024-06-17",
"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_pri07",
"Project":"Schoenau",
"Version":"6.7.1-2024-06-17",
"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_pri08",
"Project":"Schoenau",
"Version":"6.7.1-2024-06-17",
"text":"";
}

View File

@ -0,0 +1,40 @@
{
"title":"DC2C_pri31",
"Project":"door close print",
"Version":"6.7.1-2024-06-17",
"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":"refund reciept",
"Version":"6.7.1-2024-06-17",
"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,7 @@
{
"Project" : "Schoenau",
"Version" : "1.0.0",
"Info" : "",
"Version" : "1.2.0",
"Info" : "<<Tariff for Zone 1>>",
"Currency": [
{
"pcu_id": 1,
@ -38,8 +38,8 @@
"pop_day_night_end_time": "15:20:00",
"pop_price_night": 0,
"pop_min_time": 60,
"pop_max_time": 10080,
"pop_min_price": 3,
"pop_max_time": 14400,
"pop_min_price": 300,
"pop_carry_over": 1,
"pop_daily_card_price": 0,
"pop_multi_hour_price": 8
@ -49,47 +49,62 @@
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 1,
"pra_price": 3
"pra_price": 300
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 6,
"pra_price": 7
"pra_price": 700
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 5,
"pra_price": 8
"pra_price": 900
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 7,
"pra_price": 16
"pra_price": 1800
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 8,
"pra_price": 24
"pra_price": 2700
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 9,
"pra_price": 32
"pra_price": 3600
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 10,
"pra_price": 40
"pra_price": 4500
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 11,
"pra_price": 48
"pra_price": 5400
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 12,
"pra_price": 56
"pra_price": 6300
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 13,
"pra_price": 7200
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 14,
"pra_price": 8100
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 15,
"pra_price": 9000
}
],
"Duration": [
@ -126,7 +141,7 @@
{
"pun_id": 9,
"pun_label": "96h",
"pun_duration": 5670
"pun_duration": 5760
},
{
"pun_id": 10,
@ -142,6 +157,21 @@
"pun_id": 12,
"pun_label": "168h",
"pun_duration": 10080
},
{
"pun_id": 13,
"pun_label": "192h",
"pun_duration": 11520
},
{
"pun_id": 14,
"pun_label": "216h",
"pun_duration": 12960
},
{
"pun_id": 15,
"pun_label": "240h",
"pun_duration": 14400
}
]
}

View File

@ -1,7 +1,7 @@
{
"Project" : "Schoenau",
"Version" : "1.0.0",
"Info" : "",
"Version" : "1.2.0",
"Info" : "<<<Tariff for zone 2>>>",
"Currency": [
{
"pcu_id": 1,
@ -38,28 +38,73 @@
"pop_day_night_end_time": "15:07:00",
"pop_price_night": 0,
"pop_min_time": 60,
"pop_max_time": 1440,
"pop_min_price": 2,
"pop_max_time": 14400,
"pop_min_price": 300,
"pop_carry_over": 1,
"pop_daily_card_price": 0,
"pop_multi_hour_price": 5
"pop_multi_hour_price": 8
}
],
"PaymentRate": [
{
"pra_payment_option_id": 1100,
"pra_payment_unit_id": 1,
"pra_price": 2
"pra_price": 300
},
{
"pra_payment_option_id": 1100,
"pra_payment_unit_id": 6,
"pra_price": 4
"pra_price": 500
},
{
"pra_payment_option_id": 1100,
"pra_payment_unit_id": 5,
"pra_price": 5
"pra_price": 600
},
{
"pra_payment_option_id": 1100,
"pra_payment_unit_id": 7,
"pra_price": 1200
},
{
"pra_payment_option_id": 1100,
"pra_payment_unit_id": 8,
"pra_price": 1800
},
{
"pra_payment_option_id": 1100,
"pra_payment_unit_id": 9,
"pra_price": 2400
},
{
"pra_payment_option_id": 1100,
"pra_payment_unit_id": 10,
"pra_price": 3000
},
{
"pra_payment_option_id": 1100,
"pra_payment_unit_id": 11,
"pra_price": 3600
},
{
"pra_payment_option_id": 1100,
"pra_payment_unit_id": 12,
"pra_price": 4200
},
{
"pra_payment_option_id": 1100,
"pra_payment_unit_id": 13,
"pra_price": 4800
},
{
"pra_payment_option_id": 1100,
"pra_payment_unit_id": 14,
"pra_price": 5400
},
{
"pra_payment_option_id": 1100,
"pra_payment_unit_id": 15,
"pra_price": 6000
}
],
"Duration": [
@ -96,7 +141,7 @@
{
"pun_id": 9,
"pun_label": "96h",
"pun_duration": 5670
"pun_duration": 5760
},
{
"pun_id": 10,
@ -112,6 +157,21 @@
"pun_id": 12,
"pun_label": "168h",
"pun_duration": 10080
},
{
"pun_id": 13,
"pun_label": "192h",
"pun_duration": 11520
},
{
"pun_id": 14,
"pun_label": "216h",
"pun_duration": 12960
},
{
"pun_id": 15,
"pun_label": "240h",
"pun_duration": 14400
}
]
}

View File

@ -39,7 +39,7 @@
"pop_price_night": 0,
"pop_min_time": 60,
"pop_max_time": 1440,
"pop_min_price": 2,
"pop_min_price": 200,
"pop_carry_over": 1,
"pop_daily_card_price": 0,
"pop_multi_hour_price": 5
@ -49,17 +49,17 @@
{
"pra_payment_option_id": 1100,
"pra_payment_unit_id": 1,
"pra_price": 2
"pra_price": 200
},
{
"pra_payment_option_id": 1100,
"pra_payment_unit_id": 6,
"pra_price": 4
"pra_price": 400
},
{
"pra_payment_option_id": 1100,
"pra_payment_unit_id": 5,
"pra_price": 5
"pra_price": 500
}
],
"Duration": [
@ -96,7 +96,7 @@
{
"pun_id": 9,
"pun_label": "96h",
"pun_duration": 5670
"pun_duration": 5760
},
{
"pun_id": 10,

View File

@ -0,0 +1,177 @@
{
"Project" : "Schoenau",
"Version" : "1.2.1",
"Info" : "<<Tariff for Zone 1>>",
"Currency": [
{
"pcu_id": 1,
"pcu_sign": "€",
"pcu_major": "Euro",
"pcu_minor": "Cent",
"pcu_active": true
}
],
"PaymentMethod": [
{
"pme_id": 1,
"pme_label": "progressive"
},
{
"pme_id": 2,
"pme_label": "degressive"
},
{
"pme_id": 3,
"pme_label": "linear"
},
{
"pme_id": 4,
"pme_label": "steps"
}
],
"PaymentOption": [
{
"pop_id": 1099,
"pop_label": "Zone 1",
"pop_payment_method_id": 4,
"pop_day_end_time": "15:20:00",
"pop_day_night_end_time": "15:20:00",
"pop_price_night": 0,
"pop_min_time": 60,
"pop_max_time": 14400,
"pop_min_price": 300,
"pop_carry_over": 1,
"pop_daily_card_price": 0,
"pop_multi_hour_price": 8
}
],
"PaymentRate": [
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 1,
"pra_price": 300
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 6,
"pra_price": 700
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 5,
"pra_price": 900
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 7,
"pra_price": 1800
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 8,
"pra_price": 2700
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 9,
"pra_price": 3600
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 10,
"pra_price": 4500
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 11,
"pra_price": 5400
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 12,
"pra_price": 6300
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 13,
"pra_price": 7200
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 14,
"pra_price": 8100
},
{
"pra_payment_option_id": 1099,
"pra_payment_unit_id": 15,
"pra_price": 9000
}
],
"Duration": [
{
"pun_id": 1,
"pun_label": "1h",
"pun_duration": 60
},
{
"pun_id": 3,
"pun_label": "15 min",
"pun_duration": 15
},
{
"pun_id": 5,
"pun_label": "24h",
"pun_duration": 1440
},
{
"pun_id": 6,
"pun_label": "3h",
"pun_duration": 180
},
{
"pun_id": 7,
"pun_label": "48h",
"pun_duration": 2880
},
{
"pun_id": 8,
"pun_label": "72h",
"pun_duration": 4320
},
{
"pun_id": 9,
"pun_label": "96h",
"pun_duration": 5760
},
{
"pun_id": 10,
"pun_label": "120h",
"pun_duration": 7200
},
{
"pun_id": 11,
"pun_label": "144h",
"pun_duration": 8640
},
{
"pun_id": 12,
"pun_label": "168h",
"pun_duration": 10080
},
{
"pun_id": 13,
"pun_label": "192h",
"pun_duration": 11520
},
{
"pun_id": 14,
"pun_label": "216h",
"pun_duration": 12960
},
{
"pun_id": 15,
"pun_label": "240h",
"pun_duration": 14400
}
]
}

16
etc/psa_update/opkg_commands Executable file
View File

@ -0,0 +1,16 @@
###############################################################################
# !!! NOTE !!!
###############################################################################
# opkg-commands added to this file will be executed by ATBUpdateTool.
###############################################################################
#
opkg update
opkg install prepare-update
#
opkg --cache /var/cache/opkg --download-only upgrade atb-dc-libraries
opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-dc
opkg --cache /var/cache/opkg --download-only upgrade atbqt
#
opkg --cache /var/cache/opkg upgrade atb-dc-libraries
opkg --cache /var/cache/opkg upgrade atb-plugin-dc
opkg --cache /var/cache/opkg upgrade atbqt