Compare commits

..

26 Commits

Author SHA1 Message Date
fa71def31a Merge branch 'zg1/zone1' of https://ptu-config.atb-comm.de/ATB/customer_743 into zg1/zone1 2024-11-04 10:09:56 +01:00
c0abeb7989 Add tariff-file with new format, but functional same as tariff01 2024-11-04 10:09:21 +01:00
547331592e
APP states: Coin-input: wait for CASH_INPUT_FINISHED 2024-11-04 08:52:31 +01:00
a0c9ec223a
Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_743 into zg1/zone1 2024-10-31 16:20:53 +01:00
553f376583
APP states: handle CALCULATE_TIME_OVERPAID 2024-10-31 16:20:03 +01:00
5c0ee36168 Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_743 into zg1/zone1 2024-08-28 10:51:31 +02:00
141c83848e Update for Stadt-Muenzen 2024-08-28 10:49:07 +02:00
f271722cd8
opkg install release 2024-06-18 2024-07-03 08:59:26 +02:00
536f64af46
Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_743 into zg1/zone1 2024-07-03 08:57:01 +02:00
9d1c99c617 Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_743 into zg1/zone1 2024-07-02 17:08:36 +02:00
1c203cacfb Update as provided by Dennis 2024-07-02 17:07:41 +02:00
28a9b035f4
opkg: release 20240517-1 2024-05-21 11:25:24 +02:00
ffd1e142e6
VendingProcess: fix direct coin input 2024-05-14 13:53:15 +02:00
d13e716c4d
Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_743 into zg1/zone1 2024-05-14 13:45:06 +02:00
356b1df277 New Version for test 2024-05-14 10:20:48 +02:00
4c503f083b DC2Cv-5.19 2024-05-13 16:18:20 +02:00
eda56d83e0
Merge branch 'master' into zg1/zone1 2024-02-27 14:25:47 +01:00
9bc4c69886
Merge branch 'master' into zg1/zone1 2024-02-27 13:36:45 +01:00
813f00c1e6
Merge branch 'master' into zg1/zone1 2024-02-27 09:52:49 +01:00
56df6fdafe newline after kirchdorf 2024-02-26 15:11:09 +01:00
340ec04e3b newline after kirchdorf 2024-02-26 15:10:46 +01:00
594c6365de Sync tariff file with master 2024-02-26 14:53:15 +01:00
3af68e30e5 Add files from 26.02.2024 as provided by thomas 2024-02-26 14:46:07 +01:00
e441d62f4d Define explicit time range for the first 30 minutes of the tariff.
Add tariff-config to define the tariff as dynamic, meaning that it can start
at any minute (modulo operation times).
2024-02-21 11:19:53 +01:00
a813ea48bc remove installing atbupdatetool and mxt-touch-reset 2024-02-20 12:17:56 +01:00
f5e8909c91 Add tariff file for Kirchdorf. 2024-02-16 13:39:58 +01:00
4 changed files with 22 additions and 32 deletions

View File

@ -18,15 +18,12 @@
<EVENT name="TIMEOUT" resultingState="CASH_PAYMENT" <EVENT name="TIMEOUT" resultingState="CASH_PAYMENT"
setCashInputMode="PAY_UP" setCashInputMode="PAY_UP"
setProduct="SHORT_TERM_PARKING" setProduct="SHORT_TERM_PARKING"
setPaymentType="CASH"/>/> setPaymentType="CASH"/>
</APP_STATE> </APP_STATE>
<APP_STATE name="PAYMENT_SELECTION"> <APP_STATE name="PAYMENT_SELECTION">
<EVENT name="BUTTON_CANCEL" resultingState="IDLE"/> <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
<EVENT name="RECEIVED_DC_COIN_ATTACHED" resultingState="CASH_PAYMENT" setCashInputMode="PAY_UP"
setProduct="SHORT_TERM_PARKING"
setPaymentType="CASH"/>
<EVENT name="BUTTON_PAYMETHOD_1" resultingState="IDLE"/> <EVENT name="BUTTON_PAYMETHOD_1" resultingState="IDLE"/>
<EVENT name="BUTTON_PAYMETHOD_2" resultingState="CASH_PAYMENT" setCashInputMode="PAY_UP" <EVENT name="BUTTON_PAYMETHOD_2" resultingState="CASH_PAYMENT" setCashInputMode="PAY_UP"
setProduct="SHORT_TERM_PARKING" setProduct="SHORT_TERM_PARKING"
@ -81,6 +78,9 @@
</APP_STATE> </APP_STATE>
<APP_STATE name="CASH_PAYMENT_INPUT"> <APP_STATE name="CASH_PAYMENT_INPUT">
<ENTRY_TASK name="REQUEST_PARKING_ENDTIME"/> <ENTRY_TASK name="REQUEST_PARKING_ENDTIME"/>
<!-- AUTO-TICKET on PayUp: accept payment -->
<EVENT name="RECEIVED_CALCULATE_TIME_OVERPAID" task="PAYMENT_ACCEPTED" resultingState="CASH_PAYMENT_INPUT"/>
<EVENT name="RECEIVED_CALCULATE_TIME_MAX" task="PAYMENT_ACCEPTED" resultingState="CASH_PAYMENT_INPUT"/>
<EVENT name="RECEIVED_CASH_INPUT" resultingState="CASH_PAYMENT_INPUT"/> <EVENT name="RECEIVED_CASH_INPUT" resultingState="CASH_PAYMENT_INPUT"/>
<EVENT name="RECEIVED_CASH_INPUT_OVERPAYED" resultingState="CASH_OVERPAYED_ASK"/> <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_FINISHED" resultingState="PRINT_TICKET_CASH"/>

View File

@ -1,12 +0,0 @@
{
"title":"DC2C_config",
"project":"Kirchdorf",
"version":"22.01.2024 00001",
"custNum":743,
"machNum":1000,
"borough":1,
"zone":1,
"alias":0,
"location":""
}

View File

@ -1,7 +1,7 @@
{ {
"title":"DC2C_device", "title":"DC2C_device",
"project":"Galltuer", "project":"Kirchdorf",
"Version":"22.01.2024 00103", "Version":"02.07.2024 00103",
"printer":1, "printer":1,
"coinChk":1, "coinChk":1,
"mifRd":1, "mifRd":1,
@ -25,6 +25,11 @@
"foreign":1, "foreign":1,
"refundPrint":1, "refundPrint":1,
"billWarnLev":400, "billWarnLev":400,
"billFullLev":500 "billFullLev":500,
"housing":1,
"changeCoins":1,
"dev_aux1":0,
"dev_aux2":0,
"dev_aux3":0,
"dev_aux4":0
} }

View File

@ -6,14 +6,11 @@
# #
opkg update opkg update
opkg install prepare-update opkg install prepare-update
# opkg install atbupdatetool #
# opkg install mxt-touch-reset opkg --cache /var/cache/opkg --download-only upgrade atb-dc-libraries
# opkg remove atb-accountingtool opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-dc
# opkg install atb-accountingtool opkg --cache /var/cache/opkg --download-only upgrade atbqt
opkg --cache /var/cache/opkg --download-only upgrade #
opkg --cache /var/cache/opkg upgrade opkg --cache /var/cache/opkg upgrade atb-dc-libraries
# opkg remove apism opkg --cache /var/cache/opkg upgrade atb-plugin-dc
# opkg install apism opkg --cache /var/cache/opkg upgrade atbqt
opkg info apism
opkg info atbqt
opkg info atbupdatetool