31 Commits

Author SHA1 Message Date
1362c61ae4 sync with brancht zg1/zone101 2024-04-12 09:11:01 +02:00
d9c98d5748 add tariff101.json for zone101 (solar) 2024-04-10 10:27:41 +02:00
c767849c2c remove separate solar/net.jsons 2024-04-10 10:17:11 +02:00
74dad410bb Add ptu5-systemcontroller using upgrade 2024-04-10 10:12:09 +02:00
0e6272602c Added opkg install tariff-config-332 2024-04-09 17:00:35 +02:00
c537095c46 Update tariff-info to trigger new download 2024-04-09 15:09:40 +02:00
038bc004a8 Update tariffs for zone1 and zone2 2024-04-09 10:27:52 +02:00
db10f7fcf8 update version to 05.04.2024 2024-04-05 13:50:23 +02:00
3a51bebd82 Fix typo: Koenigssee 2024-03-28 09:15:24 +01:00
491624619a Set version to 1.1.1 for testing. 2024-03-15 11:33:18 +01:00
03d1a113a8 Set pop_max_time: 10080, pop_multi_hour_price: 8 2024-03-15 10:39:32 +01:00
a49807484b Merge branch 'master' of git.mimbach49.de:GerhardHoffmann/customer_332 2024-03-13 13:52:42 +01:00
983d54d838 ATBAPP: Add customer vending process description (states) 2024-03-13 13:28:43 +01:00
f1e7dc9e0f set min-price to 300 2024-03-13 13:10:57 +01:00
9dc0e02105 Merge branch 'master' of git.mimbach49.de:GerhardHoffmann/customer_332 2024-03-13 12:44:28 +01:00
a5835dddae Change tariff for zone2 (Hinterbrand) 2024-02-26 09:39:10 +01:00
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
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
f0180cbe30 Add opkg install mxt-touch-reset to fix touch-screen issues 2024-01-24 12:42:37 +01:00
9480f75479 sync with branch zg1/zone1 2024-01-24 12:31:38 +01:00
a3868cea1b Sync with branch zg1/zone1 2023-11-29 09:33:53 +01:00
eff3c6351d Fix typo: 5670 -> 5760. 2023-11-28 10:26:06 +01:00
909c124fb8 Add new files (used for new templates) 2023-11-24 13:42:42 +01:00
5f755bd800 Revert version to original 00001. 2023-11-24 09:39:53 +01:00
fd3ef4d79f Remove euro sign. 2023-11-24 09:30:36 +01:00
cd7db15372 Remove euro sign. 2023-11-24 09:30:16 +01:00
3ac760eb9b Switch back to machine-id 1000 and zone = 0 (original setting) 2023-11-24 09:29:38 +01:00
01166c2644 witch back to machine-id 1000 and zone=0. 2023-11-24 09:28:34 +01:00
0fe79592ee Merge branch 'zg1/zone1' 2023-11-22 17:14:36 +01:00
938bcc0144 Add json-config files for schoenau. 2023-11-20 13:10:20 +01:00
1f9c20f774 Add opkg_commands file. 2023-11-16 09:47:27 +01:00
14 changed files with 84 additions and 3143 deletions

1
README
View File

@@ -1 +0,0 @@
This is a demo/test zone for update tests

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

File diff suppressed because it is too large Load Diff

View File

@@ -1,14 +1,14 @@
{
"title":"DC2C_cash ",
"project":"Schoenau",
"version":"06.05.2024 02.00.07",
"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],
"version":"15.10.2023 14:55 02.00.06",
"CoinDenom(15..0)":[200,100,50,0,0,0,0,0,0,255,200,100,50,20,10,5],
"CoinValue(15..0)":[0,380,0,0,0,0,0,0,0,3,200,100,50,20,10,5],
"CoinAccept(15..0)":[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
"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],
"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
"BillAccept(15..0)":[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
"LocalTaxRate":19,
"ForeignTaxRate":0,
"Surcharge":0,

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

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

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

View File

@@ -23,9 +23,5 @@
"BattWarn":11800,
"BattErr":11200,
"foreign":1,
"refundPrint":1,
"billWarnLev":300,
"billFullLev":380,
"housing":1
"refPrint":1
}

View File

@@ -1,7 +1,7 @@
{
"title":"DC2C_pri03",
"project":"Schoenau",
"Version":"09.04.2024 00001",
"Version":"05.04.2024 00001",
"feed":"nl",
"styl":"size 00",
"text":"Automat: ",

View File

@@ -1,7 +1,7 @@
{
"title":"DC2C_pri07",
"project":"Schoenau",
"Version":"09.04.2024 00001",
"Version":"05.04.2024 00001",
"feed":"nl",
"styl":"size 00",
"text":"Automat: ",

View File

@@ -1,7 +1,7 @@
{
"title":"DC2C_pri32",
"project":"refund reciept",
"Version":"01.12.2023 00007",
"Version":"15.11.2023 00002",
"styl":"font 08",
"styl":"size 10",
"feed":"margin02",

View File

@@ -1,177 +0,0 @@
{
"Project" : "Schoenau",
"Version" : "1.2.0",
"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
}
]
}

View File

@@ -6,21 +6,9 @@
#
opkg update
opkg install prepare-update
#
opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-dc
opkg --cache /var/cache/opkg upgrade atb-plugin-dc
#
opkg --cache /var/cache/opkg --download-only upgrade apism
opkg --cache /var/cache/opkg upgrade apism
#
opkg --cache /var/cache/opkg --download-only upgrade atb-dc-libraries
opkg --cache /var/cache/opkg upgrade atb-dc-libraries
#
opkg --cache /var/cache/opkg --download-only upgrade atbupdatetool
opkg --cache /var/cache/opkg upgrade atbupdatetool
#
opkg --cache /var/cache/opkg --download-only upgrade apconfig
opkg --cache /var/cache/opkg upgrade apconfig
#
opkg --cache /var/cache/opkg --download-only upgrade atbqt
opkg --cache /var/cache/opkg upgrade atbqt
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