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

Compare commits

base: GerhardHoffmann:zg1/zone101
Branches Tags
GerhardHoffmann:master
GerhardHoffmann:zg1/zone100
GerhardHoffmann:zg1/zone1
GerhardHoffmann:zg1/zone2
GerhardHoffmann:zg1/zone3
GerhardHoffmann:zg1/zone101
..
compare: GerhardHoffmann:master
Branches Tags
GerhardHoffmann:master
GerhardHoffmann:zg1/zone100
GerhardHoffmann:zg1/zone1
GerhardHoffmann:zg1/zone2
GerhardHoffmann:zg1/zone3
GerhardHoffmann:zg1/zone101

56 Commits
zg1/zone10 ... master

Author SHA1 Message Date
Siegfried Siegert
b3233143d6
Textupdate: "Wait for Terminal" 2024-08-02 10:32:47 +02:00
Gerhard Hoffmann
99defbb851 Fix (Thomas): Title -> title 2024-06-17 15:41:27 +02:00
Gerhard Hoffmann
ab371e437c Update Jsons for Schoenau as provided by Thomas 2024-06-17 11:43:49 +02:00
Gerhard Hoffmann
82a04d0a06 sync master with zg1/zone1 (-> and all other branches) 2024-05-08 11:19:12 +02:00
Gerhard Hoffmann
4915aaaa38 keep only 'opkg update' 2024-05-06 12:22:19 +02:00
Gerhard Hoffmann
262f333864 Update DC2C_cash/device.json as provides by Thomas 2024-05-06 11:15:38 +02:00
Gerhard Hoffmann
a5aaf055f9 Set version date (23/04) -> trigger git 2024-04-23 12:38:50 +02:00
Gerhard Hoffmann
1362c61ae4 sync with brancht zg1/zone101 2024-04-12 09:11:01 +02:00
Gerhard Hoffmann
d9c98d5748 add tariff101.json for zone101 (solar) 2024-04-10 10:27:41 +02:00
Gerhard Hoffmann
c767849c2c remove separate solar/net.jsons 2024-04-10 10:17:11 +02:00
Gerhard Hoffmann
74dad410bb Add ptu5-systemcontroller using upgrade 2024-04-10 10:12:09 +02:00
Gerhard Hoffmann
0e6272602c Added opkg install tariff-config-332 2024-04-09 17:00:35 +02:00
Gerhard Hoffmann
c537095c46 Update tariff-info to trigger new download 2024-04-09 15:09:40 +02:00
Gerhard Hoffmann
038bc004a8 Update tariffs for zone1 and zone2 2024-04-09 10:27:52 +02:00
Gerhard Hoffmann
db10f7fcf8 update version to 05.04.2024 2024-04-05 13:50:23 +02:00
Gerhard Hoffmann
3a51bebd82 Fix typo: Koenigssee 2024-03-28 09:15:24 +01:00
Gerhard Hoffmann
491624619a Set version to 1.1.1 for testing. 2024-03-15 11:33:18 +01:00
Gerhard Hoffmann
03d1a113a8 Set pop_max_time: 10080, pop_multi_hour_price: 8 2024-03-15 10:39:32 +01:00
Siegfried Siegert
a49807484b
Merge branch 'master' of git.mimbach49.de:GerhardHoffmann/customer_332 2024-03-13 13:52:42 +01:00
Siegfried Siegert
983d54d838
ATBAPP: Add customer vending process description (states) 2024-03-13 13:28:43 +01:00
Gerhard Hoffmann
f1e7dc9e0f set min-price to 300 2024-03-13 13:10:57 +01:00
Siegfried Siegert
9dc0e02105
Merge branch 'master' of git.mimbach49.de:GerhardHoffmann/customer_332 2024-03-13 12:44:28 +01:00
Gerhard Hoffmann
a5835dddae Change tariff for zone2 (Hinterbrand) 2024-02-26 09:39:10 +01:00
Gerhard Hoffmann
9569c90ddc sync with tariff01.json in zg1/zone1 -> Minor: version from 1.0.0 to 1.0.15 2024-01-25 11:39:26 +01:00
Gerhard Hoffmann
5036717517 On not upgrade, but install packages only with direct commands. 
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:50:14 +01:00
Gerhard Hoffmann
f0180cbe30 Add opkg install mxt-touch-reset to fix touch-screen issues 2024-01-24 12:42:37 +01:00
Gerhard Hoffmann
9480f75479 sync with branch zg1/zone1 2024-01-24 12:31:38 +01:00
Gerhard Hoffmann
a3868cea1b Sync with branch zg1/zone1 2023-11-29 09:33:53 +01:00
Gerhard Hoffmann
eff3c6351d Fix typo: 5670 -> 5760. 2023-11-28 10:26:06 +01:00
Gerhard Hoffmann
909c124fb8 Add new files (used for new templates) 2023-11-24 13:42:42 +01:00
Gerhard Hoffmann
5f755bd800 Revert version to original 00001. 2023-11-24 09:39:53 +01:00
Gerhard Hoffmann
fd3ef4d79f Remove euro sign. 2023-11-24 09:30:36 +01:00
Gerhard Hoffmann
cd7db15372 Remove euro sign. 2023-11-24 09:30:16 +01:00
Gerhard Hoffmann
3ac760eb9b Switch back to machine-id 1000 and zone = 0 (original setting) 2023-11-24 09:29:38 +01:00
Gerhard Hoffmann
01166c2644 witch back to machine-id 1000 and zone=0. 2023-11-24 09:28:34 +01:00
Siegfried Siegert
0fe79592ee
Merge branch 'zg1/zone1' 2023-11-22 17:14:36 +01:00
Siegfried Siegert
1ec8e27971
Price in cents 2023-11-22 17:10:30 +01:00
Gerhard Hoffmann
c7891ec6dd set mach-id to 1004 for testing 2023-11-22 10:17:05 +01:00
Gerhard Hoffmann
4d9c93f7ed set mach-id to 1002 for testing 2023-11-22 10:03:07 +01:00
Gerhard Hoffmann
0a790a2042 set mach-id to 1001 for testing 2023-11-22 09:47:23 +01:00
Gerhard Hoffmann
73f4acf321 set mach-id to 100 for testing 2023-11-22 09:42:51 +01:00
Gerhard Hoffmann
94701c0022 set mach-id = 1111 for testing 2023-11-21 11:43:42 +01:00
Gerhard Hoffmann
bfb05e696a set zone = 1 for testing 2023-11-21 11:39:09 +01:00
Gerhard Hoffmann
7227f0a33d set mach-id = 1000 for testing 2023-11-21 11:34:31 +01:00
Gerhard Hoffmann
597b509e10 set zone = 1 for testing 2023-11-21 11:22:25 +01:00
Gerhard Hoffmann
b48d9f80bf set mach-id = 991 for testing 2023-11-21 11:12:53 +01:00
Gerhard Hoffmann
8129998ead set mach-id = 1000 for testing 2023-11-21 11:07:19 +01:00
Gerhard Hoffmann
2b8d45d6e7 Set machine id = 1001 for testing. 2023-11-21 10:49:12 +01:00
Gerhard Hoffmann
400a6da94f testing 2023-11-20 15:08:14 +01:00
Gerhard Hoffmann
88bf5c05cd readd prepare-update.w 2023-11-20 15:05:56 +01:00
Gerhard Hoffmann
58ab99e33c testing 2023-11-20 15:01:42 +01:00
Gerhard Hoffmann
92b813ea23 Testing without prepare-update. 2023-11-20 15:00:41 +01:00
Gerhard Hoffmann
938bcc0144 Add json-config files for schoenau. 2023-11-20 13:10:20 +01:00
Gerhard Hoffmann
98310cd13d Add config files for schoenau. 2023-11-20 13:08:28 +01:00
Gerhard Hoffmann
a1d9e30269 Add opkg_commands file. 2023-11-16 09:48:59 +01:00
Gerhard Hoffmann
1f9c20f774 Add opkg_commands file. 2023-11-16 09:47:27 +01:00
9 changed files with 128 additions and 69 deletions
Show Stats Expand all files Collapse all files

77
etc/atbapp/states/APP_States.xml
View File

@ -1,8 +1,7 @@
<?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="BUTTON_START" resultingState="LICENSEPLATE_INPUT"/>
<EVENT name="SELL_DISABLE" resultingState="FREE_PARK"/>
<SCREEN name="START"/>
<MODE name="IDLE"/>
@ -13,32 +12,17 @@
<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"/>
<EVENT name="BUTTON_NEXT" resultingState="PARKTIME_SELECTION" setProduct="ShortTimeParking"/>
<SCREEN name="LICENSEPLATE_INPUT"/>
</APP_STATE>
<APP_STATE name="PRODUCT_SELECTION">
<EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
<EVENT name="BUTTON_VEHICLE_1" resultingState="PAYMENT_SELECTION_SHORT_TIME" setCashInputMode="PAY_UP" setProduct="ShortTimeParking"/>
<EVENT name="BUTTON_VEHICLE_2" resultingState="PAYMENT_SELECTION_DAY" setCashInputMode="PAY_DOWN" setProduct="DayTicket"/>
<SCREEN name="PRODUCT_SELECTION"/>
</APP_STATE>
<APP_STATE name="PAYMENT_SELECTION">
<EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
@ -78,7 +62,7 @@
<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_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"/>
@ -87,8 +71,8 @@
<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_OVERPAYED" resultingState="PRINT_TICKET_CASH"/>
<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"/>
<SCREEN name="COIN_PAYMENT"/>
@ -96,8 +80,8 @@
<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_OVERPAYED" resultingState="PRINT_TICKET_CASH"/>
<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"/>
<EVENT name="BUTTON_NEXT" task="PAYMENT_ACCEPTED" resultingState="CASH_PAYMENT_INPUT"/>
@ -110,7 +94,7 @@
<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="REQUEST_ISAMAS_FAIL_TRANSACTION"/>
<ENTRY_TASK name="CASH_ABORT"/>
<ENTRY_TASK name="TIMER" timeout="3000"/>
<EVENT name="TIMEOUT" resultingState="IDLE"/>
@ -130,19 +114,6 @@
<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"/>
@ -166,28 +137,20 @@
<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_SUCCESS" resultingState="PRINT_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>
<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>
<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 -->
<!-- TODO: hangle changer Error -->
<!-- no screen change here -->
</APP_STATE>
<APP_STATE name="GIVE_CHANGE">
@ -198,8 +161,8 @@
<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>
<SCREEN name="GOODBYE_PAYMENT_OK"/>
</APP_STATE>
<APP_STATE name="CC_PAYMENT_ERROR">
<ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>

0
etc/psa_config/DC2C_conf.json Normal file → Executable file
View File

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

@ -0,0 +1,12 @@
{
"title":"DC2C_config",
"project":"Schoenau",
"version":"15.11.2023 00001",
"custNum":332,
"machNum":21,
"borough":0,
"zone":0,
"alias":0,
"location":"Vorplatz 1"
}

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

@ -0,0 +1,12 @@
{
"title":"DC2C_config",
"project":"Schoenau",
"version":"15.11.2023 00001",
"custNum":332,
"machNum":25,
"borough":0,
"zone":0,
"alias":0,
"location":"Vorplatz 1"
}

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

@ -0,0 +1,12 @@
{
"title":"DC2C_config",
"project":"Schoenau",
"version":"15.11.2023 00001",
"custNum":332,
"machNum":26,
"borough":0,
"zone":0,
"alias":0,
"location":"Vorplatz 1"
}

6
etc/psa_config/DC2C_device.json
View File

@ -1,11 +1,11 @@
{
"title":"DC2C_device",
"Title":"DC2C_device",
"Project":"Schoenau",
"Version":"6.7.2-2024-06-17",
"Version":"6.7.1-2024-06-17",
"printer":1,
"coinChk":3,
"mifRd":1,
"solarPwr":1,
"solarPwr":0,
"modem":1,
"creditCard":1,
"escrow":0,

31
etc/psa_config/DC2C_device_json.netz Normal 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
}

31
etc/psa_config/DC2C_device_json.solar Normal file
View File

@ -0,0 +1,31 @@
{
"title":"DC2C_device",
"Project":"Schoenau",
"Version":"6.7.2-2024-06-17",
"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,
"refundPrint":1,
"billWarnLev":300,
"billFullLev":380,
"housing":1
}

16
etc/psa_update/opkg_commands
View File

@ -5,12 +5,10 @@
###############################################################################
#
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
# opkg install prepare-update
# opkg install atbupdatetool
# opkg install mxt-touch-reset
# opkg install apism
# opkg install tariff-config-332
# opkg --cache /var/cache/opkg --download-only upgrade ptu5-systemcontroller
# opkg --cache /var/cache/opkg upgrade ptu5-systemcontroller